2270 files changed, 49225 insertions, 15973 deletions

diff --git a/community/adns/PKGBUILD b/community/adns/PKGBUILD
index 1ccd12a8e..b8bb1ffcb 100644
--- a/community/adns/PKGBUILD
+++ b/community/adns/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 65027 2012-02-20 02:05:52Z spupykin $
+# $Id: PKGBUILD 100126 2013-11-01 20:19:37Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: dorphell <dorphell@archlinux.org>
 # Contributor: Tom Newsom <Jeepster@gmx.co.uk>
 
 pkgname=adns
 pkgver=1.4
-pkgrel=3.1
+pkgrel=4
 pkgdesc="adns is an asyncronous replacement resolver library"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.chiark.greenend.org.uk/~ian/adns/"
@@ -18,6 +18,10 @@ build() {
   cd $srcdir/$pkgname-$pkgver
   ./configure --prefix=/usr
   make
+}
+
+package() {
+  cd $srcdir/$pkgname-$pkgver
   mkdir -p $pkgdir/usr/{lib,include,bin}
   make prefix=$pkgdir/usr install
 }
diff --git a/community/aegisub/PKGBUILD b/community/aegisub/PKGBUILD
index 9852e6f64..4d450a170 100755
--- a/community/aegisub/PKGBUILD
+++ b/community/aegisub/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 97224 2013-09-15 13:34:01Z alucryd $
+# $Id: PKGBUILD 99199 2013-10-25 12:58:18Z giovanni $
 # Maintainer: Maxime Gauduin <alucryd@gmail.com>
 # Contributor: kozec <kozec@kozec.com>
 # Contributor: Limao Luo <luolimao+AUR@gmail.com>
 
 pkgname=aegisub
 pkgver=3.0.4
-pkgrel=4
+pkgrel=5
 pkgdesc="A general-purpose subtitle editor with ASS/SSA support"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.aegisub.org"
diff --git a/community/afpfs-ng/PKGBUILD b/community/afpfs-ng/PKGBUILD
index 4435ea05d..c51c117fc 100644
--- a/community/afpfs-ng/PKGBUILD
+++ b/community/afpfs-ng/PKGBUILD
@@ -1,16 +1,15 @@
-# $Id: PKGBUILD 68567 2012-03-28 10:22:57Z idevolder $
+# $Id: PKGBUILD 99034 2013-10-22 19:25:28Z idevolder $
 # Maintainer: BlackIkeEagle <ike DOT devolder AT gmail DOT com>
 # Contributor: slubman <slubman.dndd@laposte.net>
 
 pkgname=afpfs-ng
 pkgver=0.8.1
-pkgrel=5
+pkgrel=7
 pkgdesc="A client for the Apple Filing Protocol (AFP)"
 url="http://alexthepuffin.googlepages.com/"
 license=('GPL')
 depends=('gmp' 'fuse' 'libgcrypt')
 arch=('i686' 'x86_64' 'mips64el')
-options=(!libtool)
 source=(
 	"http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.bz2"
 	'fix_afpfs-ng_includes.patch'
diff --git a/community/agg/PKGBUILD b/community/agg/PKGBUILD
index a8f4b8e7d..d0e088f88 100644
--- a/community/agg/PKGBUILD
+++ b/community/agg/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 55569 2011-09-14 10:30:07Z andrea $
+# $Id: PKGBUILD 99669 2013-10-30 22:54:38Z allan $
 # Maintainer: Jonathan Conder <jonno dot conder at gmail dot com>
 
 pkgname=agg
@@ -11,7 +11,7 @@ license=('GPL')
 depends=('gcc-libs' 'sdl' 'freetype2')
 provides=('antigrain')
 replaces=('antigrain')
-options=('!libtool' '!makeflags')
+options=('!makeflags')
 source=("http://www.antigrain.com/${pkgname}-${pkgver}.tar.gz"
         agg-2.4-depends.patch
         agg-2.5-pkgconfig.patch)
diff --git a/community/algol68g/PKGBUILD b/community/algol68g/PKGBUILD
index 587ce029b..71b9a973f 100644
--- a/community/algol68g/PKGBUILD
+++ b/community/algol68g/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 94260 2013-07-18 11:12:21Z arodseth $
+# $Id: PKGBUILD 100425 2013-11-04 08:08:07Z arodseth $
 # Maintainer: Alexander Rødseth <rodseth@gmail.com>
 # Contributor: karolina.lindqvist@kramnet.se
 
 pkgname=algol68g
-pkgver=2.7
+pkgver=2.8
 pkgrel=1
 pkgdesc='Algol 68 Genie, an Algol 68 compiler-interpreter'
 arch=('x86_64' 'i686' 'mips64el')
@@ -14,25 +14,25 @@ optdepends=('postgresql-libs: for postgresql support')
 source=("http://jmvdveer.home.xs4all.nl/algol68g-$pkgver.tar.gz"
       	'plotutils.patch'
       	'http://www.xs4all.nl/~jmvdveer/a68gdoc.pdf')
-sha256sums=('ebcf029ae65ceafca87090cc470dd37f86ac0bdb1529cd4dd7a92454d224d325'
+sha256sums=('0c6fc7213f5a00f978faef2d09622d2c3ee01c87594dd6f5c51cd532b719861a'
             '50afcc7812d117e5f0a2f5240c9cd58f8bfcc04b3da0634b9aa0ab06183ed0aa'
-            '8cbfb480cb5dfb20f79c2391d7111fc8b727c3e9e02008ab4c0cde9acb62e7d3')
+            '74e2cf28074a7588608209de1a38faec7649e4f8d341ea914ea613ce167aed19')
 
 prepare() {
-  cd "$srcdir/$pkgname-$pkgver"
+  cd "$pkgname-$pkgver"
 
   patch -p1 -i ../plotutils.patch
 }
 
 build() {
-  cd "$srcdir/$pkgname-$pkgver"
+  cd "$pkgname-$pkgver"
 
   ./configure --prefix=/usr
   make
 }
 
 package() {
-  cd "$srcdir/$pkgname-$pkgver"
+  cd "$pkgname-$pkgver"
 
   make DESTDIR="$pkgdir" docdir="/usr/share/doc/$pkgname" install
   install "$srcdir/a68gdoc.pdf" "$pkgdir/usr/share/doc/$pkgname"
diff --git a/community/alltray/PKGBUILD b/community/alltray/PKGBUILD
index a01d2b3b1..1354390dd 100644
--- a/community/alltray/PKGBUILD
+++ b/community/alltray/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 65283 2012-02-20 15:18:04Z spupykin $
+# $Id: PKGBUILD 99670 2013-10-30 22:55:01Z allan $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer : James Rayner <iphitus@gmail.com>
 # Contributor: Roberto Salas <ro0xito@gmail.com>
@@ -11,7 +11,6 @@ license=('GPL')
 arch=('i686' 'x86_64' 'mips64el')
 url="http://alltray.trausch.us/"
 depends=('libxpm' 'libgtop' 'libwnck')
-options=('!libtool')
 source=(https://code.launchpad.net/alltray/trunk/${pkgver}/+download/alltray-${pkgver}.tar.gz)
 md5sums=('5842253b89a5943031b5a02bbd8fd4fb')
 
diff --git a/community/amidi-plug/PKGBUILD b/community/amidi-plug/PKGBUILD
index 735feff9f..9e7d39e67 100644
--- a/community/amidi-plug/PKGBUILD
+++ b/community/amidi-plug/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 65039 2012-02-20 02:15:30Z spupykin $
+# $Id: PKGBUILD 99671 2013-10-30 22:55:22Z allan $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: yosh64 <yosh64.at.gmail.dot.com>
 
@@ -11,7 +11,6 @@ url="http://www.develia.org/projects.php?l=2&f=1&p=amidiplug"
 license=('GPL2')
 depends=('xmms' 'fluidsynth')
 makedepends=('pkgconfig')
-options=('!libtool')
 source=(http://www.develia.org/files/$pkgname-$pkgver.tar.bz2)
 md5sums=('bb128c40dce0ab4afda79da01f985a09')
 
diff --git a/community/anyfs-tools/PKGBUILD b/community/anyfs-tools/PKGBUILD
index 9cfb60279..b0f86516c 100644
--- a/community/anyfs-tools/PKGBUILD
+++ b/community/anyfs-tools/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 91828 2013-05-28 17:03:05Z spupykin $
+# $Id: PKGBUILD 100128 2013-11-01 20:19:59Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com>
 
 pkgname=anyfs-tools
 pkgver=0.85.1c
-pkgrel=4
+pkgrel=5
 pkgdesc="unix-way toolset for recovering and converting filesystems"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://anyfs-tools.sourceforge.net/"
diff --git a/community/aqbanking/PKGBUILD b/community/aqbanking/PKGBUILD
index 85a76a355..40a7f9afe 100644
--- a/community/aqbanking/PKGBUILD
+++ b/community/aqbanking/PKGBUILD
@@ -1,18 +1,17 @@
-# $Id: PKGBUILD 74854 2012-08-07 14:17:14Z spupykin $
+# $Id: PKGBUILD 100084 2013-11-01 13:55:55Z eric $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: David Moore <davidm@sjsoft.com>
 
 pkgname=aqbanking
 pkgver=5.0.25
 _dnrel=95
-pkgrel=1
+pkgrel=2
 pkgdesc="A library for online banking and financial applications"
 arch=(i686 x86_64 'mips64el')
-options=('!libtool')
 url="http://www.aquamaniac.de/aqbanking"
 license=('GPL')
 depends=('gwenhywfar' 'ktoblzcheck' 'libofx')
-options=('!makeflags' '!libtool')
+options=('!makeflags')
 source=("aqbanking-$pkgver.tar.gz::http://www2.aquamaniac.de/sites/download/download.php?package=03&release=${_dnrel}&file=01&dummy=aqbanking-$pkgver.tar.gz")
 md5sums=('b238639962128ce25db81870f65173d9')
 
@@ -23,5 +22,9 @@ build() {
 	--with-backends="aqhbci aqofxconnect" \
 	--enable-gwenhywfar
   make
+}
+
+package() {
+  cd $srcdir/aqbanking-$pkgver
   make DESTDIR=$pkgdir install
 }
diff --git a/community/argyllcms/PKGBUILD b/community/argyllcms/PKGBUILD
index 29aa2e938..ef7dd7bb4 100644
--- a/community/argyllcms/PKGBUILD
+++ b/community/argyllcms/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 96037 2013-08-19 11:21:51Z tredaelli $
+# $Id: PKGBUILD 99402 2013-10-28 11:10:04Z tredaelli $
 # Maintainer: Timothy Redaelli <timothy.redaelli@gmail.com>
 # Contributor: Frank Ickstadt (frank dot ickstadt at gmail dot com)
 
 pkgname=argyllcms
 _pkgname=Argyll
-pkgver=1.6.0
+pkgver=1.6.1
 _pkgver="V${pkgver}"
 pkgrel=1
 pkgdesc="An ICC compatible color management system with support for different colorimeter hardware"
@@ -15,7 +15,7 @@ source=(http://www.argyllcms.com/${_pkgname}_${_pkgver}_src.zip)
 url="http://www.argyllcms.com/"
 license=("GPL" "AGPL")
 install=${pkgname}.install
-md5sums=('0e89e62fd4bb49dcc6ce57d54592216e')
+md5sums=('aed439b76054ef8e8b065106d314681c')
 
 build() {
   cd "${srcdir}"/${_pkgname}_${_pkgver}
diff --git a/community/aria2/PKGBUILD b/community/aria2/PKGBUILD
index b6ccfc609..24c4e4b91 100644
--- a/community/aria2/PKGBUILD
+++ b/community/aria2/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 97034 2013-09-11 06:15:17Z bpiotrowski $
+# $Id: PKGBUILD 99071 2013-10-24 08:15:38Z bpiotrowski $
 # Maintainer:  Bartłomiej Piotrowski <nospam@bpiotrowski.pl>
 # Contributor: Thomas Dziedzic < gostrc at gmail >
 # Contributor: Angel Velasquez <angvp@archlinux.org>
@@ -6,7 +6,7 @@
 # Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
 
 pkgname=aria2
-pkgver=1.18.0
+pkgver=1.18.1
 pkgrel=1
 pkgdesc='Download utility that supports HTTP(S), FTP, BitTorrent, and Metalink'
 arch=('i686' 'x86_64' 'mips64el')
@@ -15,7 +15,7 @@ license=('GPL')
 depends=('gnutls' 'libxml2' 'sqlite' 'c-ares' 'ca-certificates')
 checkdepends=('cppunit')
 source=(http://downloads.sourceforge.net/aria2/aria2-${pkgver}.tar.xz)
-sha256sums=('431aa6a1ba1cf992d5ac68c2822854a6c6991f03d025608311b5d99227fc0ab7')
+sha256sums=('14179cec7d476204faa52c4220fd8332a1036edd2c16fa3a9a29fd5d8b763968')
 
 build() {
   cd $pkgname-$pkgver
diff --git a/community/ario/PKGBUILD b/community/ario/PKGBUILD
index db5e3a091..6012f53a3 100644
--- a/community/ario/PKGBUILD
+++ b/community/ario/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 63500 2012-02-05 11:51:34Z ibiru $
+# $Id: PKGBUILD 99673 2013-10-30 22:56:21Z allan $
 # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
 
 pkgname=ario
@@ -10,7 +10,6 @@ url="http://ario-player.sourceforge.net/"
 license=('GPL')
 depends=('avahi' 'curl' 'dbus-glib' 'gnutls' 'hicolor-icon-theme' 'libglade' 'libmpdclient' 'libnotify' 'libsoup' 'libunique' 'taglib' 'xdg-utils')
 makedepends=('intltool' 'perl-xml-parser')
-options=('!libtool')
 install=$pkgname.install
 changelog=$pkgname.changelog
 source=(http://downloads.sourceforge.net/sourceforge/$pkgname-player/$pkgname-$pkgver.tar.gz
diff --git a/community/arm-wince-cegcc-gcc-base/PKGBUILD b/community/arm-wince-cegcc-gcc-base/PKGBUILD
index 50d765ac0..443bd0801 100644
--- a/community/arm-wince-cegcc-gcc-base/PKGBUILD
+++ b/community/arm-wince-cegcc-gcc-base/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 61005 2011-12-20 11:51:03Z spupykin $
+# $Id: PKGBUILD 99680 2013-10-30 22:59:10Z allan $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 
 pkgname=arm-wince-cegcc-gcc-base
@@ -8,7 +8,6 @@ _prefix=/opt/cegcc
 pkgdesc="CE GCC bundle - cross compilation tools for WinCE"
 arch=(i686 x86_64)
 license=(GPL)
-options=(!libtool)
 url="http://cegcc.sf.net"
 depends=('glibc' 'mpfr' 'cloog')
 makedepends=(arm-wince-cegcc-binutils)
diff --git a/community/arm-wince-cegcc-gcc/PKGBUILD b/community/arm-wince-cegcc-gcc/PKGBUILD
index 8787f4b46..1962507a8 100644
--- a/community/arm-wince-cegcc-gcc/PKGBUILD
+++ b/community/arm-wince-cegcc-gcc/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 61036 2011-12-20 20:10:53Z spupykin $
+# $Id: PKGBUILD 99679 2013-10-30 22:58:46Z allan $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 
 pkgname=arm-wince-cegcc-gcc
@@ -8,7 +8,7 @@ _prefix=/opt/cegcc
 pkgdesc="CE GCC bundle - cross compilation tools for WinCE"
 arch=(i686 x86_64)
 license=('GPL')
-options=(!libtool !strip)
+options=(!strip)
 url="http://cegcc.sf.net"
 depends=('cloog' 'ppl' 'arm-wince-cegcc-binutils')
 makedepends=('arm-wince-cegcc-newlib' 'arm-wince-cegcc-w32api'
diff --git a/community/arp-scan/PKGBUILD b/community/arp-scan/PKGBUILD
index a6e2be7fa..c9db4118a 100644
--- a/community/arp-scan/PKGBUILD
+++ b/community/arp-scan/PKGBUILD
@@ -1,17 +1,16 @@
-# $Id: PKGBUILD 65634 2012-02-21 15:59:18Z mtorromeo $
+# $Id: PKGBUILD 98753 2013-10-17 14:37:31Z mtorromeo $
 # Maintainer: Massimiliano Torromeo <massimiliano.torromeo@gmail.com>
 # Contributor: xav <xav at ethertricks dot net>
 
 pkgname=arp-scan
-pkgver=1.8.1
-pkgrel=2.1
+pkgver=1.9
+pkgrel=1
 pkgdesc="A tool that uses ARP to discover and fingerprint IP hosts on the local network"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.nta-monitor.com/tools/arp-scan/"
 license=('GPL')
 depends=('libpcap' 'perl-libwww')
-source=(http://www.nta-monitor.com/tools/arp-scan/download/${pkgname}-${pkgver}.tar.gz)
-md5sums=('38db8f27fc6553a88367748ea04483d6')
+source=(http://www.nta-monitor.com/files/arp-scan/${pkgname}-${pkgver}.tar.gz)
 
 build() {
 	cd "${srcdir}/${pkgname}-${pkgver}"
@@ -24,3 +23,4 @@ package() {
 	make DESTDIR="${pkgdir}" install
 }
 
+sha256sums=('ce908ac71c48e85dddf6dd4fe5151d13c7528b1f49717a98b2a2535bd797d892')
diff --git a/community/arpack/PKGBUILD b/community/arpack/PKGBUILD
index 48bef3af5..3ef96376d 100644
--- a/community/arpack/PKGBUILD
+++ b/community/arpack/PKGBUILD
@@ -1,23 +1,22 @@
-# $Id: PKGBUILD 85849 2013-03-07 18:31:38Z arodseth $
+# $Id: PKGBUILD 99686 2013-10-30 23:01:28Z allan $
 # Maintainer: Alexander Rødseth <rodseth@gmail.com>
 # Contributor: William Rea <sillywilly@gmail.com>
 # Contributor: Stefan Husmann <stefan-husmann@t-online.de>
 
 pkgname=arpack
 pkgver=3.1.2
-pkgrel=1
+pkgrel=2
 arch=('x86_64' 'i686' 'mips64el')
 pkgdesc='Fortran77 subroutines designed to solve large scale eigenvalue problems'
 url='http://forge.scilab.org/index.php/p/arpack-ng/'
 license=('BSD')
 depends=('lapack' 'openmpi')
 provides=('arpack-ng')
-options=('!libtool')
 source=("http://forge.scilab.org/upload/$pkgname-ng/files/$pkgname-ng_$pkgver.tar.gz")
 sha256sums=('9338bda5bef5a4bafd99c18f327acb54f8be4ffc5c53d0a186e4aa27db3260f2')
 
 build() {
-  cd "$srcdir/$pkgname-ng_$pkgver"
+  cd "$pkgname-ng_$pkgver"
 
   ./configure --prefix=/usr --enable-mpi
   make \
@@ -27,7 +26,7 @@ build() {
 }
 
 package() {
-  cd "$srcdir/$pkgname-ng_$pkgver"
+  cd "$pkgname-ng_$pkgver"
 
   make DESTDIR="$pkgdir/" install
   install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING"
diff --git a/community/audit/PKGBUILD b/community/audit/PKGBUILD
index 6a8a24dac..5fa26701f 100644
--- a/community/audit/PKGBUILD
+++ b/community/audit/PKGBUILD
@@ -1,18 +1,18 @@
-# $Id: PKGBUILD 96792 2013-09-05 09:31:14Z mtorromeo $
+# $Id: PKGBUILD 99687 2013-10-30 23:01:49Z allan $
 # Maintainer: Massimiliano Torromeo <massimiliano.torromeo@gmail.com>
 # Contributor: Connor Behan <connor.behan@gmail.com>
 # Contributor: henning mueller <henning@orgizm.net>
 
 pkgname=audit
 pkgver=2.3.2
-pkgrel=1
+pkgrel=2
 pkgdesc='User space utilities for storing and searching the audit records generated by the audit subsystem in the Linux kernel.'
 url="http://people.redhat.com/sgrubb/$pkgname"
 arch=(i686 x86_64 mips64el)
 depends=(krb5 libcap-ng)
 makedepends=(libldap swig linux-headers python2)
 license=(GPL)
-options=(!libtool emptydirs)
+options=(emptydirs)
 backup=(
 	etc/libaudit.conf
 	etc/audit/rules.d/audit.rules
diff --git a/community/augeas/PKGBUILD b/community/augeas/PKGBUILD
index e8f44cddc..d990b72ed 100644
--- a/community/augeas/PKGBUILD
+++ b/community/augeas/PKGBUILD
@@ -1,16 +1,15 @@
-# $Id: PKGBUILD 95728 2013-08-16 08:25:38Z spupykin $
+# $Id: PKGBUILD 100130 2013-11-01 20:20:20Z spupykin $
 # Contributor: Thomas S Hatch <thatch45@gmail.com>
 # Contributor: Jon Nordby <jononor@gmail.com>
 
 pkgname=augeas
 pkgver=1.1.0
-pkgrel=1
+pkgrel=2
 pkgdesc="A configuration editing tool that parses config files and transforms them into a tree"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://augeas.net"
 license=('LGPL')
 depends=('libxml2' 'gcc-libs')
-options=('!libtool')
 source=(http://download.augeas.net/augeas-$pkgver.tar.gz{,.sig})
 md5sums=('520ce983457ff9ffa3816bc41a9f328b'
          'SKIP')
diff --git a/community/avfs/PKGBUILD b/community/avfs/PKGBUILD
index ed004f224..66f181e4c 100644
--- a/community/avfs/PKGBUILD
+++ b/community/avfs/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 83120 2013-01-27 15:51:39Z pierre $
+# $Id: PKGBUILD 99689 2013-10-30 23:02:31Z allan $
 # Maintainer: Kevin Piche <kevin@archlinux.org>
 # Contributor: K. Piche <kpiche@rogers.com>
 
@@ -10,7 +10,7 @@ arch=('i686' 'x86_64' 'mips64el')
 license=('GPL' 'LGPL')
 url="http://avf.sourceforge.net/"
 depends=('fuse' 'xz' 'perl')
-options=('!emptydirs' '!libtool')
+options=('!emptydirs')
 source=(http://downloads.sourceforge.net/sourceforge/avf/${pkgname}-${pkgver}.tar.bz2{,.asc})
 md5sums=('f0f254d092e54da14bbf3ea22b76da99'
          'd71607de21819f3d67246473f0bc21f3')
diff --git a/community/avifile/PKGBUILD b/community/avifile/PKGBUILD
index f2169a2af..8f5aecd1b 100644
--- a/community/avifile/PKGBUILD
+++ b/community/avifile/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 87987 2013-04-09 21:29:15Z eric $
+# $Id: PKGBUILD 99690 2013-10-30 23:02:52Z allan $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: tobias <tobias@archlinux.org>
 # Contributor: Tom Newsom <Jeepster@gmx.co.uk>
@@ -13,7 +13,6 @@ depends=('qt3' 'sdl' 'freetype2' 'libpng' 'libjpeg'
 makedepends=('lame' 'v4l-utils' 'chrpath')
 url="http://avifile.sourceforge.net"
 license=('GPL')
-options=('!libtool')
 source=("http://downloads.sourceforge.net/sourceforge/avifile/$pkgname-0.7-$pkgver.tar.bz2"
 	'gcc.patch'
 	'videodev.patch')
diff --git a/community/avr-binutils/PKGBUILD b/community/avr-binutils/PKGBUILD
index 636eba978..4a82e982a 100644
--- a/community/avr-binutils/PKGBUILD
+++ b/community/avr-binutils/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 88220 2013-04-14 18:16:45Z schuay $
+# $Id: PKGBUILD 99691 2013-10-30 23:03:14Z allan $
 # Maintainer: schuay <jakob.gruber@gmail.com>
 # Contributor: Brad Fanella <bradfanella@archlinux.us>
 # Contributor: Corrado Primier <bardo@aur.archlinux.org>
@@ -16,7 +16,7 @@ license=('GPL')
 depends=('glibc>=2.17' 'zlib' 'binutils')
 provides=("binutils-avr=$pkgver")
 replaces=('binutils-avr')
-options=('!libtool' '!distcc' '!ccache')
+options=('!distcc' '!ccache')
 install=avr-binutils.install
 source=(ftp://ftp.gnu.org/gnu/binutils/binutils-${pkgver}.tar.bz2{,.sig}
         binutils-2.23.2-texinfo-5.0.patch
diff --git a/community/avr-gcc/PKGBUILD b/community/avr-gcc/PKGBUILD
index 3bcecdca4..9d2466d9a 100644
--- a/community/avr-gcc/PKGBUILD
+++ b/community/avr-gcc/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 88836 2013-04-23 14:57:29Z schuay $
+# $Id: PKGBUILD 99692 2013-10-30 23:03:34Z allan $
 # Maintainer: schuay <jakob.gruber@gmail.com>
 # Contributor: Brad Fanella <bradfanella@archlinux.us>
 # Contributor: Corrado Primier <bardo@aur.archlinux.org>
@@ -8,8 +8,8 @@
 
 pkgname=avr-gcc
 _pkgname=gcc
-pkgver=4.8.0
-pkgrel=2
+pkgver=4.8.2
+pkgrel=1
 pkgdesc="The GNU AVR Compiler Collection"
 arch=('i686' 'x86_64')
 license=('GPL' 'LGPL' 'FDL' 'custom')
@@ -18,7 +18,7 @@ depends=('avr-binutils>=2.23' 'cloog' 'ppl' 'gcc-libs>=4.8.0' 'libmpc')
 optdepends=('avr-libc: Standard C library for Atmel AVR development')
 provides=("gcc-avr=$pkgver")
 replaces=('gcc-avr')
-options=('!libtool' '!emptydirs' '!strip')
+options=('!emptydirs' '!strip')
 source=(http://ftp.gnu.org/gnu/gcc/${_pkgname}-${pkgver}/gcc-${pkgver}.tar.bz2)
 
 _basedir=${_pkgname}-${pkgver}
@@ -98,4 +98,4 @@ package() {
     rm -rf ${pkgdir}/usr/share/info
 }
 
-md5sums=('e6040024eb9e761c3bea348d1fa5abb0')
+md5sums=('a3d7d63b9cb6b6ea049469a0c4a43c9d')
diff --git a/community/avr-gdb/PKGBUILD b/community/avr-gdb/PKGBUILD
index 29aaf49f7..d4ab21009 100644
--- a/community/avr-gdb/PKGBUILD
+++ b/community/avr-gdb/PKGBUILD
@@ -7,14 +7,13 @@
 
 pkgname=avr-gdb
 _pkgname=gdb
-pkgver=7.5.1
+pkgver=7.6.1
 pkgrel=1
 pkgdesc="The GNU Debugger for AVR"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.gnu.org/software/gdb/"
 license=('GPL3')
 depends=('python2')
-options=('!libtool')
 source=(http://ftp.gnu.org/gnu/gdb/${_pkgname}-${pkgver}.tar.bz2)
 
 build() {
@@ -52,4 +51,4 @@ package() {
   rm -rf ${pkgdir}/usr/include/gdb
 }
 
-md5sums=('3f48f468b24447cf24820054ff6e85b1')
+md5sums=('fbc4dab4181e6e9937075b43a4ce2732')
diff --git a/community/awesome/PKGBUILD b/community/awesome/PKGBUILD
index a0d0f2b83..1641d5235 100644
--- a/community/awesome/PKGBUILD
+++ b/community/awesome/PKGBUILD
@@ -1,12 +1,12 @@
-# $Id: PKGBUILD 97620 2013-09-25 19:19:38Z seblu $
+# $Id: PKGBUILD 98638 2013-10-16 01:00:11Z seblu $
 # Maintainer: Sébastien Luttringer
 # Contributor: xduugu
 # Contributor: Ronald van Haren <ronald.archlinux.org>
 # Contributor: Vesa Kaihlavirta
 
 pkgname=awesome
-pkgver=3.5.1
-pkgrel=3
+pkgver=3.5.2
+pkgrel=1
 pkgdesc='Highly configurable framework window manager'
 arch=('i686' 'x86_64' 'mips64el')
 url='http://awesome.naquadah.org/'
@@ -16,13 +16,12 @@ depends=(
   'dbus'
   'gdk-pixbuf2'
   'imlib2'
-  'libxcursor'
   'libxdg-basedir'
   'lua'
   'lua-lgi'
   'pango'
   'startup-notification'
-  'xcb-util-image'
+  'xcb-util-cursor'
   'xcb-util-keysyms'
   'xcb-util-wm'
   'xorg-xmessage'
@@ -44,7 +43,7 @@ optdepends=(
 provides=('notification-daemon')
 backup=('etc/xdg/awesome/rc.lua')
 source=("$url/download/$pkgname-$pkgver.tar.xz")
-md5sums=('f528f66ddcdb07f24e6f494837371702')
+md5sums=('c16eaaaddf6f56b4e041007952e2a4fe')
 
 build() {
   cd $pkgname-$pkgver
diff --git a/community/bamf/PKGBUILD b/community/bamf/PKGBUILD
new file mode 100644
index 000000000..0e9e817f2
--- /dev/null
+++ b/community/bamf/PKGBUILD
@@ -0,0 +1,31 @@
+# $Id: PKGBUILD 99159 2013-10-25 08:28:21Z alucryd $
+# Maintainer: Maxime Gauduin <alucryd at gmail dot com>
+# Contributor: Balló György <ballogyor+arch at gmail dot com>
+
+pkgname=bamf
+pkgver=0.5.0
+pkgrel=2
+pkgdesc="Application matching framework"
+arch=('i686' 'x86_64')
+url="https://launchpad.net/bamf"
+license=('GPL')
+depends=('libgtop' 'libwnck3')
+makedepends=('gobject-introspection' 'python2-lxml' 'vala')
+source=("http://launchpad.net/${pkgname}/${pkgver%.*}/${pkgver}/+download/${pkgname}-${pkgver}.tar.gz")
+sha256sums=('93b1acced96d32b36270cf18feb2761014ce2226814303c632448f717a8f9113')
+
+build() {
+  cd ${pkgname}-${pkgver}
+
+  export PYTHON='/usr/bin/python2'
+  ./configure --prefix='/usr' --sysconfdir='/etc' --localstatedir='/var' --libexecdir="/usr/lib/${pkgname}" --disable-{static,webapps}
+  make
+}
+
+package() {
+  cd ${pkgbase}-${pkgver}
+
+  make DESTDIR="${pkgdir}" install
+}
+
+# vim: ts=2 sw=2 et:
diff --git a/community/banner/PKGBUILD b/community/banner/PKGBUILD
index 8720cb681..b84170f85 100644
--- a/community/banner/PKGBUILD
+++ b/community/banner/PKGBUILD
@@ -1,15 +1,16 @@
-# Maintainer: jsteel <jsteel@aur.archlinux.org>
+# Maintainer: Jonathan Steel <jsteel@aur.archlinux.org>
 # Contributor: Peter Simons <simons@cryp.to>
 
 pkgname=banner
 pkgver=1.3.2
-pkgrel=4
+pkgrel=5
 pkgdesc="Print large banners to ASCII terminals"
 arch=('i686' 'x86_64')
 url="http://shh.thathost.com/pub-unix"
 license=('GPL')
 depends=('glibc')
 makedepends=('shhmsg' 'shhopt')
+conflicts=('sysvbanner')
 source=($url/files/$pkgname-$pkgver.tar.gz)
 md5sums=('9bd1dc58d3bced525a19194b92d20217')
 
diff --git a/community/bcg729/PKGBUILD b/community/bcg729/PKGBUILD
index 5714fc15e..4555956d5 100644
--- a/community/bcg729/PKGBUILD
+++ b/community/bcg729/PKGBUILD
@@ -1,15 +1,14 @@
-# $Id: PKGBUILD 92852 2013-06-17 06:58:41Z andrea $
+# $Id: PKGBUILD 100132 2013-11-01 20:20:41Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 
 pkgname=bcg729
 pkgver=1.0.0
-pkgrel=3
+pkgrel=4
 pkgdesc="g729 codec"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.linphone.org/eng/documentation/dev/bcg729.html"
 license=('GPL')
 depends=('mediastreamer')
-options=('!libtool')
 source=(http://download-mirror.savannah.gnu.org/releases/linphone/plugins/sources/$pkgname-$pkgver.tar.gz)
 md5sums=('45e127a9a309aff94d3262d97b5aeab0')
 
diff --git a/community/beaver/PKGBUILD b/community/beaver/PKGBUILD
index 924b6ea0f..91539d985 100644
--- a/community/beaver/PKGBUILD
+++ b/community/beaver/PKGBUILD
@@ -15,7 +15,6 @@ license=('GPL2')
 depends=('gtk2' 'hicolor-icon-theme')
 makedepends=('intltool')
 install=${pkgname}.install
-options=('!libtool')
 source=("http://sourceforge.net/projects/beaver-editor/files/${pkgver:0:3}/beaver-${pkgver}.tar.bz2")
 md5sums=('0cb1bf7350e7399c85a42d6672907d64')
 
diff --git a/community/bind/PKGBUILD b/community/bind/PKGBUILD
index 2917f33a7..f7276fc65 100644
--- a/community/bind/PKGBUILD
+++ b/community/bind/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 97454 2013-09-20 14:54:34Z seblu $
+# $Id: PKGBUILD 99697 2013-10-30 23:05:52Z allan $
 # Maintainer: Sébastien Luttringer
 # Contributor: Gaetan Bisson <bisson@archlinux.org>
 # Contributor: judd <jvinet@zeroflux.org>
@@ -12,7 +12,7 @@ pkgdesc='The ISC BIND nameserver'
 url='http://www.isc.org/software/bind/'
 license=('custom:ISC')
 arch=('i686' 'x86_64' 'mips64el')
-options=('!makeflags' '!libtool')
+options=('!makeflags')
 depends=('openssl' 'krb5' 'libxml2')
 provides=('dns-server')
 backup=('etc/logrotate.d/named'
diff --git a/community/bird/PKGBUILD b/community/bird/PKGBUILD
index 908af191a..e40f8b216 100644
--- a/community/bird/PKGBUILD
+++ b/community/bird/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 94704 2013-07-29 09:56:29Z seblu $
+# $Id: PKGBUILD 98871 2013-10-20 22:53:38Z seblu $
 # Maintainer: Sébastien Luttringer
 
 pkgbase=bird
 pkgname=('bird' 'bird6')
 pkgver=1.3.11
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64' 'mips64el')
 url='http://bird.network.cz/'
 license=('GPL2')
@@ -13,8 +13,8 @@ source=("ftp://bird.network.cz/pub/bird/${pkgname}-${pkgver}.tar.gz"
         'bird.service'
         'bird6.service')
 md5sums=('8ad2eb997fb8251bc5b24cf32619571b'
-         '01360e3b71ff2ed2223e87a3176e0659'
-         'b895b473cbc98cfd54751f737536eb1e')
+         '69221e063a3f07dcad519d5eeacaae75'
+         '5b172bd052b523efd95ee018e891e181')
 
 build() {
   cd $pkgbase-$pkgver
diff --git a/community/bird/bird.service b/community/bird/bird.service
index faee0d845..c2e2572bf 100644
--- a/community/bird/bird.service
+++ b/community/bird/bird.service
@@ -3,7 +3,8 @@ Description=BIRD routing daemon
 After=network.target
 
 [Service]
-ExecStart=/usr/bin/bird -d
+Type=forking
+ExecStart=/usr/bin/bird
 ExecReload=/usr/bin/birdc configure
 ExecStop=/usr/bin/birdc down
 
diff --git a/community/bird/bird6.service b/community/bird/bird6.service
index d852fb52c..b7fed8637 100644
--- a/community/bird/bird6.service
+++ b/community/bird/bird6.service
@@ -3,7 +3,8 @@ Description=BIRD IPv6 routing daemon
 After=network.target
 
 [Service]
-ExecStart=/usr/bin/bird6 -d
+Type=forking
+ExecStart=/usr/bin/bird6
 ExecReload=/usr/bin/birdc6 configure
 ExecStop=/usr/bin/birdc6 down
 
diff --git a/community/bless/PKGBUILD b/community/bless/PKGBUILD
deleted file mode 100644
index e1d7f26fa..000000000
--- a/community/bless/PKGBUILD
+++ /dev/null
@@ -1,26 +0,0 @@
-# $Id: PKGBUILD 65060 2012-02-20 02:38:21Z spupykin $
-# Maintainer:  TDY <tdy@gmx.com>
-# Contributor: dcraven <dcraven@gmail.com>
-
-pkgname=bless
-pkgver=0.6.0
-pkgrel=3
-pkgdesc="A high-quality, full-featured hex editor"
-arch=('i686' 'x86_64')
-url="http://home.gna.org/bless/"
-license=('GPL')
-depends=('gtk-sharp-2>=2.8')
-makedepends=('gettext' 'pkgconfig' 'rarian')
-source=(http://download.gna.org/bless/bless-$pkgver.tar.gz)
-md5sums=('b4c20d113281dfedb67d9f3ff8b174e3')
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-  ./configure --prefix=/usr --without-scrollkeeper
-  make
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-  make DESTDIR="$pkgdir" install
-}
diff --git a/community/blueman/PKGBUILD b/community/blueman/PKGBUILD
index 368eca1ab..cb0be796a 100644
--- a/community/blueman/PKGBUILD
+++ b/community/blueman/PKGBUILD
@@ -1,37 +1,39 @@
-# $Id: PKGBUILD 92494 2013-06-07 09:28:53Z tomegun $
+# $Id: PKGBUILD 100136 2013-11-01 20:21:28Z spupykin $
 # Contributor: Ionut Biru <ibiru@archlinux.org
 # Contributor: Abhishek Dasgupta <abhidg@gmail.com>
 
 pkgname=blueman
-pkgver=1.23
-pkgrel=10
+pkgver=20131021git
+pkgrel=2
 pkgdesc="GTK+ bluetooth manager"
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
-url="https://launchpad.net/blueman"
-depends=('bluez4' 'bluez-libs' 'gnome-icon-theme' 'libpulse' 'obex-data-server'
+url="https://github.com/cschramm/blueman"
+depends=('bluez' 'bluez-libs' 'gnome-icon-theme' 'libpulse' 'obex-data-server'
          'python2-dbus' 'python2-notify' 'startup-notification' 'xdg-utils')
-makedepends=('pyrex' 'intltool')
+makedepends=('pyrex' 'intltool' 'git')
 optdepends=('dnsmasq: For creating PAN network'
 	    'modemmanager: For modem management service'
 	    'notification-daemon: For desktop notifications'
 	    'polkit-gnome: For privileged actions'
 	    'pulseaudio: To use the pulseaudio plugin'
 	    'python2-gconf: For gconf configuration support')
-options=('!libtool')
 install=$pkgname.install
-source=(https://launchpad.net/${pkgname}/1.2/${pkgver}/+download/${pkgname}-${pkgver}.tar.gz)
-md5sums=('f0bee59589f4c23e35bf08c2ef8acaef')
+source=("blueman::git://github.com/cschramm/blueman.git")
+md5sums=('SKIP')
 
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  export PYTHON=python2
+prepare() {
+  cd "${srcdir}/${pkgname}"
   for file in apps/blueman*; do
     sed -i 's_#!/usr/bin/python_#!/usr/bin/python2_' $file
   done
   sed -i 's|"blueman-tray"|"blueman"|' blueman/plugins/applet/StatusIcon.py
+}
 
+build() {
+  cd "${srcdir}/${pkgname}"
+  export PYTHON=python2
+  ./autogen.sh
   ./configure --prefix=/usr \
 	--sysconfdir=/etc \
 	--libexecdir=/usr/lib/blueman \
@@ -40,7 +42,7 @@ build() {
 }
 
 package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+  cd "${srcdir}/${pkgname}"
   make DESTDIR="${pkgdir}" install
   echo "NotShowIn=KDE;" >> ${pkgdir}/etc/xdg/autostart/blueman.desktop
 }
diff --git a/community/bmake/PKGBUILD b/community/bmake/PKGBUILD
new file mode 100644
index 000000000..27475c9c4
--- /dev/null
+++ b/community/bmake/PKGBUILD
@@ -0,0 +1,38 @@
+# Maintainer: Alex Szczuczko <alex at szc dot ca>
+# Contributor: Devin Cofer <ranguvar{AT]archlinux[DOT}us>
+# Contributor: Imanol Celaya <ilcra1989@gmail.com>
+
+pkgname=bmake
+pkgver=20131001
+pkgrel=2
+pkgdesc="Portable version of the NetBSD 'make' build tool"
+arch=('i686' 'x86_64')
+url="http://www.crufty.net/help/sjg/bmake.html"
+license=('BSD')
+source=("http://www.crufty.net/ftp/pub/sjg/bmake-$pkgver.tar.gz")
+sha256sums=('0a91ac60b82270c4b4f21a43e66eb51c32b4df55e01ea592e42eb323909a559b')
+
+prepare() {
+    cd "$srcdir/$pkgname"
+    # Add missing bsd.*.mk symlinks
+    _links_orig="dep doc init lib links man nls obj own prog subdir"
+    _links_new="dep doc inc init lib links man nls obj own prog subdir"
+    sed -i -e "s/$_links_orig/$_links_new/" mk/install-mk
+}
+
+build() {
+    cd "$srcdir"
+    mkdir -p bmake-build
+    cd bmake-build
+    sh ../bmake/boot-strap --prefix=/usr
+}
+
+package() {
+    cd "$srcdir/bmake-build"
+    # Fix directory permissions on install
+    install -dm0755 "$pkgdir/usr/bin"
+    install -dm0755 "$pkgdir/usr/share/man/cat1"
+    install -dm0755 "$pkgdir/usr/share/licenses/$pkgname"
+    sh ../bmake/boot-strap --prefix=/usr --install-destdir="$pkgdir" op=install
+    head -n70 ../bmake/main.c >$pkgdir/usr/share/licenses/$pkgname/LICENSE
+}
diff --git a/community/bullet/PKGBUILD b/community/bullet/PKGBUILD
index 3dc4ce5d5..9621fe5af 100644
--- a/community/bullet/PKGBUILD
+++ b/community/bullet/PKGBUILD
@@ -1,25 +1,25 @@
-# $Id: PKGBUILD 83395 2013-01-31 09:42:11Z svenstaro $
+# $Id: PKGBUILD 99165 2013-10-25 09:52:29Z svenstaro $
 # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
 # Contributor: Christoph Zeiler <archNOSPAM_at_moonblade.dot.org>
 
 pkgbase=bullet
 pkgname=('bullet' 'bullet-docs')
-_rev=2613
-pkgver=2.81
-pkgrel=2
+_rev=2704
+pkgver=2.82
+pkgrel=1
 pkgdesc="A 3D Collision Detection and Rigid Body Dynamics Library for games and animation"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.bulletphysics.com/Bullet/"
 license=('custom:zlib')
 depends=()
 makedepends=('cmake' 'doxygen' 'graphviz' 'ttf-dejavu' 'mesa')
-source=(http://bullet.googlecode.com/files/${pkgbase}-${pkgver}-rev${_rev}.tgz
+source=(http://bullet.googlecode.com/files/${pkgbase}-${pkgver}-r${_rev}.tgz
         ${pkgbase}.pc)
-md5sums=('cec9c9a79c2804dbf6385dd7d061346c'
+md5sums=('70b3c8d202dee91a0854b4cbc88173e8'
          'd1da06deba3b08b884d2212f6838905c')
 
 build() {
-  cd ${pkgbase}-${pkgver}-rev${_rev}
+  cd ${pkgbase}-${pkgver}-r${_rev}
 
   # get a clean build dir
   [[ -d build ]] && rm -rf build
@@ -48,7 +48,7 @@ build() {
 package_bullet() {
   optdepends=('bullet-docs: documentation')
 
-  cd ${pkgbase}-${pkgver}-rev${_rev}/build
+  cd ${pkgbase}-${pkgver}-r${_rev}/build
 
   # install it
   make DESTDIR=${pkgdir} install
@@ -65,7 +65,7 @@ package_bullet-docs() {
   pkgdesc="Documentation for bullet"
   depends=()
 
-  cd ${pkgbase}-${pkgver}-rev${_rev}
+  cd ${pkgbase}-${pkgver}-r${_rev}
 
   # install docs
   install -Dm644 Bullet_User_Manual.pdf ${pkgdir}/usr/share/doc/bullet/Bullet_User_Manual.pdf
diff --git a/community/bwm-ng/PKGBUILD b/community/bwm-ng/PKGBUILD
index 4fd2d3509..54128c25e 100644
--- a/community/bwm-ng/PKGBUILD
+++ b/community/bwm-ng/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 65064 2012-02-20 02:39:44Z spupykin $
+# $Id: PKGBUILD 99703 2013-10-30 23:07:28Z allan $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Sven Kauber <celeon@gmail.com>
 
@@ -10,7 +10,6 @@ arch=(i686 x86_64 'mips64el')
 url="http://www.gropp.org/"
 license=('GPL')
 depends=('ncurses')
-options=('!libtool')
 source=("http://www.gropp.org/bwm-ng/${pkgname}-${pkgver}.tar.gz")
 md5sums=('d3a02484fb7946371bfb4e10927cebfb')
 
diff --git a/community/c++-gtk-utils/PKGBUILD b/community/c++-gtk-utils/PKGBUILD
index 8ed15d896..ccae0fa43 100644
--- a/community/c++-gtk-utils/PKGBUILD
+++ b/community/c++-gtk-utils/PKGBUILD
@@ -1,17 +1,17 @@
-# $Id: PKGBUILD 93711 2013-07-08 17:21:21Z giovanni $
+# $Id: PKGBUILD 99706 2013-10-30 23:09:03Z allan $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 
 pkgname=c++-gtk-utils
-pkgver=2.0.18
+pkgver=2.0.20
 pkgrel=1
 pkgdesc="Classes and functions for programming in GTK+"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://cxx-gtk-utils.sourceforge.net/"
 license=('LGPL2.1')
 depends=('gtk3')
-options=('!libtool' '!docs' '!emptydirs')
+options=('!docs' '!emptydirs')
 source=("http://downloads.sourceforge.net/project/cxx-gtk-utils/cxx-gtk-utils/${pkgver}/${pkgname}-${pkgver}.tar.gz")
-md5sums=('446a8e0120d69639b1950c72bd545116')
+md5sums=('8af461ec1f2696e92a1fe1c62a08730b')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/community/cairo-dock-plugins/PKGBUILD b/community/cairo-dock-plugins/PKGBUILD
index d1ac36dd1..19d1e76af 100755
--- a/community/cairo-dock-plugins/PKGBUILD
+++ b/community/cairo-dock-plugins/PKGBUILD
@@ -1,17 +1,17 @@
-# $Id: PKGBUILD 93867 2013-07-11 15:30:19Z alucryd $
-# Maintainer: Maxime Gauduin <alucryd@gmail.com>
-# Contributor: Tofe <chris.chapuis@gmail.com>
-# Contributor: zhuqin <zhuqin83@gmail.com>
-# Contributor: tri1976 <trile7@gmail.com>
-# Contributor: snoopy33 <snoopy33@no-log.org>
+# $Id: PKGBUILD 99702 2013-10-30 23:07:09Z alucryd $
+# Maintainer: Maxime Gauduin <alucryd at gmail dot com>
+# Contributor: Tofe <chris dot chapuis at gmail dot com>
+# Contributor: zhuqin <zhuqin83 at gmail dot com>
+# Contributor: tri1976 <trile7 at gmail dot com>
+# Contributor: snoopy33 <snoopy33 at no dash log dot org>
 
 pkgname=cairo-dock-plugins
-pkgver=3.2.1
-pkgrel=4
-pkgdesc="Plugins for Cairo-Dock"
-url="https://launchpad.net/cairo-dock"
-license=('GPL')
+pkgver=3.3.2
+pkgrel=1
+pkgdesc='Plugins for Cairo-Dock'
 arch=('i686' 'x86_64')
+url="https://launchpad.net/${pkgname%-*}-plug-ins"
+license=('GPL')
 depends=('cairo-dock')
 makedepends=('cmake' 'alsa-lib' 'fftw' 'gnome-menus' 'gtk-sharp-2' 'gvfs' 'libetpan' 'libexif' 'libical' 'libpulse' 'libxklavier' 'libzeitgeist' 'lm_sensors' 'ndesk-dbus-glib' 'python' 'python2' 'ruby' 'upower' 'vala' 'vte3' 'webkitgtk3')
 optdepends=('alsa-lib: Sound Control, Sound Effects applets'
@@ -33,17 +33,8 @@ optdepends=('alsa-lib: Sound Control, Sound Effects applets'
             'upower: Logout, PowerManager applets'
             'vte3: Terminal applet'
             'webkitgtk3: Weblets applet')
-options=('!libtool')
-source=("http://launchpad.net/cairo-dock-plug-ins/3.2/${pkgver}/+download/${pkgname}-${pkgver}.tar.gz"
-        'python.patch')
-sha256sums=('11b4433e40bbb1507757b23e167c521d620827576c2f30bb1a9642e0bff57e01'
-            'f33ff6f2b93936c5050ae369d1b08c41bd17f5a2fb4ce46da5436d78d0b3fa8e')
-
-prepare() {
-  cd ${pkgname}-${pkgver}
-
-  patch -Np1 -i ../python.patch
-}
+source=("${url}/${pkgver%.?}/${pkgver}/+download/${pkgname}-${pkgver}.tar.gz")
+sha256sums=('48f0caddb0a563d8a64176f66610ca35df5c952071e5574486d39bb574994643')
 
 build() {
   cd ${pkgname}-${pkgver}
@@ -53,7 +44,7 @@ build() {
   fi
   mkdir build && cd build
 
-  cmake .. -DCMAKE_INSTALL_PREFIX=/usr
+  cmake .. -DCMAKE_INSTALL_PREFIX='/usr'
   make
 }
 
diff --git a/community/cairo-dock-plugins/python.patch b/community/cairo-dock-plugins/python.patch
deleted file mode 100644
index 413ff0fa9..000000000
--- a/community/cairo-dock-plugins/python.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-diff -rupN cairo-dock-plugins-3.2.1.orig/Dbus/interfaces/bash/BashInstall.cmake.in cairo-dock-plugins-3.2.1/Dbus/interfaces/bash/BashInstall.cmake.in
---- cairo-dock-plugins-3.2.1.orig/Dbus/interfaces/bash/BashInstall.cmake.in	2013-07-11 17:09:45.165345967 +0200
-+++ cairo-dock-plugins-3.2.1/Dbus/interfaces/bash/BashInstall.cmake.in	2013-07-11 17:10:22.238469121 +0200
-@@ -2,7 +2,7 @@ IF ("@PYTHON2_FOUND@" STREQUAL "TRUE")
- 	IF("@ROOT_PREFIX@" STREQUAL "")
- 		EXEC_PROGRAM("@PYTHON2_EXECUTABLE@" "${CMAKE_CURRENT_BINARY_DIR}" ARGS
- 						"setup.py" "install"
--						"--prefix=${CMAKE_INSTALL_PREFIX}"
-+						"--prefix=$DESTDIR${CMAKE_INSTALL_PREFIX}"
- 						"@DEBIAN_INSTALL_LAYOUT@")
- 	ELSEIF(NOT "@ROOT_PREFIX@" STREQUAL "" AND "@python_no_deb_layout@" STREQUAL "")
- 		EXEC_PROGRAM("@PYTHON2_EXECUTABLE@" "${CMAKE_CURRENT_BINARY_DIR}" ARGS
-@@ -20,7 +20,7 @@ IF ("@PYTHON3_FOUND@" STREQUAL "TRUE")
- 	IF("@ROOT_PREFIX@" STREQUAL "")
- 		EXEC_PROGRAM("@PYTHON3_EXECUTABLE@" "${CMAKE_CURRENT_BINARY_DIR}" ARGS
- 						"setup.py" "install"
--						"--prefix=${CMAKE_INSTALL_PREFIX}"
-+						"--prefix=$DESTDIR${CMAKE_INSTALL_PREFIX}"
- 						"@DEBIAN_INSTALL_LAYOUT@")
- 	ELSEIF(NOT "@ROOT_PREFIX@" STREQUAL "" AND "@python_no_deb_layout@" STREQUAL "")
- 		EXEC_PROGRAM("@PYTHON3_EXECUTABLE@" "${CMAKE_CURRENT_BINARY_DIR}" ARGS
-diff -rupN cairo-dock-plugins-3.2.1.orig/Dbus/interfaces/python/PythonInstall.cmake.in cairo-dock-plugins-3.2.1/Dbus/interfaces/python/PythonInstall.cmake.in
---- cairo-dock-plugins-3.2.1.orig/Dbus/interfaces/python/PythonInstall.cmake.in	2013-07-11 17:09:45.162012653 +0200
-+++ cairo-dock-plugins-3.2.1/Dbus/interfaces/python/PythonInstall.cmake.in	2013-07-11 17:10:56.581607933 +0200
-@@ -2,7 +2,7 @@ if ("@PYTHON2_FOUND@" STREQUAL "TRUE")
- 	IF("@ROOT_PREFIX@" STREQUAL "")
- 		EXEC_PROGRAM("@PYTHON2_EXECUTABLE@" "${CMAKE_CURRENT_BINARY_DIR}" ARGS
- 						"setup.py" "install"
--						"--prefix=${CMAKE_INSTALL_PREFIX}"
-+						"--prefix=$DESTDIR${CMAKE_INSTALL_PREFIX}"
- 						"@DEBIAN_INSTALL_LAYOUT@")
- 	ELSEIF(NOT "@ROOT_PREFIX@" STREQUAL "" AND "@python_no_deb_layout@" STREQUAL "")
- 		EXEC_PROGRAM("@PYTHON2_EXECUTABLE@" "${CMAKE_CURRENT_BINARY_DIR}" ARGS
-@@ -20,7 +20,7 @@ if ("@PYTHON3_FOUND@" STREQUAL "TRUE")
- 	IF("@ROOT_PREFIX@" STREQUAL "")
- 		EXEC_PROGRAM("@PYTHON3_EXECUTABLE@" "${CMAKE_CURRENT_BINARY_DIR}" ARGS
- 						"setup.py" "install"
--						"--prefix=${CMAKE_INSTALL_PREFIX}"
-+						"--prefix=$DESTDIR${CMAKE_INSTALL_PREFIX}"
- 						"@DEBIAN_INSTALL_LAYOUT@")
- 	ELSEIF(NOT "@ROOT_PREFIX@" STREQUAL "" AND "@python_no_deb_layout@" STREQUAL "")
- 		EXEC_PROGRAM("@PYTHON3_EXECUTABLE@" "${CMAKE_CURRENT_BINARY_DIR}" ARGS
-@@ -32,4 +32,4 @@ if ("@PYTHON3_FOUND@" STREQUAL "TRUE")
- 						"setup.py" "install"
- 						"--root=@ROOT_PREFIX@")
- 	ENDIF()
--ENDIF()
-\ No newline at end of file
-+ENDIF()
diff --git a/community/cairo-dock/PKGBUILD b/community/cairo-dock/PKGBUILD
index d47e4d107..3026acb13 100755
--- a/community/cairo-dock/PKGBUILD
+++ b/community/cairo-dock/PKGBUILD
@@ -1,43 +1,35 @@
-# $Id: PKGBUILD 88925 2013-04-24 21:20:34Z alucryd $
-# Maintainer: Maxime Gauduin <alucryd@gmail.com>
-# Contributor: Tofe <chris.chapuis@gmail.com>
-# Contributor: erm67 <erm67@yahoo.it>
+# $Id: PKGBUILD 99668 2013-10-30 22:32:44Z alucryd $
+# Maintainer: Maxime Gauduin <alucryd at gmail dot com>
+# Contributor: Tofe <chris dot chapuis at gmail dot com>
+# Contributor: erm67 <erm67 at yahoo dot it>
 
 pkgname=cairo-dock
-pkgver=3.2.1
-pkgrel=3
-pkgdesc="Light eye-candy fully themable animated dock"
+pkgver=3.3.2
+pkgrel=1
+pkgdesc='Light eye-candy fully themable animated dock'
 arch=('i686' 'x86_64' 'mips64el')
-url="https://launchpad.net/cairo-dock-core"
+url="https://launchpad.net/${pkgname}-core"
 license=('GPL')
 depends=('curl' 'dbus-glib' 'gtk3' 'librsvg')
 makedepends=('cmake')
 optdepends=('cairo-dock-plugins: Plugins for Cairo-Dock')
-options=('!libtool')
-source=("http://launchpad.net/${pkgname}-core/3.2/${pkgver}/+download/${pkgname}-${pkgver}.tar.gz" 'gldit-rpath.patch')
-sha256sums=('441e407f92138dc604c796b0455777b765e298ecb8f3120104f521d0e0b34543'
-            '5a5fbc67aaa210387ef4410701747fe741942c99c4bd84ae771b96a3bdd1c4cc')
-
-prepare() {
-  cd "${srcdir}"/${pkgname}-${pkgver}
-
-  patch -Np1 -i ../gldit-rpath.patch
-}
+source=("${url}/${pkgver%.?}/${pkgver}/+download/${pkgname}-${pkgver}.tar.gz")
+sha256sums=('a2d3854771d7ef5b262593b37aed216ece7eeacfc3e2a08deb4a797f175f6af8')
 
 build() {
-  cd "${srcdir}"/${pkgname}-${pkgver}
+  cd ${pkgname}-${pkgver}
 
   if [[ -d build ]]; then
     rm -rf build
   fi
   mkdir build && cd build
 
-  cmake .. -DCMAKE_INSTALL_PREFIX=/usr
+  cmake .. -DCMAKE_INSTALL_PREFIX='/usr'
   make
 }
 
 package() {
-  cd "${srcdir}"/${pkgname}-${pkgver}/build
+  cd ${pkgname}-${pkgver}/build
 
   make DESTDIR="${pkgdir}" install
 }
diff --git a/community/calf/PKGBUILD b/community/calf/PKGBUILD
index 9e0919b60..ea3390615 100644
--- a/community/calf/PKGBUILD
+++ b/community/calf/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 79299 2012-11-02 14:14:33Z arodseth $
+# $Id: PKGBUILD 99704 2013-10-30 23:08:18Z allan $
 # Maintainer: Alexander Rødseth <rodseth@gmail.com>
 # Contributor: Ray Rashif <schiv@archlinux.org>
 
@@ -13,7 +13,6 @@ depends=('libglade' 'fftw' 'lash' 'dssi' 'fluidsynth' 'hicolor-icon-theme' 'desk
 makedepends=('lv2core' 'ladspa' 'dssi')
 source=("http://downloads.sf.net/$pkgname/$pkgname-$pkgver.tar.gz")
 install=calf.install
-options=('!libtool')
 sha256sums=('1106e7e27bcd18d47fc58c952a4dbf6c7a763272e13b2b94cee6f1b2fb922cec')
 
 build() {
diff --git a/community/castget/PKGBUILD b/community/castget/PKGBUILD
index 16b0ef03a..11e6df955 100644
--- a/community/castget/PKGBUILD
+++ b/community/castget/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 67455 2012-03-11 21:00:52Z lcarlier $
+# $Id: PKGBUILD 99705 2013-10-30 23:08:43Z allan $
 # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
 # Contributor: Jeff Mickey <jeff@archlinux.org>
 
@@ -10,7 +10,6 @@ arch=('i686' 'x86_64' 'mips64el')
 url="http://www.nongnu.org/castget/"
 license=('GPL')
 depends=('glib2' 'libxml2' 'curl' 'id3lib')
-options=('!libtool')
 changelog=$pkgname.changelog
 source=(http://savannah.nongnu.org/download/$pkgname/$pkgname-$pkgver.tar.bz2)
 md5sums=('e80096715efc17d1d87de793871e0006')
diff --git a/community/ccid/PKGBUILD b/community/ccid/PKGBUILD
index a61a9823a..a22590b01 100644
--- a/community/ccid/PKGBUILD
+++ b/community/ccid/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 98050 2013-10-04 16:09:59Z giovanni $
+# $Id: PKGBUILD 98755 2013-10-17 15:45:53Z giovanni $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Daniel Plaza <daniel.plaza.espi@gmail.com>
 
 pkgname=ccid
-pkgver=1.4.12
-pkgrel=2
+pkgver=1.4.13
+pkgrel=1
 pkgdesc="A generic USB Chip/Smart Card Interface Devices driver"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://pcsclite.alioth.debian.org/ccid.html"
@@ -12,8 +12,8 @@ license=('LGPL' 'GPL')
 depends=('pcsclite' 'libusbx')
 makedepends=('pkg-config')
 backup=(etc/reader.conf.d/libccidtwin)
-source=("https://alioth.debian.org/frs/download.php/file/3937/${pkgname}-${pkgver}.tar.bz2")
-md5sums=('54a314b60b60a9549febc75b6dc516d5')
+source=("https://alioth.debian.org/frs/download.php/file/3959/${pkgname}-${pkgver}.tar.bz2")
+md5sums=('89c167a873df1f8bc0dc907ce209e5ff')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/community/cdbxx/PKGBUILD b/community/cdbxx/PKGBUILD
index b2be5c5f5..917f102fe 100644
--- a/community/cdbxx/PKGBUILD
+++ b/community/cdbxx/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 65076 2012-02-20 03:31:11Z spupykin $
+# $Id: PKGBUILD 100138 2013-11-01 20:21:49Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com>
 
 pkgname=cdbxx
 pkgver=0.0.1rc2
-pkgrel=3
+pkgrel=4
 pkgdesc="cdbxx is a small STL style C++ library for TinyCDB implementation of Constant Database"
 arch=(i686 x86_64 'mips64el')
 url="http://cdbxx.sourceforge.net/"
@@ -21,5 +21,9 @@ build() {
   sed -i '1,2i#include <string.h>' src/db.cc
 
   make
+}
+
+package() {
+  cd $srcdir/$pkgname-$pkgver
   make DESTDIR=$pkgdir install
 }
diff --git a/community/chicken/PKGBUILD b/community/chicken/PKGBUILD
index 8ace279a6..f691cc8ea 100644
--- a/community/chicken/PKGBUILD
+++ b/community/chicken/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 98342 2013-10-08 19:42:24Z arodseth $
+# $Id: PKGBUILD 99646 2013-10-30 17:19:18Z arodseth $
 # Maintainer: Alexander Rødseth <rodseth@gmail.com>
 # Contributor: Vesa Kaihlavirta <vegai@iki.fi>
 # Contributor: <david@pako.st>
@@ -6,12 +6,13 @@
 
 pkgname=chicken
 pkgver=4.8.0.5
-pkgrel=1
+pkgrel=2
 pkgdesc='Compiler for R5RS scheme, featuring handy extensions'
 arch=('x86_64' 'i686' 'mips64el')
 url='http://call-cc.org/'
 license=('BSD')
 depends=('gcc')
+options=('staticlibs')
 source=("http://code.call-cc.org/releases/${pkgver%.*}/$pkgname-$pkgver.tar.gz")
 sha256sums=('5b9192951bc61cc19dd4963cceb93908bff46b6868d7927f19850e8973c430fb')
 
diff --git a/community/chrony/PKGBUILD b/community/chrony/PKGBUILD
index d10e1d111..e54a0f628 100644
--- a/community/chrony/PKGBUILD
+++ b/community/chrony/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 95307 2013-08-09 02:41:57Z thestinger $
+# $Id: PKGBUILD 99445 2013-10-29 00:06:24Z thestinger $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: Daniel Micay <danielmicay@gmail.com>
 # Contributor: Bartłomiej Piotrowski <nospam@bpiotrowski.pl>
@@ -9,7 +9,7 @@
 
 pkgname=chrony
 pkgver=1.29
-pkgrel=1
+pkgrel=2
 pkgdesc='Lightweight NTP client and server'
 arch=('i686' 'x86_64' 'mips64el')
 url="http://chrony.tuxfamily.org/"
@@ -34,9 +34,9 @@ package() {
 
   install -Dm0644 "$srcdir/$pkgname-$pkgver/examples/chrony.conf.example" "$pkgdir/etc/chrony.conf"
 
-  # Arch's kernel has enhanced RTC support, make chrony use it by default
-  sed -i '/^! \(rtconutc\|rtcfile \/var\/lib\/chrony\/rtc\)$/ s/^! //' \
-    "$pkgdir/etc/chrony.conf"
+  echo -e "\n# Enable kernel RTC sync\nrtcsync" >> "$pkgdir/etc/chrony.conf"
+
+  sed -i '/^! rtconutc$/ s/^! //' "$pkgdir/etc/chrony.conf"
 
   mv "$pkgdir/usr/sbin/chronyd" "$pkgdir/usr/bin"
   rmdir "$pkgdir/usr/sbin"
diff --git a/community/chuck/PKGBUILD b/community/chuck/PKGBUILD
index 1927295f1..a8a8b127f 100644
--- a/community/chuck/PKGBUILD
+++ b/community/chuck/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 78497 2012-10-20 00:31:27Z arodseth $
+# $Id: PKGBUILD 98759 2013-10-17 17:27:23Z arodseth $
 # Maintainer: Alexander Rødseth <rodseth@gmail.com>
 # Contributor: Laurent Carlier <lordheavym@gmail.com>
 # Contributor: Brad Fanella <bradfanella@archlinux.us>
@@ -7,7 +7,7 @@
 # Contributor: tardo <tardo@nagi-fanboi.net>
 
 pkgname=chuck
-pkgver=1.3.1.3
+pkgver=1.3.2.0
 pkgrel=1
 pkgdesc='Concurrent, on-the-fly audio programming language'
 arch=('x86_64' 'i686' 'mips64el')
@@ -15,26 +15,18 @@ url='http://chuck.cs.princeton.edu/'
 license=('GPL')
 depends=('gcc-libs' 'libsndfile')
 source=("http://chuck.cs.princeton.edu/release/files/$pkgname-$pkgver.tgz")
-sha256sums=('8ef8a65fe4d265b6f509b9339355a5658b47d9b43219fa09c182ca846cc0a740')
+sha256sums=('ee0c7d94cd4053f9683f84007350992b7e7552fcc190eeba21a66de8deaf3948')
 
 build() {
-  cd $srcdir/$pkgname-$pkgver/src
-
-  msg2 'Configuring...'
-	CFLAGS+=' -fno-strict-aliasing -lpthread'
-	CXXFLAGS+=' -fno-strict-aliasing -fpermissive -lpthread'
-
-  msg2 'Compiling...'
-  # Alternatives to linux-alsa are: linux-jack linux-oss osx win32
-  make linux-alsa
+  make -C "$pkgname-$pkgver/src" linux-alsa # linux-jack linux-oss osx win32
 }
 
 package() {
-  cd $srcdir/$pkgname-$pkgver/src
+  cd "$pkgname-$pkgver/src"
 
-  install -Dm755 chuck $pkgdir/usr/bin/chuck
-  mkdir -p $pkgdir/usr/share/doc/$pkgname
-  cp -r ../examples $pkgdir/usr/share/doc/$pkgname/
+  install -Dm755 "$pkgname" "$pkgdir/usr/bin/$pkgname"
+  mkdir -p "$pkgdir/usr/share/doc/$pkgname"
+  cp -r ../examples "$pkgdir/usr/share/doc/$pkgname"
 }
 
 # vim:set ts=2 sw=2 et:
diff --git a/community/cinnamon-control-center/PKGBUILD b/community/cinnamon-control-center/PKGBUILD
index 2dfe208ab..d699e9c3f 100644
--- a/community/cinnamon-control-center/PKGBUILD
+++ b/community/cinnamon-control-center/PKGBUILD
@@ -1,24 +1,24 @@
-# $Id: PKGBUILD 98410 2013-10-09 16:57:37Z faidoc $
+# $Id: PKGBUILD 99709 2013-10-30 23:10:13Z allan $
 # Maintainer: Alexandre Filgueira <alexfilgueira@cinnarch.com
 # Based on gnome-control-center:
 # Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Jan de Groot <jgc@archlinux.org>
 
 pkgname=cinnamon-control-center
-pkgver=2.0.2
+pkgver=2.0.6
 pkgrel=1
 pkgdesc="The Control Center for Cinnamon"
 arch=('i686' 'x86_64' 'mips64el')
-depends=('cinnamon' 'network-manager-applet')
+depends=('cinnamon-settings-daemon' 'cinnamon-translations' 'gnome-menus' 'libgnomekbd' 'network-manager-applet')
 optdepends=('gnome-color-manager: for color management tasks')
-makedepends=('intltool' 'gnome-common')
+makedepends=('intltool' 'gnome-common' 'docbook-xsl')
 url="https://github.com/linuxmint/cinnamon-control-center"
 install=cinnamon-control-center.install
 license=('GPL')
-options=('!libtool' '!emptydirs')
+options=('!emptydirs')
 source=("$pkgname-$pkgver.tar.gz::https://github.com/linuxmint/cinnamon-control-center/archive/$pkgver.tar.gz"
         region.patch)
-sha256sums=('28318423297dd27a51a0a84d0f4b28453aca5c16ca362f7f4b56bd8e1b67b594'
+sha256sums=('4871c7893bd6d215df76abbc69f9f75340a5997cdca00669544c7e63eb3c6a2f'
             '077cb8d6814c32a4df85f71c2b8fa84da25e5260263a6e0536c6e1626051f022')
 
 prepare() {
@@ -26,8 +26,6 @@ prepare() {
 
   # Fix region panel
   patch -Np1 -i ../region.patch
-
-  chmod +x autogen.sh
 }
 
 build() {
@@ -51,10 +49,7 @@ package() {
   # Remove unused stuff
   make -C panels/sound DESTDIR="$pkgdir" uninstall
   make -C panels/sound/data DESTDIR="$pkgdir" install
-  make -C shell DESTDIR="$pkgdir" uninstall
-  make -C shell DESTDIR="$pkgdir" install-libLTLIBRARIES
-
-  # Remove broken desktop files
+  make -C shell DESTDIR="$pkgdir" uninstall-binPROGRAMS uninstall-directoryDATA uninstall-uiDATA
   rm -R "$pkgdir/usr/share/applications"
   rm -R "$pkgdir/etc"
 
diff --git a/community/cinnamon-desktop/PKGBUILD b/community/cinnamon-desktop/PKGBUILD
index b492d4376..eb3ca73d2 100644
--- a/community/cinnamon-desktop/PKGBUILD
+++ b/community/cinnamon-desktop/PKGBUILD
@@ -3,7 +3,7 @@
 # Contributor:  Jan de Groot <jan@archlinux.org>
 
 pkgname=cinnamon-desktop
-pkgver=2.0.1
+pkgver=2.0.3
 pkgrel=1
 pkgdesc="Library with common API for various Cinnamon modules"
 arch=(i686 x86_64)
@@ -11,10 +11,9 @@ license=(GPL LGPL)
 depends=(gtk3 libxkbfile)
 makedepends=(intltool gobject-introspection gnome-common)
 url="https://github.com/linuxmint/cinnamon-desktop"
-options=(!libtool)
 install=cinnamon-desktop.install
 source=("${pkgname}-${pkgver}.tar.gz::https://github.com/linuxmint/cinnamon-desktop/archive/${pkgver}.tar.gz")
-sha256sums=('326bb7f02692a0baa21821ec70968be3cf70702d8330a7452aa03f9fbc851de1')
+sha256sums=('bd9c50df70432d2e37a7c11728dcdf264af235b261b3f378eade61dc4ef101c3')
 
 build() {
   cd $pkgname-$pkgver
diff --git a/community/cinnamon-screensaver/PKGBUILD b/community/cinnamon-screensaver/PKGBUILD
index 3a883ec80..8a7c3ae18 100644
--- a/community/cinnamon-screensaver/PKGBUILD
+++ b/community/cinnamon-screensaver/PKGBUILD
@@ -4,33 +4,37 @@
 # Jan de Groot <jgc@archlinux.org>
 
 pkgname=cinnamon-screensaver
-pkgver=2.0.0
-pkgrel=1
+pkgver=2.0.3
+pkgrel=3
 pkgdesc="Screensaver designed to integrate well with the Cinnamon desktop."
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 url="https://github.com/linuxmint/cinnamon-screensaver"
 backup=(etc/pam.d/cinnamon-screensaver)
-depends=('cinnamon' 'cinnamon-desktop')
+depends=('cinnamon-desktop' 'cinnamon-translations' 'dbus-glib' 'libgnomekbd')
 makedepends=('intltool' 'gnome-common')
-options=(!emptydirs)
 source=($pkgname-$pkgver.tar.gz::https://github.com/linuxmint/cinnamon-screensaver/archive/$pkgver.tar.gz
        cinnamon-screensaver.pam
-       fix-dbus-compatibility.patch
+       away-message-fixes.patch
+       fix-systemd-lock.patch
        lock_screen_on_suspend.patch)
-sha256sums=('90da7f811892f667202ecd1240091f9c4d253eebe223bbfedb3d544dd68b3fc7'
+sha256sums=('00c866e98994afc8939d1d347de631cebaa6ec34ad59646a7ccd223bd757cc7d'
             'b6ea9e2eb586d94bcabb617a8f1c2958111df87afdbb51f645882bccdc15cbda'
-            'eebd1d056c21d2d3f60fb954677b9214fd1d575ed1c2bbb56326cedf41a39eb6'
-            '516c479558576c6c5a2509abfcbf4fdafb5953d252e7a4ab972f9db6137daca8')
+            'f9f3d555b0c325322469be765b488da599fc850f8ff5a74f72fdf69f68e04c96'
+            '14d3301a03883330bf044a40ea4dce74a829b03174833d21efe66ebeb940dc0c'
+            '54f281eeb0e97c8c46250e287719051e0a580f6c0de384760aaa3532b42616f1')
 
 prepare() {
   cd $pkgname-$pkgver
 
-  # Fix compatibility with gnome-screensaver's D-Bus interface and various fixes
-  patch -Np1 -i ${srcdir}/fix-dbus-compatibility.patch
+  # Various fixes for away message handling
+  patch -Np1 -i ../away-message-fixes.patch
+
+  # Use the session path instead of the session id
+  patch -Np1 -i ../fix-systemd-lock.patch
 
   # Lock screen on suspend with systemd
-  patch -Np1 -i ${srcdir}/lock_screen_on_suspend.patch
+  patch -Np1 -i ../lock_screen_on_suspend.patch
 }
 
 build() {
@@ -47,14 +51,4 @@ package() {
   cd $pkgname-$pkgver
   make DESTDIR="$pkgdir" install
   install -Dm644 ../cinnamon-screensaver.pam "$pkgdir/etc/pam.d/cinnamon-screensaver"
-
-  # Autostart only in Cinnamon
-  cp "$pkgdir/etc/xdg/autostart/cinnamon-screensaver.desktop" \
-    "$pkgdir/etc/xdg/autostart/cinnamon2d-screensaver.desktop"
-  sed -i 's/^OnlyShowIn=.*/OnlyShowIn=GNOME;/' \
-    "$pkgdir"/etc/xdg/autostart/cinnamon{,2d}-screensaver.desktop
-  echo 'AutostartCondition=GNOME3 if-session cinnamon' \
-    >> "$pkgdir/etc/xdg/autostart/cinnamon-screensaver.desktop"
-  echo 'AutostartCondition=GNOME3 if-session cinnamon2d' \
-    >> "$pkgdir/etc/xdg/autostart/cinnamon2d-screensaver.desktop"
 }
diff --git a/community/cinnamon-screensaver/away-message-fixes.patch b/community/cinnamon-screensaver/away-message-fixes.patch
new file mode 100644
index 000000000..1828c5beb
--- /dev/null
+++ b/community/cinnamon-screensaver/away-message-fixes.patch
@@ -0,0 +1,226 @@
+diff -Naur cinnamon-screensaver-2.0.3.orig/doc/dbus-interface.html cinnamon-screensaver-2.0.3/doc/dbus-interface.html
+--- cinnamon-screensaver-2.0.3.orig/doc/dbus-interface.html	2013-10-26 19:34:39.000000000 +0200
++++ cinnamon-screensaver-2.0.3/doc/dbus-interface.html	2013-10-29 10:08:06.568038245 +0100
+@@ -70,7 +70,7 @@
+         <code class="literal">Lock</code>
+       </h3></div></div></div><p>
+         Request that the screen be locked.
+-      </p></div><div class="sect2" title="Cycle"><div class="titlepage"><div><div><h3 class="title"><a name="gs-method-Cycle"></a>
++      </p><div class="informaltable"><table border="1"><colgroup><col><col></colgroup><thead><tr><th>Direction</th><th>Type</th><th>Description</th></tr></thead><tbody><tr><td>in</td><td>string</td><td>the away message</td></tr></tbody></table></div></div><div class="sect2" title="Cycle"><div class="titlepage"><div><div><h3 class="title"><a name="gs-method-Cycle"></a>
+         <code class="literal">Cycle</code>
+       </h3></div></div></div><p>
+         Request that the screen saver theme be restarted and, if applicable,
+diff -Naur cinnamon-screensaver-2.0.3.orig/src/cinnamon-screensaver-command.c cinnamon-screensaver-2.0.3/src/cinnamon-screensaver-command.c
+--- cinnamon-screensaver-2.0.3.orig/src/cinnamon-screensaver-command.c	2013-10-26 19:34:39.000000000 +0200
++++ cinnamon-screensaver-2.0.3/src/cinnamon-screensaver-command.c	2013-10-29 22:32:13.127650887 +0100
+@@ -41,7 +41,7 @@
+ static gboolean do_query      = FALSE;
+ static gboolean do_time       = FALSE;
+ 
+-static gchar   *away_message  = "DEFAULT";
++static gchar   *away_message  = "";
+ 
+ static GOptionEntry entries [] = {
+         { "exit", 0, 0, G_OPTION_ARG_NONE, &do_quit,
+@@ -114,7 +114,7 @@
+ static GDBusMessage *
+ screensaver_send_message_string (GDBusConnection *connection,
+                                  const char      *name,
+-                                 gboolean         value)
++                                 gchar           *value)
+ {
+         GDBusMessage *message, *reply;
+         GError       *error;
+@@ -310,14 +310,7 @@
+         }
+ 
+         if (do_lock) {
+-				if (g_strcmp0 (away_message, "DEFAULT") == 0) {
+-					reply = screensaver_send_message_string (connection, "Lock", away_message);
+-				}
+-				else {
+-					gchar * custom_message = g_strdup_printf("CUSTOM###%s", away_message);
+-					reply = screensaver_send_message_string (connection, "Lock", custom_message);
+-					g_free (custom_message);
+-				}
++                reply = screensaver_send_message_string (connection, "Lock", away_message);
+                 if (reply == NULL) {
+                         g_message ("Did not receive a reply from the screensaver.");
+                         goto done;
+diff -Naur cinnamon-screensaver-2.0.3.orig/src/cinnamon-screensaver-dialog.c cinnamon-screensaver-2.0.3/src/cinnamon-screensaver-dialog.c
+--- cinnamon-screensaver-2.0.3.orig/src/cinnamon-screensaver-dialog.c	2013-10-26 19:34:39.000000000 +0200
++++ cinnamon-screensaver-2.0.3/src/cinnamon-screensaver-dialog.c	2013-10-29 18:34:38.042752214 +0100
+@@ -49,7 +49,6 @@
+ static gboolean enable_logout  = FALSE;
+ static gboolean enable_switch  = FALSE;
+ static char    *logout_command = NULL;
+-static char    *away_message     = NULL;
+ 
+ static GOptionEntry entries [] = {
+         { "verbose", 0, 0, G_OPTION_ARG_NONE, &verbose,
+diff -Naur cinnamon-screensaver-2.0.3.orig/src/gs-listener-dbus.c cinnamon-screensaver-2.0.3/src/gs-listener-dbus.c
+--- cinnamon-screensaver-2.0.3.orig/src/gs-listener-dbus.c	2013-10-26 19:34:39.000000000 +0200
++++ cinnamon-screensaver-2.0.3/src/gs-listener-dbus.c	2013-10-30 03:04:42.134732524 +0100
+@@ -570,7 +570,7 @@
+         if (! dbus_message_get_args (message, &error,
+                                      DBUS_TYPE_STRING, &body,
+                                      DBUS_TYPE_INVALID)) {
+-                raise_syntax (connection, message, "ShowMessage");
++                raise_syntax (connection, message, "Lock");
+                 return DBUS_HANDLER_RESULT_HANDLED;
+         }
+         
+@@ -584,6 +584,7 @@
+ 
+         return DBUS_HANDLER_RESULT_HANDLED;
+ }
++
+ static DBusHandlerResult
+ listener_show_message (GSListener     *listener,
+                        DBusConnection *connection,
+@@ -906,7 +907,7 @@
+                 } else if (dbus_message_is_signal (message, SYSTEMD_LOGIND_SESSION_INTERFACE, "Lock")) {
+                         if (_listener_message_path_is_our_session (listener, message)) {
+                                 gs_debug ("systemd requested session lock");
+-                                return listener_lock (listener, connection, message);
++                                g_signal_emit (listener, signals [LOCK], 0, "");
+                         }
+ 
+                         return DBUS_HANDLER_RESULT_HANDLED;
+@@ -948,7 +949,7 @@
+         } else if (dbus_message_is_signal (message, CK_SESSION_INTERFACE, "Lock")) {
+                 if (_listener_message_path_is_our_session (listener, message)) {
+                         gs_debug ("ConsoleKit requested session lock");
+-                        return listener_lock (listener, connection, message);
++                        g_signal_emit (listener, signals [LOCK], 0, "");
+                 }
+ 
+                 return DBUS_HANDLER_RESULT_HANDLED;
+diff -Naur cinnamon-screensaver-2.0.3.orig/src/gs-manager.c cinnamon-screensaver-2.0.3/src/gs-manager.c
+--- cinnamon-screensaver-2.0.3.orig/src/gs-manager.c	2013-10-26 19:34:39.000000000 +0200
++++ cinnamon-screensaver-2.0.3/src/gs-manager.c	2013-10-29 20:27:40.394604570 +0100
+@@ -1097,6 +1097,7 @@
+                 g_object_unref (manager->priv->settings);
+         }
+ 
++        g_free (manager->priv->away_message);
+         g_free (manager->priv->logout_command);
+         g_free (manager->priv->keyboard_command);
+ 
+@@ -1261,6 +1262,8 @@
+ 
+         gs_manager_destroy_windows (manager);
+ 
++        gs_manager_set_away_message (manager, NULL);
++
+         /* reset state */
+         manager->priv->active = FALSE;
+         manager->priv->activate_time = 0;
+@@ -1275,10 +1278,18 @@
+ gs_manager_set_away_message (GSManager   *manager,
+                              const char  *message)
+ {
+-        g_free (manager->priv->logout_command);
+-
+-        manager->priv->away_message = g_strdup(message);
+         GSList *l;
++
++        g_return_if_fail (GS_IS_MANAGER (manager));
++
++        g_free (manager->priv->away_message);
++
++        if (message) {
++                manager->priv->away_message = g_strdup (message);
++        } else {
++                manager->priv->away_message = NULL;
++        }
++
+         for (l = manager->priv->windows; l; l = l->next) {
+                 gs_window_set_away_message (l->data, manager->priv->away_message);
+         }
+@@ -1293,7 +1304,6 @@
+         if (active) {
+                 res = gs_manager_activate (manager);
+         } else {
+-                gs_manager_set_away_message(manager, "");
+                 res = gs_manager_deactivate (manager);
+         }
+ 
+diff -Naur cinnamon-screensaver-2.0.3.orig/src/gs-window-x11.c cinnamon-screensaver-2.0.3/src/gs-window-x11.c
+--- cinnamon-screensaver-2.0.3.orig/src/gs-window-x11.c	2013-10-26 19:34:39.000000000 +0200
++++ cinnamon-screensaver-2.0.3/src/gs-window-x11.c	2013-10-29 23:11:15.240828725 +0100
+@@ -2132,38 +2132,19 @@
+         return utf8_name;
+ }
+ 
+-static gchar * 
+-str_replace(const char *string, const char *delimiter, const char *replacement)
+-{
+-	gchar **split;
+-	gchar *ret;
+-	g_return_val_if_fail(string      != NULL, NULL);
+-	g_return_val_if_fail(delimiter   != NULL, NULL);
+-	g_return_val_if_fail(replacement != NULL, NULL);
+-	split = g_strsplit(string, delimiter, 0);
+-	ret = g_strjoinv(replacement, split);
+-	g_strfreev(split);
+-	return ret;
+-}
+-
+ static void
+ update_clock (GSWindow *window)
+ {	
+-	char *markup;
+-	char *away_message;
+-			
+-	if (window->priv->away_message != NULL && g_str_has_prefix (window->priv->away_message, "CUSTOM###") && g_strcmp0(window->priv->away_message, "") != 0) {		
+-		away_message = str_replace(window->priv->away_message, "CUSTOM###", "");		
+-        markup = g_strdup_printf ("%s\n\n<b><span font_desc=\"Ubuntu 14\" foreground=\"#CCCCCC\"> %s</span></b>\n<b><span font_desc=\"Ubuntu 10\" foreground=\"#ACACAC\">  ~ %s</span></b>", gnome_wall_clock_get_clock (window->priv->clock_tracker), away_message, get_user_display_name());
+-	}
+-	else {
+-		away_message = g_strdup_printf (_("%s"), window->priv->default_message);
+-        markup = g_strdup_printf ("%s\n\n<b><span font_desc=\"Ubuntu 14\" foreground=\"#CCCCCC\">%s</span></b>", gnome_wall_clock_get_clock (window->priv->clock_tracker), away_message);
+-	}
+-			
+-	gtk_label_set_markup (GTK_LABEL (window->priv->clock), markup);
+-	g_free (markup);
+-	g_free (away_message);
++        char *markup;
++
++        if (window->priv->away_message != NULL && g_strcmp0(window->priv->away_message, "") != 0) {
++                markup = g_strdup_printf ("%s\n\n<b><span font_desc=\"Ubuntu 14\" foreground=\"#CCCCCC\"> %s</span></b>\n<b><span font_desc=\"Ubuntu 10\" foreground=\"#ACACAC\">  ~ %s</span></b>", gnome_wall_clock_get_clock (window->priv->clock_tracker), g_markup_escape_text(window->priv->away_message, -1), get_user_display_name());
++        } else {
++                markup = g_strdup_printf ("%s\n\n<b><span font_desc=\"Ubuntu 14\" foreground=\"#CCCCCC\">%s</span></b>", gnome_wall_clock_get_clock (window->priv->clock_tracker), g_markup_escape_text(window->priv->default_message, -1));
++        }
++
++        gtk_label_set_markup (GTK_LABEL (window->priv->clock), markup);
++        g_free (markup);
+ }
+ 
+ static void
+@@ -2197,7 +2178,16 @@
+ gs_window_set_away_message (GSWindow   *window,
+                             const char *message)
+ {
+-        window->priv->away_message = message;
++        g_return_if_fail (GS_IS_WINDOW (window));
++
++        g_free (window->priv->away_message);
++
++        if (message) {
++                window->priv->away_message = g_strdup (message);
++        } else {
++                window->priv->away_message = NULL;
++        }
++
+         update_clock (window);
+ }
+ 
+@@ -2320,6 +2310,7 @@
+ 
+         g_return_if_fail (window->priv != NULL);
+ 
++        g_free (window->priv->away_message);
+         g_free (window->priv->logout_command);
+         g_free (window->priv->keyboard_command);
+ 
diff --git a/community/cinnamon-screensaver/fix-dbus-compatibility.patch b/community/cinnamon-screensaver/fix-dbus-compatibility.patch
deleted file mode 100644
index 3d70a79d0..000000000
--- a/community/cinnamon-screensaver/fix-dbus-compatibility.patch
+++ /dev/null
@@ -1,149 +0,0 @@
-From e43385126cf6f5187f98f940b8c04c3e99202b0b Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Ball=C3=B3=20Gy=C3=B6rgy?= <ballogyor@gmail.com>
-Date: Thu, 28 Feb 2013 05:45:12 +0100
-Subject: [PATCH 1/4] Fix crashing and compatibility with gnome-screensaver's
- D-Bus interface
-
----
- src/cinnamon-screensaver-command.c |  4 ++--
- src/gs-listener-dbus.c             | 10 ++++++++--
- src/gs-manager.c                   | 14 +++++++++++---
- 3 files changed, 21 insertions(+), 7 deletions(-)
-
-diff --git a/src/cinnamon-screensaver-command.c b/src/cinnamon-screensaver-command.c
-index 4267bd0..5c90916 100644
---- a/src/cinnamon-screensaver-command.c
-+++ b/src/cinnamon-screensaver-command.c
-@@ -311,11 +311,11 @@
- 
-         if (do_lock) {
- 				if (g_strcmp0 (away_message, "DEFAULT") == 0) {
--					reply = screensaver_send_message_string (connection, "Lock", away_message);
-+					reply = screensaver_send_message_string (connection, "LockMessage", away_message);
- 				}
- 				else {
- 					gchar * custom_message = g_strdup_printf("CUSTOM###%s", away_message);
--					reply = screensaver_send_message_string (connection, "Lock", custom_message);
-+					reply = screensaver_send_message_string (connection, "LockMessage", custom_message);
- 					g_free (custom_message);
- 				}
-                 if (reply == NULL) {
-diff --git a/src/gs-listener-dbus.c b/src/gs-listener-dbus.c
-index 2a98aee..6dbf12d 100644
---- a/src/gs-listener-dbus.c
-+++ b/src/gs-listener-dbus.c
-@@ -653,6 +653,8 @@ enum {
-         xml = g_string_append (xml,
-                                "  <interface name=\""GS_INTERFACE"\">\n"
-                                "    <method name=\"Lock\">\n"
-+                               "    </method>\n"
-+                               "    <method name=\"LockMessage\">\n"
-                                "      <arg name=\"body\" direction=\"in\" type=\"s\"/>\n"
-                                "    </method>\n"
-                                "    <method name=\"SimulateUserActivity\">\n"
-@@ -744,6 +746,10 @@ enum {
-         g_return_val_if_fail (message != NULL, DBUS_HANDLER_RESULT_NOT_YET_HANDLED);
- 
-         if (dbus_message_is_method_call (message, GS_SERVICE, "Lock")) {
-+                g_signal_emit (listener, signals [LOCK], 0);
-+                return send_success_reply (connection, message);
-+        }
-+        if (dbus_message_is_method_call (message, GS_SERVICE, "LockMessage")) {
-                 return listener_lock (listener, connection, message);
-         }
-         if (dbus_message_is_method_call (message, GS_SERVICE, "Quit")) {
-@@ -906,7 +912,7 @@ enum {
-                 } else if (dbus_message_is_signal (message, SYSTEMD_LOGIND_SESSION_INTERFACE, "Lock")) {
-                         if (_listener_message_path_is_our_session (listener, message)) {
-                                 gs_debug ("systemd requested session lock");
--                                return listener_lock (listener, connection, message);
-+                                g_signal_emit (listener, signals [LOCK], 0);
-                         }
- 
-                         return DBUS_HANDLER_RESULT_HANDLED;
-@@ -948,7 +954,7 @@ enum {
-         } else if (dbus_message_is_signal (message, CK_SESSION_INTERFACE, "Lock")) {
-                 if (_listener_message_path_is_our_session (listener, message)) {
-                         gs_debug ("ConsoleKit requested session lock");
--                        return listener_lock (listener, connection, message);
-+                        g_signal_emit (listener, signals [LOCK], 0);
-                 }
- 
-                 return DBUS_HANDLER_RESULT_HANDLED;
-diff --git a/src/gs-manager.c b/src/gs-manager.c
-index 1544921..bc09cb9 100644
---- a/src/gs-manager.c
-+++ b/src/gs-manager.c
-@@ -1275,10 +1275,18 @@ enum {
- gs_manager_set_away_message (GSManager   *manager,
-                              const char  *message)
- {
--        g_free (manager->priv->logout_command);
--
--        manager->priv->away_message = g_strdup(message);
-         GSList *l;
-+
-+        g_return_if_fail (GS_IS_MANAGER (manager));
-+
-+        g_free (manager->priv->away_message);
-+
-+        if (message) {
-+                manager->priv->away_message = g_strdup (message);
-+        } else {
-+                manager->priv->away_message = NULL;
-+        }
-+
-         for (l = manager->priv->windows; l; l = l->next) {
-                 gs_window_set_away_message (l->data, manager->priv->away_message);
-         }
--- 
-1.8.1.6
-
-
-From 4db01451afbb246213f483805f81a77c4c7371a3 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Ball=C3=B3=20Gy=C3=B6rgy?= <ballogyor@gmail.com>
-Date: Fri, 1 Mar 2013 05:17:46 +0100
-Subject: [PATCH 2/4] Update dbus document with the new LockMessage method
-
----
- doc/dbus-interface.html | 10 +++++++++-
- 1 file changed, 9 insertions(+), 1 deletion(-)
-
-diff --git a/doc/dbus-interface.html b/doc/dbus-interface.html
-index faff26c..c9f95ba 100644
---- a/doc/dbus-interface.html
-+++ b/doc/dbus-interface.html
-@@ -2,6 +2,8 @@
- ������������<code class="email">&lt;<a class="email" href="mailto:mccann@jhu.edu">mccann@jhu.edu</a>&gt;</code><br>
- ����������</p></div></div></div></div></div><div><p class="releaseinfo">Version 1.7.1</p></div></div><hr></div><div class="toc"><p><b>Table of Contents</b></p><dl><dt><span class="chapter"><a href="#dbus-interface">1. DBUS Interface</a></span></dt><dd><dl><dt><span class="sect1"><a href="#gs-intro">Introduction</a></span></dt><dt><span class="sect1"><a href="#gs-methods">Methods</a></span></dt><dd><dl><dt><span class="sect2"><a href="#gs-method-Lock">
-         <code class="literal">Lock</code>
-+      </a></span></dt><dt><span class="sect2"><a href="#gs-method-LockMessage">
-+        <code class="literal">LockMessage</code>
-       </a></span></dt><dt><span class="sect2"><a href="#gs-method-Cycle">
-         <code class="literal">Cycle</code>
-       </a></span></dt><dt><span class="sect2"><a href="#gs-method-SimulateUserActivity">
-@@ -30,6 +32,8 @@
-         <code class="literal">AuthenticationRequestEnd</code>
-       </a></span></dt></dl></dd><dt><span class="sect1"><a href="#gs-examples">Examples</a></span></dt></dl></dd></dl></div><div class="chapter" title="Chapter�1.�DBUS Interface"><div class="titlepage"><div><div><h2 class="title"><a name="dbus-interface"></a>Chapter�1.�DBUS Interface</h2></div></div></div><div class="toc"><p><b>Table of Contents</b></p><dl><dt><span class="sect1"><a href="#gs-intro">Introduction</a></span></dt><dt><span class="sect1"><a href="#gs-methods">Methods</a></span></dt><dd><dl><dt><span class="sect2"><a href="#gs-method-Lock">
-         <code class="literal">Lock</code>
-+      </a></span></dt><dt><span class="sect2"><a href="#gs-method-LockMessage">
-+        <code class="literal">LockMessage</code>
-       </a></span></dt><dt><span class="sect2"><a href="#gs-method-Cycle">
-         <code class="literal">Cycle</code>
-       </a></span></dt><dt><span class="sect2"><a href="#gs-method-SimulateUserActivity">
-@@ -70,7 +74,11 @@
-         <code class="literal">Lock</code>
-       </h3></div></div></div><p>
-         Request that the screen be locked.
--      </p></div><div class="sect2" title="Cycle"><div class="titlepage"><div><div><h3 class="title"><a name="gs-method-Cycle"></a>
-+      </p></div><div class="sect2" title="LockMessage"><div class="titlepage"><div><div><h3 class="title"><a name="gs-method-LockMessage"></a>
-+        <code class="literal">LockMessage</code>
-+      </h3></div></div></div><p>
-+        Request that the screen be locked, and set an away message.
-+      </p><div class="informaltable"><table border="1"><colgroup><col><col></colgroup><thead><tr><th>Direction</th><th>Type</th><th>Description</th></tr></thead><tbody><tr><td>in</td><td>string</td><td>the away message</td></tr></tbody></table></div></div><div class="sect2" title="Cycle"><div class="titlepage"><div><div><h3 class="title"><a name="gs-method-Cycle"></a>
-         <code class="literal">Cycle</code>
-       </h3></div></div></div><p>
-         Request that the screen saver theme be restarted and, if applicable,
--- 
-1.8.1.6
-
diff --git a/community/cinnamon-screensaver/fix-systemd-lock.patch b/community/cinnamon-screensaver/fix-systemd-lock.patch
new file mode 100644
index 000000000..7ce3e2394
--- /dev/null
+++ b/community/cinnamon-screensaver/fix-systemd-lock.patch
@@ -0,0 +1,83 @@
+From cac2c0ad8f4f40b6b175b9fbcde06935859f1bbc Mon Sep 17 00:00:00 2001
+From: Peter de Ridder <peter@xfce.org>
+Date: Wed, 20 Mar 2013 20:44:51 +0100
+Subject: [PATCH] Use the session path instead of the session id.
+
+---
+ src/gs-listener-dbus.c | 47 +++++++++++++++++++++++++++--------------------
+ 1 file changed, 27 insertions(+), 20 deletions(-)
+
+diff --git a/src/gs-listener-dbus.c b/src/gs-listener-dbus.c
+index 703d9e1..11fb95e 100644
+--- a/src/gs-listener-dbus.c
++++ b/src/gs-listener-dbus.c
+@@ -116,19 +117,8 @@ enum {
+         if (listener->priv->session_id == NULL)
+                 return FALSE;
+ 
+-#ifdef WITH_SYSTEMD
+-        /* The bus object path is simply the actual session ID
+-         * prefixed to make it a bus path */
+-        if (listener->priv->have_systemd)
+-                return g_str_has_prefix (ssid, SYSTEMD_LOGIND_SESSION_PATH "/")
+-                        && strcmp (ssid + sizeof (SYSTEMD_LOGIND_SESSION_PATH),
+-                                   listener->priv->session_id) == 0;
+-#endif
+-
+-#ifdef WITH_CONSOLE_KIT
+         if (strcmp (ssid, listener->priv->session_id) == 0)
+                 return TRUE;
+-#endif
+ 
+         return FALSE;
+ }
+@@ -416,20 +406,37 @@ enum {
+ 
+ #ifdef WITH_SYSTEMD
+         if (listener->priv->have_systemd) {
+-                char *t;
+-                int r;
++                dbus_uint32_t pid = getpid();
+ 
+-                r = sd_pid_get_session (0, &t);
+-                if (r < 0) {
+-                        gs_debug ("Couldn't determine our own session id: %s", strerror (-r));
++                message = dbus_message_new_method_call (SYSTEMD_LOGIND_SERVICE, SYSTEMD_LOGIND_PATH, SYSTEMD_LOGIND_INTERFACE, "GetSessionByPID");
++                if (message == NULL) {
++                        gs_debug ("Couldn't allocate the dbus message");
+                         return NULL;
+                 }
+ 
+-                /* t is allocated with malloc(), we need it with g_malloc() */
+-                ssid = g_strdup(t);
+-                free (t);
++                if (dbus_message_append_args (message, DBUS_TYPE_UINT32, &pid, DBUS_TYPE_INVALID) == FALSE) {
++                        gs_debug ("Couldn't add args to the dbus message");
++                        return NULL;
++                }
++
++                /* FIXME: use async? */
++                reply = dbus_connection_send_with_reply_and_block (listener->priv->system_connection,
++                                                                   message,
++                                                                   -1, &error);
++                dbus_message_unref (message);
++
++                if (dbus_error_is_set (&error)) {
++                        gs_debug ("%s raised:\n %s\n\n", error.name, error.message);
++                        dbus_error_free (&error);
++                        return NULL;
++                }
++
++                dbus_message_iter_init (reply, &reply_iter);
++                dbus_message_iter_get_basic (&reply_iter, &ssid);
++
++                dbus_message_unref (reply);
+ 
+-                return ssid;
++                return g_strdup (ssid);
+         }
+ #endif
+ 
+-- 
+1.8.4
+
diff --git a/community/cinnamon-screensaver/lock_screen_on_suspend.patch b/community/cinnamon-screensaver/lock_screen_on_suspend.patch
index 5c273c70e..a6019a503 100644
--- a/community/cinnamon-screensaver/lock_screen_on_suspend.patch
+++ b/community/cinnamon-screensaver/lock_screen_on_suspend.patch
@@ -25,7 +25,7 @@ index 7f718fa..49586fd 100644
 +                                    DBUS_TYPE_BOOLEAN, &active,
 +                                    DBUS_TYPE_INVALID) && active) {
 +                                gs_debug ("systemd notified that system is about to sleep");
-+                                g_signal_emit (listener, signals [LOCK], 0);
++                                g_signal_emit (listener, signals [LOCK], 0, "");
 +                        } else {
 +                                gs_debug ("cannot parse PrepareForSleep");
 +                        }
diff --git a/community/cinnamon-session/PKGBUILD b/community/cinnamon-session/PKGBUILD
index 21b5a827d..785176c4c 100644
--- a/community/cinnamon-session/PKGBUILD
+++ b/community/cinnamon-session/PKGBUILD
@@ -3,7 +3,7 @@
 # Contributor: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 
 pkgname=cinnamon-session
-pkgver=2.0.1
+pkgver=2.0.4
 pkgrel=1
 pkgdesc="The Cinnamon Session Handler"
 arch=(i686 x86_64)
@@ -16,7 +16,7 @@ url="https://github.com/linuxmint/cinnamon-session"
 source=(${pkgname}-${pkgver}.tar.gz::https://github.com/linuxmint/cinnamon-session/archive/${pkgver}.tar.gz
         remove_sessionmigration.patch
         timeout.patch)
-sha256sums=('e1dd1bc044be28c2849041e7f1cd23b388442c77500a59baf57d244a6d81b88b'
+sha256sums=('6de02197c89bde698e4f28cba51653967e1322c17c55ebc5f81ca30b14f58278'
             'f3c0bc1a3debfaa686230f19ba371b08dd4645064d90ead0c34f465c7d416736'
             'ef421a14814c7858490b3a806568ab4ec8a0dc21d390e94f801771c1261bb24a')
 
diff --git a/community/cinnamon-session/lightdm_userswitch.patch b/community/cinnamon-session/lightdm_userswitch.patch
deleted file mode 100644
index 2fc9fe17b..000000000
--- a/community/cinnamon-session/lightdm_userswitch.patch
+++ /dev/null
@@ -1,153 +0,0 @@
-diff --git a/cinnamon-session/csm-manager.c b/cinnamon-session/csm-manager.c
-index e3388b1..a8e63c5 100644
---- a/cinnamon-session/csm-manager.c
-+++ b/cinnamon-session/csm-manager.c
-@@ -1097,44 +1097,20 @@ cancel_end_session (CsmManager *manager)
-         start_phase (manager);
- }
- 
--
--static void
--manager_switch_user (GdkDisplay *display,
--                     CsmManager *manager)
--{
--        GError  *error;
--        char    *command;
--        GAppLaunchContext *context;
--        GAppInfo *app;
--
--	/* We have to do this here and in request_switch_user() because this
--	 * function can be called at a later time, not just directly after
--	 * request_switch_user(). */
--	if (_switch_user_is_locked_down (manager)) {
--		g_warning ("Unable to switch user: User switching has been locked down");
--		return;
--	}
--
--        command = g_strdup_printf ("%s %s",
--                                   MDM_FLEXISERVER_COMMAND,
--                                   MDM_FLEXISERVER_ARGS);
--
--        error = NULL;
--        context = (GAppLaunchContext*) gdk_display_get_app_launch_context (display);
--        app = g_app_info_create_from_commandline (command, MDM_FLEXISERVER_COMMAND, 0, &error);
--
--        if (app) {
--                g_app_info_launch (app, NULL, context, &error);
--                g_object_unref (app);
--        }
--
--        g_free (command);
--        g_object_unref (context);
--
--        if (error) {
--                g_debug ("CsmManager: Unable to start MDM greeter: %s", error->message);
--                g_error_free (error);
--        }
-+static gboolean
-+process_is_running (const char * name)
-+{
-+    int num_processes;
-+    char * command = g_strdup_printf ("pidof %s | wc -l", name);
-+    FILE *fp = popen(command, "r");
-+    fscanf(fp, "%d", &num_processes);
-+    pclose(fp);
-+    if (num_processes > 0) {
-+        return TRUE;
-+    }
-+    else {
-+        return FALSE;
-+    }
- }
- 
- static gboolean
-@@ -1157,7 +1133,7 @@ manager_perhaps_lock (CsmManager *manager)
- 
-         /* do this sync to ensure it's on the screen when we start suspending */
-         error = NULL;
--        ret = g_spawn_command_line_sync ("gnome-screensaver-command --lock", NULL, NULL, NULL, &error);
-+        ret = g_spawn_command_line_sync ("cinnamon-screensaver-command --lock", NULL, NULL, NULL, &error);
-         if (!ret) {
-                 g_warning ("Couldn't lock screen: %s", error->message);
-                 g_error_free (error);
-@@ -1165,6 +1141,80 @@ manager_perhaps_lock (CsmManager *manager)
- }
- 
- static void
-+manager_switch_user (GdkDisplay *display,
-+                     CsmManager *manager)
-+{
-+        GError  *error;
-+        char    *command;
-+        GAppLaunchContext *context;
-+        GAppInfo *app;
-+
-+    /* We have to do this here and in request_switch_user() because this
-+     * function can be called at a later time, not just directly after
-+     * request_switch_user(). */
-+    if (_switch_user_is_locked_down (manager)) {
-+        g_warning ("Unable to switch user: User switching has been locked down");
-+        return;
-+    }
-+    
-+    if (process_is_running("mdm")) {
-+            command = g_strdup_printf ("%s %s",
-+                                       MDM_FLEXISERVER_COMMAND,
-+                                       MDM_FLEXISERVER_ARGS);
-+
-+            error = NULL;
-+            context = (GAppLaunchContext*) gdk_display_get_app_launch_context (display);
-+            app = g_app_info_create_from_commandline (command, MDM_FLEXISERVER_COMMAND, 0, &error);
-+
-+            if (app) {
-+                    g_app_info_launch (app, NULL, context, &error);
-+                    g_object_unref (app);
-+            }
-+
-+            g_free (command);
-+            g_object_unref (context);
-+
-+            if (error) {
-+                    g_debug ("CsmManager: Unable to start MDM greeter: %s", error->message);
-+                    g_error_free (error);
-+            }
-+    }
-+    else if (process_is_running("lightdm")) {
-+        const gchar *xdg_seat_path = g_getenv ("XDG_SEAT_PATH");
-+        if (xdg_seat_path != NULL) {
-+            GDBusProxyFlags flags = G_DBUS_PROXY_FLAGS_DO_NOT_AUTO_START;
-+            GDBusProxy *proxy = NULL;
-+            error = NULL;
-+
-+            proxy = g_dbus_proxy_new_for_bus_sync(G_BUS_TYPE_SYSTEM,
-+                                                  flags,
-+                                                  NULL,
-+                                                  "org.freedesktop.DisplayManager",
-+                                                  xdg_seat_path,
-+                                                  "org.freedesktop.DisplayManager.Seat",
-+                                                  NULL,
-+                                                  &error);
-+            if (proxy != NULL) {
-+                    manager_perhaps_lock (manager);
-+                    g_dbus_proxy_call (proxy,
-+                                       "SwitchToGreeter",
-+                                       g_variant_new ("()"),
-+                                       G_DBUS_CALL_FLAGS_NONE,
-+                                       -1,
-+                                       NULL,
-+                                       NULL,
-+                                       NULL);
-+                    g_object_unref (proxy);
-+            }
-+            else {
-+                    g_debug ("GsmManager: Unable to start LightDM greeter: %s", error->message);
-+                    g_error_free (error);
-+            }
-+        } 
-+    }
-+}
-+
-+static void
- manager_attempt_hibernate (CsmManager *manager)
- {
-         if (csm_system_can_hibernate (manager->priv->system)) {
diff --git a/community/cinnamon-settings-daemon/PKGBUILD b/community/cinnamon-settings-daemon/PKGBUILD
index 0d3417363..fbe01d17f 100644
--- a/community/cinnamon-settings-daemon/PKGBUILD
+++ b/community/cinnamon-settings-daemon/PKGBUILD
@@ -3,22 +3,22 @@
 # Contributor: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 
 pkgname=cinnamon-settings-daemon
-pkgver=2.0.1
-pkgrel=2
+pkgver=2.0.6
+pkgrel=1
 pkgdesc="The Cinnamon Settings daemon"
 arch=('i686' 'x86_64')
 license=('GPL')
 depends=('cinnamon-desktop' 'ibus' 'libcanberra-pulse' 'librsvg' 'nss' 'pulseaudio-alsa' 'upower')
 makedepends=('intltool' 'docbook-xsl' 'gnome-common')
-options=('!emptydirs' '!libtool')
+options=('!emptydirs')
 install=cinnamon-settings-daemon.install
 url="https://github.com/linuxmint/cinnamon-settings-daemon"
 source=("${pkgname}-${pkgver}.tar.gz::https://github.com/linuxmint/cinnamon-settings-daemon/archive/${pkgver}.tar.gz"
         keyboard.patch
         automount-plugin.patch)
-sha256sums=('f03f5ea46bec11a6a0ed02b232dab8cb99a84fd8a9b52a76a454a7ba74dc1168'
+sha256sums=('50d9d2799415f2a98fbb2ec05a66aa807c861562d87c0371631ab30b9f7e26d3'
             '3c05b978cb414c8fc1530f211bab58627a64ac9c156630c9d486f5926a85109c'
-            '0a6dfbea6f28e5107212a8e8091ded6a3b5b34b1710c11c2f04c4d02846f9398')
+            '4fc2b3a354b53d41d92d7f95d175a6a18382330353a0579d29c2d33b9400a837')
 
 prepare() {
   cd $pkgname-$pkgver
diff --git a/community/cinnamon-settings-daemon/automount-plugin.patch b/community/cinnamon-settings-daemon/automount-plugin.patch
index f6ca1181f..745ed9e2b 100644
--- a/community/cinnamon-settings-daemon/automount-plugin.patch
+++ b/community/cinnamon-settings-daemon/automount-plugin.patch
@@ -1,15 +1,15 @@
 diff -Naur cinnamon-settings-daemon-2.0.1.orig/data/org.cinnamon.settings-daemon.plugins.gschema.xml.in.in cinnamon-settings-daemon-2.0.1/data/org.cinnamon.settings-daemon.plugins.gschema.xml.in.in
---- cinnamon-settings-daemon-2.0.1.orig/data/org.cinnamon.settings-daemon.plugins.gschema.xml.in.in	2013-10-02 16:13:56.000000000 +0200
-+++ cinnamon-settings-daemon-2.0.1/data/org.cinnamon.settings-daemon.plugins.gschema.xml.in.in	2013-10-08 22:49:15.438929150 +0200
+--- cinnamon-settings-daemon-2.0.6.orig/data/org.cinnamon.settings-daemon.plugins.gschema.xml.in.in 2013-11-03 10:50:04.000000000 -0500
++++ cinnamon-settings-daemon-2.0.6/data/org.cinnamon.settings-daemon.plugins.gschema.xml.in.in  2013-11-05 15:33:21.112912392 -0500
 @@ -2,6 +2,7 @@
    <schema gettext-domain="@GETTEXT_PACKAGE@" id="org.cinnamon.settings-daemon.plugins" path="/org/cinnamon/settings-daemon/plugins/">
      <child name="a11y-keyboard" schema="org.cinnamon.settings-daemon.plugins.a11y-keyboard"/>
      <child name="a11y-settings" schema="org.cinnamon.settings-daemon.plugins.a11y-settings"/>
 +    <child name="automount" schema="org.cinnamon.settings-daemon.plugins.automount"/>
-     <child name="background" schema="org.cinnamon.settings-daemon.plugins.background"/>
      <child name="clipboard" schema="org.cinnamon.settings-daemon.plugins.clipboard"/>
      <child name="color" schema="org.cinnamon.settings-daemon.plugins.color"/>
-@@ -43,6 +44,18 @@
+     <child name="cursor" schema="org.cinnamon.settings-daemon.plugins.cursor"/>
+@@ -42,6 +43,18 @@
        <_summary>Priority to use for this plugin</_summary>
        <_description>Priority to use for this plugin in cinnamon-settings-daemon startup queue</_description>
      </key>
@@ -382,7 +382,7 @@ diff -Naur cinnamon-settings-daemon-2.0.1.orig/plugins/automount/Makefile.am cin
 -	$(top_builddir)/cinnamon-settings-daemon/libcsd.la
 +	$(NULL)
  
--autostartdir = $(sysconfdir)/xdg/autostart
+-autostartdir = $(datadir)/applications
 -autostart_in_files = cinnamon-fallback-mount-helper.desktop.in
 -autostart_in_in_files = cinnamon-fallback-mount-helper.desktop.in.in
 -autostart_DATA = $(autostart_in_files:.desktop.in=.desktop)
diff --git a/community/cinnamon/PKGBUILD b/community/cinnamon/PKGBUILD
index 2a7c3c3e7..f03a6bd3f 100644
--- a/community/cinnamon/PKGBUILD
+++ b/community/cinnamon/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 98400 2013-10-09 16:38:23Z faidoc $
+# $Id: PKGBUILD 100528 2013-11-05 14:09:17Z faidoc $
 # Maintainer: Alexandre Filgueira <alexfilgueira@cinnarch.com>
 # Contributor: M0Rf30
 # Contributor: unifiedlinux
 # Contributor: CReimer
 
 pkgname=cinnamon
-pkgver=2.0.2
+pkgver=2.0.10
 pkgrel=1
 pkgdesc="Linux desktop which provides advanced innovative features and a traditional user experience"
 arch=('i686' 'x86_64' 'mips64el')
@@ -13,26 +13,21 @@ url="http://cinnamon.linuxmint.com/"
 license=('GPL2')
 depends=('accountsservice' 'caribou' 'cinnamon-settings-daemon' 'cinnamon-session'
          'cinnamon-translations' 'cjs' 'clutter-gtk' 'gconf' 'gnome-icon-theme'
-         'gnome-menus' 'gnome-themes-standard' 'gstreamer0.10' 'libgnome-keyring'
+         'gnome-menus' 'gnome-themes-standard' 'gstreamer' 'libgnome-keyring'
          'librsvg' 'networkmanager' 'muffin' 'pygtk' 'python2-dbus' 'python2-pillow'
-         'python2-pam' 'python2-pexpect' 'python2-pyinotify' 'python2-lxml' 'webkitgtk')
+         'python2-pam' 'python2-pexpect' 'python2-pyinotify' 'python2-lxml' 'webkitgtk'
+         'cinnamon-control-center' 'cinnamon-screensaver' 'libgnomekbd'
+         'network-manager-applet' 'nemo' 'polkit-gnome')
 makedepends=('gnome-common' 'intltool')
-optdepends=('cinnamon-control-center: extended configurations for Cinnamon'
-            'cinnamon-screensaver: lock screen'
-            'gucharmap: show character table from Keyboard applet'
-            'libgnomekbd: show keyboard layout from Keyboard applet'
-            'nemo: the official Cinnamon file manager (forked from Nautilus)')
-options=('!libtool' '!emptydirs')
+options=('!emptydirs')
 install=${pkgname}.install
 source=("$pkgname-$pkgver.tar.gz::https://github.com/linuxmint/Cinnamon/archive/$pkgver.tar.gz"
-        "fix-control-center-check.patch"
-        "background.patch"
+        "cinnamon-gstreamer1.patch"
         "keyboard_applet.patch"
         "input_keybindings.patch"
         "org.archlinux.pkexec.cinnamon-settings-users.policy")
-sha256sums=('3b7043a603c19d96bf1e5ccaafde24ca507c93ee51e81e8c5c8754457a18a5ac'
-            'ee5694bdc997ffa35a817f691b15bae13747137d35ec2aecd0da298d7edbe426'
-            '373d80cdb23250fbde846ed493ba422672cc42b03a111c2ce044467ee782df7f'
+sha256sums=('d63c1681da7fa16a0385c64dd93af71ae4ad17fb2a0b112ddfa1aa5232a27596'
+            '2e10ba71fd9ba40afd7e9492b2fc0d5bcc27874bcde543cfd8a47ad20c52354a'
             '6acb07393105ddced8a4c3c869a596350d1a7d81a808ca5307d2ad770653a9d3'
             'e28c40eb844105154fa6106f5b4de3151a22805b3a7b2f84be9ea6c15cec3de6'
             '371beac9e55d36f7629d2fc5cb40d6a3e6c0f4aac014f6fefdcd6743b5194b23')
@@ -44,26 +39,34 @@ prepare() {
   sed -i 's:/usr/bin/python :/usr/bin/python2 :' files/usr/bin/cinnamon-menu-editor
   find -type f | xargs sed -i 's@^#!.*python$@#!/usr/bin/python2@'
 
-  # Check for the cc-panel path, not for the unneeded binary
-  patch -Np1 -i ../fix-control-center-check.patch
-
-  # Fix missing backgrounds
-  patch -Np1 -i ../background.patch
-
   # Fix keyboard applet
   patch -Np1 -i ../keyboard_applet.patch
 
   # Add input keybindings
   patch -Np1 -i ../input_keybindings.patch
 
-  # Prefix 'System Settings' with 'Cinnamon' to avoid confusion with gnome-control-center
-  sed -i 's/^Name\(.*\)=\(.*\)/Name\1=Cinnamon \2/' files/usr/share/applications/cinnamon-settings{,-users}.desktop
+  # Port to GStreamer 1.0. Also backports some recorder bugfixes
+  patch -Np1 -i ../cinnamon-gstreamer1.patch
+
+  # Fix required components
+  sed -i 's/cinnamon-fallback-mount-helper;/polkit-gnome-authentication-agent-1;/
+          s/nm-applet;/cinnamon-nm-applet;/' files/usr/share/cinnamon-session/sessions/cinnamon*.session
 
   # fix for the python2 PAM module  
   sed -i 's:import PAM:import pam:' files/usr/lib/cinnamon-settings/modules/cs_user.py
 
   # Use pkexec instead of gksu
   sed -i 's/gksu/pkexec/' files/usr/bin/cinnamon-settings-users
+
+  # Check for the cc-panel path, not for the unneeded binary
+  sed -i 's|/usr/bin/cinnamon-control-center|/usr/lib/cinnamon-control-center-1/panels|' files/usr/bin/cinnamon-settings
+
+  # Cinnamon has no upstream backgrounds, use GNOME backgrounds instead
+  sed -i 's|/usr/share/cinnamon-background-properties|/usr/share/gnome-background-properties|' \
+    files/usr/lib/cinnamon-settings/modules/cs_backgrounds.py
+
+  # Prefix 'System Settings' with 'Cinnamon' to avoid confusion with gnome-control-center
+  sed -i 's/^Name\(.*\)=\(.*\)/Name\1=Cinnamon \2/' files/usr/share/applications/cinnamon-settings{,-users}.desktop
 }
 
 build() {
@@ -77,15 +80,16 @@ build() {
                --disable-schemas-compile \
                --enable-compile-warnings=yes \
                --with-session-tracking=systemd
-  make CFLAGS="${CFLAGS} -Wno-deprecated -Wno-deprecated-declarations"
+  make
 }
 
 package() {
   cd ${srcdir}/Cinnamon*
   make DESTDIR="${pkgdir}" install
 
-  # Remove leftover files after patching
-  find "$pkgdir" -type f -name *.orig | xargs rm
+  # Install cinnamon-nm-applet.desktop file
+  sed 's/^NotShowIn=.*/OnlyShowIn=GNOME/' /usr/share/applications/nm-applet.desktop \
+    > "${pkgdir}/usr/share/applications/cinnamon-nm-applet.desktop"
 
   # Install policy file
   install -Dm644 "${srcdir}/org.archlinux.pkexec.cinnamon-settings-users.policy" \
diff --git a/community/cinnamon/background.patch b/community/cinnamon/background.patch
deleted file mode 100644
index ccfdce4cf..000000000
--- a/community/cinnamon/background.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- a/files/usr/lib/cinnamon-settings/modules/cs_backgrounds.py
-+++ b/files/usr/lib/cinnamon-settings/modules/cs_backgrounds.py
-@@ -334,10 +334,9 @@ class BackgroundWallpaperPane (Gtk.VBox)
-     
-     def update_icon_view(self):
-         pictures_list = []
--        if os.path.exists("/usr/share/cinnamon-background-properties"):
--            for i in os.listdir("/usr/share/cinnamon-background-properties"):
--                if i.endswith(".xml"):
--                    pictures_list += self.parse_xml_backgrounds_list(os.path.join("/usr/share/cinnamon-background-properties", i))
-+        for i in os.listdir("/usr/share/gnome-background-properties"):
-+            if i.endswith(".xml"):
-+                    pictures_list += self.parse_xml_backgrounds_list(os.path.join("/usr/share/gnome-background-properties", i))
-         
-         path = os.path.join(os.getenv("HOME"), ".cinnamon", "backgrounds")
-         if os.path.exists(path):
diff --git a/community/cinnamon/cinnamon-gstreamer1.patch b/community/cinnamon/cinnamon-gstreamer1.patch
new file mode 100644
index 000000000..6c27c1620
--- /dev/null
+++ b/community/cinnamon/cinnamon-gstreamer1.patch
@@ -0,0 +1,282 @@
+diff -ruN a/configure.ac b/configure.ac
+--- a/configure.ac	2013-10-16 15:10:22.237511846 +0000
++++ b/configure.ac	2013-10-16 15:00:45.501321091 +0000
+@@ -44,15 +44,15 @@
+ 
+ # We need at least this, since gst_plugin_register_static() was added
+ # in 0.10.16, but nothing older than 0.10.21 has been tested.
+-GSTREAMER_MIN_VERSION=0.10.16
++GSTREAMER_MIN_VERSION=0.11.92
+ 
+ recorder_modules=
+ build_recorder=false
+ AC_MSG_CHECKING([for GStreamer (needed for recording functionality)])
+-if $PKG_CONFIG --exists gstreamer-0.10 '>=' $GSTREAMER_MIN_VERSION ; then
++if $PKG_CONFIG --exists gstreamer-1.0 '>=' $GSTREAMER_MIN_VERSION ; then
+    AC_MSG_RESULT(yes)
+    build_recorder=true
+-   recorder_modules="gstreamer-0.10 gstreamer-base-0.10 x11"
++   recorder_modules="gstreamer-1.0 gstreamer-base-1.0 x11"
+    PKG_CHECK_MODULES(TEST_CINNAMON_RECORDER, $recorder_modules clutter-1.0 xfixes)
+ else
+    AC_MSG_RESULT(no)
+diff -ruN a/src/cinnamon-recorder.c b/src/cinnamon-recorder.c
+--- a/src/cinnamon-recorder.c	2013-10-16 15:10:22.344177808 +0000
++++ b/src/cinnamon-recorder.c	2013-10-16 15:26:42.801040167 +0000
+@@ -8,6 +8,7 @@
+ #include <string.h>
+ #include <unistd.h>
+ 
++#define GST_USE_UNSTABLE_API
+ #include <gst/gst.h>
+ 
+ #include "cinnamon-recorder-src.h"
+@@ -147,7 +148,7 @@
+  * (Theora does have some support for frames at non-uniform times, but
+  * things seem to break down if there are large gaps.)
+  */
+-#define DEFAULT_PIPELINE "videorate ! vp8enc quality=10 speed=2 threads=%T ! queue ! webmmux"
++#define DEFAULT_PIPELINE "vp8enc min_quantizer=13 max_quantizer=13 cpu-used=5 deadline=1000000 threads=%T ! queue ! webmmux"
+ 
+ /* The default filename pattern. Example cinnamon-20090311b-2.webm
+  */
+@@ -446,6 +447,7 @@
+ recorder_draw_cursor (CinnamonRecorder *recorder,
+                       GstBuffer     *buffer)
+ {
++  GstMapInfo info;
+   cairo_surface_t *surface;
+   cairo_t *cr;
+ 
+@@ -464,7 +466,8 @@
+   if (!recorder->cursor_image)
+     return;
+ 
+-  surface = cairo_image_surface_create_for_data (GST_BUFFER_DATA(buffer),
++  gst_buffer_map (buffer, &info, GST_MAP_WRITE);
++  surface = cairo_image_surface_create_for_data (info.data,
+                                                  CAIRO_FORMAT_ARGB32,
+                                                  recorder->stage_width,
+                                                  recorder->stage_height,
+@@ -479,6 +482,7 @@
+ 
+   cairo_destroy (cr);
+   cairo_surface_destroy (surface);
++  gst_buffer_unmap (buffer, &info);
+ }
+ 
+ /* Draw an overlay indicating how much of the target memory is used
+@@ -541,10 +545,11 @@
+   data = g_malloc (size);
+ 
+   buffer = gst_buffer_new();
+-  GST_BUFFER_SIZE(buffer) = size;
+-  GST_BUFFER_MALLOCDATA(buffer) = GST_BUFFER_DATA(buffer) = data;
++  gst_buffer_insert_memory (buffer, -1,
++                            gst_memory_new_wrapped (0, data, size, 0,
++                                                    size, data, g_free));
+ 
+-  GST_BUFFER_TIMESTAMP(buffer) = get_wall_time() - recorder->start_time;
++  GST_BUFFER_PTS(buffer) = get_wall_time() - recorder->start_time;
+ 
+   cogl_read_pixels (0, 0,
+                     recorder->stage_width, recorder->stage_height,
+@@ -1042,23 +1047,18 @@
+ {
+   GstCaps *caps;
+ 
+-  /* The data is always native-endian xRGB; ffmpegcolorspace
++  /* The data is always native-endian xRGB; videoconvert
+    * doesn't support little-endian xRGB, but does support
+    * big-endian BGRx.
+    */
+-  caps = gst_caps_new_simple ("video/x-raw-rgb",
+-                              "bpp", G_TYPE_INT, 32,
+-                              "depth", G_TYPE_INT, 24,
++  caps = gst_caps_new_simple ("video/x-raw",
+ #if G_BYTE_ORDER == G_LITTLE_ENDIAN
+-                              "red_mask",   G_TYPE_INT, 0x0000ff00,
+-                              "green_mask", G_TYPE_INT, 0x00ff0000,
+-                              "blue_mask",  G_TYPE_INT, 0xff000000,
++                              "format", G_TYPE_STRING, "BGRx",
+ #else
+-                              "red_mask",   G_TYPE_INT, 0xff0000,
+-                              "green_mask", G_TYPE_INT, 0x00ff00,
+-                              "blue_mask",  G_TYPE_INT, 0x0000ff,
++                              "format", G_TYPE_STRING, "xRGB",
+ #endif
+-                              "endianness", G_TYPE_INT, G_BIG_ENDIAN,
++                              "bpp", G_TYPE_INT, 32,
++                              "depth", G_TYPE_INT, 24,
+                               "framerate", GST_TYPE_FRACTION, pipeline->recorder->framerate, 1,
+                               "width", G_TYPE_INT, pipeline->recorder->stage_width,
+                               "height", G_TYPE_INT, pipeline->recorder->stage_height,
+@@ -1076,7 +1076,7 @@
+ {
+   GstPad *sink_pad = NULL, *src_pad = NULL;
+   gboolean result = FALSE;
+-  GstElement *ffmpegcolorspace;
++  GstElement *videoconvert;
+ 
+   sink_pad = gst_bin_find_unlinked_pad (GST_BIN (pipeline->pipeline), GST_PAD_SINK);
+   if (sink_pad == NULL)
+@@ -1095,19 +1095,19 @@
+ 
+   recorder_pipeline_set_caps (pipeline);
+ 
+-  /* The ffmpegcolorspace element is a generic converter; it will convert
++  /* The videoconvert element is a generic converter; it will convert
+    * our supplied fixed format data into whatever the encoder wants
+    */
+-  ffmpegcolorspace = gst_element_factory_make ("ffmpegcolorspace", NULL);
+-  if (!ffmpegcolorspace)
++  videoconvert = gst_element_factory_make ("videoconvert", NULL);
++  if (!videoconvert)
+     {
+-      g_warning("Can't create ffmpegcolorspace element");
++      g_warning("Can't create videoconvert element");
+       goto out;
+     }
+-  gst_bin_add (GST_BIN (pipeline->pipeline), ffmpegcolorspace);
++  gst_bin_add (GST_BIN (pipeline->pipeline), videoconvert);
+ 
+-  gst_element_link_many (pipeline->src, ffmpegcolorspace, NULL);
+-  src_pad = gst_element_get_static_pad (ffmpegcolorspace, "src");
++  gst_element_link_many (pipeline->src, videoconvert, NULL);
++  src_pad = gst_element_get_static_pad (videoconvert, "src");
+ 
+   if (!src_pad)
+     {
+@@ -1637,7 +1637,7 @@
+  * might be used to send the output to an icecast server
+  * via shout2send or similar.
+  *
+- * The default value is 'videorate ! theoraenc ! oggmux'
++ * The default value is 'vp8enc min_quantizer=13 max_quantizer=13 cpu-used=5 deadline=1000000 threads=%T ! queue ! webmmux'
+  */
+ void
+ cinnamon_recorder_set_pipeline (CinnamonRecorder *recorder,
+diff -ruN a/src/cinnamon-recorder-src.c b/src/cinnamon-recorder-src.c
+--- a/src/cinnamon-recorder-src.c	2013-10-16 15:10:22.347511119 +0000
++++ b/src/cinnamon-recorder-src.c	2013-10-16 15:33:41.581609206 +0000
+@@ -2,6 +2,7 @@
+ 
+ #include "config.h"
+ 
++#define GST_USE_UNSTABLE_API
+ #include <gst/base/gstpushsrc.h>
+ 
+ #include "cinnamon-recorder-src.h"
+@@ -12,6 +13,9 @@
+ 
+   GMutex *mutex;
+ 
++  GstClock *clock;
++  GstClockTime last_frame_time;
++
+   GstCaps *caps;
+   GAsyncQueue *queue;
+   gboolean closed;
+@@ -33,21 +37,21 @@
+ /* Special marker value once the source is closed */
+ #define RECORDER_QUEUE_END ((GstBuffer *)1)
+ 
+-GST_BOILERPLATE(CinnamonRecorderSrc, cinnamon_recorder_src, GstPushSrc, GST_TYPE_PUSH_SRC);
++G_DEFINE_TYPE(CinnamonRecorderSrc, cinnamon_recorder_src, GST_TYPE_PUSH_SRC);
+ 
+ static void
+-cinnamon_recorder_src_init (CinnamonRecorderSrc      *src,
+-			 CinnamonRecorderSrcClass *klass)
++cinnamon_recorder_src_init (CinnamonRecorderSrc      *src)
+ {
++  gst_base_src_set_format (GST_BASE_SRC (src), GST_FORMAT_TIME);
++  gst_base_src_set_live (GST_BASE_SRC (src), TRUE);
++
++  src->clock = gst_system_clock_obtain ();
++  src->last_frame_time = 0;
++
+   src->queue = g_async_queue_new ();
+   src->mutex = g_mutex_new ();
+ }
+ 
+-static void
+-cinnamon_recorder_src_base_init (gpointer klass)
+-{
+-}
+-
+ static gboolean
+ cinnamon_recorder_src_memory_used_update_idle (gpointer data)
+ {
+@@ -87,21 +91,28 @@
+   GstBuffer *buffer;
+ 
+   if (src->closed)
+-    return GST_FLOW_UNEXPECTED;
++    return GST_FLOW_EOS;
+ 
+   buffer = g_async_queue_pop (src->queue);
++  if (src->last_frame_time == 0)
++    src->last_frame_time = gst_clock_get_time (GST_CLOCK (src->clock));
++
+   if (buffer == RECORDER_QUEUE_END)
+     {
+       /* Returning UNEXPECTED here will cause a EOS message to be sent */
+       src->closed = TRUE;
+-      return GST_FLOW_UNEXPECTED;
++      return GST_FLOW_EOS;
+     }
+ 
+   cinnamon_recorder_src_update_memory_used (src,
+-					 - (int)(GST_BUFFER_SIZE(buffer) / 1024));
++					 - (int)(gst_buffer_get_size(buffer) / 1024));
+ 
+   *buffer_out = buffer;
+ 
++  GST_BUFFER_DURATION(*buffer_out) = GST_CLOCK_DIFF (src->last_frame_time, gst_clock_get_time (GST_CLOCK (src->clock)));
++
++  src->last_frame_time = gst_clock_get_time (GST_CLOCK (src->clock));
++
+   return GST_FLOW_OK;
+ }
+ 
+@@ -142,7 +153,9 @@
+ 
+   g_mutex_free (src->mutex);
+ 
+-  G_OBJECT_CLASS (parent_class)->finalize (object);
++  gst_object_unref (src->clock);
++
++  G_OBJECT_CLASS (cinnamon_recorder_src_parent_class)->finalize (object);
+ }
+ 
+ static void
+@@ -246,9 +259,9 @@
+   g_return_if_fail (CINNAMON_IS_RECORDER_SRC (src));
+   g_return_if_fail (src->caps != NULL);
+ 
+-  gst_buffer_set_caps (buffer, src->caps);
++  gst_base_src_set_caps (GST_BASE_SRC (src), src->caps);
+   cinnamon_recorder_src_update_memory_used (src,
+-					 (int) (GST_BUFFER_SIZE(buffer) / 1024));
++					 (int)(gst_buffer_get_size(buffer) / 1024));
+ 
+   g_async_queue_push (src->queue, gst_buffer_ref (buffer));
+ }
+diff -ruN a/src/test-recorder.c b/src/test-recorder.c
+--- a/src/test-recorder.c	2013-10-16 15:10:22.240845159 +0000
++++ b/src/test-recorder.c	2013-10-16 15:48:03.685915756 +0000
+@@ -1,5 +1,6 @@
+ /* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
+ 
++#define GST_USE_UNSTABLE_API
+ #include "cinnamon-recorder.h"
+ #include <clutter/clutter.h>
+ #include <gst/gst.h>
+@@ -29,7 +30,6 @@
+   ClutterAnimation *animation;
+   ClutterColor red, green, blue;
+ 
+-  g_thread_init (NULL);
+   gst_init (&argc, &argv);
+   if (clutter_init (&argc, &argv) != CLUTTER_INIT_SUCCESS)
+     return 1;
diff --git a/community/cinnamon/fix-control-center-check.patch b/community/cinnamon/fix-control-center-check.patch
deleted file mode 100644
index 981b1c1a5..000000000
--- a/community/cinnamon/fix-control-center-check.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naur cinnamon-1.7.1.orig/files/usr/bin/cinnamon-settings cinnamon-1.7.1/files/usr/bin/cinnamon-settings
---- cinnamon-1.7.1.orig/files/usr/bin/cinnamon-settings	2013-02-21 17:23:45.000000000 +0100
-+++ cinnamon-1.7.1/files/usr/bin/cinnamon-settings	2013-03-03 03:03:24.151209998 +0100
-@@ -7,7 +7,7 @@
- 	if os.path.exists("/usr/lib/cinnamon-settings/modules/cs_%s.py" % module):
- 		print "Python module"
- 		os.execvp("/usr/lib/cinnamon-settings/cinnamon-settings.py", ("",) + tuple(sys.argv[1:]))
--	elif os.path.exists("/usr/bin/cinnamon-control-center"):
-+	elif os.path.exists("/usr/lib/cinnamon-control-center-1/panels"):
- 		print "Unknown module %s, using cinnamon-control-center" % module
- 		os.execvp("/usr/lib/cinnamon-settings/cinnamon-settings.py", ("",) + tuple(sys.argv[1:]))
- 	elif os.path.exists("/usr/bin/gnome-control-center"):	
\ No newline at end of file
diff --git a/community/cjs/PKGBUILD b/community/cjs/PKGBUILD
index 7c6439e20..eb3b5b709 100644
--- a/community/cjs/PKGBUILD
+++ b/community/cjs/PKGBUILD
@@ -11,7 +11,6 @@ url="https://github.com/linuxmint/cjs"
 license=(GPL)
 depends=(cairo gobject-introspection js185 dbus-glib)
 makedepends=(gnome-common)
-options=('!libtool')
 source=("${pkgname}-${pkgver}.tar.gz::https://github.com/linuxmint/cjs/archive/${pkgver}.tar.gz")
 sha256sums=('2fea6c491e6ce8567201f14c0e926181154d798d4811dd65da477c014bfb2a9a')
 
diff --git a/community/clanlib/PKGBUILD b/community/clanlib/PKGBUILD
index 0a244388f..ff7aafaca 100644
--- a/community/clanlib/PKGBUILD
+++ b/community/clanlib/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 97670 2013-09-27 06:38:16Z svenstaro $
+# $Id: PKGBUILD 99713 2013-10-30 23:11:42Z allan $
 # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
 
 pkgname=clanlib
@@ -10,7 +10,6 @@ url="http://clanlib.org/"
 license=('zlib')
 depends=('alsa-lib' 'libjpeg' 'libmikmod' 'libpng' 'libvorbis' 'libxi' 'libxmu' 'sdl_gfx' 'freetype2' 'pcre' 'sqlite' 'libgl')
 makedepends=('doxygen' 'graphviz' 'mesa')
-options=('!libtool')
 source=(clanlib-${pkgver}.tar.gz::https://github.com/sphair/ClanLib/archive/3.0.0.tar.gz)
 md5sums=('bfbfd7cc89be12f02c3994d4fcdd49f3')
 
diff --git a/community/classpath/PKGBUILD b/community/classpath/PKGBUILD
index 973420ee6..2b157829b 100644
--- a/community/classpath/PKGBUILD
+++ b/community/classpath/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 97832 2013-09-30 10:02:06Z spupykin $
+# $Id: PKGBUILD 100102 2013-11-01 17:14:29Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: tardo <tardo@nagi-fanboi.net>
 # Contributor: Sean Gillespie <Sean.D.Gillespie@gmail.com>
 
 pkgname=classpath
 pkgver=0.98
-pkgrel=5
+pkgrel=6
 pkgdesc="A free replacement for Sun's proprietary core Java class libraries."
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.gnu.org/software/classpath/"
diff --git a/community/clearsilver/PKGBUILD b/community/clearsilver/PKGBUILD
index a184a4c65..d2863b6ec 100644
--- a/community/clearsilver/PKGBUILD
+++ b/community/clearsilver/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 86874 2013-03-23 23:10:33Z td123 $
+# $Id: PKGBUILD 100518 2013-11-05 11:31:11Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer : Aaron Griffin <aaron@archlinux.org>
 # Contributor: William Rea <sillywilly@gmail.com>
 
 pkgname=clearsilver
 pkgver=0.10.5
-pkgrel=9
+pkgrel=11
 pkgdesc="clearsilver is a fast, powerful, and language-neutral HTML template system"
 arch=('i686' 'x86_64' 'mips64el')
 url='http://www.clearsilver.net'
diff --git a/community/codeblocks/PKGBUILD b/community/codeblocks/PKGBUILD
index 9cceeb3ae..4cdd8fddf 100644
--- a/community/codeblocks/PKGBUILD
+++ b/community/codeblocks/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 96531 2013-08-31 09:00:41Z bpiotrowski $
+# $Id: PKGBUILD 99714 2013-10-30 23:12:02Z allan $
 # Maintainer:  Bartłomiej Piotrowski <nospam@bpiotrowski.pl>
 # Contributor: Robert Hollencamp <rhollencamp@gmail.com>
 # Contributor: Daniel J Griffiths <griffithsdj@inbox.com>
@@ -14,7 +14,6 @@ license=('GPL3')
 depends=('boost-libs' 'bzip2' 'desktop-file-utils' 'gamin' 'gtk-update-icon-cache'
          'hicolor-icon-theme' 'hunspell' 'shared-mime-info' 'wxgtk')
 makedepends=('boost' 'zip')
-options=('!libtool')
 install=codeblocks.install
 source=(http://download.berlios.de/$pkgname/${pkgname}_${pkgver}-1.tar.gz)
 md5sums=('4fa8980a8c578b8b5589fceb9b0890d6')
diff --git a/community/collectd/PKGBUILD b/community/collectd/PKGBUILD
index c7fe00c3b..f9328104c 100644
--- a/community/collectd/PKGBUILD
+++ b/community/collectd/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 96266 2013-08-23 04:10:37Z bisson $
+# $Id: PKGBUILD 99715 2013-10-30 23:12:24Z allan $
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
 # Contributor: Gerhard Brauer <gerhard.brauer@web.de>
 
@@ -46,7 +46,6 @@ sha1sums=('c2bc3ca3c62cfba4499c4eb14066a4c78301cc2c'
           '04f676d0b76c34df0bbf94629813e035b1febe04')
 
 backup=('etc/collectd.conf')
-options=('!libtool')
 
 prepare() {
 	cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/community/commoncpp2/PKGBUILD b/community/commoncpp2/PKGBUILD
index d5d5e8a33..5d9204490 100644
--- a/community/commoncpp2/PKGBUILD
+++ b/community/commoncpp2/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 64380 2012-02-12 11:04:24Z arodseth $
+# $Id: PKGBUILD 100142 2013-11-01 20:22:25Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Franco Tortoriello <franco.tortoriello@gmail.com>
 # Contributor: Andrea Scarpino <andrea@archlinux.org>
@@ -8,13 +8,13 @@
 
 pkgname=commoncpp2
 pkgver=1.8.1
-pkgrel=3.1
+pkgrel=4
 pkgdesc="GNU Common C++ 2"
 arch=('x86_64' 'i686' 'mips64el')
 url='http://www.gnu.org/software/commoncpp/'
 license=('GPL' 'custom')
 depends=('gcc-libs' 'zlib' 'sh')
-options=('!libtool' '!makeflags')
+options=('!makeflags')
 install=$pkgname.install
 source=("http://ftp.gnu.org/pub/gnu/commoncpp/$pkgname-$pkgver.tar.gz")
 sha256sums=('53ced4aff74e28a1d8018eb2b4974519028db3c12471ab6dff1c873578c9af4e')
diff --git a/community/confuse/PKGBUILD b/community/confuse/PKGBUILD
index 33f19975c..a2c4d8586 100644
--- a/community/confuse/PKGBUILD
+++ b/community/confuse/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 64161 2012-02-09 16:35:50Z ttopper $
+# $Id: PKGBUILD 99717 2013-10-30 23:13:11Z allan $
 # Contributor : Ionut Biru <ibiru@archlinux.org>
 # Contributor: Roman Kyrylych <roman@archlinux.org>
 # Contributor: Alexander Mieland (dma147) <dma147@linux-stats.org>
@@ -13,7 +13,7 @@ url="http://www.nongnu.org/confuse"
 license=('LGPL')
 depends=('glibc')
 source=("http://savannah.nongnu.org/download/${pkgname}/${pkgname}-${pkgver}.tar.gz")
-options=('!libtool' '!emptydirs')
+options=('!emptydirs')
 md5sums=('45932fdeeccbb9ef4228f1c1a25e9c8f')
 
 build() {
diff --git a/community/connman/PKGBUILD b/community/connman/PKGBUILD
index e75c1a7a9..2434554df 100644
--- a/community/connman/PKGBUILD
+++ b/community/connman/PKGBUILD
@@ -1,10 +1,10 @@
-#$Id: PKGBUILD 96945 2013-09-09 02:20:31Z dwallace $
+#$Id: PKGBUILD 100369 2013-11-02 21:44:13Z dwallace $
 # Maintainer: Daniel Wallace <danielwallace at gtmanfred dot com>
 # Contributor: Lucas De Marchi <lucas.de.marchi@gmail.com>
 
 pkgname=connman
-pkgver=1.18
-pkgrel=2
+pkgver=1.19
+pkgrel=1
 pkgdesc="Wireless LAN network manager"
 url="http://connman.net/"
 arch=('i686' 'x86_64' 'mips64el')
@@ -15,10 +15,9 @@ optdepends=('bluez: Support for Bluetooth devices'
             'wpa_supplicant: For WiFi devices'
             'pptpclient: for ppp support')
 makedepends=('bluez' 'wpa_supplicant' 'openconnect' 'openvpn' 'ppp')
-options=('!libtool')
 source=("http://www.kernel.org/pub/linux/network/${pkgname}/${pkgname}-${pkgver}.tar.bz2"
         'allow_group_network.diff')
-md5sums=('cd696bf74512eb644cef6e983ba6c94f'
+md5sums=('562181545fe04ec8442ab4774963154d'
          'a8d22ee089fb0ed725130d16ad393047')
 
 prepare(){
diff --git a/community/conntrack-tools/PKGBUILD b/community/conntrack-tools/PKGBUILD
index 0764ea7f1..923eaf1b6 100644
--- a/community/conntrack-tools/PKGBUILD
+++ b/community/conntrack-tools/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 95231 2013-08-07 09:35:16Z seblu $
+# $Id: PKGBUILD 99719 2013-10-30 23:13:52Z allan $
 # Maintainer: Sébastien Luttringer
 # Contributor: Valere Monseur <valere_monseur@hotmail.com>
 # Contributor: Alessandro Sagratini <ale_sagra@hotmail.com>
@@ -16,7 +16,6 @@ depends=('libnetfilter_conntrack'
          'libnetfilter_cthelper'
          'libnetfilter_queue')
 backup=('etc/conntrackd.conf')
-options=('!libtool')
 source=("http://www.netfilter.org/projects/$pkgname/files/$pkgname-$pkgver.tar.bz2"{,.sig}
         'conntrackd.service')
 install=$pkgname.install
diff --git a/community/converseen/PKGBUILD b/community/converseen/PKGBUILD
index 0337063b1..3579c5c98 100644
--- a/community/converseen/PKGBUILD
+++ b/community/converseen/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 97491 2013-09-21 18:36:28Z eric $
+# $Id: PKGBUILD 99619 2013-10-30 16:13:52Z giovanni $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: archtux <antonio.arias99999 at gmail.com>
 
 pkgname=converseen
-pkgver=0.6.4
-pkgrel=3
+pkgver=0.6.5
+pkgrel=1
 pkgdesc="The batch image converter and resizer"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://converseen.sourceforge.net/"
@@ -13,7 +13,7 @@ depends=('imagemagick' 'qt4' 'libwmf' 'openexr' 'libwebp')
 makedepends=('cmake')
 install=converseen.install
 source=("http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.bz2")
-md5sums=('072cb40a495e539661ea789131555f79')
+md5sums=('7db27020d6071f73eea23655d5272055')
 
 build() {
   cd "${srcdir}"
diff --git a/community/couchdb/PKGBUILD b/community/couchdb/PKGBUILD
index c472c17d4..143bf1f9c 100644
--- a/community/couchdb/PKGBUILD
+++ b/community/couchdb/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 96754 2013-09-04 10:16:32Z spupykin $
+# $Id: PKGBUILD 99720 2013-10-30 23:14:13Z allan $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Vitaliy Berdinskikh ur6lad[at]i.ua
 # Contributor: Michael Fellinger <m.fellinger@gmail.com>
 
 pkgname=couchdb
 pkgver=1.4.0
-pkgrel=1
+pkgrel=2
 pkgdesc="A document-oriented database that can be queried and indexed in a MapReduce fashion using JSON"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://couchdb.apache.org"
@@ -13,7 +13,6 @@ license=('APACHE')
 depends=('icu' 'erlang-nox' 'js185' 'openssl' 'curl')
 makedepends=('autoconf-archive' 'git')
 install=couchdb.install
-options=('!libtool')
 backup=('etc/couchdb/local.ini'
 	'etc/conf.d/couchdb'
 	'etc/logrotate.d/couchdb')
diff --git a/community/ctpl/PKGBUILD b/community/ctpl/PKGBUILD
index 0c797fec9..1531ff67a 100644
--- a/community/ctpl/PKGBUILD
+++ b/community/ctpl/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 60598 2011-12-14 19:59:50Z arodseth $
+# $Id: PKGBUILD 99721 2013-10-30 23:14:36Z allan $
 # Maintainer: Alexander Rødseth <rodseth@gmail.com>
 # Contributor: Angel Velasquez <angvp@archlinux.org>   
 # Contributor: Patrick Melo <patrick@patrickmelo.eti.br>
@@ -10,7 +10,6 @@ arch=('i686' 'x86_64' 'mips64el')
 url="http://ctpl.tuxfamily.org/"
 license=('GPL')
 depends=('glib2')
-options=(!libtool)
 source=("http://download.tuxfamily.org/ctpl/releases/$pkgname-$pkgver.tar.gz")
 sha256sums=('7da73e7d8f10d222f5685b8eb80541d7e4d342aa74673039692fa5c4e8b120a7')
 
diff --git a/community/cuetools/PKGBUILD b/community/cuetools/PKGBUILD
index 6a8f03798..0b2f938e0 100644
--- a/community/cuetools/PKGBUILD
+++ b/community/cuetools/PKGBUILD
@@ -1,33 +1,39 @@
-# $Id: PKGBUILD 64846 2012-02-18 17:42:48Z stativ $
+# $Id: PKGBUILD 98850 2013-10-20 09:41:43Z stativ $
 # Maintainer: Lukas Jirkovsky <l.jirkovsky@gmail.com>
 pkgname=cuetools
-pkgver=1.3.1
-pkgrel=5
-pkgdesc="Set of utilities for working with cue files and toc files"
+pkgver=1.4.0
+pkgrel=1
+pkgdesc="Cue and toc file parsers and utilities"
 arch=('i686' 'x86_64' 'mips64el')
-url="http://developer.berlios.de/projects/cuetools/"
+url="https://github.com/svend/cuetools"
+#url="http://developer.berlios.de/projects/cuetools/"
 license=('GPL')
 depends=('glibc')
-source=(http://download.berlios.de/$pkgname/$pkgname-$pkgver.tar.gz \
-        cuetag.patch)
-md5sums=('45575f7a1bdc6615599fa6cb49845cca'
-         '38969241a7b6ac88e2f1b46c3da0ecc2')
+source=("https://github.com/svend/cuetools/archive/${pkgver}.tar.gz"
+	"fix_build_with_automake-1.12.diff")
+md5sums=('4492dae2b3f9e077f6455a1f1cddef3b'
+         '67a3b32711d1a1f508be6ed0f1bdadf3')
 
-build() {
-  cd "$srcdir"/$pkgname-$pkgver
+prepare() {
+  cd "$srcdir/$pkgname-$pkgver"
+
+  patch -Np1 < "$srcdir/fix_build_with_automake-1.12.diff" || true
 
-  # fix cuetag
-  patch -Np0 < "$srcdir"/cuetag.patch
-  sed -i -e 's/--import-vc-from/--import-tags-from/' \
-    -e 's/--remove-vc-all/--remove-all-tags/' extras/cuetag.sh
+  aclocal
+  autoheader
+  automake --force-missing --add-missing
+  autoconf
+}
+
+build() {
+  cd "$srcdir/$pkgname-$pkgver"
 
-  ./configure --prefix=/usr --mandir=/usr/share/man
+  ./configure --prefix=/usr
   make
 }
 
 package() {
-  cd "$srcdir"/$pkgname-$pkgver
+  cd "$srcdir/$pkgname-$pkgver"
 
   make DESTDIR="$pkgdir" install
-  install -m755 extras/cuetag.sh "$pkgdir"/usr/bin/cuetag.sh
 }
diff --git a/community/cuetools/cuetag.patch b/community/cuetools/cuetag.patch
deleted file mode 100644
index cd41dcd56..000000000
--- a/community/cuetools/cuetag.patch
+++ /dev/null
@@ -1,37 +0,0 @@
---- extras/cuetag.sh	2006-09-06 14:24:47.000000000 -0400
-+++ extras/cuetag.sh	2007-01-26 00:13:23.000000000 -0500
-@@ -63,7 +63,7 @@
- 	(for field in $fields; do
- 		value=""
- 		for conv in `eval echo \\$$field`; do
--			value=`$CUEPRINT -n $1 -t "$conv\n" $cue_file`
-+			value=`$CUEPRINT -n $1 -t "$conv\n" "$cue_file"`
- 
- 			if [ -n "$value" ]; then
- 				echo "$field=$value"
-@@ -96,7 +96,7 @@
- 	for field in $fields; do
- 		value=""
- 		for conv in `eval echo \\$$field`; do
--			value=`$CUEPRINT -n $1 -t "$conv\n" $cue_file`
-+			value=`$CUEPRINT -n $1 -t "$conv\n" "$cue_file"`
- 
- 			if [ -n "$value" ]; then
- 				break
-@@ -141,14 +141,14 @@
- 	cue_file=$1
- 	shift
- 
--	ntrack=`cueprint -d '%N' $cue_file`
-+	ntrack=`cueprint -d '%N' "$cue_file"`
- 	trackno=1
- 
- 	if [ $# -ne $ntrack ]; then
- 		echo "warning: number of files does not match number of tracks"
- 	fi
- 
--	for file in $@; do
-+	for file in "$@"; do
- 		case $file in
- 		*.[Ff][Ll][Aa][Cc])
- 			vorbis $trackno "$file"
diff --git a/community/cuetools/fix_build_with_automake-1.12.diff b/community/cuetools/fix_build_with_automake-1.12.diff
new file mode 100644
index 000000000..9090f32c3
--- /dev/null
+++ b/community/cuetools/fix_build_with_automake-1.12.diff
@@ -0,0 +1,24 @@
+From 761eba5b9b9c87a872a18b7ba4bf3d77a96e2157 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Horv=C3=A1th=20Bal=C3=A1zs?= <q@qroa.ch>
+Date: Tue, 15 Oct 2013 01:17:52 +0200
+Subject: [PATCH] Fix build with automake-1.12.
+
+---
+ configure.ac | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/configure.ac b/configure.ac
+index f54bb92..9f36932 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -4,6 +4,7 @@ AC_PROG_CC
+ AC_PROG_INSTALL
+ AC_PROG_RANLIB
+ AM_PROG_LEX
++m4_ifdef([AM_PROG_AR], [AM_PROG_AR])
+ AC_PROG_YACC
+ AC_CONFIG_HEADERS([config.h])
+ AC_CONFIG_FILES([Makefile doc/Makefile src/Makefile src/lib/Makefile src/tools/Makefile extras/Makefile])
+-- 
+1.8.4
+
diff --git a/community/cwiid/PKGBUILD b/community/cwiid/PKGBUILD
index 096e78afd..90aaf9dc2 100644
--- a/community/cwiid/PKGBUILD
+++ b/community/cwiid/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 92496 2013-06-07 09:28:55Z tomegun $
+# $Id: PKGBUILD 99065 2013-10-23 22:02:55Z speps $
 # Maintainer : speps <speps at aur dot archlinux dot org>
 # Contributor: Ray Rashif <schiv@archlinux.org>
 # Contributor: Wieland Hoffmann <the_mineo@web.de>
@@ -7,41 +7,39 @@
 # 2012/06/05 : <added into community as supercollider dependency>
 
 pkgname=cwiid
-pkgver=0.6.00
-pkgrel=13
+pkgver=0.6.00+svn201
+pkgrel=1
 pkgdesc="Linux Nintendo Wiimote interface"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://abstrakraft.org/cwiid"
 depends=('bluez-libs' 'gtk2' 'python2')
-makedepends=('python2')
 license=('GPL')
 install="$pkgname.install"
-source=("$url/downloads/$pkgname-$pkgver.tgz"
-        "$url/raw-attachment/ticket/70/bluez_4_api_changes.patch")
-md5sums=('8d574afdeedc5e5309c87a72d744316a'
-         '19b288723d1f2b97a3e5288ab9de3313')
+source=("https://github.com/abstrakraft/cwiid/archive/svn_history.tar.gz")
+md5sums=('e1bc290504dc53f02581866eed0b85c3')
+
+prepare() {
+  cd $pkgname-svn_history
+  sed -i '/ldconfig/s/WITH/ENABLE/' configure.ac
+  aclocal
+  autoconf -f
+}
 
 build() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  # bluez v4 compatibility
-  patch -Np1 -i "$srcdir/bluez_4_api_changes.patch"
-
+  cd $pkgname-svn_history
   ./configure --prefix=/usr \
               --sysconfdir=/etc \
-              --disable-ldconfig \
-              --with-python=python2
+              --with-python=python2 \
+              --enable-ldconfig=no
 
-  LDFLAGS+="$(pkg-config --libs bluez) -lrt -pthread" make
+  LDFLAGS+="$(pkg-config --libs bluez) -lpthread" \
+  make
 }
 
 package() {
-  cd "$srcdir/$pkgname-$pkgver"
+  cd $pkgname-svn_history
   make DESTDIR="$pkgdir" install
 
-  # fix static lib permissions
-  chmod 644 "$pkgdir/usr/lib/libcwiid.a"
-
   # wminput README
   install -Dm644 wminput/README \
     "$pkgdir/usr/share/doc/$pkgname/wminput/README"
diff --git a/community/cython/PKGBUILD b/community/cython/PKGBUILD
index 97400c542..ac6ae0c6b 100644
--- a/community/cython/PKGBUILD
+++ b/community/cython/PKGBUILD
@@ -1,18 +1,18 @@
-# $Id: PKGBUILD 96075 2013-08-20 06:32:15Z lcarlier $
+# $Id: PKGBUILD 98721 2013-10-17 12:42:56Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Igor Scabini <furester @ gmail.com>
 
 pkgname=('cython' 'cython2')
 pkgbase=cython
-pkgver=0.19.1
-pkgrel=2
+pkgver=0.19.2
+pkgrel=1
 pkgdesc="C-Extensions for Python "
 arch=(i686 x86_64 'mips64el')
 url="http://www.cython.org"
 license=('APACHE')
 makedepends=('python-setuptools' 'python2-setuptools')
 source=("http://cython.org/release/Cython-$pkgver.tar.gz")
-md5sums=('df4cfb2b8e3345272e3fc451b76bd630')
+md5sums=('4af1218346510b464c0a6bf15500d0e2')
 
 build() {
   true
diff --git a/community/dante/PKGBUILD b/community/dante/PKGBUILD
index 648c4df12..c31fc124f 100644
--- a/community/dante/PKGBUILD
+++ b/community/dante/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 91850 2013-05-28 17:25:33Z spupykin $
+# $Id: PKGBUILD 100144 2013-11-01 20:22:44Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Guillem Rieu <guillemr@gmx.net>
 
 pkgname=dante
 pkgver=1.3.2
-pkgrel=5
+pkgrel=6
 pkgdesc="SOCKS v4 and v5 compatible proxy server and client"
 url="http://www.inet.no/dante"
 arch=(i686 x86_64 'mips64el')
@@ -12,7 +12,6 @@ license=('custom')
 depends=('pam' 'krb5')
 backup=('etc/socks.conf'
 	'etc/sockd.conf')
-options=('!libtool')
 source=(ftp://ftp.inet.no/pub/socks/${pkgname}-${pkgver}.tar.gz
 	sockd.service)
 md5sums=('250c6456cd3fefa17f07fa80c9ccf6bd'
diff --git a/community/darktable/PKGBUILD b/community/darktable/PKGBUILD
index 705a89271..af3e661c7 100644
--- a/community/darktable/PKGBUILD
+++ b/community/darktable/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 97018 2013-09-10 13:41:22Z spupykin $
+# $Id: PKGBUILD 99723 2013-10-30 23:19:15Z allan $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer:  Christian Himpel <chressie at gmail dot com>
 # Contributor: Johannes Hanika <hanatos at gmail dot com>
@@ -17,7 +17,6 @@ depends=('exiv2>=0.18' 'intltool>=0.40' 'lcms2' 'lensfun>=0.2.3' 'libglade' 'dbu
 makedepends=('intltool>=0.40' 'cmake' 'librsvg')
 optdepends=('librsvg')
 install=darktable.install
-options=(!libtool)
 source=(http://downloads.sourceforge.net/project/darktable/darktable/${_pkgver}/darktable-$pkgver.tar.xz)
 md5sums=('7eaa89aa5257b5f61cc7462db08ce164')
 
diff --git a/community/dart/PKGBUILD b/community/dart/PKGBUILD
new file mode 100644
index 000000000..7eb295604
--- /dev/null
+++ b/community/dart/PKGBUILD
@@ -0,0 +1,85 @@
+# $Id: PKGBUILD 100438 2013-11-04 12:04:12Z arodseth $
+# Maintainer: Alexander Rødseth <rodseth@gmail.com>
+# Contributor: T. Jameson Little <t.jameson.little at gmail dot com>
+# Contributor: Usagi Ito <usagi@WonderRabbitProject.net>
+# Contributor: siasia <http://pastebin.com/qsBEmNCw>
+# Contributor: Julien Nicoulaud <julien.nicoulaud@gmail.com>
+
+pkgname=dart
+pkgver=0.8.7.0
+pkgrel=2
+pkgdesc='The dart programming language (includes SDK and editor)'
+arch=('x86_64' 'i686')
+url='http://www.dartlang.org/'
+license=('BSD' 'EPL')
+depends=('java-runtime' 'gtk2' 'desktop-file-utils' 'gconf')
+makedepends=('gendesk' 'setconf')
+backup=("opt/$pkgname/DartEditor.ini")
+options=('!strip')
+
+if [[ $CARCH == x86_64 ]]; then
+  source=("https://storage.googleapis.com/dart-editor-archive-integration/latest/darteditor-linux-64.zip"
+          'darteditor.png::https://www.dartlang.org/tools/images/dart-logo-48.png')
+  sha256sums=('230d53fc95f873e4d2e7cd2377706693196dbfc154c80493d57cf409d2908d72'
+              'd90f14b0cfa2dd36502ed5e5854466d54c8d0cf0ac9a5d9ec823274c1a33a00e')
+else
+  source=("https://storage.googleapis.com/dart-editor-archive-integration/latest/darteditor-linux-32.zip"
+          'darteditor.png::https://www.dartlang.org/tools/images/dart-logo-48.png')
+  sha256sums=('4752ad56ca58611cf67474d3ebb979a2e5f26e477a3c508cf5847c7207e837a1'
+              'd90f14b0cfa2dd36502ed5e5854466d54c8d0cf0ac9a5d9ec823274c1a33a00e')
+fi
+
+prepare() {
+  # Fix permissions
+  find "$pkgname" -type d -exec chmod 0755 '{}' + \
+    -or -type f -exec chmod 0644 '{}' +
+  chmod +x "$pkgname/DartEditor"
+  chmod +x "$pkgname/dart-sdk/bin/"*
+
+  # Remove Dartium (takes 309,31 MB, available in the dartium-bin package on AUR)
+  rm -r "$pkgname/chromium"
+
+  # Prepare a desktop shortcut
+  gendesk -n -f --pkgname 'darteditor' --name 'Dart Editor' \
+    --exec 'darteditor %U' --pkgdesc 'Editor for the dart programming language'
+
+  # Fix paths
+  cd "$pkgname/dart-sdk/bin"
+  setconf dart2js BIN_DIR "/opt/$pkgname/dart-sdk/bin"
+  setconf dart2js PROG_NAME "/opt/$pkgname/dart-sdk/bin/dart2js"
+  setconf dartanalyzer SCRIPT_DIR "/opt/$pkgname/dart-sdk/bin"
+  setconf dartdoc BIN_DIR "/opt/$pkgname/dart-sdk/bin"
+  setconf pub BIN_DIR "/opt/$pkgname/dart-sdk/bin"
+  setconf pub SDK_DIR "/opt/$pkgname/dart-sdk"
+
+  # Fix missing "fi" and missing newline
+  echo -e "fi\n" >> pub
+}
+
+package() {
+  # Create directories
+  install -d "$pkgdir"{"/opt/$pkgname",/usr/{bin,"share/doc/$pkgname"}}
+
+  # Package the files
+  cp -a dart/* "$pkgdir/opt/$pkgname/"
+
+  # Set up symbolic links for the executables
+  for f in dart dart2js dartanalyzer dartdoc pub; do
+    ln -s "/opt/$pkgname/dart-sdk/bin/$f" "$pkgdir/usr/bin/$f"
+  done
+  ln -s "/opt/$pkgname/DartEditor" "$pkgdir/usr/bin/darteditor"
+
+  # Package samples and documentation
+  for f in samples about.html about_files; do
+    echo mv "$pkgdir/opt/$pkgname/$f" "$pkgdir/usr/share/doc/$pkgname/"
+  done
+
+  # Set up a symbolic link for the configuration
+  echo ln -s "/opt/$pkgname/DartEditor.ini" "$pkgdir/etc/darteditor.ini"
+
+  # Package desktop shortcut and icon
+  install -Dm644 'darteditor.desktop' "$pkgdir/usr/share/applications/$pkgname.desktop"
+  install -Dm644 'darteditor.png' "$pkgdir/usr/share/pixmaps/darteditor.png"
+}
+
+# vim:set ts=2 sw=2 et:
diff --git a/community/dbmail/PKGBUILD b/community/dbmail/PKGBUILD
index d91d6f79a..a53ba5c49 100644
--- a/community/dbmail/PKGBUILD
+++ b/community/dbmail/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 97976 2013-10-02 13:30:38Z spupykin $
+# $Id: PKGBUILD 99724 2013-10-30 23:19:36Z allan $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Sebastian Faltoni <sebastian.faltoni@gmail.com>
 
 pkgname=dbmail
 pkgver=3.1.7
-pkgrel=2
+pkgrel=4
 pkgdesc="Fast and scalable sql based mail services"
 arch=('i686' 'x86_64' 'mips64el')
 depends=('gmime' 'libzdb' 'mhash' 'libevent')
@@ -15,7 +15,7 @@ optdepends=('libldap: for LDAP authentication'
 	    'python2-mysql2pgsql: migrate from MySQL to PostreSQL')
 url="http://www.dbmail.org"
 license=('GPL')
-options=('!libtool' 'zipman')
+options=('zipman')
 backup=(etc/xinetd.d/dbmail-imapd
 	etc/xinetd.d/dbmail-pop3d
 	etc/xinetd.d/dbmail-lmtpd
diff --git a/community/deadbeef/PKGBUILD b/community/deadbeef/PKGBUILD
index 452ad3aba..d52881653 100644
--- a/community/deadbeef/PKGBUILD
+++ b/community/deadbeef/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 82328 2013-01-15 11:34:59Z allan $
+# $Id: PKGBUILD 99725 2013-10-30 23:19:58Z allan $
 # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de>
 # Contributor: Alexey Yakovenko <waker@users.sourceforge.net>
 
@@ -29,7 +29,6 @@ optdepends=('libsamplerate: for Resampler plugin'
             'libx11: for global hotkeys plugin'
             'zlib: for Audio Overload plugin'
             'libzip: for vfs_zip plugin')
-options=('!libtool')
 install='deadbeef.install'
 source=("http://downloads.sourceforge.net/project/${pkgname}/${pkgname}-${pkgver}.tar.bz2")
 md5sums=('26b6036ca7e59c88267d3de4f42c4d01')
diff --git a/community/deja-dup/PKGBUILD b/community/deja-dup/PKGBUILD
index 664239641..678dec6f0 100644
--- a/community/deja-dup/PKGBUILD
+++ b/community/deja-dup/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 97723 2013-09-27 20:25:48Z bgyorgy $
+# $Id: PKGBUILD 99726 2013-10-30 23:20:21Z allan $
 # Maintainer: Balló György <ballogyor+arch at gmail dot com>
 
 pkgname=deja-dup
@@ -14,7 +14,6 @@ optdepends=('gnome-keyring: save passwords'
             'nautilus: backup extension'
             'python2-boto: Amazon S3 backend'
             'ubuntuone-client: Ubuntu One backend')
-options=('!libtool')
 install=$pkgname.install
 source=(http://launchpad.net/$pkgname/${pkgver%.*}/$pkgver/+download/$pkgname-$pkgver.tar.xz)
 md5sums=('480516869f49813880f2bbb35700c9af')
diff --git a/community/denemo/PKGBUILD b/community/denemo/PKGBUILD
index f169842db..3d1ca4431 100644
--- a/community/denemo/PKGBUILD
+++ b/community/denemo/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 93805 2013-07-10 13:14:17Z spupykin $
+# $Id: PKGBUILD 99727 2013-10-30 23:20:50Z allan $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Philipp Sandhaus <philipp.sandhaus@gmx.de>
 # Contributor: Robert Emil Berge <filoktetes@linuxophic.org>
@@ -14,7 +14,6 @@ license=('GPL')
 depends=('aubio' 'portaudio' 'lilypond' 'gtk3' 'libxml2' 'guile' 'fftw'
 	 'librsvg' 'fluidsynth' 'libsmf' 'evince' 'gtksourceview3' 'portmidi')
 makedepends=('intltool')
-options=('!libtool')
 backup=('etc/denemo/denemo.conf')
 source=("http://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.gz")
 md5sums=('1d633ad7741ab12dab865219a20559f0')
diff --git a/community/devil/PKGBUILD b/community/devil/PKGBUILD
index 44ef5c3c4..b2dfe16cd 100644
--- a/community/devil/PKGBUILD
+++ b/community/devil/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 96404 2013-08-28 00:08:35Z eric $
+# $Id: PKGBUILD 99728 2013-10-30 23:21:11Z allan $
 # Maintainer: Laurent Carlier <lordheavym@gmail.org>
 # Contributor: damir <damir@archlinux.org>
 # Contributor: TheHoff <forums>
@@ -11,7 +11,7 @@ arch=('i686' 'x86_64' 'mips64el')
 url="http://openil.sourceforge.net/"
 depends=('libpng' 'libmng' 'jasper' 'lcms' 'openexr')
 install=devil.install
-options=('!libtool' '!docs' '!emptydirs')
+options=('!docs' '!emptydirs')
 license=('GPL')
 source=(http://downloads.sourceforge.net/openil/DevIL-$pkgver.tar.gz libpng14.patch)
 md5sums=('7918f215524589435e5ec2e8736d5e1d'
diff --git a/community/dfc/PKGBUILD b/community/dfc/PKGBUILD
new file mode 100644
index 000000000..acf5d560c
--- /dev/null
+++ b/community/dfc/PKGBUILD
@@ -0,0 +1,33 @@
+# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
+# Contributor: Rolinh <robinDOThahlingATgw-computingDOTnet>
+
+pkgname=dfc
+pkgver=3.0.4
+pkgrel=1
+pkgdesc="Display file system space usage using graphs and colors"
+arch=('x86_64' 'i686')
+url="http://projects.gw-computing.net/projects/dfc"
+license=('BSD')
+depends=('glibc')
+makedepends=('cmake' 'gettext')
+conflicts=('dfc-git')
+source=(http://projects.gw-computing.net/attachments/download/79/${pkgname}-${pkgver}.tar.gz)
+install='dfc.install'
+md5sums=('3b9edc197ad21e1dfe10128d130e626c')
+
+build() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+
+  cmake . -DPREFIX=/usr -DSYSCONFDIR=/etc -DCMAKE_BUILD_TYPE=RELEASE
+  make
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+
+  make DESTDIR="${pkgdir}" install
+
+  install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+}
+
+# vim:set ts=2 sw=2 et:
diff --git a/community/dfc/dfc.install b/community/dfc/dfc.install
new file mode 100644
index 000000000..30fd1a096
--- /dev/null
+++ b/community/dfc/dfc.install
@@ -0,0 +1,4 @@
+post_install() {
+	echo 'Optional configuration file is located in /etc/xdg/dfc/'
+	echo 'Copy it to ~/.config/dfc/ (create this folder if necessary) if you want to use it.'
+}
diff --git a/community/dia/PKGBUILD b/community/dia/PKGBUILD
index 60a7381a6..6600500ae 100644
--- a/community/dia/PKGBUILD
+++ b/community/dia/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 90015 2013-05-06 19:36:39Z foutrelis $
+# $Id: PKGBUILD 99729 2013-10-30 23:21:31Z allan $
 # Maintainer: Thorsten Töpper <atsutane-tu@freethoughts.de>
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Juergen Hoetzel <juergen@archlinux.org>
@@ -15,7 +15,7 @@ install=dia.install
 depends=('libxslt' 'desktop-file-utils' 'libart-lgpl' 'gtk2' 'hicolor-icon-theme')
 makedepends=('intltool' 'python2' 'docbook-xsl')
 optdepends=('python2')
-options=('!libtool' 'docs' '!emptydirs')
+options=('docs' '!emptydirs')
 source=("ftp://ftp.gnome.org/pub/gnome/sources/${pkgname}/0.97/${pkgname}-${pkgver}.tar.xz"
 	"dia-crash.patch::https://git.gnome.org/browse/dia/patch/?id=213bdfe956bf8fe57c86316f68a09408fef1647e")
 md5sums=('1e1180a513fb567709b09bc19f12105e'
diff --git a/community/dietlibc/PKGBUILD b/community/dietlibc/PKGBUILD
index 1040480dd..4c93f57be 100644
--- a/community/dietlibc/PKGBUILD
+++ b/community/dietlibc/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 92521 2013-06-07 16:21:25Z spupykin $
+# $Id: PKGBUILD 100146 2013-11-01 20:23:04Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: Tino Reichardt <milky-archlinux@mcmilk.de>
 
 pkgname=dietlibc
 pkgver=0.33
-pkgrel=1
+pkgrel=2
 pkgdesc="a libc optimized for small size"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.fefe.de/dietlibc/"
diff --git a/community/directfb/PKGBUILD b/community/directfb/PKGBUILD
index 499c7456e..fbba3d610 100644
--- a/community/directfb/PKGBUILD
+++ b/community/directfb/PKGBUILD
@@ -1,18 +1,18 @@
-# $Id: PKGBUILD 96481 2013-08-30 15:29:14Z spupykin $
+# $Id: PKGBUILD 100148 2013-11-01 20:23:24Z spupykin $
 # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
 # Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgname=directfb
-pkgver=1.7.0
-pkgrel=1
+pkgver=1.7.1
+pkgrel=2
 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' 'libpng' 'freetype2' 'libdrm' 'libgl' 'mesa')
-options=('!libtool')
 source=(http://www.directfb.org/downloads/Core/DirectFB-${pkgver%.*}/DirectFB-${pkgver}.tar.gz)
 sha1sums=('095852479098a55be2b0c6a0250af4159ee16e7c')
+sha1sums=('ff3dc6885f2875586849d88ee9f87fca866259b0')
 
 build() {
   cd DirectFB-${pkgver}
diff --git a/community/dispcalgui/PKGBUILD b/community/dispcalgui/PKGBUILD
index b8b5b2596..9d745438d 100644
--- a/community/dispcalgui/PKGBUILD
+++ b/community/dispcalgui/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 96076 2013-08-20 06:32:16Z lcarlier $
+# $Id: PKGBUILD 99412 2013-10-28 11:55:41Z tredaelli $
 # Maintainer: Timothy Redaelli <timothy.redaelli@gmail.com>
 # Contributor: Cedric Girard <girard.cedric@gmail.com>
 # Contributor: foxbunny <bg.branko@gmail.com>
 
 pkgname=dispcalgui
-pkgver=1.2.7.0
-pkgrel=2
+pkgver=1.5.3.1
+pkgrel=1
 pkgdesc="A GUI frontend for several utilities from the open source color management system Argyll CMS"
 arch=('i686' 'x86_64')
 url="http://hoech.net/dispcalGUI/"
@@ -15,7 +15,7 @@ depends=('argyllcms' 'wxpython' 'hicolor-icon-theme' 'desktop-file-utils' 'pytho
 optdepends=('gksu: For running as root')
 install=${pkgname}.install
 source=("http://downloads.sourceforge.net/project/dispcalgui/release/${pkgver}/dispcalGUI-${pkgver}.tar.gz")
-md5sums=('a0ff80ee5e560fbe208c12189e00c470')
+md5sums=('1b7542ecee8f39a49b90197613a46a73')
 
 prepare() {
   cd "${srcdir}"/dispcalGUI-${pkgver}
diff --git a/community/doublecmd/PKGBUILD b/community/doublecmd/PKGBUILD
index 18bccd8f3..bad27de08 100644
--- a/community/doublecmd/PKGBUILD
+++ b/community/doublecmd/PKGBUILD
@@ -1,5 +1,5 @@
 # vim:set ft=sh:
-# $Id: PKGBUILD 97499 2013-09-22 18:09:18Z idevolder $
+# $Id: PKGBUILD 99033 2013-10-22 19:21:49Z idevolder $
 # Maintainer: BlackIkeEagle <ike DOT devolder AT gmail DOT com>
 # Contributor: (sirocco AT ngs.ru)
 
@@ -7,7 +7,7 @@ pkgbase=doublecmd
 pkgname=('doublecmd-gtk2' 'doublecmd-qt')
 pkgver=0.5.7
 _helpver=0.5.5
-pkgrel=1
+pkgrel=2
 url="http://doublecmd.sourceforge.net/"
 arch=('i686' 'x86_64')
 license=('GPL')
@@ -49,6 +49,7 @@ build() {
 package_doublecmd-gtk2() {
 	pkgdesc="twin-panel (commander-style) file manager (GTK)"
 	depends=('gtk2')
+	conflicts=('doublecmd-qt')
 	cd "$srcdir/$pkgbase-gtk"
 	sed -e 's/LIB_SUFFIX=.*/LIB_SUFFIX=/g' -i ./install/linux/install.sh
 	./install/linux/install.sh --install-prefix="$pkgdir"
@@ -61,6 +62,7 @@ package_doublecmd-gtk2() {
 package_doublecmd-qt() {
 	pkgdesc="twin-panel (commander-style) file manager (QT)"
 	depends=('qt4pas')
+	conflicts=('doublecmd-gtk2')
 	cd "$srcdir/$pkgbase-qt"
 	sed -e 's/LIB_SUFFIX=.*/LIB_SUFFIX=/g' -i ./install/linux/install.sh
 	./install/linux/install.sh --install-prefix="$pkgdir"
diff --git a/community/dspam/PKGBUILD b/community/dspam/PKGBUILD
index 226f19ddc..18dfb80fc 100644
--- a/community/dspam/PKGBUILD
+++ b/community/dspam/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 96455 2013-08-29 15:08:36Z spupykin $
+# $Id: PKGBUILD 100150 2013-11-01 20:23:57Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: William Rea <sillywilly@gmail.com>
 
 pkgname=dspam
 pkgver=3.10.2
-pkgrel=7
+pkgrel=8
 pkgdesc="A scalable, open-source statistical anti-spam filter"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://dspam.nuclearelephant.com/"
@@ -20,7 +20,7 @@ optdepends=('libmariadbclient: MariaDB support'
 	    'sqlite: SQLite support'
 	    'clamav: ClamAV support'
 	    'libldap: external lookup support')
-options=('zipman' 'docs' '!libtool')
+options=('zipman' 'docs')
 install=$pkgname.install
 source=(http://downloads.sourceforge.net/project/dspam/dspam/dspam-$pkgver/dspam-$pkgver.tar.gz
 	dspam.logrotated
diff --git a/community/dub/PKGBUILD b/community/dub/PKGBUILD
index b092a0b07..94580a0c2 100644
--- a/community/dub/PKGBUILD
+++ b/community/dub/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer:  Mihails Strasuns <public@dicebot.lv>
 # Contributor: Moritz Maxeiner <moritz@ucworks.org>
 pkgname=dub
-pkgver=0.9.18
+pkgver=0.9.19
 pkgrel=1
 pkgdesc="Developer package manager for D programming language"
 arch=('i686' 'x86_64')
@@ -9,6 +9,7 @@ url="https://github.com/rejectedsoftware/dub"
 license=('MIT')
 makedepends=('dmd' 'libphobos-devel' 'git')
 depends=('d-compiler' 'd-runtime' 'curl')
+conflicts=('dub-git')
 source=("git+http://github.com/rejectedsoftware/dub.git#tag=v$pkgver")
 sha256sums=('SKIP')
 
diff --git a/community/dwdiff/PKGBUILD b/community/dwdiff/PKGBUILD
index 31915b2a4..cb43d7cf8 100644
--- a/community/dwdiff/PKGBUILD
+++ b/community/dwdiff/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 87045 2013-03-26 11:49:38Z foutrelis $
+# $Id: PKGBUILD 98737 2013-10-17 14:01:43Z andyrtr $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 
 pkgname=dwdiff
 pkgver=2.0.4
-pkgrel=4
+pkgrel=5
 pkgdesc="A front-end for the diff program that operates at the word level instead of the line level"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://os.ghalkes.nl/dwdiff.html"
@@ -14,7 +14,7 @@ md5sums=('1bb69cbfb76583f69c6912f925fc4cec')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
-  ./configure --prefix=/usr
+  ./configure --prefix=/usr --without-dwfilter
   make
 }
 
diff --git a/community/dynamite/PKGBUILD b/community/dynamite/PKGBUILD
index cb465fe15..820a5449a 100644
--- a/community/dynamite/PKGBUILD
+++ b/community/dynamite/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 65136 2012-02-20 04:58:34Z spupykin $
+# $Id: PKGBUILD 100104 2013-11-01 17:14:55Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Zhukov Pavel <gelios@gmail.com>
 
 pkgname=dynamite
 pkgver=0.1.1
-pkgrel=3
+pkgrel=4
 pkgdesc="Dynamite is a tool and library for decompressing data compressed with PKWARE Data Compression Library"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://synce.sourceforge.net/"
@@ -16,5 +16,9 @@ build() {
   cd $srcdir/libdynamite-$pkgver
   ./configure --prefix=/usr
   make
+}
+
+package() {
+  cd $srcdir/libdynamite-$pkgver
   make DESTDIR=$pkgdir install
 }
diff --git a/community/echoping/PKGBUILD b/community/echoping/PKGBUILD
index 8aa171a71..7b83f47a2 100644
--- a/community/echoping/PKGBUILD
+++ b/community/echoping/PKGBUILD
@@ -2,7 +2,7 @@
 
 pkgname=echoping
 pkgver=6.0.2
-pkgrel=3
+pkgrel=4
 pkgdesc="tests performance of a remote host by sending HTTP, TCP and UDP requests"
 arch=('i686' 'x86_64')
 url="http://echoping.sourceforge.net/"
@@ -10,7 +10,6 @@ license=('GPL')
 depends=(libidn popt libldap)
 source=(http://sourceforge.net/projects/$pkgname/files/$pkgname/$pkgver/$pkgname-$pkgver.tar.gz)
 md5sums=('991478532b56ab3b6f46ea9fa332626f')
-options=(!libtool)
 
 build() {
   cd $srcdir/$pkgname-$pkgver
diff --git a/community/ecryptfs-utils/PKGBUILD b/community/ecryptfs-utils/PKGBUILD
index 574f2e6bc..09a7350f6 100644
--- a/community/ecryptfs-utils/PKGBUILD
+++ b/community/ecryptfs-utils/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 92248 2013-06-03 11:15:14Z allan $
+# $Id: PKGBUILD 99733 2013-10-30 23:22:59Z allan $
 # Maintainer: Timothy Redaelli <timothy.redaelli@gmail.com>
 # Contributor: Richard Murri <admin@richardmurri.com>
 # Contributor: Michal Krenek <mikos@sg1.cz>
@@ -15,7 +15,6 @@ depends=('keyutils' 'nss' 'openssl')
 optdepends=('python2: for python module')
 source=("http://launchpad.net/ecryptfs/trunk/${pkgver}/+download/${pkgname}_${pkgver}.orig.tar.gz"
         "${pkgname}_${pkgver}.orig.tar.gz.sig::http://launchpad.net/ecryptfs/trunk/${pkgver}/+download/..-${pkgname}_${pkgver}.orig.tar.gz.asc")
-options=(!libtool)
 md5sums=('39929d850edd24b175ff0c82722e0de1'
          '1fc46fb18d662315c8d4cb13b0e618c0')
 
diff --git a/community/elinks/PKGBUILD b/community/elinks/PKGBUILD
index 6b64f18e9..a32b2d338 100644
--- a/community/elinks/PKGBUILD
+++ b/community/elinks/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 88677 2013-04-21 22:16:44Z heftig $
+# $Id: PKGBUILD 100054 2013-10-31 20:47:13Z kkeen $
 # Maintainer: Kyle Keen <keenerd@gmail.com>
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
@@ -7,20 +7,22 @@
 
 pkgname=elinks
 pkgver=0.13
-_commit="9313aae9062e1d9ff084858fa6844259cd8237d6"
-pkgrel=12
+_commit="a3751107033599b835eaafa61177c8d4dda4b7ef"
+pkgrel=15
 pkgdesc="An advanced and well-established feature-rich text mode web browser."
 arch=("i686" "x86_64" 'mips64el')
 url="http://elinks.or.cz"
 license=('GPL')
 depends=('bzip2' 'expat>=2.0' 'gpm>=1.20.4' 'openssl' 'lua51' 'libidn' 'js185'
-	 'gc' 'tre')
+	 'gc' 'tre' 'desktop-file-utils')
 makedepends=('git')
+install=elinks.install
 source=("git+http://elinks.cz/elinks.git#commit=$_commit")
 md5sums=('SKIP')
 
 build() {
   cd elinks
+  sed -i 's/Terminal=1/Terminal=true/' "contrib/debian/$pkgname.desktop"
   [ -x configure ] || sh autogen.sh
   ./configure --prefix=/usr --mandir=/usr/share/man \
               --sysconfdir=/etc \
diff --git a/community/freeorion/freeorion.install b/community/elinks/elinks.install
index ad97d7bab..e111ef946 100644
--- a/community/freeorion/freeorion.install
+++ b/community/elinks/elinks.install
@@ -1,13 +1,11 @@
-post_upgrade() {
+post_install() {
   update-desktop-database -q
 }
 
-post_install() {
-  post_upgrade
+post_upgrade() {
+  post_install
 }
 
 post_remove() {
-  post_upgrade
+  post_install
 }
-
-# vim:set ts=2 sw=2 et:
diff --git a/community/emerillon/PKGBUILD b/community/emerillon/PKGBUILD
index f46c9696e..6de25493c 100644
--- a/community/emerillon/PKGBUILD
+++ b/community/emerillon/PKGBUILD
@@ -9,7 +9,6 @@ url="http://projects.gnome.org/emerillon/"
 license=('GPL')
 depends=('libchamplain' 'geoclue' 'libpeas' 'rest')
 makedepends=('gobject-introspection' 'gnome-doc-utils' 'intltool' 'vala')
-options=('!libtool')
 install=$pkgname.install
 source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
 sha256sums=('0648c70bc19d3bd334a5403938aba3855eb644ee337c29aeecd5ce57ea0bf085')
diff --git a/community/encfs/PKGBUILD b/community/encfs/PKGBUILD
index 599cee548..79857cc7e 100644
--- a/community/encfs/PKGBUILD
+++ b/community/encfs/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 94020 2013-07-13 12:31:50Z svenstaro $
+# $Id: PKGBUILD 99736 2013-10-30 23:24:04Z allan $
 # Contributor: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Jaroslaw Swierczynski <swiergot@aur.archlinux.org>
 # Contributor: Sven Kauber, <celeon@gmail.com>
@@ -13,7 +13,6 @@ url='http://www.arg0.net/encfs'
 license=('GPL')
 depends=('rlog' 'openssl' 'fuse' 'boost-libs')
 makedepends=('boost')
-options=('!libtool')
 source=("http://encfs.googlecode.com/files/${pkgname}-${pkgver}.tgz")
 md5sums=('ac90cc10b2e9fc7e72765de88321d617')
 
diff --git a/community/enet/PKGBUILD b/community/enet/PKGBUILD
index 1c667ec42..2a204e520 100644
--- a/community/enet/PKGBUILD
+++ b/community/enet/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 96714 2013-09-03 11:27:11Z svenstaro $
+# $Id: PKGBUILD 99737 2013-10-30 23:24:24Z allan $
 # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
 # Contributor: Mateusz Herych <heniekk@gmail.com>
 # Contributor: Bj?indeijer <bjorn@lindeijer.nl>
@@ -11,7 +11,6 @@ arch=('i686' 'x86_64' 'mips64el')
 url='http://enet.bespin.org/'
 license=('custom')
 depends=('glibc')
-options=('!libtool')
 source=("http://enet.bespin.org/download/${pkgname}-${pkgver}.tar.gz")
 sha1sums=('c188e380024f346758376290ad80a1c89e206171')
 
diff --git a/community/erlang-nox/PKGBUILD b/community/erlang-nox/PKGBUILD
index a3ddb47b3..49ce66717 100644
--- a/community/erlang-nox/PKGBUILD
+++ b/community/erlang-nox/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 97433 2013-09-19 22:16:37Z arodseth $
+# $Id: PKGBUILD 99621 2013-10-30 16:14:28Z arodseth $
 # Maintainer: Alexander Rødseth <rodseth@gmail.com>
 # Contributor: Lukas Fleischer <archlinux@cryptocrack.de>
 # Contributor: Vesa Kaihlavirta <vesa@archlinux.org>
@@ -8,7 +8,7 @@
 
 pkgname=erlang-nox
 pkgver=R16B02
-pkgrel=1
+pkgrel=2
 pkgdesc='General-purpose concurrent functional programming language developed by Ericsson (headless version)'
 arch=('x86_64' 'i686')
 url='http://www.erlang.org/'
@@ -19,6 +19,7 @@ conflicts=('erlang')
 optdepends=('erlang-unixodbc: database support'
             'java-environment: for Java support'
             'lksctp-tools: for SCTP support')
+options=('staticlibs')
 source=("http://www.erlang.org/download/otp_src_${pkgver/_/-}.tar.gz"
         "http://www.erlang.org/download/otp_doc_man_${pkgver/_/-}.tar.gz")
 sha256sums=('6ab8ad1df8185345554a4b80e10fd8be06c4f2b71b69dcfb8528352787b32f85'
diff --git a/community/erlang/PKGBUILD b/community/erlang/PKGBUILD
index d965c6cf0..81ef8a261 100644
--- a/community/erlang/PKGBUILD
+++ b/community/erlang/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 97431 2013-09-19 21:08:56Z arodseth $
+# $Id: PKGBUILD 99617 2013-10-30 15:44:14Z arodseth $
 # Maintainer: Lukas Fleischer <archlinux@cryptocrack.de>
 # Maintainer: Alexander Rødseth <rodseth@gmail.com>
 # Contributor: Vesa Kaihlavirta <vesa@archlinux.org>
@@ -9,11 +9,12 @@
 pkgbase=erlang
 pkgname=('erlang' 'erlang-unixodbc')
 pkgver=R16B02
-pkgrel=1
+pkgrel=2
 arch=('x86_64' 'i686' 'mips64el')
 url='http://www.erlang.org/'
 license=('custom')
 makedepends=('perl' 'mesa' 'lksctp-tools' 'unixodbc' 'wxgtk' 'wxgtk2.9')
+options=('staticlibs')
 source=("http://www.erlang.org/download/otp_src_${pkgver/_/-}.tar.gz"
         "http://www.erlang.org/download/otp_doc_man_${pkgver/_/-}.tar.gz"
         'epmd.service'
diff --git a/community/ettercap/PKGBUILD b/community/ettercap/PKGBUILD
index 4dee9d221..614d786da 100644
--- a/community/ettercap/PKGBUILD
+++ b/community/ettercap/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 97482 2013-09-21 10:35:04Z jelle $
+# $Id: PKGBUILD 99738 2013-10-30 23:24:51Z allan $
 # Maintainer:
 # Contributor: Tom Newsom <Jeepster@gmx.co.uk>
 
@@ -11,7 +11,7 @@ url="http://ettercap.github.com/ettercap/"
 license=('GPL')
 depends=('openssl' 'libpcap' 'pcre' 'libltdl' 'libnet')
 makedepends=('ghostscript' 'cmake' 'libpcap' 'libltdl' 'libnet' 'gtk2')
-options=('!libtool' '!makeflags' '!emptydirs')
+options=('!makeflags' '!emptydirs')
 source=("https://github.com/Ettercap/ettercap/archive/v$pkgver.tar.gz")
 md5sums=('067514bb53ff76b81d578676e2048319')
 
diff --git a/community/exim/PKGBUILD b/community/exim/PKGBUILD
index 2e166a5ba..d2a20dd93 100644
--- a/community/exim/PKGBUILD
+++ b/community/exim/PKGBUILD
@@ -1,11 +1,12 @@
-# $Id: PKGBUILD 92250 2013-06-03 11:15:19Z allan $
-# Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de>
+# $Id: PKGBUILD 99560 2013-10-29 18:01:02Z bpiotrowski $
+# Maintainer:  Bartłomiej Piotrowski <nospam@bpiotrowski.pl>
+# Contributor: Lukas Fleischer <archlinux at cryptocrack dot de>
 # Contributor: Angel Velasquez <angvp@archlinux.org>
 # Contributor: judd <jvinet@zeroflux.org>
 
 pkgname=exim
-pkgver=4.80.1
-pkgrel=5
+pkgver=4.82
+pkgrel=1
 pkgdesc="Message Transfer Agent"
 arch=('x86_64' 'i686' 'mips64el')
 url='http://www.exim.org/'
@@ -25,7 +26,7 @@ source=("http://mirror.switch.ch/ftp/mirror/exim/exim/exim4/exim-$pkgver.tar.bz2
         exim@.service
         exim.socket
         exim-submission.socket)
-sha256sums=('9565b10f06be224fd03adafae2e07e6fdbb479f8873e3894ddb13f98eeebe78f'
+sha256sums=('46dedfb6ced2aa4a1eddc5d8ce46a790a961508bd389faa2e215302ae80d91cf'
             '932c9149b6809c70e94c1256e28325d197bbf80d27322793e217d4b692d49c5a'
             '7f1408f9c5d905968e665941f5c5efcf9da53e7a0bbef6c66220343bc2ae994b'
             'd33b8595e92ec812c9f6961f98e50b6a3986d5bd966ed4efec2c52c1fce47636'
diff --git a/community/fbpanel/PKGBUILD b/community/fbpanel/PKGBUILD
index 33b1844a9..a1b8f1620 100644
--- a/community/fbpanel/PKGBUILD
+++ b/community/fbpanel/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 98391 2013-10-09 14:15:54Z spupykin $
+# $Id: PKGBUILD 100493 2013-11-05 10:04:31Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: Jeff Mickey <jeff@archlinux.org>
 # Contributor: Torin Daniel <torindan@gmail.com>
@@ -6,21 +6,28 @@
 
 pkgname=fbpanel
 pkgver=6.1
-pkgrel=4
+pkgrel=6
 pkgdesc="NetWM compliant desktop panel"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://fbpanel.sourceforge.net/"
 depends=('gtk2')
 license=('GPL')
 source=("http://downloads.sourceforge.net/fbpanel/fbpanel-${pkgver}.tbz2"
+	"taskbar_unicode.patch::https://bugs.archlinux.org/task/37639?getfile=11189"
         "battery_fix.patch")
 md5sums=('80ca0c64195b30587cfcb8c2cd9887a0'
+         '0af51e8f0391ea9b734a57a9880b57e5'
          'dc1db8eee1be899725f350eb36793ea4')
 
-build() {
+prepare() {
   cd "$srcdir/$pkgname-$pkgver"
   patch -p1 <$srcdir/battery_fix.patch
-  ./configure --prefix=/usr
+  patch -p1 <$srcdir/taskbar_unicode.patch
+}
+
+build() {
+  cd "$srcdir/$pkgname-$pkgver"
+  ./configure --prefix=/usr --libexecdir=/usr/lib
   echo "LDFLAGSX += -lX11 -lm" >>config.mk
   make
 }
diff --git a/community/fbreader/PKGBUILD b/community/fbreader/PKGBUILD
index a555f65ac..d4b5dccc3 100644
--- a/community/fbreader/PKGBUILD
+++ b/community/fbreader/PKGBUILD
@@ -1,15 +1,15 @@
-# $Id: PKGBUILD 85342 2013-03-01 10:29:55Z andrea $
+# $Id: PKGBUILD 98932 2013-10-21 13:19:58Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: William Rea <sillywilly@gmail.com>
 
 pkgname=fbreader
 pkgver=0.99.4
-pkgrel=2
+pkgrel=3
 pkgdesc="An e-book reader for Linux"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.fbreader.org/"
 license=('GPL')
-depends=('fribidi' 'bzip2' 'curl' 'qt4' 'liblinebreak' 'sqlite')
+depends=('fribidi' 'bzip2' 'curl' 'qt4' 'libunibreak' 'sqlite')
 makedepends=('ccache')
 source=(http://www.fbreader.org/files/desktop/fbreader-sources-$pkgver.tgz)
 md5sums=('ed13a9c3aeb68aaa98a1dd6f7947a31d')
@@ -19,7 +19,6 @@ build() {
   export UI_TYPE=qt4
   export TARGET_STATUS=release
   cd $srcdir/fbreader-$pkgver
-  sed -i 's|-lunibreak|-llinebreak|g' makefiles/config.mk zlibrary/text/Makefile
   make ZLSHARED=no MOC=/usr/bin/moc-qt4
 }
 
diff --git a/community/fcitx-configtool/PKGBUILD b/community/fcitx-configtool/PKGBUILD
index 4dc27e2d7..2a0a88269 100644
--- a/community/fcitx-configtool/PKGBUILD
+++ b/community/fcitx-configtool/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 93365 2013-07-02 09:47:22Z fyan $
+# $Id: PKGBUILD 99327 2013-10-27 04:18:39Z fyan $
 # Maintainer: Felix Yan <felixonmars@gmail.com>
 
 pkgname=fcitx-configtool
-pkgver=0.4.7
-pkgrel=2
+pkgver=0.4.8
+pkgrel=1
 pkgdesc="GTK based config tool for Fcitx"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://fcitx.googlecode.com/"
@@ -14,19 +14,16 @@ makedepends=("cmake")
 source=("http://download.fcitx-im.org/$pkgname/$pkgname-$pkgver.tar.xz")
 
 build() {
-  cd "$srcdir/$pkgname-$pkgver"
+  cd $pkgname-$pkgver
   msg "Starting make..."
 
-  mkdir -p build
-  cd build
-
-  cmake -DCMAKE_INSTALL_PREFIX=/usr ..
+  cmake -DCMAKE_INSTALL_PREFIX=/usr .
   make 
 }
 
 package() {
-  cd "$srcdir/$pkgname-$pkgver/build"
+  cd $pkgname-$pkgver
   make DESTDIR="$pkgdir" install
 }
 
-sha512sums=('90ec9f4c30c46ea937f965173a4213b67d1cb360cc43b96af9899cdd5a0e35d34658ee7149ed10b3dc58d3851bc1712915db970fd2d25a976983b1037e380be2')
+sha512sums=('7b3c43b9d7d1dab04880effe6fc4e80e64c9bad34699c0c8d2992ec971605ef2eaa0b1fb13f71a582289c75560c3edc95af21f6413ac2bb594d5cdb31a0b4cb7')
diff --git a/community/fcitx-m17n/PKGBUILD b/community/fcitx-m17n/PKGBUILD
index 76643f035..dde8ff0a7 100644
--- a/community/fcitx-m17n/PKGBUILD
+++ b/community/fcitx-m17n/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 93368 2013-07-02 09:47:25Z fyan $
+# $Id: PKGBUILD 100394 2013-11-03 12:25:13Z fyan $
 # Maintainer: Felix Yan <felixonmars@gmail.com>
 
 pkgname=fcitx-m17n
-pkgver=0.2.1
+pkgver=0.2.2
 pkgrel=1
 pkgdesc="Fcitx Wrapper for m17n."
 arch=('i686' 'x86_64' 'mips64el')
@@ -13,17 +13,15 @@ makedepends=('cmake')
 source=("http://download.fcitx-im.org/$pkgname/$pkgname-${pkgver}.tar.xz")
 
 build() {
-    cd "$srcdir/${pkgname}-${pkgver}"
-    mkdir -p build
-    cd build
+    cd ${pkgname}-${pkgver}
     
-    cmake -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release ..
+    cmake -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release .
     make
 }
 
 package() {
-    cd "$srcdir/${pkgname}-${pkgver}/build"
+    cd ${pkgname}-${pkgver}
     make DESTDIR="${pkgdir}" install
 }
 
-sha512sums=('b2becf6f20de32191690a5541956dc0a607443bd593fbfb61d1663dcc1f854df6b146c17ed73afbdff4006c12f001707de87adc706b3e1d45608bbf2bc045bce')
+sha512sums=('f0a708a351956c3972ae7d91050e274438c5631c785e829f746629f9cf2cb4c0bfe7dcb5f4e8bcda62e7761081526a484afb533a86b1c8b5c7d063f6ecbc502a')
diff --git a/community/fcitx-mozc/PKGBUILD b/community/fcitx-mozc/PKGBUILD
index bc714998a..9cf53929f 100644
--- a/community/fcitx-mozc/PKGBUILD
+++ b/community/fcitx-mozc/PKGBUILD
@@ -1,40 +1,37 @@
-# $Id: PKGBUILD 97633 2013-09-26 06:11:29Z fyan $
+# $Id: PKGBUILD 100541 2013-11-05 17:38:22Z fyan $
 # Maintainer: Felix Yan <felixonmars@gmail.com>
 # Contributor: ponsfoot <cabezon dot hashimoto at gmail dot com>
 
 ## Mozc compile option
 _bldtype=Release
 
-_zipcoderel=201307
+_zipcoderel=201310
 _protobuf_ver=2.5.0
-_gyp_rev=1656
+_gyp_rev=1774
 
 _pkgbase=mozc
+_revision=178
 pkgname=fcitx-mozc
 pkgdesc="Fcitx Module of A Japanese Input Method for Chromium OS, Windows, Mac and Linux (the Open Source Edition of Google Japanese Input)"
-pkgver=1.11.1522.102
+pkgver=1.12.1599.102
 _patchver=${pkgver}.1
 pkgrel=2
 arch=('i686' 'x86_64' 'mips64el')
 url="http://code.google.com/p/mozc/"
 license=('custom')
 depends=('qt4' 'fcitx' 'zinnia')
-makedepends=('pkg-config' 'python2' 'gtest' 'curl' 'gtk2' 'mesa')
+makedepends=('pkg-config' 'python2' 'gtest' 'curl' 'gtk2' 'mesa' 'svn')
 replaces=('mozc-fcitx')
 conflicts=('mozc' 'mozc-server' 'mozc-utils-gui' 'mozc-fcitx')
-source=(http://mozc.googlecode.com/files/mozc-${pkgver}.tar.bz2
-        http://downloads.sourceforge.net/project/pnsft-aur/mozc/gyp-${_gyp_rev}.tar.xz
+source=(svn+http://mozc.googlecode.com/svn#revision=$_revision
+        gyp::svn+http://gyp.googlecode.com/svn/trunk#revision=$_gyp_rev
         http://downloads.sourceforge.net/pnsft-aur/ken_all-${_zipcoderel}.zip
         http://downloads.sourceforge.net/pnsft-aur/jigyosyo-${_zipcoderel}.zip
         http://protobuf.googlecode.com/files/protobuf-${_protobuf_ver}.tar.bz2
         http://download.fcitx-im.org/fcitx-mozc/fcitx-mozc-${_patchver}.patch
-	http://download.fcitx-im.org/fcitx-mozc/fcitx-mozc-icon.tar.gz
-	#mozc_1.10.1390.102_remove_warn_as_error.patch
-)
+        http://download.fcitx-im.org/fcitx-mozc/fcitx-mozc-icon.tar.gz)
 
 build() {
-  cd "$srcdir"
-
   #source /etc/profile.d/qt4.sh
 
   # Update: Fix qt4 include path too
@@ -44,19 +41,16 @@ build() {
   CFLAGS="${CFLAGS} -I/usr/include/qt4 -fvisibility=hidden"
   CXXFLAGS="${CXXFLAGS} -I/usr/include/qt4 -fvisibility=hidden"
 
-  cd "${srcdir}/${_pkgbase}-${pkgver}"
+  cd svn/trunk/src
   
   # Apply fcitx patch
   rm unix/fcitx -rf
-  patch -Np2 -i ${srcdir}/fcitx-mozc-${_patchver}.patch
+  patch -Np2 -i "$srcdir/fcitx-mozc-${_patchver}.patch"
 
   # Fix qt4 binary path
   sed -i 's|(qt_dir)/bin|(qt_dir)/lib/qt4/bin|' gui/*.gyp{,i}
   sed -i 's|(qt_dir_env)/bin|(qt_dir_env)/lib/qt4/bin|' gui/*.gyp{,i}
 
-  # Patch for gcc>=4.8
-  #patch -p0 -i "${srcdir}/mozc_1.10.1390.102_remove_warn_as_error.patch"
-
   # Adjust to use python2
   find . -name  \*.py        -type f -exec sed -i -e "1s|python.*$|python2|"  {} +
   find . -regex '.*\.gypi?$' -type f -exec sed -i -e "s|'python'|'python2'|g" {} +
@@ -67,10 +61,12 @@ build() {
   msg "Done."
 
   # Copy gyp
-  cp -rf "${srcdir}"/gyp-${_gyp_rev}/* third_party/gyp
+  mkdir third_party/gyp
+  cp -rf "${srcdir}"/gyp/* third_party/gyp
 
   # Copy protobuf to be linked statically
-  cp -rf "${srcdir}/protobuf-${_protobuf_ver}" protobuf/files
+  mkdir third_party/protobuf
+  cp -rf "${srcdir}/protobuf-${_protobuf_ver}"/* third_party/protobuf
 
   msg "Starting make..."
 
@@ -85,7 +81,7 @@ build() {
 }
 
 package() {
-  cd "${srcdir}/${_pkgbase}-${pkgver}"
+  cd svn/trunk/src
   install -D -m 755 out_linux/${_bldtype}/mozc_server "${pkgdir}/usr/lib/mozc/mozc_server"
   install    -m 755 out_linux/${_bldtype}/mozc_tool   "${pkgdir}/usr/lib/mozc/mozc_tool"
 
@@ -116,10 +112,10 @@ package() {
   install -m 644 "$srcdir/fcitx-mozc-icons/mozc-tool.png" "${pkgdir}/usr/share/fcitx/mozc/icon/mozc-tool.png"
 }
 
-sha512sums=('f1319b6cee9ba9444e75a3775abbd5804fda545be87e1977aa48825a14073448db6b12c2312d1cf74469cec7392af5c889a0fbd64cf741cc4e8c1c44dcdbf68f'
-            'c162dab8d2935793002fef9a12d49a9ec36b4be3af73fe425e522302871744bf0710726539444bfd354244b41cea9fc649fb83a957000d70bcb0556265cdb171'
-            '9661c697368e3d3afec65fda3e07db5ceea358e26ecc372872dcdd52a688c5cf5a14d2b2eeb8a3875c1941b192efb5a100eb846067d4d5cb32afdb9dd4b0ba29'
-            '14b0dd6854e8732c4aa0105b6a8e39e7778c86ac94adf899ddb42424c6033eccd5686734f4bbe7ba8542903ac987fd553a051abfeeceae5c1649f9a74cb9e8a1'
+sha512sums=('SKIP'
+            'SKIP'
+            'f4ba607dc8d8ad6b12fbf47e6a9b56e1dee5552db65bb6a21e55b3db8567601df4e916f88ee039bb4f84dd7ad9994ad9e7b494fbb06d14b8ce6c8ca316e3a571'
+            '551fd2ee44a0cdf317885351528d5248fc56c261e73b793ac46c8f043a6f5461e1e4400df67cd151a01891217185fc12993a6a0d727d9f8217947d9b23d7b69c'
             '5994b3669808b82fef5c860ecad36358c0767f84acac877e7bfcf722e59d972835a955714149bdd4158fbd1328a51d01397a563991d26475351ee72be48142ee'
-            '8d7a132613193c2e120d4a17fad97045451bcc700a552fa52e85f83cf5403de36b66c4bf6148c9cdabb493e82a5338cc090b693569d8ff087f4646e0604e0d3b'
+            'e6a5a21520e36aa6cd27295c5a1b050a8f1a8dccf82918b0b57f17c79393c8b527c3f70dbfa2de0af42d3f85eac3095ef476a067fb24dbc2fa325c1f6a1138cc'
             '5507c637e5a65c44ccf6e32118b6d16647ece865171b9a77dd3c78e6790fbd97e6b219e68d2e27750e22074eb536bccf8d553c295d939066b72994b86b2f251a')
diff --git a/community/fcitx-unikey/PKGBUILD b/community/fcitx-unikey/PKGBUILD
index a68aa82b1..db7e705b2 100644
--- a/community/fcitx-unikey/PKGBUILD
+++ b/community/fcitx-unikey/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 94198 2013-07-16 16:15:47Z fyan $
+# $Id: PKGBUILD 98587 2013-10-14 15:13:19Z fyan $
 # Maintainer: Felix Yan <felixonmars@gmail.com>
 
 pkgname=fcitx-unikey
-pkgver=0.2.2
+pkgver=0.2.3
 pkgrel=1
 pkgdesc="Fcitx Wrapper for unikey"
 arch=('i686' 'x86_64' 'mips64el')
@@ -28,4 +28,4 @@ package() {
   make DESTDIR="${pkgdir}" install
 }
 
-sha512sums=('71a0773222b1172943f80bce904da77c136225981a0580d937327829c8d734fc65d9c4afa5275bd210ca837d7a7b9d8bfb18df96f62710068b9883a22499fbfb')
+sha512sums=('5826022312ad307d8a070cd3ab77a206a5f73d6ce5337cdac4c75ec9a436b055ca0e28fcc7baf2f1512b2cb92c779002a8fc41ac01cdedc3dc669355d825a0aa')
diff --git a/community/fcitx/PKGBUILD b/community/fcitx/PKGBUILD
index 3a75e6938..e878a396b 100644
--- a/community/fcitx/PKGBUILD
+++ b/community/fcitx/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 97747 2013-09-28 08:49:25Z fyan $
+# $Id: PKGBUILD 98738 2013-10-17 14:01:45Z andyrtr $
 # Maintainer: Felix Yan <felixonmars@gmail.com>
 # Contributor: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: csslayer <wengxt AT gmail com>
@@ -6,7 +6,7 @@
 pkgbase=fcitx
 pkgname=('fcitx' 'fcitx-gtk2' 'fcitx-gtk3' 'fcitx-qt4')
 pkgver=4.2.8.3
-pkgrel=1
+pkgrel=2
 groups=('fcitx-im')
 arch=('i686' 'x86_64' 'mips64el')
 url="http://fcitx-im.org"
diff --git a/community/ffms2/PKGBUILD b/community/ffms2/PKGBUILD
index bb2c78517..74d0e96b1 100644
--- a/community/ffms2/PKGBUILD
+++ b/community/ffms2/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 97223 2013-09-15 13:32:52Z alucryd $$
+# $Id: PKGBUILD 99739 2013-10-30 23:25:12Z allan $$
 # Maintainer: Maxime Gauduin <alucryd@gmail.com>
 
 pkgname=ffms2
@@ -10,7 +10,6 @@ url="https://github.com/FFMS/ffms2"
 license=('MIT')
 depends=('ffmpeg')
 replaces=('ffmpegsource')
-options=('!libtool')
 source=("https://github.com/FFMS/ffms2/archive/${pkgver}.tar.gz")
 sha256sums=('6f1379514f03a14092fdfc9941960a9b86f5b78d86f9e000eeddf3bf50d42811')
 
diff --git a/community/fish/PKGBUILD b/community/fish/PKGBUILD
index 94b9c58b4..ddd26bb8c 100644
--- a/community/fish/PKGBUILD
+++ b/community/fish/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 92181 2013-06-02 13:25:12Z bpiotrowski $
+# $Id: PKGBUILD 99431 2013-10-28 19:00:44Z bpiotrowski $
 # Maintainer: Kaiting Chen <kaitocracy@gmail.com>
 # Maintainer:  Bartłomiej Piotrowski <nospam@bpiotrowski.pl>
 # Contributor: Abhishek Dasgupta <abhidg@gmail.com>
@@ -6,8 +6,8 @@
 # Contributor: Jan Fader <jan.fader@web.de>
 
 pkgname=fish
-pkgver=2.0.0
-pkgrel=2
+pkgver=2.1.0
+pkgrel=1
 pkgdesc='Smart and user friendly shell intended mostly for interactive use'
 arch=('i686' 'x86_64' 'mips64el')
 url='http://fishshell.com/'
@@ -15,21 +15,19 @@ license=('GPL2')
 depends=('python2' 'inetutils')
 makedepends=('doxygen' 'python')
 install=fish.install
-source=(fish-$pkgver.tar.gz::http://fishshell.com/files/$pkgver/fish.tar.gz)
-md5sums=('fe5907e6af61607d4128ce891a1f6501')
+source=(http://fishshell.com/files/$pkgver/fish-$pkgver.tar.gz)
+md5sums=('3a29aebde522b8f52d9975d7423db99e')
 
 build() {
-  set -x
-  cd fish
-  autoconf
+  cd fish-$pkgver
   ./configure --prefix=/usr \
-              --sysconfdir=/etc \
-              --without-xsel
+    --sysconfdir=/etc \
+    --without-xsel
   make
 }
 
 package() {
-  cd fish
+  cd fish-$pkgver
   make DESTDIR="$pkgdir" install
 
   # use python2
diff --git a/community/flam3/PKGBUILD b/community/flam3/PKGBUILD
index 22a6d458f..ee4aee2b5 100644
--- a/community/flam3/PKGBUILD
+++ b/community/flam3/PKGBUILD
@@ -1,22 +1,21 @@
-# $Id: PKGBUILD 90023 2013-05-06 19:36:52Z foutrelis $
+# $Id: PKGBUILD 99213 2013-10-25 20:22:05Z eric $
 # Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgname=flam3
 pkgver=3.0.1
-pkgrel=3
+pkgrel=4
 pkgdesc="Tools to create/display fractal flames: algorithmically generated images and animations"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://flam3.com/"
 license=('GPL3')
 depends=('libjpeg' 'libpng' 'libxml2')
-options=('!libtool')
 source=(http://flam3.googlecode.com/files/${pkgname}-${pkgver}.tar.gz flam3-3.0.1-libpng15.patch)
 sha1sums=('8814515f2e49e034e47cf97e9d2c0e932844abb9'
           '17ece6cc00899e5135dad2bc79f97dfbd73107a6')
 
 prepare() {
   cd ${pkgname}-${pkgver}/src
-  patch -p1 -i ../../flam3-3.0.1-libpng15.patch
+  patch -p1 -i "${srcdir}/flam3-3.0.1-libpng15.patch"
 }
 
 build() {
diff --git a/community/flickcurl/PKGBUILD b/community/flickcurl/PKGBUILD
index 17e87ce17..cd21e0fe9 100644
--- a/community/flickcurl/PKGBUILD
+++ b/community/flickcurl/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 88309 2013-04-16 13:27:02Z spupykin $
+# $Id: PKGBUILD 100106 2013-11-01 17:15:29Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 
 pkgname=flickcurl
 pkgver=1.24
-pkgrel=1
+pkgrel=2
 pkgdesc="C library for the Flickr API"
 arch=(i686 x86_64 'mips64el')
 url="http://librdf.org/flickcurl/"
diff --git a/community/flowcanvas/PKGBUILD b/community/flowcanvas/PKGBUILD
index c709a7d92..f11c67143 100644
--- a/community/flowcanvas/PKGBUILD
+++ b/community/flowcanvas/PKGBUILD
@@ -1,20 +1,33 @@
-# $Id: PKGBUILD 63558 2012-02-05 11:55:57Z ibiru $
+# $Id: PKGBUILD 98571 2013-10-14 07:10:01Z bisson $
 # Maintainer: Ray Rashif <schiv@archlinux.org>
 # Contributor: Max a.k.a. Synthead <synthead@gmail.com>
 # Contributor: christhemonkey <christhemonkey at gmail dot com>
 
 pkgname=flowcanvas
 pkgver=0.7.1
-pkgrel=3
+pkgrel=4
 pkgdesc="Gtkmm/Gnomecanvasmm widget for boxes-and-lines style environments"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://drobilla.net/software/flowcanvas/"
-depends=('libgnomecanvasmm' 'graphviz')
+depends=('libgnomecanvasmm' 'graphviz>=2.34')
 makedepends=('boost' 'python2')
 license=('GPL')
 install=$pkgname.install
-source=(http://download.drobilla.net/$pkgname-$pkgver.tar.bz2)
-md5sums=('a4908f6385ce9fd2ce97c8caa823f053')
+source=("http://download.drobilla.net/$pkgname-$pkgver.tar.bz2"
+        "graphviz-2.30.patch")
+md5sums=('a4908f6385ce9fd2ce97c8caa823f053'
+         'e5b2b23d8be0c9fa14b8b52379a15155')
+
+prepare() {
+  cd "$srcdir/$pkgname-$pkgver"
+
+  # graphviz 2.30 compatibility
+  # see http://dev.drobilla.net/ticket/888
+  # adapted from FreeBSD patch (just stripped their stuff)
+  # potentially unstable (nothing committed by developer yet)
+  # may have to incorporate proposed patch for ganv (successor to this lib)
+  patch -Np0 -i "$srcdir/graphviz-2.30.patch"
+}
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
diff --git a/community/flowcanvas/graphviz-2.30.patch b/community/flowcanvas/graphviz-2.30.patch
new file mode 100644
index 000000000..1338a6832
--- /dev/null
+++ b/community/flowcanvas/graphviz-2.30.patch
@@ -0,0 +1,56 @@
+--- src/Canvas.cpp.orig	2011-01-10 00:19:58.000000000 +0100
++++ src/Canvas.cpp	2013-03-16 13:45:17.797462753 +0100
+@@ -1253,21 +1253,21 @@
+ 	 */
+
+ 	GVC_t* gvc = gvContext();
+-	Agraph_t* G = agopen((char*)"g", AGDIGRAPH);
++	Agraph_t* G = agopen((char*)"g", Agdirected, NULL);
+
+ 	nodes.gvc = gvc;
+ 	nodes.G = G;
+
+ 	if (_direction == HORIZONTAL)
+-		agraphattr(G, (char*)"rankdir", (char*)"LR");
++		agattr(G, AGRAPH, (char*)"rankdir", (char*)"LR");
+ 	else
+-		agraphattr(G, (char*)"rankdir", (char*)"TD");
++		agattr(G, AGRAPH, (char*)"rankdir", (char*)"TD");
+
+ 	unsigned id = 0;
+ 	for (ItemList::const_iterator i = _items.begin(); i != _items.end(); ++i) {
+ 		std::ostringstream ss;
+ 		ss << "n" << id++;
+-		Agnode_t* node = agnode(G, strdup(ss.str().c_str()));
++		Agnode_t* node = agnode(G, strdup(ss.str().c_str()), true);
+ 		if (boost::dynamic_pointer_cast<Module>(*i)) {
+ 			ss.str("");
+ 			ss << (*i)->width() / 96.0;
+@@ -1310,7 +1310,7 @@
+
+ 		assert(src_node && dst_node);
+
+-		Agedge_t* edge = agedge(G, src_node, dst_node);
++		Agedge_t* edge = agedge(G, src_node, dst_node, NULL, true);
+
+ 		if (use_length_hints && c->length_hint() != 0) {
+ 			std::ostringstream len_ss;
+@@ -1325,7 +1325,7 @@
+ 		if (partner) {
+ 			GVNodes::iterator p = nodes.find(partner);
+ 			if (p != nodes.end())
+-				agedge(G, i->second, p->second);
++				agedge(G, i->second, p->second, NULL, true);
+ 		}
+ 	}
+
+--- wscript.orig	2011-01-12 00:09:31.000000000 +0100
++++ wscript	2013-03-16 14:19:43.577462602 +0100
+@@ -41,6 +41,7 @@
+ 	conf.check_tool('compiler_cxx')
+ 	autowaf.check_pkg(conf, 'libgvc', uselib_store='AGRAPH',
+ 	                  atleast_version='2.8', mandatory=False)
++	conf.env['LIB_AGRAPH'] = ['cgraph' if l == 'graph' else l for l in conf.env['LIB_AGRAPH']]
+ 	autowaf.check_pkg(conf, 'gtkmm-2.4', uselib_store='GLIBMM',
+ 	                  atleast_version='2.10.0', mandatory=True)
+ 	autowaf.check_pkg(conf, 'libgnomecanvasmm-2.6', uselib_store='GNOMECANVASMM',
diff --git a/community/flumotion/PKGBUILD b/community/flumotion/PKGBUILD
index b51e173d9..1a0e26dd9 100644
--- a/community/flumotion/PKGBUILD
+++ b/community/flumotion/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 91878 2013-05-28 18:07:53Z spupykin $
+# $Id: PKGBUILD 99740 2013-10-30 23:25:33Z allan $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Geoffroy Carrier <geoffroy.carrier@koon.fr>
 # Contributor: William Rea <sillywilly@gmail.com>
@@ -9,7 +9,6 @@ pkgrel=2
 arch=('i686' 'x86_64' 'mips64el')
 pkgdesc="A streaming media server"
 url="http://www.flumotion.net"
-options=('!libtool')
 license=('GPL')
 backup=(etc/flumotion/workers/default.xml
 	etc/flumotion/managers/default/planet.xml)
diff --git a/community/fox/PKGBUILD b/community/fox/PKGBUILD
index 7cccbb50d..cdf008dec 100644
--- a/community/fox/PKGBUILD
+++ b/community/fox/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 90025 2013-05-06 19:36:56Z foutrelis $
+# $Id: PKGBUILD 100152 2013-11-01 20:24:18Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Ben <ben@benmazer.net>
 
 pkgname=fox
 pkgver=1.6.49
-pkgrel=2
+pkgrel=3
 pkgdesc="Free Objects for X: GUI Toolkit for C++"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.fox-toolkit.org/"
@@ -12,7 +12,6 @@ license=('LGPL' 'custom')
 depends=('bzip2' 'libxcursor' 'libxft' 'libxrandr' 'libxi' 'libpng' 'libtiff' 'glu')
 makedepends=('mesa')
 optdepends=('perl')
-options=('!libtool')
 source=(http://ftp.fox-toolkit.org/pub/fox-$pkgver.tar.gz)
 md5sums=('e120647d26a27ed37cd5fed8b75c8a3d')
 
diff --git a/community/freehdl/PKGBUILD b/community/freehdl/PKGBUILD
index d10a4bdee..3ed6bb03a 100644
--- a/community/freehdl/PKGBUILD
+++ b/community/freehdl/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 82362 2013-01-16 10:08:50Z spupykin $
+# $Id: PKGBUILD 100156 2013-11-01 20:25:05Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Neil Darlow <neil@darlow.co.uk>
 # Contributor: Jens Maucher <defcon@archlinux.us>
 
 pkgname=freehdl
 pkgver=0.0.8
-pkgrel=5
+pkgrel=6
 pkgdesc='An open-source (C++ generating) VHDL simulator'
 arch=('i686' 'x86_64' 'mips64el')
 url='http://freehdl.seul.org'
diff --git a/community/freeorion/PKGBUILD b/community/freeorion/PKGBUILD
deleted file mode 100644
index a130e59b3..000000000
--- a/community/freeorion/PKGBUILD
+++ /dev/null
@@ -1,109 +0,0 @@
-# $Id: PKGBUILD 95910 2013-08-18 16:26:52Z arodseth $
-# Maintainer: Alexander Rødseth <rodseth@gmail.com>
-# Contributor: Elmo Todurov <todurov@gmail.com>
-# Contributor: guini <sidtrun@googlemail.com>
-# Contributor: Forrest Loomis <cybercyst@gmail.com>
-# Contributor: Sven-Hendrik Haase <sh@lutzhaase.com>
-# Contributor: fana-m <geminin@gmx.net>
-
-pkgname=freeorion
-pkgver=0.4.3
-pkgrel=2
-_svnrev=6344
-_pyversion=2.7
-pkgdesc='Turn-based galactic conquest game inspired by Master of Orion'
-arch=('x86_64' 'i686')
-url='http://www.freeorion.org/'
-license=('GPL2')
-if [ "$CARCH" == "x86_64" ]
-then
-  depends=('lib32-nvidia-cg-toolkit')
-else
-  depends=('nvidia-cg-toolkit')
-fi
-depends=('bullet' 'freealut' 'libvorbis' 'python2' 'gigi' 'desktop-file-utils' 'libgl')
-makedepends=('boost' 'ogre=1.8.1' 'sdl' 'gigi>0.8.0-18' 'graphviz' 'mesa-libgl'
-             'desktop-file-utils' 'setconf' 'cmake' 'gendesk' 'subversion' 'libogg'
-             'addinclude')
-options=('!strip' '!emptydirs')
-install=$pkgname.install
-source=("$pkgname.sh"
-        "$pkgname.png::https://a.fsdn.com/con/icons/fr/freeorion@sf.net/FO_Icon_256x256.png"
-        'cmake_python.patch'
-        "$pkgname::svn+https://freeorion.svn.sourceforge.net/svnroot/freeorion/trunk/FreeOrion/#revision=6344")
-sha256sums=('25b574af5397226373e24510ce59de94c5df5b31d94562fc0de387fd70731707'
-            'a6a253eed31b77b00bf4f721f4b1c6bbd95505b9e4b38b736101e551dd12ff5f'
-            '3dbe8df9c3a4a0d6451f42727ebf9bcb21fed41a08d1181d1cf77ef4ab5ee81a'
-            'SKIP')
-
-prepare() {
-  cd "$pkgname"
-
-  # CMake/Python fix...
-  patch -N -p1 -i "$srcdir/cmake_python.patch"
-
-  # Generate desktop shortcut
-  gendesk -n --pkgname "$pkgname" --pkgdesc "$pkgdesc"
-
-  addinclude -n GG/GG/adobe/once.hpp '#include <stdint.h>'
-  addinclude -n GG/GG/adobe/closed_hash.hpp '#include <stdint.h>'
-}
-
-build() {
-  cd "$pkgname"
-
-  # Generating makefiles
-  cmake \
-    -DPYTHON_INCLUDE_DIR:PATH="/usr/include/python$_pyversion" \
-    -DPYTHON_LIBRARY:FILEPATH="/usr/lib/libpython$_pyversion.so" \
-    -G "Unix Makefiles"
-  
-  # GLU fix
-  if [ "$CARCH" == "x86_64" ]
-  then
-    setconf CMakeCache.txt CMAKE_CXX_FLAGS:STRING \
-      "'-march=native -mtune=generic -O2 -fno-var-tracking -pipe -fstack-protector --param=ssp-buffer-size=4 -D_FORTIFY_SOURCE=2 -lGL -lGLU -rpath=/usr/lib '"
-  fi
-
-  # Compiling
-  make -j1
-
-  # OGRE fix
-  sed -i 's:PluginFolder=.:PluginFolder=/usr/lib/OGRE/:g' \
-    "$srcdir/$pkgname/ogre_plugins.cfg"
-}
-
-package() {
-  cd "$pkgname"
-
-  # Binaries
-  install -Dm755 "$srcdir/$pkgname.sh" "$pkgdir/usr/bin/freeorion"
-  install -Dm755 freeorion "$pkgdir/usr/bin/freeorion.elf"
-  install -Dm755 freeorionca "$pkgdir/usr/bin/freeorionca"
-  install -Dm755 freeoriond "$pkgdir/usr/bin/freeoriond"
-
-  # Data
-  install -d "$pkgdir/usr/share/$pkgname"
-  install -d "$pkgdir/usr/lib/$pkgname"
-  cp -r default "$pkgdir/usr/share/$pkgname"
-  install -Dm644 OISInput.cfg "$pkgdir/usr/share/$pkgname/OISInput.cfg"
-
-  # Desktop shortcut and icon
-  install -Dm644 "$pkgname.desktop" \
-    "$pkgdir/usr/share/applications/freeorion.desktop"
-  install -Dm644 "$srcdir/$pkgname.png" \
-    "$pkgdir/usr/share/pixmaps/freeorion.png"
-
-  # OGRE plugin configuration
-  install -Dm644 "$srcdir/$pkgname/ogre_plugins.cfg" \
-    "$pkgdir/usr/share/freeorion/ogre_plugins.cfg"
-
-  # Documentation
-  install -Dm644 loki_setup/README.txt \
-    "$pkgdir/usr/share/doc/$pkgname/README.txt"
-
-  # Cleanup
-  find "$pkgdir" -name ".svn" -print0 | xargs -0 rm -rf
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/community/freeorion/cmake_python.patch b/community/freeorion/cmake_python.patch
deleted file mode 100644
index b875fa844..000000000
--- a/community/freeorion/cmake_python.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- a/client/AI/CMakeLists.txt	2012-09-10 00:11:18.659341865 +0200
-+++ b/client/AI/CMakeLists.txt	2012-09-10 00:12:37.659345189 +0200
-@@ -33,6 +33,20 @@
- find_package(PythonLibs)
- if (PYTHONLIBS_FOUND)
-     include_directories(${PYTHON_INCLUDE_PATH})
-+    SET(_VERSION_REGEX
-+      "^#define[ \t]+PY([A-Z_]*_VERSION)[ \t]+[\"]*([0-9A-Za-z\\.]+)[\"]*[ \t]*$")
-+    FILE(STRINGS "${PYTHON_INCLUDE_DIR}/patchlevel.h" _VERSION_STRINGS
-+       LIMIT_COUNT 10 REGEX ${_VERSION_REGEX})
-+    FOREACH(_VERSION_STRING ${_VERSION_STRINGS})
-+        STRING(REGEX REPLACE ${_VERSION_REGEX} "PYTHON\\1"
-+           _VERSION_VARIABLE "${_VERSION_STRING}")
-+        STRING(REGEX REPLACE ${_VERSION_REGEX} "\\2"
-+           _VERSION_NUMBER "${_VERSION_STRING}")
-+        SET(${_VERSION_VARIABLE} ${_VERSION_NUMBER})
-+    ENDFOREACH(_VERSION_STRING ${_VERSION_STRINGS})
-+    IF(PYTHON_MAJOR_VERSION EQUAL 3)
-+        MESSAGE(FATAL_ERROR "Python 3 is not supported!")
-+    ENDIF()
- else ()
-     message(FATAL_ERROR " library not found.")
- endif ()
diff --git a/community/freeorion/freeorion.sh b/community/freeorion/freeorion.sh
deleted file mode 100644
index 9f35e7032..000000000
--- a/community/freeorion/freeorion.sh
+++ /dev/null
@@ -1,143 +0,0 @@
-#!/bin/sh
-#
-# written by Markus Sinner, http://psitronic.de
-#
-# Nightly builds on.
-# http://freeorion.psitronic.de/download/nightly/
-#
-# This is a wrapper-script for starting FreeOrion on
-# ix86 (and maybe x64) Linux Systems.
-# This script will CD into application and set some
-# enviroment variables.
-
-# ---- commandline PARAMETERS and ENVIROMENT variables -----
-# This script supports parameters, that will be evaluated
-# BEFORE freeorion binary is called and will be removed, 
-# because the binary won't support them.
-# Currently only one parameter at a time is supported!
-# Parameters other than these will be appended as command
-# line parameters to the call of the freeorion binary.
-#
-# --strace
-#   This starts freeorion using the "strace" utility. 
-#   Generates a strace logifle /tmp/freeorion.trace.
-#   Make sure it is installed on your system!
-# --gdb
-#   Runs freeorion in a gdb instance, passes the original
-#   parameters through the --args parameter of gdb
-#
-#
-# ENVIROMENT variables
-# This script supports some enviroment variables. To set them
-# either use the followin command BEFORE you execute this script.
-#    export XXXX="value"
-# This permanently set the variable in you current shell script.
-# Or you prepend the options when running this script, like this:
-#    PARAM1="hello" PARAM2="yo man" /usr/bin/freeorion.elf
-#
-# Supportet are:
-#   FO_TRACE=
-#      Use this to prepend something to calling freorion.
-#      This variables also is used internally, when --gdb or --trace
-#      appear on the command line.
-#   FO_GDB_ARGS=
-#      If you use --gbd, you should uses this env to add GDB parameters.
-#      Make sure you end this list of parameters with --args, otherwise
-#      gdb won't start. Example: FO_GDB_ARGS="-q -s fo.symbols --args"
-#   LD_LIBRARY_PATH=
-#      This is a well known env and will be honored by this script.
-#
-
-
-# ---------- STARTS HERE ---------------
-# Change into application directory
-# If this is a symlink, then we
-# need to change into the dir of symlink-target.
-if [ -h $0 ]; then
-  #echo "I am Symlink. Following into my targets basedir"
-  ME=`readlink $0`
-else
-  #echo "Following into my basedir"
-  ME=$0
-fi
-
-# This is important! Script won't work outside its installation dir
-ROOT=/usr/share/freeorion
-cd ${ROOT}
-#echo -n "CWD: "
-pwd
-
-
-
-# Check for python. If freeorionca binary is missing it, use
-# the shipped version.
-if ldd /usr/bin/freeorionca | grep "libpython.*not found"; then
-    #echo "python2.5 missing. Using shipped version."
-    PYTHON_USE_SHIPPED=1
-else 
-    #echo "python2.5 found. Using it."
-    PYTHON_USE_SHIPPED=0
-fi
-
-# Set Python library home for loading modules
-# If no python 2.5 is detected, use shipped python 2.5
-if [ "$PYTHON_USE_SHIPPED" = "1" ]; then
-    export PYTHONHOME=/usr/lib/freeorion/python2.5
-    export PYTHONPATH=${PYTHONHOME}
-    export PYTHONDEBUG=1
-    export PYTHONVERBOSE=1
-    #echo "PYTHONHOME=${PYTHONHOME}"
-    
-    export LD_LIBRARY_PATH=${PYTHONHOME}:${LD_LIBRARY_PATH}
-    export LD_PRELOAD=${PYTHONHOME}/libutil.so.1:${PYTHONHOME}/libpython2.5.so
-fi
-
-
-# Command line Parameter --gdb forces running in gdb
-# Setting FO_TRACE to gdb results in other settings, see
-# below
-if [ "$1" = "--gdb" ]; then
-    FO_TRACE="gdb"
-
-    # Don't forget to remove the param
-    shift
-fi
-
-if [ "$1" = "--strace" ]; then
-    TRACEFILE=/tmp/freeorion.trace
-    echo
-    echo "Tracing to ${TRACEFILE}"
-    echo
-    FO_TRACE="strace -f -o ${TRACEFILE}"
-
-    # Don't forget to remove the param
-    shift
-fi
-
-
-
-# Add a parameter FO_GDB_ARGS to support gdb
-# Or warn the user, if he changed FO_GDB_ARGS and has
-# forgotten to end it with --args
-if [ "$FO_TRACE" = "gdb" ]; then
-    if [ "$FO_GDB_ARGS" = "" ]; then
-	FO_GDB_ARGS="--args"
-    else
-	echo "****************************************************"
-	echo "** NOTE         NOTE         NOTE         NOTE    **"
-	echo "Running FO in gdb"
-	echo "If you use FO_GDB_ARGS on your command line, make"
-	echo "sure that you END this variabble with --args."
-	echo "Otherwise gdb will not start."
-	echo
-	echo "Type 'start' when the gdb instance has loaded!"
-	echo	
-    fi
-fi
-
-
-# Support loading libs from application/lib
-export LD_LIBRARY_PATH=./lib:${LD_LIBRARY_PATH}
-
-# Call with settings-dir to avoid conflicting installations
-${FO_TRACE} ${FO_GDB_ARGS} /usr/bin/freeorion.elf  --resource-dir ./default $@
diff --git a/community/freeradius-client/PKGBUILD b/community/freeradius-client/PKGBUILD
index ecac54b00..12ca14227 100644
--- a/community/freeradius-client/PKGBUILD
+++ b/community/freeradius-client/PKGBUILD
@@ -1,16 +1,15 @@
-# $Id: PKGBUILD 91904 2013-05-29 10:03:59Z spupykin $
+# $Id: PKGBUILD 100158 2013-11-01 20:25:26Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Kalidarn
 
 pkgname=freeradius-client
 pkgver=1.1.6
-pkgrel=5
+pkgrel=6
 pkgdesc="FreeRADIUS Client Software"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://wiki.freeradius.org/Radiusclient"
 license=('BSD')
 depends=('sh')
-options=(!libtool)
 source=(ftp://ftp.freeradius.org/pub/radius/$pkgname-$pkgver.tar.bz2)
 md5sums=('2e46564e450ae13aedb70dc133b158ac')
 
diff --git a/community/freeradius/PKGBUILD b/community/freeradius/PKGBUILD
index 83a269fb7..0c9058a7d 100644
--- a/community/freeradius/PKGBUILD
+++ b/community/freeradius/PKGBUILD
@@ -1,24 +1,24 @@
-# $Id: PKGBUILD 96844 2013-09-06 12:39:09Z spupykin $
+# $Id: PKGBUILD 100324 2013-11-02 09:25:51Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Jason R Begley (jayray@digitalgoat.com>
 
 pkgname=freeradius
-pkgver=2.2.0
-pkgrel=9
+pkgver=3.0.0
+pkgrel=1
 pkgdesc="The premier open source RADIUS server"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.freeradius.org/"
 license=('GPL')
-depends=('krb5' 'pth' 'net-snmp' 'postgresql-libs' 'libmariadbclient')
+depends=('krb5' 'pth' 'net-snmp' 'postgresql-libs' 'libmariadbclient' 'talloc')
 makedepends=('libpcap' 'unixodbc' 'python2')
 optdepends=('libpcap' 'unixodbc' 'python2')
-options=('!libtool' '!makeflags')
+options=('!makeflags')
 install=$pkgname.install
 source=("ftp://ftp.freeradius.org/pub/radius/freeradius-server-$pkgver.tar.bz2"{,.sig}
 	freeradius.tmpfiles
 	freeradius.service
 	krb5-build-fix.patch)
-md5sums=('0fb333fe6a64eb2b1dd6ef67f7bca119'
+md5sums=('e805282ff8fc2b273c23e44967322002'
          'SKIP'
          'f959e89812bedfc9f8308076f78cd74e'
          'e3f18e3a25df3b692e59f60605354708'
@@ -26,9 +26,9 @@ md5sums=('0fb333fe6a64eb2b1dd6ef67f7bca119'
 
 build() {
   cd $srcdir/freeradius-server-$pkgver
-  export CFLAGS="$CFLAGS -fno-strict-aliasing"
-  sed -i 's/ -DKRB5_DEPRECATED//' src/modules/rlm_krb5/Makefile.in
-  patch -p1 <$srcdir/krb5-build-fix.patch
+#  export CFLAGS="$CFLAGS -fno-strict-aliasing"
+#  sed -i 's/ -DKRB5_DEPRECATED//' src/modules/rlm_krb5/Makefile.in
+#  patch -p1 <$srcdir/krb5-build-fix.patch
   ./configure --with-system-libtool --with-system-libltdl \
 	      --prefix=/usr --enable-heimdal-krb5 \
 	      --localstatedir=/var \
diff --git a/community/freerdp/PKGBUILD b/community/freerdp/PKGBUILD
index 112481899..9d857d685 100644
--- a/community/freerdp/PKGBUILD
+++ b/community/freerdp/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 97610 2013-09-25 13:56:48Z spupykin $
+# $Id: PKGBUILD 99744 2013-10-30 23:26:59Z allan $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Stijn Segers <francesco dot borromini at gmail dot com>
 
@@ -14,7 +14,6 @@ depends=('openssl' 'libxcursor' 'libcups' 'alsa-lib' 'libxext' 'libxdamage'
 makedepends=('krb5' 'cmake' 'damageproto' 'xmlto' 'docbook-xsl')
 conflicts=('freerdp-git')
 changelog=${pkgname}.changelog
-options=('!libtool')
 source=($pkgname-$pkgver.tar.gz::https://github.com/FreeRDP/FreeRDP/archive/$pkgver.tar.gz
         ffmpeg2.0.patch
         patch_numblock.patch)
diff --git a/community/freewrl/PKGBUILD b/community/freewrl/PKGBUILD
index 6a165b6e8..dbfdad83f 100644
--- a/community/freewrl/PKGBUILD
+++ b/community/freewrl/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 94880 2013-08-01 06:54:53Z bpiotrowski $
+# $Id: PKGBUILD 99745 2013-10-30 23:27:19Z allan $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com>
 
@@ -13,7 +13,6 @@ license=('GPL')
 depends=('java-runtime' 'libxaw' 'glew' 'freeglut' 'curl' 'freetype2' 'imlib2' 'sox'
 	 'unzip' 'imagemagick' 'libxml2' 'ttf-bitstream-vera' 'lesstif' 'js185' 'glu')
 makedepends=('java-environment' 'xulrunner' 'wget' 'mesa')
-options=(!libtool)
 source=(http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.bz2)
 md5sums=('27f4bf163011d8ac2088a535cb58a13d')
 
diff --git a/community/fxdesktop/PKGBUILD b/community/fxdesktop/PKGBUILD
deleted file mode 100644
index 695cda07e..000000000
--- a/community/fxdesktop/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# $Id: PKGBUILD 90029 2013-05-06 19:37:01Z foutrelis $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Contributor: Sander Jansen <sander@knology.net>
-
-pkgname=fxdesktop
-pkgver=0.1.12
-pkgrel=7
-pkgdesc="Lightweight Desktop Environment"
-arch=('i686' 'x86_64' 'mips64el')
-url="http://code.google.com/p/fxdesktop/"
-license=('GPL')
-depends=('fox>=1.6.0')
-makedepends=('glu')
-source=(http://archlinux-stuff.googlecode.com/files/$pkgname-$pkgver.tar.bz2)
-md5sums=('9489e7369b5e052e0b6836a3b0670832')
-
-build() {
-  cd $srcdir/$pkgname-$pkgver
-  # Override default flags
-  export CFLAGS="-Wall -O2 -pipe"
-  export CXXFLAGS="-Wall -O2 -pipe"
-  [ "$CARCH" = "x86_64" ] && (sed -i -e 's|lib64|lib|g' build/config.linux_x86_64)
-  # Compile
-  ./gb --prefix=/usr
-}
-
-package() {
-  cd $srcdir/$pkgname-$pkgver
-  ./gb --package-root=$pkgdir/usr install
-}
diff --git a/community/gambas3/PKGBUILD b/community/gambas3/PKGBUILD
index dc19d88d5..b66bbb5b5 100644
--- a/community/gambas3/PKGBUILD
+++ b/community/gambas3/PKGBUILD
@@ -1,22 +1,22 @@
-# $Id: PKGBUILD 95094 2013-08-05 14:15:46Z andyrtr $
+# $Id: PKGBUILD 99337 2013-10-27 11:13:45Z lcarlier $
 # Maintainer: Laurent Carlier <lordheavym@gmail.com>
 # Contributor : sebikul <sebikul@gmail.com>
 
 pkgbase=gambas3
-_components=('gambas3-gb-args' 'gambas3-gb-cairo' 'gambas3-gb-chart' 'gambas3-gb-dbus' 'gambas3-gb-complex'
-         'gambas3-gb-compress' 'gambas3-gb-crypt' 'gambas3-gb-data' 'gambas3-gb-db-form' 'gambas3-gb-db-mysql' 
+_components=('gambas3-gb-args' 'gambas3-gb-cairo' 'gambas3-gb-chart' 'gambas3-gb-clipper' 'gambas3-gb-complex'
+         'gambas3-gb-compress' 'gambas3-gb-crypt' 'gambas3-gb-dbus' 'gambas3-gb-data' 'gambas3-gb-db-form' 'gambas3-gb-db-mysql' 
          'gambas3-gb-db-odbc' 'gambas3-gb-db-postgresql' 'gambas3-gb-db-sqlite2' 'gambas3-gb-db-sqlite3' 'gambas3-gb-db' 
          'gambas3-gb-desktop-gnome' 'gambas3-gb-desktop' 'gambas3-gb-eval-highlight' 'gambas3-gb-httpd' 'gambas3-gb-form-dialog' 'gambas3-gb-form-mdi' 
-         'gambas3-gb-form-stock' 'gambas3-gb-form' 'gambas3-gb-gsl' 'gambas3-gb-gtk-opengl' 'gambas3-gb-gtk' 'gambas3-gb-image-effect'
+         'gambas3-gb-form-stock' 'gambas3-gb-form' 'gambas3-gb-gmp' 'gambas3-gb-gsl' 'gambas3-gb-gtk-opengl' 'gambas3-gb-gtk' 'gambas3-gb-image-effect'
          'gambas3-gb-image-imlib' 'gambas3-gb-image-io' 'gambas3-gb-image' 'gambas3-gb-jit' 'gambas3-gb-libxml' 'gambas3-gb-map'
          'gambas3-gb-media' 'gambas3-gb-memcached' 'gambas3-gb-mime' 'gambas3-gb-mysql' 'gambas3-gb-ncurses' 'gambas3-gb-net-curl' 'gambas3-gb-net-pop3'
-         'gambas3-gb-net-smtp' 'gambas3-gb-net' 'gambas3-gb-opengl-glu' 'gambas3-gb-opengl-glsl' 'gambas3-gb-opengl' 'gambas3-gb-option'
-         'gambas3-gb-pcre' 'gambas3-gb-pdf' 'gambas3-gb-qt4-ext' 'gambas3-gb-qt4-opengl' 'gambas3-gb-qt4-webkit' 'gambas3-gb-qt4'
-         'gambas3-gb-report' 'gambas3-gb-sdl-sound' 'gambas3-gb-sdl' 'gambas3-gb-settings' 'gambas3-gb-signal' 'gambas3-gb-v4l' 'gambas3-gb-vb'
+         'gambas3-gb-net-smtp' 'gambas3-gb-net' 'gambas3-gb-openal' 'gambas3-gb-opengl-glu' 'gambas3-gb-opengl-glsl' 'gambas3-gb-opengl-sge' 'gambas3-gb-opengl'
+         'gambas3-gb-option' 'gambas3-gb-pcre' 'gambas3-gb-pdf' 'gambas3-gb-qt4-ext' 'gambas3-gb-qt4-opengl' 'gambas3-gb-qt4-webkit' 'gambas3-gb-qt4'
+         'gambas3-gb-openssl' 'gambas3-gb-report' 'gambas3-gb-sdl-sound' 'gambas3-gb-sdl' 'gambas3-gb-settings' 'gambas3-gb-signal' 'gambas3-gb-v4l' 'gambas3-gb-vb'
          'gambas3-gb-xml-html' 'gambas3-gb-xml-rpc' 'gambas3-gb-xml-xslt' 'gambas3-gb-xml' 'gambas3-gb-web')
 pkgname=(${_components[@]} 'gambas3-runtime' 'gambas3-devel' 'gambas3-ide' 'gambas3-script' 'gambas3-examples')
-pkgver=3.4.2
-pkgrel=2
+pkgver=3.5.0
+pkgrel=3
 pkgdesc="A free development environment based on a Basic interpreter."
 arch=('i686' 'x86_64' 'mips64el')
 url="http://gambas.sourceforge.net/"
@@ -27,13 +27,11 @@ makedepends=('intltool' 'mariadb' 'postgresql' 'libffi' 'bzip2' 'glib2' 'v4l-uti
          'postgresql-libs' 'libmariadbclient' 'unixodbc' 'sqlite2' 'sqlite' 'librsvg'
          'curl' 'poppler-glib' 'sdl_mixer' 'sdl_ttf' 'libxtst' 'pcre' 'qtwebkit'
          'libxcursor' 'libsm' 'dbus-core' 'libxml2' 'libxslt' 'libgnome-keyring'
-	 'gsl' 'gstreamer0.10' 'gstreamer0.10-base' 'gtkglext' 'ncurses' 'llvm'
+	 'gsl' 'gst-plugins-base-libs' 'alure' 'gtkglext' 'ncurses' 'llvm'
 	 'gmime')
-options=(!emptydirs)
-source=("http://downloads.sourceforge.net/gambas/${pkgbase}-${pkgver}.tar.bz2"
-         gambas3-3.4.1-llvm-3.3.patch)
-md5sums=('c35c0f88211e2c0203d2467acb8d384d'
-         '04bf972f5d5546118ecbcc1f24271216')
+options=('!emptydirs' 'libtool')
+source=("http://downloads.sourceforge.net/gambas/${pkgbase}-${pkgver}.tar.bz2")
+md5sums=('20274da44d043104adb6fca02e6b5fab')
 
 create_dirs() {
   install -dm755 ${pkgdir}/usr/lib/gambas3
@@ -43,9 +41,6 @@ create_dirs() {
 prepare() {
   cd ${srcdir}/${pkgbase}-${pkgver}
 
-  # Fix build with LLVM 3.3 (patch from Fedora)
-  patch -Np1 -i../gambas3-3.4.1-llvm-3.3.patch
-
   ./reconf-all
 }
 
@@ -96,6 +91,18 @@ package_gambas3-gb-chart() {
   mv -v usr/share/gambas3/info/gb.chart.* ${pkgdir}/usr/share/gambas3/info/
 }
 
+package_gambas3-gb-clipper() {
+  depends=('gambas3-runtime')
+  pkgdesc="Polygon clipping component"
+
+  cd ${srcdir}/fakeinstall
+  
+  create_dirs
+  
+  mv -v usr/lib/gambas3/gb.clipper.* ${pkgdir}/usr/lib/gambas3/
+  mv -v usr/share/gambas3/info/gb.clipper.* ${pkgdir}/usr/share/gambas3/info/
+}
+
 package_gambas3-gb-complex() {
   depends=('gambas3-runtime')
   pkgdesc="Complex numbers component"
@@ -327,6 +334,18 @@ package_gambas3-gb-form() {
   mv -v usr/share/gambas3/control/gb.form ${pkgdir}/usr/share/gambas3/control/
 }
 
+package_gambas3-gb-gmp() {
+  depends=('gambas3-runtime' 'gmp')
+  pkgdesc="Arbitrary precision arithmetic component"
+
+  cd ${srcdir}/fakeinstall
+  
+  create_dirs
+  
+  mv -v usr/lib/gambas3/gb.gmp.* ${pkgdir}/usr/lib/gambas3/
+  mv -v usr/share/gambas3/info/gb.gmp.* ${pkgdir}/usr/share/gambas3/info/
+}
+
 package_gambas3-gb-gsl() {
   depends=('gambas3-runtime' 'gsl')
   pkgdesc="The GNU Scientific Library component"
@@ -461,7 +480,7 @@ package_gambas3-gb-map() {
 }
 
 package_gambas3-gb-media() {
-  depends=('gambas3-runtime' 'gstreamer0.10' 'gstreamer0.10-base')
+  depends=('gambas3-runtime' 'gst-plugins-base-libs')
   pkgdesc="Simplified interface to the GStreamer library component"
 
   cd ${srcdir}/fakeinstall
@@ -568,6 +587,18 @@ package_gambas3-gb-net() {
   mv -v usr/share/gambas3/info/gb.net.* ${pkgdir}/usr/share/gambas3/info/
 }
 
+package_gambas3-gb-openal() {
+  depends=('gambas3-runtime' 'alure')
+  pkgdesc="OpenAL 3D audio component"
+
+  cd ${srcdir}/fakeinstall
+  
+  create_dirs
+  
+  mv -v usr/lib/gambas3/gb.openal.* ${pkgdir}/usr/lib/gambas3/
+  mv -v usr/share/gambas3/info/gb.openal.* ${pkgdir}/usr/share/gambas3/info/
+}
+
 package_gambas3-gb-opengl-glu() {
   depends=('gambas3-gb-opengl')
   pkgdesc="GL Utility component"
@@ -592,6 +623,18 @@ package_gambas3-gb-opengl-glsl() {
   mv -v usr/share/gambas3/info/gb.opengl.glsl.* ${pkgdir}/usr/share/gambas3/info/
 }
 
+package_gambas3-gb-opengl-sge() {
+  depends=('gambas3-gb-opengl')
+  pkgdesc="Simple OpenGL game engine component"
+
+  cd ${srcdir}/fakeinstall
+  
+  create_dirs
+  
+  mv -v usr/lib/gambas3/gb.opengl.sge* ${pkgdir}/usr/lib/gambas3/
+  mv -v usr/share/gambas3/info/gb.opengl.sge* ${pkgdir}/usr/share/gambas3/info/
+}
+
 package_gambas3-gb-opengl() {
   depends=('gambas3-runtime' 'glew')
   pkgdesc="OpenGL component"
@@ -604,6 +647,18 @@ package_gambas3-gb-opengl() {
   mv -v usr/share/gambas3/info/gb.opengl.* ${pkgdir}/usr/share/gambas3/info/
 }
 
+package_gambas3-gb-openssl() {
+  depends=('gambas3-runtime' 'openssl')
+  pkgdesc="Openssl component"
+
+  cd ${srcdir}/fakeinstall
+  
+  create_dirs
+  
+  mv -v usr/lib/gambas3/gb.openssl.* ${pkgdir}/usr/lib/gambas3/
+  mv -v usr/share/gambas3/info/gb.openssl.* ${pkgdir}/usr/share/gambas3/info/
+}
+
 package_gambas3-gb-option() {
   depends=('gambas3-runtime')
   pkgdesc="Getopt component"
diff --git a/community/gavl/PKGBUILD b/community/gavl/PKGBUILD
index 99e9de3e2..c28cd59d1 100644
--- a/community/gavl/PKGBUILD
+++ b/community/gavl/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 76134 2012-09-12 03:17:18Z ebelanger $
+# $Id: PKGBUILD 99746 2013-10-30 23:27:40Z allan $
 # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de>
 # Contributor: Robert Emil Berge <filoktetes@linuxophic.org>
 # Contributor: Mateusz Herych <heniekk@gmail.com>
@@ -11,7 +11,6 @@ arch=('i686' 'x86_64' 'mips64el')
 url='http://gmerlin.sourceforge.net/'
 license=('GPL')
 depends=('glibc')
-options=('!libtool')
 source=("http://downloads.sourceforge.net/sourceforge/gmerlin/$pkgname-$pkgver.tar.gz"
 	"gavl-autoconf.patch")
 md5sums=('2752013a817fbc43ddf13552215ec2c0'
diff --git a/community/gcompris/PKGBUILD b/community/gcompris/PKGBUILD
index 0a7c1e191..18f1b0828 100644
--- a/community/gcompris/PKGBUILD
+++ b/community/gcompris/PKGBUILD
@@ -1,26 +1,24 @@
-# $Id: PKGBUILD 80539 2012-11-24 11:52:22Z foutrelis $
+# $Id: PKGBUILD 99747 2013-10-30 23:28:02Z allan $
 # Maintainer: Evangelos Foutras <evangelos@foutrelis.com>
 # Contributor: Daniel Isenmann <daniel.isenmann [at] gmx.de>
 
 pkgname=gcompris
 pkgver=12.11
-pkgrel=1
+pkgrel=2
 pkgdesc="Educational software suite comprising of numerous activities for children aged 2 to 10"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://gcompris.net/"
 license=('GPL3')
-depends=('pygtk' 'pyxml' 'librsvg' 'python2-pysqlite'
-         'gstreamer0.10-base-plugins')
+depends=('pygtk' 'librsvg' 'python2-pysqlite' 'gstreamer0.10-base-plugins')
 optdepends=('gnucap: for computer simulation within the electricity activity'
             'tuxpaint: for the painting activity'
             'gnuchess: for the chess activity')
 makedepends=('texinfo' 'texi2html' 'intltool' 'gettext' 'gnuchess')
-options=('!libtool')
 source=(http://downloads.sourceforge.net/project/$pkgname/$pkgver/$pkgname-$pkgver.tar.bz2)
 sha256sums=('97b688497963cc907e3d91f844483fb006a07b22010528dafb09ae5380523b20')
 
 build() {
-  cd "$srcdir/$pkgname-$pkgver"
+  cd $pkgname-$pkgver
 
   ./configure --prefix=/usr
   make
@@ -29,7 +27,7 @@ build() {
 package() {
   depends+=('gcompris-data')
 
-  cd "$srcdir/$pkgname-$pkgver"
+  cd $pkgname-$pkgver
   make DESTDIR="$pkgdir" install-exec
 }
 
diff --git a/community/gdal/PKGBUILD b/community/gdal/PKGBUILD
index 83aa66a94..709c8c69b 100644
--- a/community/gdal/PKGBUILD
+++ b/community/gdal/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 94922 2013-08-01 07:01:13Z bpiotrowski $
+# $Id: PKGBUILD 99749 2013-10-30 23:28:45Z allan $
 # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
 # Contributor: dibblethewrecker dibblethewrecker.at.jiwe.dot.org
 # Contributor: William Rea <sillywilly@gmail.com>
 
 pkgname=gdal
 pkgver=1.10.0
-pkgrel=2
+pkgrel=5
 pkgdesc="A translator library for raster geospatial data formats"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.gdal.org/"
@@ -16,7 +16,6 @@ optdepends=('postgresql: postgresql database support'
             'mariadb: mariadb database support'
             'perl:  perl binding support'
             'swig:  perl binding support')
-options=('!libtool')
 changelog=$pkgname.changelog
 source=(http://download.osgeo.org/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.gz
         gdal-1.5.1-python-install.patch)
diff --git a/community/gdc/PKGBUILD b/community/gdc/PKGBUILD
index 34a1a0d52..aa3224743 100644
--- a/community/gdc/PKGBUILD
+++ b/community/gdc/PKGBUILD
@@ -4,13 +4,13 @@
 # Contributor: Jesus Alvarez <jeezusjr@gmail.com>
 
 pkgname=('gdc' 'libgphobos-devel')
-pkgver=4.8.1
-pkgrel=6
+pkgver=4.8.2
+pkgrel=1
 arch=('i686' 'x86_64')
 url="https://github.com/D-Programming-GDC/GDC"
 license=('GPL')
 makedepends=('binutils>=2.23' 'git' 'gcc' 'make' 'perl' 'cloog' 'automake')
-options=('!libtool' '!emptydirs' '!buildflags')
+options=('!emptydirs' '!buildflags')
 _snapshot=4.8-20130725
 source=(ftp://gcc.gnu.org/pub/gcc/snapshots/${_snapshot}/gcc-${_snapshot}.tar.bz2
         gdc::git://github.com/D-Programming-GDC/GDC.git#branch=gdc-4.8
@@ -75,13 +75,14 @@ package_gdc()
     pkgdesc="Compiler for D programming language wich uses gcc backend"
  
     install -D -m755 $srcdir/gcc-build/gcc/gdc $pkgdir/usr/bin/gdc
-    install -D -m755 $srcdir/gcc-build/gcc/cc1d $pkgdir/usr/lib/gcc/$CHOST/4.8.1/cc1d
+    install -D -m755 $srcdir/gcc-build/gcc/cc1d $pkgdir/usr/lib/gcc/$CHOST/$pkgver/cc1d
 }
 
 package_libgphobos-devel()
 {
     pkgdesc="Standard library for D programming language, GDC port"
     provides=("d-runtime" "d-stdlib")
+    options=("staticlibs")
     depends=('gdc')
 
     # druntime
diff --git a/community/gdesklets/PKGBUILD b/community/gdesklets/PKGBUILD
index 959b9d38a..345bcee26 100644
--- a/community/gdesklets/PKGBUILD
+++ b/community/gdesklets/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 68406 2012-03-24 09:48:30Z bgyorgy $
+# $Id: PKGBUILD 99751 2013-10-30 23:29:27Z allan $
 # Maintainer: Balló György <ballogyor+arch at gmail dot com>
 # Contributor: nifan <carlos@nifan.tk>
 # Contributor: Roman Kyrylych <roman@archlinux.org>
@@ -12,7 +12,6 @@ url="http://gdesklets.de/"
 license=('GPL') 
 depends=('libgtop' 'librsvg' 'pygtk' 'desktop-file-utils' 'gnome-icon-theme' 'xdg-utils')
 makedepends=('gnome-python' 'intltool')
-options=(!libtool)
 install=$pkgname.install
 source=(http://gdesklets.de/files/$pkgname-$pkgver.tar.bz2
         gdesklets-core-0.36.3-.in-files.patch
diff --git a/community/gdk-pixbuf/PKGBUILD b/community/gdk-pixbuf/PKGBUILD
index 0c5d850ab..3849e4dd9 100644
--- a/community/gdk-pixbuf/PKGBUILD
+++ b/community/gdk-pixbuf/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 90033 2013-05-06 19:37:14Z foutrelis $
+# $Id: PKGBUILD 99752 2013-10-30 23:29:49Z allan $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: dorphell <dorphell@archlinux.org>
 # Contributor: Judd Vinet <jvinet@zeroflux.org>
@@ -12,7 +12,6 @@ url="http://www.gtk.org/"
 license=('GPL' 'LGPL')
 depends=('gtk' 'libtiff' 'libpng')
 makedepends=('libxt')
-options=('!libtool')
 source=(ftp://ftp.gnome.org/pub/gnome/sources/${pkgname}/0.22/${pkgname}-${pkgver}.tar.bz2
 	gdk-pixbuf-0.22.0-bmp_reject_corrupt.patch
 	gdk-pixbuf-0.22.0-bmp_secure.patch
diff --git a/community/gdlmm/PKGBUILD b/community/gdlmm/PKGBUILD
index 90d219aed..eb42db1c7 100644
--- a/community/gdlmm/PKGBUILD
+++ b/community/gdlmm/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 95679 2013-08-15 13:29:15Z arodseth $
+# $Id: PKGBUILD 99753 2013-10-30 23:30:10Z allan $
 # Maintainer: Alexander Rødseth <rodseth@gmail.com>
 
 pkgname=gdlmm
@@ -8,7 +8,7 @@ pkgdesc='C++ bindings for the gdl library'
 arch=('x86_64' 'i686' 'mips64el')
 url='http://git.gnome.org/browse/gdlmm/'
 depends=('gdl' 'gtkmm3')
-options=('!libtool' '!emptydirs')
+options=('!emptydirs')
 license=('LGPL')
 source=("http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz")
 sha256sums=('e280ed9233877b63ad0a0c8fb04d2c35dc6a29b3312151ee21a15b5932fef79b')
diff --git a/community/geany-plugins/PKGBUILD b/community/geany-plugins/PKGBUILD
index adeb1a88e..6026cbcce 100644
--- a/community/geany-plugins/PKGBUILD
+++ b/community/geany-plugins/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 91272 2013-05-20 19:14:00Z arodseth $
+# $Id: PKGBUILD 99755 2013-10-30 23:30:58Z allan $
 # Maintainer: Alexander Rødseth <rodseth@gmail.com>
 # Contributor: Angel 'angvp' Velasquez <angvp[at]archlinux.com.ve>  
 # Contributor: djgera
@@ -15,7 +15,6 @@ depends=("geany>=$pkgver" 'gtkspell' 'webkitgtk2' 'ctpl' 'gpgme' 'vte'
          'desktop-file-utils' 'gtk-update-icon-cache' 'lua51')
 makedepends=('intltool' 'vala' 'gdb' 'cppcheck')
 optdepends=('hspell: hebrew spell checker')
-options=('!libtool')
 install="$pkgname.install"
 source=("http://plugins.geany.org/$pkgname/$pkgname-$pkgver.tar.bz2")
 sha256sums=('ff26860edd1cbaea88c73bd8c2bd02f9ba04046674f05d3696baf66582e2bf58')
diff --git a/community/geany/PKGBUILD b/community/geany/PKGBUILD
index 302f92ba2..5b5b55008 100644
--- a/community/geany/PKGBUILD
+++ b/community/geany/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 91268 2013-05-20 18:58:27Z arodseth $
+# $Id: PKGBUILD 99754 2013-10-30 23:30:36Z allan $
 # Maintainer: Alexander Rødseth <rodseth@gmail.com>
 # Contributor: Angel Velasquez <angvp@archlinux.org> 
 # Contributor: Ionut Biru  <ibiru@archlinux.ro>
@@ -18,7 +18,6 @@ optdepends=('vte: for terminal support'
             'geany-plugins: various extra features'
             'python2')
 install="$pkgname.install"
-options=('!libtool')
 source=("http://download.geany.org/$pkgname-$pkgver.tar.bz2")
 sha256sums=('8815b16e59d8679ec359a1a5754fee05e77f7bca53083c939654bfc77d978fad')
 
diff --git a/community/geda-gaf/PKGBUILD b/community/geda-gaf/PKGBUILD
index 6fb9a1e0a..ac4362130 100644
--- a/community/geda-gaf/PKGBUILD
+++ b/community/geda-gaf/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 97320 2013-09-17 11:15:31Z kkeen $
+# $Id: PKGBUILD 99104 2013-10-24 12:53:47Z kkeen $
 # Maintainer: Kyle Keen <keenerd@gmail.com>
 # Contributor: Jared Casper <jaredcasper@gmail.com>
 # Contributor: Stefan Husmann <stefan-husmann@t-online.de>
 
 pkgname=geda-gaf
 pkgver=1.8.1
-pkgrel=3
+pkgrel=4
 pkgdesc="gEDA/gaf suite - Contains gschem, gnetlist, gsymcheck, gattrib, utilities and documentation from the gEDA project"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://geda-project.org/"
diff --git a/community/gedit-plugins/PKGBUILD b/community/gedit-plugins/PKGBUILD
index 6dff065ec..215f352d6 100644
--- a/community/gedit-plugins/PKGBUILD
+++ b/community/gedit-plugins/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 98198 2013-10-07 12:11:31Z jgc $
+# $Id: PKGBUILD 99756 2013-10-30 23:31:18Z allan $
 # Maintainer:  Ionut Biru <ibiru@archlinux.org>
 # Contributor: Alexander Rødseth <rodseth@gmail.com>
 # Contributor: Hugo Doria <hugo@archlinux.org>
@@ -17,7 +17,7 @@ makedepends=(intltool gnome-doc-utils vte3 libgit2-glib itstool)
 optdepends=('gucharmap: for charmap plugin'
             'vte3: for embedded terminal'
             'libgit2-glib: for git plugin')
-options=('!libtool' '!emptydirs')
+options=('!emptydirs')
 install=gedit-plugins.install
 source=("http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver:0:4}/$pkgname-$pkgver.tar.xz")
 sha256sums=('17cb703a09a0346b6a73d0e34eec87cde9073ffd5e0168741f0830a419ab57cd')
diff --git a/community/gemrb/PKGBUILD b/community/gemrb/PKGBUILD
index ecf2a1f56..c3885c459 100644
--- a/community/gemrb/PKGBUILD
+++ b/community/gemrb/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 91754 2013-05-27 08:10:59Z bpiotrowski $
+# $Id: PKGBUILD 99757 2013-10-30 23:31:38Z allan $
 # Maintainer: Lukas Jirkovsky <l.jirkovsky@gmail.com>
 pkgname=gemrb
 pkgver=0.8.0.1
@@ -11,7 +11,6 @@ depends=('python2' 'openal' 'libpng' 'sdl_mixer')
 # optionally it is possible to build vlc plugin too
 makedepends=('cmake')
 install=gemrb.install
-options=('!libtool')
 source=("http://downloads.sourceforge.net/sourceforge/gemrb/$pkgname-$pkgver.tar.gz")
 md5sums=('fdb97cc031cf969938952ce2c79b25fc')
 
diff --git a/community/geos/PKGBUILD b/community/geos/PKGBUILD
index ead6223e9..c86c15bb8 100644
--- a/community/geos/PKGBUILD
+++ b/community/geos/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 96649 2013-09-02 18:54:25Z jlichtblau $
+# $Id: PKGBUILD 99758 2013-10-30 23:32:00Z allan $
 # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
 # Contributor: dibblethewrecker dibblethewrecker.at.jiwe.dot.org
 # Contributor: William Rea <sillywilly@gmail.com>
@@ -12,7 +12,7 @@ arch=('i686' 'x86_64' 'mips64el')
 url="http://trac.osgeo.org/geos/"
 license=('LGPL')
 depends=('gcc-libs' 'bash')
-options=('!libtool' '!emptydirs')
+options=('!emptydirs')
 changelog=$pkgname.changelog
 source=(http://download.osgeo.org/$pkgname/$pkgname-$pkgver.tar.bz2)
 sha256sums=('15e8bfdf7e29087a957b56ac543ea9a80321481cef4d4f63a7b268953ad26c53')
diff --git a/community/gerbv/PKGBUILD b/community/gerbv/PKGBUILD
index 6ac556b08..bcdb91942 100644
--- a/community/gerbv/PKGBUILD
+++ b/community/gerbv/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 97318 2013-09-17 10:57:59Z kkeen $
+# $Id: PKGBUILD 99098 2013-10-24 12:43:42Z kkeen $
 # Maintainer: Kyle Keen <keenerd@gmail.com>
 # Contributor: Jared Casper <jaredcasper@gmail.com>
 # Contributor: Stefan Husmann <stefan-husmann@t-online.de>
 
 pkgname=gerbv
 pkgver=2.6.1
-pkgrel=1
+pkgrel=2
 pkgdesc="An open source Gerber file (RS-274X only) viewer"
 #url="http://gerbv.gpleda.org/"
 url="http://gerbv.geda-project.org/"
diff --git a/community/giggle/PKGBUILD b/community/giggle/PKGBUILD
index 2452a990f..c1b3e415c 100644
--- a/community/giggle/PKGBUILD
+++ b/community/giggle/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 88688 2013-04-21 22:17:05Z heftig $
+# $Id: PKGBUILD 99760 2013-10-30 23:32:47Z allan $
 # Maintainer : Ionut Biru <ibiru@archlinux.org>
 # Contributor: neodreams <yanbrodeur@gmail.com>
 
@@ -11,7 +11,6 @@ url="http://live.gnome.org/giggle"
 license=(GPL)
 depends=(git gtksourceview3 vte3 desktop-file-utils hicolor-icon-theme)
 makedepends=(intltool itstool)
-options=(!libtool)
 install=giggle.install
 source=(http://ftp.gnome.org/pub/GNOME/sources/giggle/0.7/$pkgname-$pkgver.tar.xz
         gtksourceview3.7.patch)
diff --git a/community/gigi/PKGBUILD b/community/gigi/PKGBUILD
deleted file mode 100644
index 101ade4d5..000000000
--- a/community/gigi/PKGBUILD
+++ /dev/null
@@ -1,60 +0,0 @@
-# $Id: PKGBUILD 95912 2013-08-18 17:24:22Z svenstaro $
-# Maintainer: Alexander Rødseth <rodseth@gmail.com>
-# Contributor: Sven-Hendrik Haase <sh@lutzhaase.com>
-# Contributor: fana-m <geminin@gmx.net>
-# Contributor: Andrzej Giniewicz <gginiu@gmail.com>
-# Contributor: Manuel Gaul <inkaine@hotmail.com>
-
-pkgname=gigi
-pkgver=6142
-pkgrel=3
-pkgdesc='Small, efficient and feature rich GUI for OpenGL and C++ (freeorion fork)'
-#url='http://gigi.sourceforge.net/'
-url='http://freeorion.svn.sourceforge.net/viewvc/freeorion/trunk/FreeOrion/GG/'
-arch=('x86_64' 'i686')
-license=('LGPL')
-depends=('boost' 'libpng' 'libtiff' 'ogre' 'sdl' 'python')
-makedepends=('subversion' 'cmake' 'setconf' 'doxygen' 'mesa-libgl')
-#https://gigi.svn.sourceforge.net/svnroot/gigi/trunk/GG/
-source=("$pkgname::svn+https://freeorion.svn.sourceforge.net/svnroot/freeorion/trunk/FreeOrion/GG/")
-sha256sums=('SKIP')
-
-pkgver() {
-  cd "$pkgname"
-
-  svnversion | tr -d [A-z]
-}
-
-prepare() {
-  cd "$pkgname"
-
-  setconf cmake/GiGiOgre.pc.in prefix /usr
-  setconf cmake/GiGi.pc.in prefix /usr
-  setconf cmake/GiGiSDL.pc.in prefix /usr
-}
-
-build() {
-  cd "$pkgname"
-
-  cmake \
-    -D CMAKE_INSTALL_PREFIX="$srcdir/pkg/usr" \
-    -D BUILD_TUTORIALS=OFF \
-    -D CPACK_GENERATOR=GiGiDevel \
-    -D CMAKE_C_FLAGS_RELEASE='-DNDEBUG' \
-    .
-  make -j1
-}
-
-package() {
-  cd "$pkgname"
-
-  make install
-  mv -v "$srcdir/pkg/usr" "$pkgdir/"
-
-  # python3 fix
-  for f in `find "$pkgdir/usr" -name "*.py"`; do
-    sed -i "s:/env python:/python3:g" "$f"
-  done
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/community/girara/PKGBUILD b/community/girara/PKGBUILD
index eaef26199..b4c25e50b 100644
--- a/community/girara/PKGBUILD
+++ b/community/girara/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 95627 2013-08-15 09:04:33Z spupykin $
+# $Id: PKGBUILD 100160 2013-11-01 20:46:36Z spupykin $
 # Maintainer: Daniel Wallace <danielwallace at gtmanfred dot com>
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: mlq <mlq@pwmt.org>
@@ -6,7 +6,7 @@
 pkgbase=girara
 pkgname=(girara-common girara-gtk2 girara-gtk3)
 pkgver=0.1.7
-pkgrel=1
+pkgrel=2
 pkgdesc="user interface library"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://pwmt.org/projects/girara"
diff --git a/community/gitg/PKGBUILD b/community/gitg/PKGBUILD
index db1946954..b9d44055e 100644
--- a/community/gitg/PKGBUILD
+++ b/community/gitg/PKGBUILD
@@ -1,17 +1,15 @@
-# $Id: PKGBUILD 88690 2013-04-21 22:17:07Z heftig $
+# $Id: PKGBUILD 99215 2013-10-25 20:50:04Z eric $
 # Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgname=gitg
 pkgver=0.2.7
-pkgrel=1
+pkgrel=2
 pkgdesc='A GIT repository viewer based on GTK+'
 arch=('i686' 'x86_64' 'mips64el')
 url='https://git.gnome.org/browse/gitg/'
 license=('GPL')
-depends=('gtksourceview3' 'git' 'desktop-file-utils' 'gsettings-desktop-schemas' \
-         'hicolor-icon-theme')
+depends=('gtksourceview3' 'git' 'desktop-file-utils' 'gsettings-desktop-schemas')
 makedepends=('intltool')
-options=('!libtool')
 install=gitg.install
 source=(ftp://ftp.gnome.org/pub/GNOME/sources/gitg/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz)
 sha1sums=('7b1428819666e4797d64dc94bb1624d5e7b75e6a')
@@ -19,7 +17,7 @@ sha1sums=('7b1428819666e4797d64dc94bb1624d5e7b75e6a')
 build() {
   cd ${pkgname}-${pkgver}
   ./configure --prefix=/usr
-  make
+  make WARN_CFLAGS="-Wall"
 }
 
 package() {
diff --git a/community/gkrellm/PKGBUILD b/community/gkrellm/PKGBUILD
index 1a3a9ec5f..cc9acf0cc 100644
--- a/community/gkrellm/PKGBUILD
+++ b/community/gkrellm/PKGBUILD
@@ -1,12 +1,13 @@
-# $Id: PKGBUILD 92097 2013-05-31 14:27:10Z foutrelis $
+# $Id: PKGBUILD 99331 2013-10-27 06:37:07Z lcarlier $
 # Maintainer: dorphell <dorphell@archlinux.org>
 # Contributor: Matt Smith (Majik) <darkknight@helpdesk.zaz.net>
 # Contributor: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
 # Contributor: Jozef Riha <jose1711@gmail.com>
 # Contributor: Alexander Rødseth <rodseth@gmail.com>
+
 pkgname=gkrellm
 pkgver=2.3.5
-pkgrel=4
+pkgrel=5
 pkgdesc="System monitor package for GTK2"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://members.dslextreme.com/users/billw/gkrellm/gkrellm.html"
@@ -31,7 +32,6 @@ package() {
   make DESTDIR="$pkgdir" PREFIX=/usr install
   install -Dm644 "server/gkrellmd.conf" "$pkgdir/etc/gkrellmd.conf"
   install -Dm644 "../gkrellm.service" "$pkgdir/usr/lib/systemd/system/gkrellm.service"
-  install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING"
 }
 
 # vim:set ts=2 sw=2 et:
diff --git a/community/glabels/PKGBUILD b/community/glabels/PKGBUILD
index 6afffeccb..b0a2f5db4 100644
--- a/community/glabels/PKGBUILD
+++ b/community/glabels/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 98190 2013-10-07 12:08:24Z jgc $
+# $Id: PKGBUILD 99761 2013-10-30 23:33:09Z allan $
 # Maintainer: Balló György <ballogyor+arch at gmail dot com>
 # Contributor: yugrotavele <yugrotavele at archlinux dot us>
 # Contributor: Damir Perisa <damir@archlinux.org>
@@ -12,7 +12,6 @@ url="http://glabels.org/"
 license=('GPL' 'LGPL')
 depends=('librsvg' 'evolution-data-server' 'qrencode' 'iec16022' 'dconf' 'desktop-file-utils' 'xdg-utils')
 makedepends=('barcode' 'intltool' 'gnome-doc-utils')
-options=('!libtool')
 install=$pkgname.install
 source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz
         glabels-3.0.0-new-eds.patch)
diff --git a/community/glitz/PKGBUILD b/community/glitz/PKGBUILD
index e96fd2b35..65f44ec7f 100644
--- a/community/glitz/PKGBUILD
+++ b/community/glitz/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 85262 2013-02-28 10:34:33Z arodseth $
+# $Id: PKGBUILD 99762 2013-10-30 23:33:29Z allan $
 # Maintainer: Alexander Rødseth <rodseth@gmail.com>
 
 pkgname=glitz
@@ -10,7 +10,6 @@ url='http://cairographics.org/'
 license=('BSD')
 depends=('libgl' 'glibc')
 makedepends=('mesa-libgl')
-options=('!libtool')
 source=("http://cairographics.org/snapshots/$pkgname-$pkgver.tar.gz")
 sha256sums=('132adf06e48531f4c01b6ba5843881e2b584a170c5222353d03cbef736d4a471')
 
diff --git a/community/glom/PKGBUILD b/community/glom/PKGBUILD
index 001cbc542..716b75f59 100644
--- a/community/glom/PKGBUILD
+++ b/community/glom/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 97732 2013-09-28 07:17:42Z jlichtblau $
+# $Id: PKGBUILD 99763 2013-10-30 23:33:51Z allan $
 # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
 # Contributor: Roman Kyrylych <Roman.Kyrylych@gmail.com>
 # Contributor: William Rea <sillywilly@gmail.com>
@@ -13,7 +13,6 @@ url="http://www.glom.org/"
 license=('GPL')
 depends=('gettext' 'boost-libs' 'libgdamm' 'libxml++' 'python2-gobject' 'libepc' 'goocanvasmm' 'gtksourceviewmm' 'evince' 'postgresql')
 makedepends=('intltool' 'gnome-doc-utils' 'python-sphinx' 'boost')
-options=('!libtool')
 install=$pkgname.install
 source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/1.24/$pkgname-$pkgver.tar.xz)
 sha256sums=('eae586be8d3fc36ee80e5ca0ef5d877e76d346cbfe451c9abff5be27692030d1')
diff --git a/community/gloox/PKGBUILD b/community/gloox/PKGBUILD
index b9f46d36f..e9d48d351 100644
--- a/community/gloox/PKGBUILD
+++ b/community/gloox/PKGBUILD
@@ -1,18 +1,17 @@
-# $Id: PKGBUILD 97518 2013-09-23 16:14:07Z spupykin $
+# $Id: PKGBUILD 100444 2013-11-04 12:11:53Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: William Rea <sillywilly@gmail.com>
 
 pkgname=gloox
-pkgver=1.0.6
+pkgver=1.0.9
 pkgrel=1
 pkgdesc="C++ libraries for development of Jabber client/component/server"
 arch=(i686 x86_64 'mips64el')
 url="http://camaya.net/gloox"
-options=('!libtool')
 license=("GPL")
 depends=('libidn' 'gnutls')
 source=(http://camaya.net/download/gloox-$pkgver.tar.bz2)
-md5sums=('80ba7fa1220913a9f67bf6f3183aafbd')
+md5sums=('48fc9aa5210c2a1ce253751a4d38e19c')
 
 build() {
   cd $srcdir/gloox-$pkgver
diff --git a/community/glusterfs/PKGBUILD b/community/glusterfs/PKGBUILD
index 1ea048b9f..7206aaa56 100644
--- a/community/glusterfs/PKGBUILD
+++ b/community/glusterfs/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 94386 2013-07-22 14:09:30Z spupykin $
+# $Id: PKGBUILD 100446 2013-11-04 12:12:13Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributors:
 #   Andrei Antoukh - niwi@niwi.be - http://www.niwi.be
 #   henning mueller <henning@orgizm.net>
 
 pkgname=glusterfs
-pkgver=3.4.0
+pkgver=3.4.1
 _basever=`echo $pkgver | cut -f1-2 -d.`
 pkgrel=1
 pkgdesc='Is a cluster file-system capable of scaling to several peta-bytes.'
@@ -14,11 +14,12 @@ url='http://www.gluster.org/'
 license=(GPL2 LGPL3)
 depends=(fuse python2 libxml2)
 makedepends=(flex bison)
-options=(!libtool)
 source=(http://download.gluster.org/pub/gluster/glusterfs/$_basever/$pkgver/glusterfs-$pkgver.tar.gz
 	glusterd.service)
 sha256sums=('2a2a43fb52a7f6b8b00331acc5ea2c86a067a2f2901cca886a2348e919c0cbd8'
             '18e6c3bcca396a4524d866977d3fa86135377d7bf5d28a130e697ae2e85f043b')
+sha256sums=('b5f1b4e3c6b86ecdfc5ff1b870ae3d3384bb2e3943565d6907c29ee6e21ab739'
+            '18e6c3bcca396a4524d866977d3fa86135377d7bf5d28a130e697ae2e85f043b')
 
 build() {
   cd $srcdir/$pkgname-$pkgver
diff --git a/community/gmerlin/PKGBUILD b/community/gmerlin/PKGBUILD
index 2342b1ded..ef4e533f1 100644
--- a/community/gmerlin/PKGBUILD
+++ b/community/gmerlin/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 91613 2013-05-25 11:46:26Z bpiotrowski $
+# $Id: PKGBUILD 99767 2013-10-30 23:35:23Z allan $
 # Maintainer: Federico Cinelli <cinelli@aur.archlinux.org>
 
 pkgname=gmerlin
@@ -15,7 +15,6 @@ optdepends=('alsa-lib: for ALSA support'
 	    'libquicktime: for movie encoding'
 	    'pulseaudio: for PulseAudio support'
 	    'v4l-utils: for video conversion')
-options=('!libtool')
 install=gmerlin.install
 source=(http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.gz
         cdio-api-fixes.patch
diff --git a/community/gmic/PKGBUILD b/community/gmic/PKGBUILD
index b5465c5b7..411d28e49 100644
--- a/community/gmic/PKGBUILD
+++ b/community/gmic/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 97134 2013-09-13 13:41:46Z spupykin $
+# $Id: PKGBUILD 99532 2013-10-29 11:26:02Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com>
 # Contributor: farid <farid at archlinuc-br.org>
@@ -6,7 +6,7 @@
 
 pkgbase=gmic
 pkgname=("gmic" "gimp-plugin-gmic" "zart")
-pkgver=1.5.7.0
+pkgver=1.5.7.2
 pkgrel=1
 arch=("i686" "x86_64" "mips64el")
 url="http://gmic.sourceforge.net"
@@ -15,7 +15,7 @@ makedepends=('gimp' 'qt4' 'fftw' 'openexr' 'opencv' 'mesa' 'gtk2')
 #options=('!emptydirs')
 source=("http://downloads.sourceforge.net/sourceforge/gmic/gmic_${pkgver}.tar.gz"
         "opencv-buildfix.patch")
-md5sums=('76e4cc4847afb7fe8afa4d7f8690d4dc'
+md5sums=('08aa65f01b5bec9cb0ff71b30102cf4e'
          '120319b0d6c81c5af186abe2281b79ca')
 
 prepare() {
diff --git a/community/gmpc/PKGBUILD b/community/gmpc/PKGBUILD
index 45be95eca..954a1f596 100644
--- a/community/gmpc/PKGBUILD
+++ b/community/gmpc/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 94825 2013-07-30 21:19:19Z arodseth $
+# $Id: PKGBUILD 99768 2013-10-30 23:35:44Z allan $
 # Maintainer: Alexander Rødseth <rodseth@gmail.com>
 # Contributor: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Tobias Kieslich <tobias@archlinux.org>
@@ -12,7 +12,6 @@ url='http://gmpclient.org/home'
 license=('GPL')
 depends=('libunique' 'libmpd' 'libsoup' 'sqlite' 'hicolor-icon-theme' 'xdg-utils')
 makedepends=('gob2' 'intltool' 'vala')
-options=('!libtool')
 install='gmpc.install'
 source=("http://download.sarine.nl/Programs/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.gz")
 sha256sums=('a69414f35396846733632ca9619921d7acda537ffd6d49bd84b444945cb76b2c')
diff --git a/community/gmtk/PKGBUILD b/community/gmtk/PKGBUILD
index ecb19458b..4e60a0096 100644
--- a/community/gmtk/PKGBUILD
+++ b/community/gmtk/PKGBUILD
@@ -1,16 +1,15 @@
-# $Id: PKGBUILD 92205 2013-06-02 18:41:20Z bpiotrowski $
+# $Id: PKGBUILD 99144 2013-10-25 02:20:05Z allan $
 # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de>
 
 pkgname=gmtk
 pkgver=1.0.8
-pkgrel=1
+pkgrel=2
 pkgdesc='Common functions for gnome-mplayer and gecko-mediaplayer.'
 arch=('i686' 'x86_64' 'mips64el')
 url='http://gmtk.googlecode.com/'
 license=('GPL')
 depends=('glib2' 'gtk3' 'dconf')
 makedepends=('intltool' 'pkg-config')
-options=(!libtool)
 source=("http://gmtk.googlecode.com/files/${pkgname}-${pkgver}.tar.gz")
 md5sums=('ee8ab99f3ac2e0071c99a35e4847bba5')
 
diff --git a/community/gnash/PKGBUILD b/community/gnash/PKGBUILD
index 5375b04e6..ef0c49064 100644
--- a/community/gnash/PKGBUILD
+++ b/community/gnash/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 94924 2013-08-01 07:01:17Z bpiotrowski $
+# $Id: PKGBUILD 99769 2013-10-30 23:36:07Z allan $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 
 pkgbase=gnash
@@ -13,7 +13,7 @@ makedepends=(curl giflib libldap sdl agg libjpeg libpng libtool mesa glu
              gstreamer0.10-base
              gtk2 libldap xulrunner hicolor-icon-theme desktop-file-utils gconf gtkglext
              pkgconfig boost)
-options=(!libtool !emptydirs)
+options=(!emptydirs)
 source=(http://ftp.gnu.org/gnu/gnash/${pkgver}/gnash-${pkgver}.tar.bz2
         nodebug.patch gnash-0.8.10-boost-1.50.patch gnucash-0.8.10-giflib-5.0.patch)
 sha256sums=('9625072e45df92baa2c28fc9999d4e2deb66bc827530baedfad2e4e2292d1224'
diff --git a/community/gnokii/PKGBUILD b/community/gnokii/PKGBUILD
index 07ff0592b..af1b017c9 100644
--- a/community/gnokii/PKGBUILD
+++ b/community/gnokii/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 95469 2013-08-12 20:27:17Z bgyorgy $
+# $Id: PKGBUILD 99770 2013-10-30 23:36:32Z allan $
 # Maintainer: Balló György <ballogyor+arch at gmail dot com>
 # Contributor: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Roman Kyrylych <roman@archlinux.org>
@@ -18,7 +18,6 @@ optdepends=('dialog: sendsms tool'
             'libmariadbclient: smsd mysql backend'
             'postgresql-libs: smsd postgresql backend')
 backup=('etc/gnokiirc')
-options=('!libtool')
 install=$pkgname.install
 source=("http://www.gnokii.org/download/$pkgname/$pkgname-$pkgver.tar.bz2"
         'gnokii-config.patch'
diff --git a/community/gnome-commander/PKGBUILD b/community/gnome-commander/PKGBUILD
index 3c9da448f..61f935720 100644
--- a/community/gnome-commander/PKGBUILD
+++ b/community/gnome-commander/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 60311 2011-12-10 09:50:50Z ibiru $
+# $Id: PKGBUILD 99771 2013-10-30 23:36:54Z allan $
 # Maintainer : Ionut Biru <ibiru@archlinux.org>
 # Contributor: Roman Kyrylych <roman@archlinux.org>
 # Contributor: Johannes Sjolund <j.sjolund@gmail.com>
@@ -12,7 +12,6 @@ url="http://www.nongnu.org/gcmd/"
 license=('GPL')
 depends=('libgnomeui' 'gnome-vfs' 'gconf' 'python2' 'libsm')
 makedepends=('perlxml' 'gnome-doc-utils>=0.20.1' 'intltool')
-options=(!libtool)
 install=gnome-commander.install
 source=(ftp://ftp.gnome.org/pub/GNOME/sources/gnome-commander/1.2/$pkgname-$pkgver.tar.xz
 	gnome-commander-1.2.8.15-build.patch)
diff --git a/community/gnome-do/PKGBUILD b/community/gnome-do/PKGBUILD
index b201a9a73..eea49c48f 100644
--- a/community/gnome-do/PKGBUILD
+++ b/community/gnome-do/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 72904 2012-06-24 18:16:23Z bgyorgy $
+# $Id: PKGBUILD 99772 2013-10-30 23:37:16Z allan $
 # Maintainer: Balló György <ballogyor+arch at gmail dot com>
 # Contributor: Allan McRae <allan@archlinux.org>
 # Contributor: Doehni <dohny@gmx.de>
@@ -12,7 +12,6 @@ url="http://do.davebsd.com/"
 license=('GPL3')
 depends=('gconf-sharp' 'libgnome-desktop-sharp' 'gnome-keyring-sharp' 'mono-addins' 'notify-sharp' 'hicolor-icon-theme' 'xdg-utils')
 makedepends=('intltool' 'libgnome-sharp' 'gio-sharp')
-options=('!libtool')
 install=$pkgname.install
 source=(http://launchpad.net/do/trunk/$pkgver/+download/$pkgname-$pkgver.tar.gz
         gio-gnomedesktop.patch)
diff --git a/community/gnome-packagekit/PKGBUILD b/community/gnome-packagekit/PKGBUILD
index dd666071e..f4dd9b4d4 100644
--- a/community/gnome-packagekit/PKGBUILD
+++ b/community/gnome-packagekit/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 91084 2013-05-19 01:47:07Z jconder $
+# $Id: PKGBUILD 99773 2013-10-30 23:37:38Z allan $
 # Maintainer: Jonathan Conder <jonno.conder@gmail.com>
 
 pkgname=gnome-packagekit
@@ -13,7 +13,7 @@ depends=('desktop-file-utils' 'gtk3' 'hicolor-icon-theme' 'libnotify'
 makedepends=('gconf' 'gtk-doc' 'intltool' 'itstool' 'libcanberra' 'upower')
 optdepends=('polkit-gnome: required for privileged actions'
             'gnome-settings-daemon-updates: update and message notifications')
-options=('!emptydirs' '!libtool')
+options=('!emptydirs')
 install="$pkgname.install"
 source=("http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz")
 sha256sums=('f13481d477a47295fa204b73ae7590f61d5576a8c889e5644cee0bc1f5cf530c')
diff --git a/community/gnome-phone-manager/PKGBUILD b/community/gnome-phone-manager/PKGBUILD
index d254b3110..a3acc46a0 100644
--- a/community/gnome-phone-manager/PKGBUILD
+++ b/community/gnome-phone-manager/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 98192 2013-10-07 12:08:26Z jgc $
+# $Id: PKGBUILD 99774 2013-10-30 23:38:00Z allan $
 # Maintainer: Balló György <ballogyor+arch at gmail dot com>
 # Contributor: Roman Kyrylych <roman@archlinux.org>
 
@@ -11,7 +11,6 @@ url="http://live.gnome.org/PhoneManager"
 license=('GPL')
 depends=('evolution-data-server' 'gconf' 'gnokii' 'gnome-bluetooth' 'libcanberra' 'telepathy-glib')
 makedepends=('intltool')
-options=('!libtool')
 install=gnome-phone-manager.install
 source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/$pkgver/$pkgname-$pkgver.tar.xz
         gnome-phone-manager-0.68-eds.patch)
diff --git a/community/gnome-settings-daemon-updates/PKGBUILD b/community/gnome-settings-daemon-updates/PKGBUILD
index 8d528344a..aae1c29a1 100644
--- a/community/gnome-settings-daemon-updates/PKGBUILD
+++ b/community/gnome-settings-daemon-updates/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 91086 2013-05-19 01:51:02Z jconder $
+# $Id: PKGBUILD 99775 2013-10-30 23:38:21Z allan $
 # Maintainer: Jonathan Conder <jonno.conder@gmail.com>
 
 _pkgname=gnome-settings-daemon
@@ -10,7 +10,7 @@ arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 depends=('gnome-packagekit' "$_pkgname")
 makedepends=('intltool' 'gtk-doc' 'gnome-desktop' 'gnome-common' 'xf86-input-wacom')
-options=('!emptydirs' '!libtool')
+options=('!emptydirs')
 install=$_pkgname.install
 url="http://www.gnome.org"
 source=("http://ftp.gnome.org/pub/gnome/sources/$_pkgname/${pkgver%.*}/$_pkgname-$pkgver.tar.xz"
diff --git a/community/gnome-subtitles/PKGBUILD b/community/gnome-subtitles/PKGBUILD
index 3e4363d8e..9d175bf53 100644
--- a/community/gnome-subtitles/PKGBUILD
+++ b/community/gnome-subtitles/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 87454 2013-03-31 21:57:58Z bgyorgy $
+# $Id: PKGBUILD 99776 2013-10-30 23:38:47Z allan $
 # Maintainer: Balló György <ballogyor+arch at gmail dot com>
 
 pkgname=gnome-subtitles
@@ -14,7 +14,6 @@ optdepends=('gst-plugins-good: Extra media codecs'
             'gst-plugins-bad: Extra media codecs'            
             'gst-plugins-ugly: Extra media codecs'
             'gst-libav: Extra media codecs')
-options=('!libtool')
 install=$pkgname.install
 source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz)
 md5sums=('b0570134af6626d4e6c018c5f7774964')
diff --git a/community/gnonlin/PKGBUILD b/community/gnonlin/PKGBUILD
index 38b16959f..62753d6c4 100644
--- a/community/gnonlin/PKGBUILD
+++ b/community/gnonlin/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 98219 2013-10-07 15:43:14Z spupykin $
+# $Id: PKGBUILD 99777 2013-10-30 23:39:20Z allan $
 # Maintainer: Alexander Rødseth <rodseth@gmail.com>
 # Contributor: Ionut Biru <ibiru@archlinux.org>
 # Contributor: Abhishek Dasgupta <abhidg@gmail.com>
@@ -12,7 +12,6 @@ arch=('x86_64' 'i686' 'mips64el')
 url='http://gnonlin.sourceforge.net/'
 depends=('gstreamer')
 makedepends=('python' 'gst-plugins-base' 'pkgconfig')
-options=('!libtool')
 license=('LGPL')
 source=("http://gstreamer.freedesktop.org/src/$pkgname/$pkgname-$pkgver.tar.xz")
 sha256sums=('e4a2dd8af1c0c97f2f63e918a25c26e871c896e88b7ee85948509f68f29e8935')
diff --git a/community/gnote/PKGBUILD b/community/gnote/PKGBUILD
index 80c9ff5ab..67cb1e140 100644
--- a/community/gnote/PKGBUILD
+++ b/community/gnote/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 90444 2013-05-12 12:57:54Z heftig $
+# $Id: PKGBUILD 100334 2013-11-02 11:34:59Z ioni $
 # Maintainer:  Ionut Biru <ibiru@archlinux.org>
 # Contributor: uastasi <uastasi@archlinux.us>
 pkgname=gnote
-pkgver=3.8.1
+pkgver=3.10.1
 pkgrel=1
 pkgdesc="A note taking application."
 arch=('i686' 'x86_64' 'mips64el')
@@ -10,10 +10,9 @@ url="http://live.gnome.org/Gnote"
 license=('GPL3')
 depends=('gtkmm3' 'libxslt' 'hicolor-icon-theme' 'desktop-file-utils' 'dconf' 'libsecret')
 makedepends=('intltool' 'itstool' 'boost')
-options=('!libtool')
 install=gnote.install
 source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('35bb4c5c0fd94bb3e8e5b91dcfff7e376408dd95fb2468ce9e248f6738d036aa')
+sha256sums=('8466343c43cb5fb223a7abfe43e6e963f64403f96a3c823f5a37474e83d5e1a0')
 
 build() {
     cd $pkgname-$pkgver
diff --git a/community/gnunet-gtk/PKGBUILD b/community/gnunet-gtk/PKGBUILD
index fa8d3e7c7..c44dd68ba 100644
--- a/community/gnunet-gtk/PKGBUILD
+++ b/community/gnunet-gtk/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 98195 2013-10-07 12:08:31Z jgc $
+# $Id: PKGBUILD 99780 2013-10-30 23:40:28Z allan $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: wahnby <wahnby@yahoo.fr>
 
@@ -8,7 +8,6 @@ pkgrel=2
 pkgdesc="A frontend for GNUnet"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://gnunet.org"
-options=('!libtool')
 license=('GPL')
 depends=('gnunet' 'glade' 'adns')
 makedepends=('pkgconfig')
diff --git a/community/gnunet/PKGBUILD b/community/gnunet/PKGBUILD
index 365205720..e0f871c9b 100644
--- a/community/gnunet/PKGBUILD
+++ b/community/gnunet/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 90671 2013-05-13 14:25:31Z spupykin $
+# $Id: PKGBUILD 99779 2013-10-30 23:40:06Z allan $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: wahnby <wahnby@yahoo.fr>
 
@@ -13,7 +13,7 @@ depends=('gmp' 'libgcrypt' 'libextractor' 'sqlite' 'curl'
 	 'libmicrohttpd' 'libunistring' 'libidn')
 makedepends=('gettext' 'pkgconfig')
 backup=(etc/gnunetd.conf)
-options=('!libtool' '!makeflags')
+options=('!makeflags')
 install=gnunet.install
 source=(ftp://ftp.gnu.org/gnu/gnunet/gnunet-${pkgver/_/}.tar.gz
 	gnunet.service
diff --git a/community/gnuradio/21-fcd.rules b/community/gnuradio/21-fcd.rules
new file mode 100644
index 000000000..93de09dc6
--- /dev/null
+++ b/community/gnuradio/21-fcd.rules
@@ -0,0 +1,9 @@
+# Udev rules for the Funcube Dongle Pro (0xfb56) and Pro+ (0xfb31)
+
+# HIDAPI/libusb:
+SUBSYSTEMS=="usb" ATTRS{idVendor}=="04d8" ATTRS{idProduct}=="fb56" MODE:="0666"
+SUBSYSTEMS=="usb" ATTRS{idVendor}=="04d8" ATTRS{idProduct}=="fb31" MODE:="0666"
+
+# HIDAPI/hidraw:
+KERNEL=="hidraw*", ATTRS{busnum}=="1", ATTRS{idVendor}=="04d8", ATTRS{idProduct}=="fb56", MODE="0666"
+KERNEL=="hidraw*", ATTRS{busnum}=="1", ATTRS{idVendor}=="04d8", ATTRS{idProduct}=="fb31", MODE="0666"
diff --git a/community/gnuradio/PKGBUILD b/community/gnuradio/PKGBUILD
new file mode 100644
index 000000000..3200dee0a
--- /dev/null
+++ b/community/gnuradio/PKGBUILD
@@ -0,0 +1,81 @@
+# $Id: PKGBUILD 100355 2013-11-02 16:17:09Z kkeen $
+# Maintainer: Kyle Keen <keenerd@gmail.com>
+# Contributor: Dominik Heidler <dheidler@gmail.com>
+pkgname=gnuradio
+pkgver=3.7.1
+pkgrel=8
+pkgdesc="General purpose DSP and SDR toolkit.  Supports usrp and fcd."
+arch=('i686' 'x86_64')
+url="http://gnuradio.org"
+license=('GPL')
+depends=('fftw' 'python2-numpy' 'cppunit' 'swig' 'gsl' 'blas' 'guile' 'boost-libs>=1.53' 'libusbx' 'portaudio' 'libuhd')
+makedepends=('boost' 'cmake' 'python2-lxml' 'pygtk' 'wxpython' 'python2-cheetah')
+optdepends=('python2-cheetah: gnuradio-companion'
+            'python2-lxml: gnuradio-companion'
+            'pygtk: gnuradio-companion'
+            'wxpython: gr-wxgui'
+            'qwtplot3d: gr-qtgui'
+            'pyqwt: gr-qtgui'
+            'doxygen: autogenerated documentation'
+            'pkgconfig: ?')
+conflicts=('gnuradio-git')
+install=gnuradio.install
+
+# todo
+# add gr-osmosdr-git to optdepends
+# split the gui components?
+# build doxygen docs?
+# icons
+
+source=("http://gnuradio.org/releases/$pkgname/$pkgname-$pkgver.tar.gz"
+        "21-fcd.rules")
+md5sums=('6c5e67da6ed8724dd900d8e343b64be4'
+         '465e12c454c6a22ebec9849181af7bdc')
+
+build() {
+	export PYTHON=python2
+	cd "$srcdir/$pkgname-$pkgver"
+	msg "Starting build."
+	mkdir -p build
+	cd build
+	cmake \
+		-DPYTHON_EXECUTABLE=$(which python2) \
+		-DPYTHON_INCLUDE_DIR=$(echo /usr/include/python2*) \
+		-DPYTHON_LIBRARY=$(echo /usr/lib/libpython2.*.so) \
+		-DENABLE_GRC=ON \
+		-DCMAKE_INSTALL_PREFIX=/usr ../
+	make
+}
+
+check() {
+	cd "$srcdir/$pkgname-$pkgver/build"
+	export PYTHON=python2
+	#make test
+}
+
+package() {
+	cd "$srcdir"
+	install -Dm644 21-fcd.rules "$pkgdir/usr/lib/udev/rules.d/21-fcd.rules"
+	cd "$srcdir/$pkgname-$pkgver/grc/freedesktop"
+        install -Dm644 gnuradio-grc.desktop "$pkgdir/usr/share/applications/$pkgname.desktop"
+	cd "$srcdir/$pkgname-$pkgver/build"
+	make DESTDIR="$pkgdir" install
+	msg "Replacing filenames to use python2."
+	sed -i -e "s|#![ ]*/usr/bin/env python$|#!/usr/bin/env python2|" \
+		$(find "$pkgdir" -name '*.py') \
+		$(find "$pkgdir" -name 'gnuradio-companion' -o -name 'flow_graph.tmpl')
+	find "$pkgdir/" -name '*.pyc' -delete
+	find "$pkgdir/" -name '*.pyo' -delete
+}
+
+# options for armv6:
+# -Dhave_mfpu_neon=0 \
+# -DCMAKE_CXX_FLAGS:STRING="-march=armv6 -mfpu=vfp -mfloat-abi=hard" \
+# -DCMAKE_C_FLAGS:STRING="-march=armv6 -mfpu=vfp -mfloat-abi=hard" \
+
+# options for armv7:
+# -DCMAKE_CXX_FLAGS:STRING="-march=armv7-a -mcpu=cortex-a9 -mfpu=neon -mfloat-abi=hard"
+# -DCMAKE_C_FLAGS:STRING="-march=armv7-a -mcpu=cortex-a9 -mfpu=neon -mfloat-abi=hard"
+# line 341 add /usr/lib/arm-linux-gnueabihf /usr/lib/arm-linux-gnueabi
+
+
diff --git a/community/gnuradio/gnuradio.install b/community/gnuradio/gnuradio.install
new file mode 100644
index 000000000..e111ef946
--- /dev/null
+++ b/community/gnuradio/gnuradio.install
@@ -0,0 +1,11 @@
+post_install() {
+  update-desktop-database -q
+}
+
+post_upgrade() {
+  post_install
+}
+
+post_remove() {
+  post_install
+}
diff --git a/community/gnustep-base/PKGBUILD b/community/gnustep-base/PKGBUILD
index 385a1aa33..12929567e 100644
--- a/community/gnustep-base/PKGBUILD
+++ b/community/gnustep-base/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 96986 2013-09-09 19:51:14Z bgyorgy $
+# $Id: PKGBUILD 98739 2013-10-17 14:01:46Z andyrtr $
 # 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.24.5
-pkgrel=2
+pkgrel=3
 pkgdesc="The GNUstep base package"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.gnustep.org/"
diff --git a/community/gnustep-gui/PKGBUILD b/community/gnustep-gui/PKGBUILD
index 83a323edb..f6e97944a 100644
--- a/community/gnustep-gui/PKGBUILD
+++ b/community/gnustep-gui/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 96990 2013-09-09 20:20:00Z bgyorgy $
+# $Id: PKGBUILD 98740 2013-10-17 14:01:47Z andyrtr $
 # 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.23.1
-pkgrel=3
+pkgrel=4
 pkgdesc="The GNUstep GUI class library"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.gnustep.org/"
diff --git a/community/go/PKGBUILD b/community/go/PKGBUILD
index 674f2de25..8515479de 100644
--- a/community/go/PKGBUILD
+++ b/community/go/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 96615 2013-09-02 10:55:16Z arodseth $
+# $Id: PKGBUILD 99613 2013-10-30 14:46:57Z arodseth $
 # Maintainer: Vesa Kaihlavirta <vegai@iki.fi>
 # Maintainer: Alexander Rødseth <rodseth@gmail.com>
 # Contributor: Rémy Oudompheng  <remy@archlinux.org>
@@ -10,7 +10,7 @@
 
 pkgname=go
 pkgver=1.1.2
-pkgrel=2
+pkgrel=3
 epoch=2
 pkgdesc='Compiler and tools for the Go programming language from Google'
 arch=('x86_64' 'i686')
@@ -18,7 +18,7 @@ url='http://golang.org/'
 license=('custom')
 depends=('perl' 'gawk')
 makedepends=('inetutils')
-options=('!strip')
+options=('!strip' 'staticlibs')
 install="$pkgname.install"
 backup=('usr/lib/go/bin')
 
@@ -35,12 +35,16 @@ else
 fi
 
 build() {
-  cd "$srcdir/$pkgname/src"
+  cd "$pkgname/src"
 
   export GOROOT_FINAL=/usr/lib/go
 
-  # We don't support SSE2 for i686, since many i686 CPUs don't have that.
-  # Build this package manually, build Go from AUR or use x86_64 instead.
+  #
+  # Arch Linux doesn't support SSE2 for i686.
+  #
+  # Use "go-sse2" from AUR if you have am i686 CPU that supports SSE2.
+  # It is highly likely that it does, and the SSE2 version is _a lot_ faster.
+  #
   export GO386=387
 
   # Enable ARM crosscompilation for linux
@@ -59,7 +63,7 @@ build() {
 }
 
 check() {
-  cd "$srcdir/$pkgname"
+  cd "$pkgname"
 
   export GO386=387
 
@@ -73,12 +77,12 @@ check() {
   export GOROOT="$srcdir/$pkgname"
   export PATH="$srcdir/$pkgname/bin:$PATH"
 
-  # TestSimpleMulticastListener will fail in standard chroot.
+  # TestSimpleMulticastListener will fail in standard chroot
   cd src && bash run.bash --no-rebuild || true
 }
 
 package() {
-  cd "$srcdir/$pkgname"
+  cd "$pkgname"
 
   install -Dm644 LICENSE \
     "$pkgdir/usr/share/licenses/go/LICENSE"
diff --git a/community/gocr/PKGBUILD b/community/gocr/PKGBUILD
index 11d1f2588..6d553379c 100644
--- a/community/gocr/PKGBUILD
+++ b/community/gocr/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 88468 2013-04-18 12:15:06Z spupykin $
+# $Id: PKGBUILD 100164 2013-11-01 20:47:16Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: damir <damir@archlinux.org>
 
 pkgname=gocr
 pkgver=0.50
-pkgrel=1
+pkgrel=2
 pkgdesc="Open-source character recognition (OCR)"
 arch=("i686" "x86_64" 'mips64el')
 url="http://jocr.sourceforge.net/index.html"
diff --git a/community/goocanvas/PKGBUILD b/community/goocanvas/PKGBUILD
index a17ddf0c6..6732c0371 100644
--- a/community/goocanvas/PKGBUILD
+++ b/community/goocanvas/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 72991 2012-06-26 19:38:49Z spupykin $
+# $Id: PKGBUILD 99781 2013-10-30 23:40:49Z allan $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: William Rea <sillywilly@gmail.com>
 
@@ -8,7 +8,7 @@ pkgrel=2
 pkgdesc="A cairo canvas widget for GTK+"
 arch=(i686 x86_64 'mips64el')
 url="http://live.gnome.org/GooCanvas"
-options=('!libtool' 'docs')
+options=('docs')
 license=("LGPL")
 depends=('gtk3')
 makedepends=('gobject-introspection' 'python-gobject2')
diff --git a/community/goocanvas1/PKGBUILD b/community/goocanvas1/PKGBUILD
index 045129c22..052fb04a6 100644
--- a/community/goocanvas1/PKGBUILD
+++ b/community/goocanvas1/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 81872 2013-01-02 15:56:34Z jelle $
+# $Id: PKGBUILD 99782 2013-10-30 23:41:15Z allan $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: William Rea <sillywilly@gmail.com>
 
@@ -8,7 +8,7 @@ pkgrel=2
 pkgdesc="A cairo canvas widget for GTK+"
 arch=(i686 x86_64 mips64el)
 url="http://live.gnome.org/GooCanvas"
-options=('!libtool' 'docs')
+options=('docs')
 license=("LGPL")
 depends=('gtk2')
 source=(http://ftp.gnome.org/pub/GNOME/sources/goocanvas/1.0/goocanvas-$pkgver.tar.bz2)
diff --git a/community/goocanvasmm/PKGBUILD b/community/goocanvasmm/PKGBUILD
index 5b71fd746..09aa5b316 100644
--- a/community/goocanvasmm/PKGBUILD
+++ b/community/goocanvasmm/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 91035 2013-05-18 13:20:54Z jlichtblau $
+# $Id: PKGBUILD 99783 2013-10-30 23:41:36Z allan $
 # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
 # Contributor: Thomas Dziedzic < gostrc at gmail >
 # Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
@@ -12,7 +12,6 @@ arch=('i686' 'x86_64' 'mips64el')
 url='http://ftp.gnome.org/pub/gnome/sources/goocanvasmm/'
 license=('GPL')
 depends=('goocanvas' 'gtkmm3')
-options=('!libtool')
 source=(http://ftp.gnome.org/pub/gnome/sources/goocanvasmm/1.90/goocanvasmm-${pkgver}.tar.xz)
 sha256sums=('a2f52fbff4f753602bb55ac8588201efd5f193c890df6dfc72004eaaf5daae92')
 
diff --git a/community/google-gadgets/PKGBUILD b/community/google-gadgets/PKGBUILD
deleted file mode 100644
index 3407d7a9c..000000000
--- a/community/google-gadgets/PKGBUILD
+++ /dev/null
@@ -1,164 +0,0 @@
-# $Id: PKGBUILD 85354 2013-03-01 10:32:21Z andrea $
-# Maintainer: Ray Rashif <schiv@archlinux.org>
-
-pkgbase=google-gadgets
-pkgname=('google-gadgets-common' 'google-gadgets-gtk' 'google-gadgets-qt')
-_realname=$pkgbase-for-linux
-_basedir="$startdir/pkg/base"
-pkgver=0.11.2
-_sover=1.0
-_sobump=0.0.0
-pkgrel=6
-arch=('i686' 'x86_64' 'mips64el')
-url="http://code.google.com/p/google-gadgets-for-linux/"
-license=('APACHE')
-makedepends=('gstreamer0.10-base-plugins' 'libwebkit'
-             'desktop-file-utils' 'xdg-utils'
-             'librsvg' 'curl' 'libsoup-gnome'
-             'qtwebkit'
-             'networkmanager'
-             'zip' 'flex')
-options=('!libtool')
-source=("http://google-gadgets-for-linux.googlecode.com/files/$_realname-$pkgver.tar.bz2"
-	"wifi-types.patch"
-  'gcc47.patch'
-  'glibc231.patch')
-md5sums=('279305553bcbf74f3e3615f6abc36a5e'
-         'f0df71c60a174e9d629db87b8bd9e102'
-         'b62bc8592b5a44cb34cb7a7e4a6cf62e'
-         '4b96d1da79a375ef2fb58ff01a76f684')
-
-build() {
-  cd "$srcdir/$_realname-$pkgver"
-
-  # Building thrice is expensive;
-  #   we move files around instead
-  #
-  # xulrunner 2.0 is incompatible;
-  #   we build without smjs-script/browser-element
-
-  patch -p1 <$srcdir/wifi-types.patch
-  patch -p1 -i "${srcdir}"/gcc47.patch
-  patch -p0 -i "${srcdir}"/glibc231.patch
-  ./configure --prefix=/usr \
-              --disable-werror \
-              --disable-update-desktop-database \
-              --disable-update-mime-database \
-              --with-oem-brand=Arch \
-              --with-ssl-ca-file=/etc/ssl/certs/ca-certificates.crt \
-              --with-browser-plugins-dir=/usr/lib/mozilla/plugins \
-              --disable-gtkmoz-browser-element \
-              --disable-smjs-script-runtime
-  make
-}
-
-package_google-gadgets-common() {
-  pkgdesc="Desktop widgets from Google (common files)"
-  install=$pkgbase-common.install
-  depends=('hicolor-icon-theme' 'shared-mime-info')
-  optdepends=('google-gadgets-gtk: GTK+ (full) UI'
-              'google-gadgets-qt: Qt (partial) UI')
-
-  cd "$srcdir/$_realname-$pkgver"
-
-  make -j1 DESTDIR="$pkgdir/" install
-
-  # we need to remove stuff in this package
-  cp -a "$pkgdir" "$_basedir"
-
-  # do not force any removal; we want to know in case files change
-  cd "$pkgdir/usr"
-  rm -r bin
-  rm -r share/applications
-
-  cd "$pkgdir/usr/lib/$pkgbase"
-
-  # gtk-related
-  #rm gtkmoz-browser-child
-  rm ../lib*gtk*
-  rm modules/gtk*.so
-
-  # qt-related
-  rm ../lib*qt*
-  rm modules/qt*.so
-}
-
-package_google-gadgets-gtk() {
-  pkgdesc="Desktop widgets from Google (full GTK+ front-end)"
-  groups=('google-gadgets')
-  install=$pkgbase.install
-  depends=('google-gadgets-common'
-           'desktop-file-utils' 'xdg-utils'
-           'gstreamer0.10-base-plugins' 'libwebkit' 'libsoup-gnome'
-           'librsvg' 'curl')
-  optdepends=('networkmanager: desktop integration')
-
-  # install the gtk binary
-  cd "$_basedir"
-  install -Dm755 "usr/bin/ggl-gtk" "$pkgdir/usr/bin/ggl-gtk"
-
-  # gtk-only browser stuff
-  #install -Dm755 usr/lib/$pkgbase/gtkmoz-browser-child \
-  #  "$pkgdir/usr/lib/$pkgbase/gtkmoz-browser-child"
-
-  # now the gtk libraries
-  mkdir -p "$pkgdir/usr/lib/$pkgbase/modules"
-
-  install -m755 usr/lib/$pkgbase/modules/gtk*.so \
-    "$pkgdir/usr/lib/$pkgbase/modules/"
-
-  install -m755 usr/lib/lib*gtk* "$pkgdir/usr/lib"
-
-  # fix permissions and symlinks
-  find "$pkgdir/usr/lib" -name *.a -exec chmod 644 {} \;
-
-  ln -sf /usr/lib/libggadget-gtk-$_sover.so.$_sobump \
-    "$pkgdir/usr/lib/libggadget-gtk-$_sover.so"
-
-  ln -sf /usr/lib/libggadget-gtk-$_sover.so.$_sobump \
-    "$pkgdir/usr/lib/libggadget-gtk-$_sover.so.0"
-
-  # freedesktop.org for gtk
-  install -Dm644 usr/share/applications/ggl-gtk.desktop \
-    "$pkgdir/usr/share/applications/ggl-gtk.desktop"
-
-  install -m644 usr/share/applications/ggl-designer.desktop \
-    "$pkgdir/usr/share/applications/"
-}
-
-package_google-gadgets-qt() {
-  pkgdesc="Desktop widgets from Google (partial Qt front-end)"
-  groups=('google-gadgets')
-  install=$pkgbase.install
-  depends=('google-gadgets-common' 'qtwebkit'
-           'desktop-file-utils' 'xdg-utils'
-           'gstreamer0.10-base-plugins' 'libwebkit')
-  optdepends=('networkmanager: desktop integration')
-
-  # install the qt binary
-  cd "$_basedir"
-  install -Dm755 usr/bin/ggl-qt "$pkgdir/usr/bin/ggl-qt"
-
-  # the qt libraries
-  mkdir -p "$pkgdir/usr/lib/$pkgbase/modules"
-
-  install -m755 usr/lib/$pkgbase/modules/qt*.so \
-    "$pkgdir/usr/lib/$pkgbase/modules/"
-
-  install -m755 usr/lib/lib*qt* "$pkgdir/usr/lib/"
-
-  # fix permissions and symlinks
-  find "$pkgdir/usr/lib" -name *.a -exec chmod 644 {} \;
-
-  ln -sf /usr/lib/libggadget-qt-$_sover.so.$_sobump \
-    "$pkgdir/usr/lib/libggadget-qt-$_sover.so"
-
-  ln -sf /usr/lib/libggadget-qt-$_sover.so.$_sobump \
-    "$pkgdir/usr/lib/libggadget-qt-$_sover.so.0"
-
-  # freedesktop.org for qt
-  install -Dm644 usr/share/applications/ggl-qt.desktop \
-    "$pkgdir/usr/share/applications/ggl-qt.desktop"
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/community/google-gadgets/gcc47.patch b/community/google-gadgets/gcc47.patch
deleted file mode 100644
index 2e77e10fd..000000000
--- a/community/google-gadgets/gcc47.patch
+++ /dev/null
@@ -1,325 +0,0 @@
-Author: Pino Toscano <pino@debian.org>
-Description: Fix building with GCC 4.7
- This patch fixes the two kinds of issues that arise with GCC 4.7:
- - include <unistd.h> for functions like access(), fork(), readlink(), etc
- - fix argument-dependent lookup issues by qualifying the lookup of functions
-Forwarded: no
-Last-Update: 2012-04-04
-
---- a/ggadget/scriptable_enumerator.h
-+++ b/ggadget/scriptable_enumerator.h
-@@ -68,22 +68,22 @@
- 
-  protected:
-   virtual void DoClassRegister() {
--    RegisterMethod("atEnd",
-+    this->RegisterMethod("atEnd",
-                    NewSlot(&E::AtEnd,
-                            &ScriptableEnumerator<E, Wrapper, Param, ClassId>
-                                ::enumerator_));
--    RegisterMethod("moveFirst",
-+    this->RegisterMethod("moveFirst",
-                    NewSlot(&E::MoveFirst,
-                            &ScriptableEnumerator<E, Wrapper, Param, ClassId>
-                                ::enumerator_));
--    RegisterMethod("moveNext",
-+    this->RegisterMethod("moveNext",
-                    NewSlot(&E::MoveNext,
-                            &ScriptableEnumerator<E, Wrapper, Param, ClassId>
-                                ::enumerator_));
--    RegisterMethod("item",
-+    this->RegisterMethod("item",
-                    NewSlot(&ScriptableEnumerator<E, Wrapper, Param, ClassId>
-                                ::GetItem));
--    RegisterProperty("count",
-+    this->RegisterProperty("count",
-                      NewSlot(&E::GetCount,
-                              &ScriptableEnumerator<E, Wrapper, Param, ClassId>
-                                  ::enumerator_),
---- a/ggadget/uuid.cc
-+++ b/ggadget/uuid.cc
-@@ -24,6 +24,7 @@
- #include <cstdlib>
- #include <cstring>
- #include <ctime>
-+#include <unistd.h>
- 
- #include "string_utils.h"
- 
---- a/ggadget/xml_dom.cc
-+++ b/ggadget/xml_dom.cc
-@@ -1327,15 +1327,15 @@
- 
-   virtual void DoClassRegister() {
-     Super::DoClassRegister();
--    RegisterProperty("data", NewSlot(&DOMCharacterData::GetData),
-+    this->RegisterProperty("data", NewSlot(&DOMCharacterData::GetData),
-                      NewSlot(&DOMCharacterData::SetData));
--    RegisterProperty("length", NewSlot(&DOMCharacterData::GetLength), NULL);
--    RegisterMethod("substringData",
-+    this->RegisterProperty("length", NewSlot(&DOMCharacterData::GetLength), NULL);
-+    this->RegisterMethod("substringData",
-                    NewSlot(&DOMCharacterData::ScriptSubstringData));
--    RegisterMethod("appendData", NewSlot(&DOMCharacterData::AppendData));
--    RegisterMethod("insertData", NewSlot(&DOMCharacterData::ScriptInsertData));
--    RegisterMethod("deleteData", NewSlot(&DOMCharacterData::ScriptDeleteData));
--    RegisterMethod("replaceData",
-+    this->RegisterMethod("appendData", NewSlot(&DOMCharacterData::AppendData));
-+    this->RegisterMethod("insertData", NewSlot(&DOMCharacterData::ScriptInsertData));
-+    this->RegisterMethod("deleteData", NewSlot(&DOMCharacterData::ScriptDeleteData));
-+    this->RegisterMethod("replaceData",
-                    NewSlot(&DOMCharacterData::ScriptReplaceData));
-   }
- 
-@@ -1377,20 +1377,20 @@
-  private:
-   UTF16String ScriptSubstringData(size_t offset, size_t count) {
-     UTF16String result;
--    CheckException(SubstringData(offset, count, &result));
-+    this->CheckException(SubstringData(offset, count, &result));
-     return result;
-   }
- 
-   void ScriptInsertData(size_t offset, const UTF16String &arg) {
--    CheckException(InsertData(offset, arg));
-+    this->CheckException(InsertData(offset, arg));
-   }
- 
-   void ScriptDeleteData(size_t offset, size_t count) {
--    CheckException(DeleteData(offset, count));
-+    this->CheckException(DeleteData(offset, count));
-   }
- 
-   void ScriptReplaceData(size_t offset, size_t count, const UTF16String &arg) {
--    CheckException(ReplaceData(offset, count, arg));
-+    this->CheckException(ReplaceData(offset, count, arg));
-   }
- 
-   DOMCharacterDataImpl impl_;
-@@ -1417,10 +1417,10 @@
- 
-   virtual void DoClassRegister() {
-     Super::DoClassRegister();
--    RegisterProperty("name", NewSlot(&DOMAttr::GetName), NULL);
-+    this->RegisterProperty("name", NewSlot(&DOMAttr::GetName), NULL);
-     // Our DOMAttrs are always specified, because we don't support DTD for now.
--    RegisterConstant("specified", true);
--    RegisterProperty("value", NewSlot(&DOMAttr::GetValue),
-+    this->RegisterConstant("specified", true);
-+    this->RegisterProperty("value", NewSlot(&DOMAttr::GetValue),
-                      NewSlot(&DOMAttr::SetValue));
-     // ownerElement is a DOM2 property, so not registered for now.
-   }
-@@ -1516,19 +1516,19 @@
- 
-   virtual void DoClassRegister() {
-     Super::DoClassRegister();
--    RegisterProperty("tagName", NewSlot(&DOMElement::GetTagName), NULL);
--    RegisterMethod("getAttribute", NewSlot(&DOMElement::GetAttribute));
--    RegisterMethod("setAttribute",
-+    this->RegisterProperty("tagName", NewSlot(&DOMElement::GetTagName), NULL);
-+    this->RegisterMethod("getAttribute", NewSlot(&DOMElement::GetAttribute));
-+    this->RegisterMethod("setAttribute",
-                    NewSlot(&DOMElement::ScriptSetAttribute));
--    RegisterMethod("removeAttribute",
-+    this->RegisterMethod("removeAttribute",
-                    NewSlot(&DOMElement::RemoveAttribute));
--    RegisterMethod("getAttributeNode",
-+    this->RegisterMethod("getAttributeNode",
-                    NewSlot(&DOMElement::GetAttributeNodeNotConst));
--    RegisterMethod("setAttributeNode",
-+    this->RegisterMethod("setAttributeNode",
-                    NewSlot(&DOMElement::ScriptSetAttributeNode));
--    RegisterMethod("removeAttributeNode",
-+    this->RegisterMethod("removeAttributeNode",
-                    NewSlot(&DOMElement::ScriptRemoveAttributeNode));
--    RegisterMethod("getElementsByTagName",
-+    this->RegisterMethod("getElementsByTagName",
-                    NewSlot(&Super::GetElementsByTagNameNotConst));
-   }
- 
-@@ -1696,16 +1696,16 @@
-     }
- 
-     virtual void DoClassRegister() {
--      RegisterProperty("length", NewSlot(&AttrsNamedMap::GetLength), NULL);
--      RegisterMethod("getNamedItem",
-+      this->RegisterProperty("length", NewSlot(&AttrsNamedMap::GetLength), NULL);
-+      this->RegisterMethod("getNamedItem",
-                      NewSlot(&AttrsNamedMap::GetNamedItemNotConst));
--      RegisterMethod("setNamedItem",
-+      this->RegisterMethod("setNamedItem",
-                      NewSlot(&AttrsNamedMap::ScriptSetNamedItem));
--      RegisterMethod("removeNamedItem",
-+      this->RegisterMethod("removeNamedItem",
-                      NewSlot(&AttrsNamedMap::ScriptRemoveNamedItem));
--      RegisterMethod("item", NewSlot(&AttrsNamedMap::GetItemNotConst));
-+      this->RegisterMethod("item", NewSlot(&AttrsNamedMap::GetItemNotConst));
-       // Microsoft compatibility.
--      RegisterMethod("", NewSlot(&AttrsNamedMap::GetItemNotConst));
-+      this->RegisterMethod("", NewSlot(&AttrsNamedMap::GetItemNotConst));
-     }
- 
-     virtual DOMNodeInterface *GetNamedItem(const std::string &name) {
-@@ -1875,7 +1875,7 @@
- 
-   virtual void DoClassRegister() {
-     Super::DoClassRegister();
--    RegisterMethod("splitText", NewSlot(&DOMText::ScriptSplitText));
-+    this->RegisterMethod("splitText", NewSlot(&DOMText::ScriptSplitText));
-   }
- 
-   virtual NodeType GetNodeType() const { return TEXT_NODE; }
-@@ -2060,9 +2060,9 @@
- 
-   virtual void DoClassRegister() {
-     Super::DoClassRegister();
--    RegisterProperty("target",
-+    this->RegisterProperty("target",
-                      NewSlot(&DOMProcessingInstruction::GetTarget), NULL);
--    RegisterProperty("data", NewSlot(&DOMProcessingInstruction::GetData),
-+    this->RegisterProperty("data", NewSlot(&DOMProcessingInstruction::GetData),
-                      NewSlot(&DOMProcessingInstruction::SetData));
-   }
- 
-@@ -2109,7 +2109,7 @@
-   DEFINE_CLASS_ID(0xd23149a89cf24e12, DOMImplementationInterface);
- 
-   virtual void DoClassRegister() {
--    RegisterMethod("hasFeature", NewSlot(&DOMImplementation::HasFeature));
-+    this->RegisterMethod("hasFeature", NewSlot(&DOMImplementation::HasFeature));
-   }
- 
-   virtual bool HasFeature(const char *feature, const char *version) const {
-@@ -2129,13 +2129,13 @@
-   void SetCode(int code) { code_ = code; }
- 
-   virtual void DoClassRegister() {
--    RegisterProperty("errorCode", NewSlot(&ParseError::GetCode), NULL);
--    RegisterConstant("filepos", 0);
--    RegisterConstant("line", 0);
--    RegisterConstant("linepos", 0);
--    RegisterConstant("reason", "");
--    RegisterConstant("srcText", "");
--    RegisterConstant("url", "");
-+    this->RegisterProperty("errorCode", NewSlot(&ParseError::GetCode), NULL);
-+    this->RegisterConstant("filepos", 0);
-+    this->RegisterConstant("line", 0);
-+    this->RegisterConstant("linepos", 0);
-+    this->RegisterConstant("reason", "");
-+    this->RegisterConstant("srcText", "");
-+    this->RegisterConstant("url", "");
-   }
- 
-  private:
-@@ -2180,45 +2180,45 @@
- 
-   virtual void DoClassRegister() {
-     Super::DoClassRegister();
--    RegisterConstant("doctype", static_cast<ScriptableInterface *>(NULL));
--    RegisterConstant("implementation", &dom_implementation_);
--    RegisterProperty("documentElement",
-+    this->RegisterConstant("doctype", static_cast<ScriptableInterface *>(NULL));
-+    this->RegisterConstant("implementation", &dom_implementation_);
-+    this->RegisterProperty("documentElement",
-                      NewSlot(&DOMDocument::GetDocumentElementNotConst), NULL);
--    RegisterMethod("loadXML", NewSlot(&DOMDocument::LoadXML));
--    RegisterMethod("createElement",
-+    this->RegisterMethod("loadXML", NewSlot(&DOMDocument::LoadXML));
-+    this->RegisterMethod("createElement",
-                    NewSlot(&DOMDocument::ScriptCreateElement));
--    RegisterMethod("createDocumentFragment",
-+    this->RegisterMethod("createDocumentFragment",
-                    NewSlot(&DOMDocument::CreateDocumentFragment));
--    RegisterMethod("createTextNode",
-+    this->RegisterMethod("createTextNode",
-                    NewSlot(&DOMDocument::CreateTextNode));
--    RegisterMethod("createComment", NewSlot(&DOMDocument::CreateComment));
--    RegisterMethod("createCDATASection",
-+    this->RegisterMethod("createComment", NewSlot(&DOMDocument::CreateComment));
-+    this->RegisterMethod("createCDATASection",
-                    NewSlot(&DOMDocument::CreateCDATASection));
--    RegisterMethod("createProcessingInstruction",
-+    this->RegisterMethod("createProcessingInstruction",
-                    NewSlot(&DOMDocument::ScriptCreateProcessingInstruction));
--    RegisterMethod("createAttribute",
-+    this->RegisterMethod("createAttribute",
-                    NewSlot(&DOMDocument::ScriptCreateAttribute));
--    RegisterMethod("createEntityReference",
-+    this->RegisterMethod("createEntityReference",
-                    NewSlot(&DOMDocument::ScriptCreateEntityReference));
--    RegisterMethod("getElementsByTagName",
-+    this->RegisterMethod("getElementsByTagName",
-                    NewSlot(&Super::GetElementsByTagNameNotConst));
--    RegisterMethod("importNode", NewSlot(&DOMDocument::ScriptImportNode));
-+    this->RegisterMethod("importNode", NewSlot(&DOMDocument::ScriptImportNode));
-     // Compatibility with Microsoft DOM.
--    RegisterProperty("parsed", NewFixedGetterSlot(true), NULL);
--    RegisterProperty("parseError", NewSlot(&DOMDocument::GetParseError), NULL);
--    RegisterProperty("resolveExternals", NULL, NewSlot(&DummySetter));
--    RegisterProperty("validateOnParse", NULL, NewSlot(&DummySetter));
--    RegisterProperty("preserveWhiteSpace",
-+    this->RegisterProperty("parsed", NewFixedGetterSlot(true), NULL);
-+    this->RegisterProperty("parseError", NewSlot(&DOMDocument::GetParseError), NULL);
-+    this->RegisterProperty("resolveExternals", NULL, NewSlot(&DummySetter));
-+    this->RegisterProperty("validateOnParse", NULL, NewSlot(&DummySetter));
-+    this->RegisterProperty("preserveWhiteSpace",
-                      NewSlot(&DOMDocument::PreservesWhiteSpace),
-                      NewSlot(&DOMDocument::SetPreserveWhiteSpace));
--    RegisterMethod("getProperty", NewSlot(DummyGetProperty));
--    RegisterMethod("setProperty", NewSlot(DummySetProperty));
-+    this->RegisterMethod("getProperty", NewSlot(DummyGetProperty));
-+    this->RegisterMethod("setProperty", NewSlot(DummySetProperty));
-     // Compatibility with Microsoft DOM: XMLHttpRequest functions.
--    RegisterProperty("async", NewSlot(&DOMDocument::IsAsync),
-+    this->RegisterProperty("async", NewSlot(&DOMDocument::IsAsync),
-                      NewSlot(&DOMDocument::SetAsync));
--    RegisterProperty("readyState", NewSlot(&DOMDocument::GetReadyState), NULL);
--    RegisterMethod("load", NewSlot(&DOMDocument::Load));
--    RegisterClassSignal("onreadystatechange",
-+    this->RegisterProperty("readyState", NewSlot(&DOMDocument::GetReadyState), NULL);
-+    this->RegisterMethod("load", NewSlot(&DOMDocument::Load));
-+    this->RegisterClassSignal("onreadystatechange",
-                         &DOMDocument::onreadystatechange_signal_);
-   }
- 
---- a/ggadget/xdg/icon_theme.cc
-+++ b/ggadget/xdg/icon_theme.cc
-@@ -16,6 +16,7 @@
- #include <sys/time.h>
- #include <time.h>
- #include <cstdlib>
-+#include <unistd.h>
- 
- #include <map>
- #include <vector>
---- a/extensions/qt_system_framework/qt_system_framework.cc
-+++ b/extensions/qt_system_framework/qt_system_framework.cc
-@@ -32,6 +32,7 @@
- #include <ggadget/xdg/desktop_entry.h>
- #include <ggadget/xdg/icon_theme.h>
- #include <ggadget/xdg/utilities.h>
-+#include <unistd.h>
- 
- #define Initialize qt_system_framework_LTX_Initialize
- #define Finalize qt_system_framework_LTX_Finalize
---- a/extensions/linux_system_framework/process.cc
-+++ b/extensions/linux_system_framework/process.cc
-@@ -17,6 +17,7 @@
- #include <sys/types.h>
- #include <dirent.h>
- #include <cstdlib>
-+#include <unistd.h>
- 
- #ifdef HAVE_X11
- #include <X11/Xlib.h>
---- a/gadgets/designer/designer_script_utils.cc
-+++ b/gadgets/designer/designer_script_utils.cc
-@@ -39,6 +39,7 @@
- #include <ggadget/system_utils.h>
- #include <ggadget/uuid.h>
- #include <ggadget/view_interface.h>
-+#include <unistd.h>
- 
- namespace ggadget {
- namespace designer {
diff --git a/community/google-gadgets/glibc231.patch b/community/google-gadgets/glibc231.patch
deleted file mode 100644
index 61de05162..000000000
--- a/community/google-gadgets/glibc231.patch
+++ /dev/null
@@ -1,25 +0,0 @@
---- ggadget/gtk/main_loop.cc
-+++ ggadget/gtk/main_loop.cc
-@@ -16,9 +16,8 @@
- 
- #include <fcntl.h>
- #include <stdint.h>
--#include <glib/ghash.h>
-+#include <glib.h>
- #include <gtk/gtk.h>
--#include <glib/gthread.h>
- #include <ggadget/common.h>
- #include "main_loop.h"
- #include "utilities.h"
---- hosts/gtk/main.cc
-+++ hosts/gtk/main.cc
-@@ -14,8 +14,8 @@
-   limitations under the License.
- */
- 
-+#include <glib.h>
- #include <gtk/gtk.h>
--#include <glib/gthread.h>
- #include <locale.h>
- #include <signal.h>
- #include <unistd.h>
diff --git a/community/google-gadgets/google-gadgets-common.install b/community/google-gadgets/google-gadgets-common.install
deleted file mode 100644
index 210cbc869..000000000
--- a/community/google-gadgets/google-gadgets-common.install
+++ /dev/null
@@ -1,15 +0,0 @@
-post_install() {
-  echo "==> Updating desktop database..."
-  gtk-update-icon-cache --quiet usr/share/icons/hicolor
-  update-mime-database usr/share/mime &> /dev/null
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  post_install
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/community/google-gadgets/google-gadgets.changelog b/community/google-gadgets/google-gadgets.changelog
deleted file mode 100644
index 5b8f85a71..000000000
--- a/community/google-gadgets/google-gadgets.changelog
+++ /dev/null
@@ -1,8 +0,0 @@
-25 Mar 2011 (GMT+8) Ray Rashif <schiv@archlinux.org>
-
-	* 0.11.2-3:
-	xulrunner rebuild
-		- undepend on xulrunner (2.0 incompatible)
-		- disable smjs-script/browser-element
-	Cleaned up scriptlets (too many blank lines)
-	Added this changelog
diff --git a/community/google-gadgets/wifi-types.patch b/community/google-gadgets/wifi-types.patch
deleted file mode 100644
index be9383a61..000000000
--- a/community/google-gadgets/wifi-types.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-diff -wbBur google-gadgets-for-linux-0.11.2/extensions/linux_system_framework/network.cc google-gadgets-for-linux-0.11.2.my/extensions/linux_system_framework/network.cc
---- google-gadgets-for-linux-0.11.2/extensions/linux_system_framework/network.cc	2009-03-15 04:12:42.000000000 +0000
-+++ google-gadgets-for-linux-0.11.2.my/extensions/linux_system_framework/network.cc	2011-04-08 20:57:16.000000000 +0000
-@@ -23,17 +23,9 @@
- namespace framework {
- namespace linux_system {
- 
--#ifdef NM_DEVICE_TYPE_WIFI
- static const int kDeviceTypeWifi = NM_DEVICE_TYPE_WIFI;
--#else
--static const int kDeviceTypeWifi = DEVICE_TYPE_802_11_WIRELESS;
--#endif
- 
--#ifdef NM_DEVICE_TYPE_ETHERNET
- static const int kDeviceTypeEthernet = NM_DEVICE_TYPE_ETHERNET;
--#else
--static const int kDeviceTypeEthernet = DEVICE_TYPE_802_3_ETHERNET;
--#endif
- 
- static const int kDeviceTypeUnknown = 0;
- 
-diff -wbBur google-gadgets-for-linux-0.11.2/extensions/linux_system_framework/wireless.cc google-gadgets-for-linux-0.11.2.my/extensions/linux_system_framework/wireless.cc
---- google-gadgets-for-linux-0.11.2/extensions/linux_system_framework/wireless.cc	2009-12-28 10:39:53.000000000 +0000
-+++ google-gadgets-for-linux-0.11.2.my/extensions/linux_system_framework/wireless.cc	2011-04-08 20:57:39.000000000 +0000
-@@ -77,11 +77,7 @@
- 
- using namespace ggadget::dbus;
- 
--#ifdef NM_DEVICE_TYPE_WIFI
- static const int kDeviceTypeWifi = NM_DEVICE_TYPE_WIFI;
--#else
--static const int kDeviceTypeWifi = DEVICE_TYPE_802_11_WIRELESS;
--#endif
- 
- // Defined in nm 0.7
- static const int kDeviceStateActivated = 8;
diff --git a/community/google-glog/PKGBUILD b/community/google-glog/PKGBUILD
index 29852c517..5822ca07c 100644
--- a/community/google-glog/PKGBUILD
+++ b/community/google-glog/PKGBUILD
@@ -1,17 +1,16 @@
-# $Id: PKGBUILD 83436 2013-02-01 07:03:30Z fyan $
+# $Id: PKGBUILD 99785 2013-10-30 23:42:17Z allan $
 # Maintainer: Felix Yan <felixonmars@gmail.com>
 # Contributor: Ian Yang <doit.ian@gmail.com>
 
 pkgname=google-glog
 pkgver=0.3.3
-pkgrel=1
+pkgrel=2
 pkgdesc="Logging library for C++"
 arch=('i686' 'x86_64' 'mips64el')
 license=('custom:BSD3')
 url="http://code.google.com/p/google-glog/"
 depends=('gcc-libs')
 makedepends=('make' 'gcc')
-options=('!libtool')
 source=("http://google-glog.googlecode.com/files/glog-${pkgver}.tar.gz")
 
 build() {
diff --git a/community/gpac/PKGBUILD b/community/gpac/PKGBUILD
index f5ad6cbbb..2b5b0c2bb 100644
--- a/community/gpac/PKGBUILD
+++ b/community/gpac/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 94884 2013-08-01 06:54:59Z bpiotrowski $
+# $Id: PKGBUILD 99218 2013-10-25 20:55:07Z eric $
 # Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgname=gpac
@@ -12,7 +12,7 @@ depends=('ffmpeg' 'libjpeg' 'libpng' 'glu' 'libxv')
 makedepends=('jack' 'a52dec' 'freetype2' 'faad2' 'libmad' 'mesa')
 optdepends=('jack: for jack support' 'a52dec: for A52 support'
             'faad2: for AAC support' 'libmad: for mp3 support')
-options=('!makeflags')
+options=('staticlibs' '!makeflags')
 source=(ftp://ftp.archlinux.org/other/community/${pkgname}/${pkgname}-${pkgver}.tar.xz{,.sig} gpac-ffmpeg.patch)
 sha1sums=('6ba29de672b6e4260e510e0e16d5bc0ab09cabb6'
           'SKIP'
diff --git a/community/gpicview/PKGBUILD b/community/gpicview/PKGBUILD
index 7abcc842a..79e692e2b 100644
--- a/community/gpicview/PKGBUILD
+++ b/community/gpicview/PKGBUILD
@@ -1,32 +1,27 @@
-# $Id: PKGBUILD 96672 2013-09-02 21:26:05Z bgyorgy $ 
+# $Id: PKGBUILD 99073 2013-10-24 08:15:59Z bpiotrowski $ 
 # Maintainer:  Bartłomiej Piotrowski <nospam@bpiotrowski.pl>
 # Contributor: Angel Velasquez <angvp@archlinux.org> 
 # Contributor: Geoffroy Carrier <geoffroy.carrier@koon.fr>
 
 pkgname=gpicview
-pkgver=0.2.3
-pkgrel=2
-pkgdesc="lightweight image viewer"
+pkgver=0.2.4
+pkgrel=1
+pkgdesc='Lightweight image viewer'
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL2')
-url="http://lxde.org/"
+url='http://lxde.org/'
 groups=('lxde')
-depends=('gtk2' 'desktop-file-utils')
+depends=('gtk2' 'desktop-file-utils' 'xdg-utils')
 install=$pkgname.install
 makedepends=('pkgconfig' 'intltool')
 optdepends=('librsvg: For SVG support')
-source=(http://downloads.sourceforge.net/sourceforge/lxde/${pkgname}-${pkgver}.tar.gz
-        fix-scrolling.patch)
-md5sums=('bca9ffe1d283ed3dbb13bada7feb7e89'
-         'f258a3e703c4daa2f79c0c9f5a625d86')
+source=(http://downloads.sourceforge.net/sourceforge/lxde/$pkgname-$pkgver.tar.gz)
+md5sums=('b209e36531f89c48e3067b389699d4c7')
 
 prepare() {
-	cd "$srcdir/$pkgname-$pkgver"
-
-	# Fix scrolling (FS#34872)
-	patch -Np1 -i "$srcdir/fix-scrolling.patch"
+	cd $pkgname-$pkgver
 
-	# Apply one main category only (FS#34684)
+	# Apply only one main category (FS#34684)
 	sed -i '/^Categories=/ s/Utility;//' gpicview.desktop.in
 }
 
@@ -38,6 +33,6 @@ build() {
 }
 
 package() {
-	cd "$srcdir/$pkgname-$pkgver"
+	cd $pkgname-$pkgver
 	make DESTDIR="$pkgdir" install
 }
diff --git a/community/gpicview/fix-scrolling.patch b/community/gpicview/fix-scrolling.patch
deleted file mode 100644
index 9323055ad..000000000
--- a/community/gpicview/fix-scrolling.patch
+++ /dev/null
@@ -1,149 +0,0 @@
-From 88e76ee77d7271820dfad4b66ea1ca892e1a1ae0 Mon Sep 17 00:00:00 2001
-From: Vadim Ushakov <igeekless@gmail.com>
-Date: Fri, 3 Aug 2012 22:43:29 +0800
-Subject: [PATCH] fix scrolling when scale == 1
-
----
- src/image-view.c |   98 ++++++++----------------------------------------------
- 1 files changed, 14 insertions(+), 84 deletions(-)
-
-diff --git a/src/image-view.c b/src/image-view.c
-index cd40e3a..b367f2a 100644
---- a/src/image-view.c
-+++ b/src/image-view.c
-@@ -309,65 +309,6 @@ void image_view_paint( ImageView* iv, GdkEventExpose* evt )
-         {
-             // GdkRectangle& rect = rects[i];
-             paint( iv, rects + i, GDK_INTERP_NEAREST );
--#if 0
--            g_debug("dirty dest: x=%d, y=%d, w=%d, h=%d\nx_off=%d, y_off=%d",
--                    rect.x, rect.y, rect.width, rect.height, iv->img_area.x, iv->img_area.y );
--
--            if( ! gdk_rectangle_intersect( &rect, &iv->img_area, &rect ) )
--                continue;
--
--            int dest_x = rect.x;
--            int dest_y = rect.y;
--
--            rect.x -= img_area.x;
--            rect.y -= img_area.y;
--
--            GdkPixbuf* src_pix = NULL;
--            int src_x, src_y;
--            if( iv->scale == 1.0 )  // original size
--            {
--                src_pix = (GdkPixbuf*)g_object_ref( pix );
--                src_x = rect.x;
--                src_y = rect.y;
--            }
--            else    // scaling is needed
--            {
--                GdkPixbuf* scaled_pix = NULL;
--                int src_w, src_h;
--                src_x = (int)floor( gdouble(rect.x) / scale + 0.5 );
--                src_y = (int)floor( gdouble(rect.y) / scale + 0.5 );
--                src_w = (int)floor( gdouble(rect.width) / scale + 0.5 );
--                src_h = (int)floor( gdouble(rect.height) / scale + 0.5 );
--                if( src_y > gdk_pixbuf_get_height(pix) )
--                    src_y = gdk_pixbuf_get_height(pix);
--                if( src_x + src_w > gdk_pixbuf_get_width(pix) )
--                    src_w = gdk_pixbuf_get_width(pix) - src_x;
--                if( src_y + src_h > gdk_pixbuf_get_height(pix) )
--                    src_h = gdk_pixbuf_get_height(pix) - src_y;
--                g_debug("orig src: x=%d, y=%d, w=%d, h=%d",
--                        src_x, src_y, src_w, src_h );
--
--                src_pix = gdk_pixbuf_new_subpixbuf( pix, src_x, src_y,  src_w, src_h );
--                scaled_pix = gdk_pixbuf_scale_simple( src_pix, rect.width, rect.height, interp_type );
--                g_object_unref( src_pix );
--                src_pix = scaled_pix;
--
--                src_x = 0;
--                src_y = 0;
--            }
--
--            if( G_LIKELY(src_pix) )
--            {
--                gdk_draw_pixbuf( widget->window,
--                                widget->style->fg_gc[GTK_STATE_NORMAL],
--                                src_pix,
--                                src_x, src_y,
--                                dest_x, dest_y,
--                                rect.width, rect.height,
--                                GDK_RGB_DITHER_NORMAL, 0, 0 );
--                g_object_unref( src_pix );
--            }
--#endif
-         }
-         g_free( rects );
- 
-@@ -525,28 +466,29 @@ void paint( ImageView* iv, GdkRectangle* invalid_rect, GdkInterpType type )
-     if( ! gdk_rectangle_intersect( invalid_rect, &iv->img_area, &rect ) )
-         return;
- 
--    int dest_x = rect.x;
--    int dest_y = rect.y;
--
--    rect.x -= iv->img_area.x;
--    rect.y -= iv->img_area.y;
-+    int dest_x;
-+    int dest_y;
- 
-     GdkPixbuf* src_pix = NULL;
--    int src_x, src_y;
-     if( iv->scale == 1.0 )  // original size
-     {
-         src_pix = (GdkPixbuf*)g_object_ref( iv->pix );
--        src_x = rect.x;
--        src_y = rect.y;
-+        dest_x = iv->img_area.x;
-+        dest_y = iv->img_area.y;
-     }
-     else    // scaling is needed
-     {
-+        dest_x = rect.x;
-+        dest_y = rect.y;
-+
-+        rect.x -= iv->img_area.x;
-+        rect.y -= iv->img_area.y;
-+
-         GdkPixbuf* scaled_pix = NULL;
--        int src_w, src_h;
--        src_x = (int)floor( ((gdouble)rect.x) / iv->scale + 0.5 );
--        src_y = (int)floor( ((gdouble)rect.y) / iv->scale + 0.5 );
--        src_w = (int)floor( ((gdouble)rect.width) / iv->scale + 0.5 );
--        src_h = (int)floor( ((gdouble)rect.height) / iv->scale + 0.5 );
-+        int src_x = (int)floor( ((gdouble)rect.x) / iv->scale + 0.5 );
-+        int src_y = (int)floor( ((gdouble)rect.y) / iv->scale + 0.5 );
-+        int src_w = (int)floor( ((gdouble)rect.width) / iv->scale + 0.5 );
-+        int src_h = (int)floor( ((gdouble)rect.height) / iv->scale + 0.5 );
-         if( src_y > gdk_pixbuf_get_height( iv->pix ) )
-             src_y = gdk_pixbuf_get_height( iv->pix );
-         if( src_x + src_w > gdk_pixbuf_get_width( iv->pix ) )
-@@ -564,23 +506,11 @@ void paint( ImageView* iv, GdkRectangle* invalid_rect, GdkInterpType type )
-             src_pix = scaled_pix;
-         }
- 
--        src_x = 0;
--        src_y = 0;
-     }
- 
-     if( G_LIKELY(src_pix) )
-     {
-         GtkWidget* widget = (GtkWidget*)iv;
--/*
--        gdk_draw_pixbuf( widget->window,
--                         widget->style->fg_gc[GTK_STATE_NORMAL],
--                         src_pix,
--                         src_x, src_y,
--                         dest_x, dest_y,
--                         rect.width, rect.height,
--                         GDK_RGB_DITHER_NORMAL, 0, 0 );
--*/
--        // New function with cairo
-         cairo_t *cr = gdk_cairo_create (gtk_widget_get_window(widget));
-         gdk_cairo_set_source_pixbuf (cr, src_pix, dest_x, dest_y);
-         cairo_paint (cr);
--- 
-1.7.4.1
-
diff --git a/community/gpicview/gpicview.install b/community/gpicview/gpicview.install
index bc3abcd40..ec506fa93 100644
--- a/community/gpicview/gpicview.install
+++ b/community/gpicview/gpicview.install
@@ -1,11 +1,12 @@
 post_install() {
-        update-desktop-database -q
+  update-desktop-database -q
+  xdg-icon-resource forceupdate --theme hicolor &> /dev/null
 }
 
 post_upgrade() {
-        post_install
+  post_install
 }
 
 post_remove() {
-        post_install
+  post_install
 }
diff --git a/community/gpointing-device-settings/PKGBUILD b/community/gpointing-device-settings/PKGBUILD
index 7d7f27fdd..075e53f0f 100644
--- a/community/gpointing-device-settings/PKGBUILD
+++ b/community/gpointing-device-settings/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 89372 2013-04-29 00:10:30Z bgyorgy $
+# $Id: PKGBUILD 99786 2013-10-30 23:42:41Z allan $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Thomas Mudrunka <harvie@@email..cz>
 
@@ -11,7 +11,6 @@ license=('GPL')
 url="http://live.gnome.org/GPointingDeviceSettings"
 depends=('gtk2' 'gconf')
 makedepends=('gnome-settings-daemon' 'intltool')
-options=('!libtool')
 source=("http://keihanna.dl.sourceforge.jp/gsynaptics/45812/${pkgname}-${pkgver}.tar.gz")
 md5sums=('1d1491473df8eabca3c15c997a975d7f')
 
diff --git a/community/gpsim/PKGBUILD b/community/gpsim/PKGBUILD
index 7fe5e9e12..9c884a477 100644
--- a/community/gpsim/PKGBUILD
+++ b/community/gpsim/PKGBUILD
@@ -1,17 +1,16 @@
-# $Id: PKGBUILD 98438 2013-10-10 13:31:09Z spupykin $
+# $Id: PKGBUILD 100166 2013-11-01 20:47:35Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: mickael9 <mickael9 at gmail dot com>
 
 pkgname=gpsim
 pkgver=0.27.0
-pkgrel=1
+pkgrel=2
 pkgdesc="A full-featured software simulator for Microchip PIC microcontrollers"
 arch=(i686 x86_64 'mips64el')
 url="http://gpsim.sourceforge.net/"
 license=(GPL)
 depends=('gtk2+extra' 'popt')
 makedepends=('gtk2+extra' 'gputils')
-options=('!libtool')
 source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz)
 md5sums=('b3ded17f1c8c6134f2381d6e6925b231')
 
diff --git a/community/grace/PKGBUILD b/community/grace/PKGBUILD
index d9c29ff80..141d2b9a0 100644
--- a/community/grace/PKGBUILD
+++ b/community/grace/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 90043 2013-05-06 19:37:42Z foutrelis $
+# $Id: PKGBUILD 100168 2013-11-01 20:47:57Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: damir <damir@archlinux.org>
 # Contributor: Damir Perisa <damir.perisa@bluewin.ch>
 
 pkgname=grace
 pkgver=5.1.23
-pkgrel=2
+pkgrel=3
 pkgdesc="2D plotting tool"
 arch=(i686 x86_64 'mips64el')
 url="http://plasma-gate.weizmann.ac.il/Grace/"
diff --git a/community/granite/PKGBUILD b/community/granite/PKGBUILD
new file mode 100644
index 000000000..45930bbfe
--- /dev/null
+++ b/community/granite/PKGBUILD
@@ -0,0 +1,36 @@
+# $Id: PKGBUILD 99110 2013-10-24 13:12:55Z alucryd $
+# Maintainer: Maxime Gauduin <alucryd at gmail dot com>
+# Contributor: Ner0 <darkelfdarkelf666 at yahoo dot co dot uk>
+
+pkgname=granite
+pkgver=0.2.2
+pkgrel=3
+pkgdesc="An extension of GTK+ libraries"
+arch=('i686' 'x86_64')
+url="https://launchpad.net/granite"
+license=('LGPL3')
+depends=('gtk3' 'libgee06')
+makedepends=('cmake' 'gobject-introspection' 'vala')
+install="${pkgname}.install"
+source=("https://launchpad.net/${pkgname}/${pkgver%\.?}/${pkgver}/+download/${pkgname}-${pkgver}.tar.gz")
+sha256sums=('341f94cd8c2af60fc072fb8602e1406bccd77189aad76424b172c3ce08c173cc')
+
+build() {
+  cd ${pkgname}-${pkgver}
+
+  if [[ -d build ]]; then
+    rm -rf build
+  fi
+  mkdir build && cd build
+
+  cmake .. -DCMAKE_INSTALL_PREFIX='/usr' -DCMAKE_BUILD_TYPE='Release'
+  make
+}
+
+package() {
+  cd ${pkgname}-${pkgver}/build
+
+  make DESTDIR="${pkgdir}" install
+}
+
+# vim: ts=2 sw=2 et:
diff --git a/community/granite/granite.install b/community/granite/granite.install
new file mode 100644
index 000000000..11027f6ea
--- /dev/null
+++ b/community/granite/granite.install
@@ -0,0 +1,13 @@
+post_install() {
+  gtk-update-icon-cache -ftq usr/share/icons/hicolor
+}
+
+post_upgrade() {
+  post_install
+}
+
+post_remove() {
+  post_install
+}
+
+# vim: ts=2 sw=2 et:
diff --git a/community/gsoap/PKGBUILD b/community/gsoap/PKGBUILD
index befbbb1be..4c067e51b 100644
--- a/community/gsoap/PKGBUILD
+++ b/community/gsoap/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 96756 2013-09-04 10:16:51Z spupykin $
+# $Id: PKGBUILD 100170 2013-11-01 20:48:34Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Tor Krill <tor@krill.nu>
 # Contributor: Lee.MaRS <leemars@gmail.com>
 
 pkgname=gsoap
 pkgver=2.8.16
-pkgrel=1
+pkgrel=2
 pkgdesc="Offers an XML language binding to ease the development of SOAP/XML Web services in C and C/C++"
 url="http://www.cs.fsu.edu/~engelen/soap.html"
 arch=('i686' 'x86_64' 'mips64el')
diff --git a/community/gsql/PKGBUILD b/community/gsql/PKGBUILD
index 92166ac5a..65667cc89 100644
--- a/community/gsql/PKGBUILD
+++ b/community/gsql/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 88439 2013-04-17 16:49:53Z bgyorgy $
+# $Id: PKGBUILD 99788 2013-10-30 23:43:21Z allan $
 # Contributor: Michael Kanis <mkanis@gmx.de>
 
 pkgname=gsql
@@ -16,7 +16,7 @@ optdepends=('libmariadbclient: MySQL engine'
             'postgresql-libs: PostgreSQL engine'
             'vte: Terminal session plugin')
 install=gsql.install
-options=(!libtool !emptydirs)
+options=(!emptydirs)
 source=(http://gsql.googlecode.com/files/${pkgname}-${pkgver}.tar.bz2)
 md5sums=('8f3322a75390584729e84a8570e08bea')
 
diff --git a/community/gst-editing-services/PKGBUILD b/community/gst-editing-services/PKGBUILD
index c7c38a563..350ff3fc9 100644
--- a/community/gst-editing-services/PKGBUILD
+++ b/community/gst-editing-services/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 98225 2013-10-07 15:51:20Z spupykin $
+# $Id: PKGBUILD 99789 2013-10-30 23:43:42Z allan $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: Lubosz Sarnecki <lubosz@gmail.com>
 # Contributor: Kerrick Staley <mail@kerrickstaley.com>
@@ -13,7 +13,6 @@ license=('LGPL')
 url='http://gstreamer.freedesktop.org/modules/gst-editing-services.html'
 depends=('gst-plugins-base')
 makedepends=('git' 'intltool' 'pkgconfig' 'gtk-doc' 'gobject-introspection')
-options=('!libtool')
 source=('git://anongit.freedesktop.org/gstreamer/gst-editing-services')
 sha256sums=('SKIP')
 
diff --git a/community/gst-python/PKGBUILD b/community/gst-python/PKGBUILD
index c18cf9d9e..8fc61d58d 100644
--- a/community/gst-python/PKGBUILD
+++ b/community/gst-python/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 98229 2013-10-07 15:57:05Z spupykin $
+# $Id: PKGBUILD 99790 2013-10-30 23:44:03Z allan $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
@@ -11,7 +11,6 @@ license=('LGPL')
 url="http://gstreamer.freedesktop.org/"
 depends=('python2-gobject' 'gst-plugins-base')
 makedepends=('pkgconfig')
-options=('!libtool')
 source=(http://gstreamer.freedesktop.org/src/gst-python/gst-python-${pkgver}.tar.bz2)
 md5sums=('16d85442b98fab61bab66a53eb571d6a')
 
diff --git a/community/gstreamermm/PKGBUILD b/community/gstreamermm/PKGBUILD
index 050059c9f..f6af444cc 100644
--- a/community/gstreamermm/PKGBUILD
+++ b/community/gstreamermm/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 81906 2013-01-03 11:48:18Z jelle $
+# $Id: PKGBUILD 99791 2013-10-30 23:44:23Z allan $
 # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
 
 pkgname=gstreamermm
@@ -10,7 +10,6 @@ url="http://gstreamer.freedesktop.org/bindings/cplusplus.html"
 license=('LGPL')
 depends=('glibmm' 'gstreamer0.10-base>=0.10.25' 'libsigc++2.0' 'libxml++')
 makedepends=('doxygen' 'pkgconfig')
-options=('!libtool')
 changelog=$pkgname.changelog
 source=(http://ftp.gnome.org/pub/GNOME/sources/gstreamermm/0.10/${pkgname}-${pkgver}.tar.xz)
 sha256sums=('12b5f377363594a69cb79f2f5cd0a8b1813ca6553680c3216e6354cfd682ebc6')
diff --git a/community/gtest/PKGBUILD b/community/gtest/PKGBUILD
index c19a0a435..8d9dc3592 100644
--- a/community/gtest/PKGBUILD
+++ b/community/gtest/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 97632 2013-09-26 06:11:28Z fyan $
+# $Id: PKGBUILD 99792 2013-10-30 23:44:46Z allan $
 # Maintainer: Felix Yan <felixonmars@gmail.com>
 # Contributor: Alexandre Bique <bique.alexandre@gmail.com>
 # Contributor: Louis R. Marascio <lrm@fitnr.com>
@@ -11,7 +11,6 @@ pkgdesc="Google Test - C++ testing utility based on the xUnit framework (like JU
 arch=('i686' 'x86_64' 'mips64el')
 url="http://code.google.com/p/googletest/"
 license=('custom:BSD3')
-options=('!libtool')
 depends=('gcc-libs' 'sh')
 makedepends=('python2' 'cmake')
 source=("http://googletest.googlecode.com/files/$pkgname-$pkgver.zip")
diff --git a/community/gtk-aurora-engine/PKGBUILD b/community/gtk-aurora-engine/PKGBUILD
index 9487a1838..06a4409fa 100644
--- a/community/gtk-aurora-engine/PKGBUILD
+++ b/community/gtk-aurora-engine/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 65546 2012-02-21 08:51:13Z spupykin $
+# $Id: PKGBUILD 99794 2013-10-30 23:45:28Z allan $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Dmitry N. Shilov <stormblast@land.ru>
 # Maintainer: Daniel J Griffiths <ghost1227@archlinux.us>
@@ -12,7 +12,6 @@ url="http://www.gnome-look.org/content/show.php/Aurora+Gtk+Engine?content=56438"
 license=('GPL')
 depends=('gtk2')
 makedepends=('pkgconfig')
-options=('!libtool')
 source=(http://www.gnome-look.org/CONTENT/content-files/56438-aurora-${pkgver}.tar.bz2
 	gtk-aurora-engine-1.5.1-glib.patch)
 md5sums=('5eeea57c5938306ad7ccfc7cd71d009d'
diff --git a/community/gtk-engine-murrine/PKGBUILD b/community/gtk-engine-murrine/PKGBUILD
index 04a3dec25..6f595a875 100644
--- a/community/gtk-engine-murrine/PKGBUILD
+++ b/community/gtk-engine-murrine/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 69978 2012-04-27 16:16:23Z spupykin $
+# $Id: PKGBUILD 99796 2013-10-30 23:46:10Z allan $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Roman Kyrylych <Roman.Kyrylych@gmail.com>
@@ -14,7 +14,6 @@ url="http://cimitan.com/murrine/project/murrine"
 license=('LGPL3')
 depends=('gtk2')
 makedepends=('intltool')
-options=('!libtool')
 source=(http://ftp.gnome.org/pub/GNOME/sources/murrine/0.98/murrine-${pkgver}.tar.xz)
 sha256sums=('e6a2af72674403d06c03e067d915004e8d9cdeec206f3350c7f3ee595b139912')
 sha256sums=('e9c68ae001b9130d0f9d1b311e8121a94e5c134b82553ba03971088e57d12c89')
diff --git a/community/gtk-engine-unico/PKGBUILD b/community/gtk-engine-unico/PKGBUILD
index 21e856757..4b42c84d9 100644
--- a/community/gtk-engine-unico/PKGBUILD
+++ b/community/gtk-engine-unico/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 79966 2012-11-15 05:43:40Z bpiotrowski $
+# $Id: PKGBUILD 99797 2013-10-30 23:46:34Z allan $
 # Maintainer:  Bartlomiej Piotrowski <nospam@bpiotrowski.pl>
 # Contributor: Hilinus <itahilinus[at]hotmail[dot]it>
 
@@ -11,7 +11,6 @@ url='https://launchpad.net/unico'
 license=('GPL')
 depends=('gtk3')
 makedepends=('gnome-common')
-options=(!libtool)
 source=(ftp://ftp.archlinux.org/other/community/$pkgname/$pkgname-139.tar.xz)
 md5sums=('a451cf9e3d6b092a2fbeb424d0436dd3')
 
diff --git a/community/gtk2+extra/PKGBUILD b/community/gtk2+extra/PKGBUILD
index 73e8633d8..b58bb8abb 100644
--- a/community/gtk2+extra/PKGBUILD
+++ b/community/gtk2+extra/PKGBUILD
@@ -1,16 +1,15 @@
-# $Id: PKGBUILD 65542 2012-02-21 08:49:41Z spupykin $
+# $Id: PKGBUILD 100172 2013-11-01 20:52:15Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Tom Newsom <Jeepster@gmx.co.uk>
 
 pkgname=gtk2+extra
 pkgver=2.1.2
-pkgrel=2
+pkgrel=3
 pkgdesc="GtkExtra is a useful set of widgets for creating GUI's for the Xwindows system using GTK+"
 arch=(i686 x86_64 'mips64el')
 url="http://gtkextra.sourceforge.net/"
 depends=('gtk2')
 license=('LGPL')
-options=('!libtool')
 source=(http://downloads.sourceforge.net/project/gtkextra/$pkgver/gtk%2Bextra-$pkgver.tar.gz
 	build-fix.patch
 	gtk2+extra-2.1.2-glib.patch)
@@ -24,5 +23,9 @@ build() {
   patch -Np1 -i ${srcdir}/gtk2+extra-2.1.2-glib.patch
   ./configure --prefix=/usr
   make
+}
+
+package() {
+  cd $srcdir/gtk+extra-$pkgver
   make DESTDIR=$pkgdir install
 }
diff --git a/community/gtkdatabox/PKGBUILD b/community/gtkdatabox/PKGBUILD
index d6ddf73e1..d2cd27f1f 100644
--- a/community/gtkdatabox/PKGBUILD
+++ b/community/gtkdatabox/PKGBUILD
@@ -1,17 +1,17 @@
-# $Id: PKGBUILD 79742 2012-11-11 19:42:10Z spupykin $
+# $Id: PKGBUILD 100174 2013-11-01 20:54:29Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: William Rea <sillywilly@gmail.com>
 
 pkgname=gtkdatabox
 pkgver=0.9.2.0
-pkgrel=1
+pkgrel=2
 pkgdesc="A widget for the Gtk+ library designed to display large amounts of numerical data"
 arch=(i686 x86_64 mips64el)
 url="http://sourceforge.net/projects/gtkdatabox/"
 license=("LGPL")
 depends=('gtk2' 'libglade')
 makedepends=('gtk-doc')
-options=('!libtool' 'docs')
+options=('docs')
 source=(http://downloads.sourceforge.net/project/gtkdatabox/gtkdatabox/$pkgver/gtkdatabox-$pkgver.tar.gz)
 md5sums=('99c1fe9a918ee94e2b6f967cd22a6f5b')
 
@@ -24,5 +24,9 @@ build() {
     --enable-gtk-doc-pdf \
     --enable-libglade
   make
+}
+
+package() {
+  cd $srcdir/gtkdatabox-$pkgver
   make DESTDIR=$pkgdir install
 }
diff --git a/community/gtkglarea/PKGBUILD b/community/gtkglarea/PKGBUILD
index 11d03fa3e..9470f3a5b 100644
--- a/community/gtkglarea/PKGBUILD
+++ b/community/gtkglarea/PKGBUILD
@@ -12,7 +12,6 @@ arch=('i686' 'x86_64')
 url="http://mono-project.com/GtkGLArea"
 license=('GPL')
 depends=('gtk2' 'glu')
-options=('!libtool')
 source=("http://ftp.gnome.org/pub/GNOME/sources/$pkgname/2.0/$pkgname-$pkgver.tar.gz")
 md5sums=('2a81a86cfa80a920a5454dd00fad2e1d')
 
diff --git a/community/gtkhotkey/PKGBUILD b/community/gtkhotkey/PKGBUILD
index 62f8d5f78..f8c76bece 100644
--- a/community/gtkhotkey/PKGBUILD
+++ b/community/gtkhotkey/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 81675 2012-12-26 12:18:55Z fyan $
+# $Id: PKGBUILD 99799 2013-10-30 23:47:19Z allan $
 # Maintainer: Felix Yan <felixonmars@gmail.com>
 # Contributor: kiefer <jorgelmadrid@gmail.com>
 # Contributor: Alessio Sergi <asergi at archlinux dot us>
@@ -14,7 +14,6 @@ url="https://launchpad.net/gtkhotkey"
 license=('LGPL3')
 depends=('gtk2')
 makedepends=('intltool')
-options=('!libtool')
 source=("http://launchpad.net/$pkgname/0.2/$pkgver/+download/$pkgname-$pkgver.tar.gz")
 md5sums=('bfdc73e68e9adbe0d506d31a25862914')
  
diff --git a/community/gtkpod/PKGBUILD b/community/gtkpod/PKGBUILD
index a323e1e01..f48b07514 100644
--- a/community/gtkpod/PKGBUILD
+++ b/community/gtkpod/PKGBUILD
@@ -1,16 +1,16 @@
-# $Id: PKGBUILD 90342 2013-05-11 16:17:24Z tomegun $
+# $Id: PKGBUILD 99800 2013-10-30 23:47:43Z allan $
 # Maintainer:  Federico Cinelli <cinelli@aur.archlinux.org>
 # Contributor: Kevin Piche <kevin@archlinux.org>
 # Contributor: Aaron Griffin <aaron@archlinux.org>
 
 pkgname=gtkpod
-pkgver=2.1.3
-pkgrel=4
+pkgver=2.1.4
+pkgrel=1
 pkgdesc="A platform independent GUI for Apple's iPod using GTK3"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://gtkpod.sourceforge.net"
 license=('GPL')
-depends=('libanjuta' 'curl' 'flac' 'libid3tag' 'libgpod' 'awk' 'hicolor-icon-theme' 'libwebkit3')
+depends=('libanjuta' 'curl' 'flac' 'libid3tag' 'libgpod' 'awk' 'hicolor-icon-theme' 'webkitgtk')
 makedepends=('flex' 'intltool' 'faad2' 'libvorbis')
 optdepends=('libmp4v2: MP4/h264 support'
             'vorbis-tools: OGG support'
@@ -18,16 +18,15 @@ optdepends=('libmp4v2: MP4/h264 support'
             'id3v2: mp3 conversion support'
             'faad2: m4a conversion support')
 install=gtkpod.install
-options=('!libtool')
 source=("http://downloads.sourceforge.net/gtkpod/$pkgname-$pkgver.tar.gz"
 	gtkpod-2.1.3-gdl-3.6.patch)
-md5sums=('57f04578de6e3262a436ec574422b144'
-	 '94a4cc0b47ba8895c0a51e53e94da517')
+md5sums=('66c12ccb529c0f7de9a48a7f0d277c80'
+         '94a4cc0b47ba8895c0a51e53e94da517')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
 
-  patch -p1 -i "$srcdir/gtkpod-2.1.3-gdl-3.6.patch"
+# patch -p1 -i "$srcdir/gtkpod-2.1.3-gdl-3.6.patch"
   sed -i 's#python#python2#' scripts/sync-palm-jppy.py
 
   ./configure --prefix=/usr
diff --git a/community/gtksourceviewmm/PKGBUILD b/community/gtksourceviewmm/PKGBUILD
index 10e838d35..dbb58d752 100644
--- a/community/gtksourceviewmm/PKGBUILD
+++ b/community/gtksourceviewmm/PKGBUILD
@@ -1,4 +1,4 @@
-#$Id: PKGBUILD 88691 2013-04-21 22:17:11Z heftig $
+#$Id: PKGBUILD 99801 2013-10-30 23:48:06Z allan $
 # Maintainer: Alexander Rødseth <rodseth@gmail.com>
 # Contributor: Ionut Biru <ibiru@archlinux.org>
 
@@ -10,7 +10,6 @@ arch=('x86_64' 'i686' 'mips64el')
 url='http://projects.gnome.org/gtksourceviewmm/'
 license=('LGPL2.1')
 depends=('gtkmm3' 'gtksourceview3')
-options=('!libtool')
 source=("http://download.gnome.org/sources/$pkgname/3.2/$pkgname-$pkgver.tar.xz")
 sha256sums=('9dc0c44f00627e434a36ac7c3a34d9c30ebe45eb6dc682dc733a85dcead2ba66')
 
diff --git a/community/gtkspell3/PKGBUILD b/community/gtkspell3/PKGBUILD
index 8db090a6d..096903245 100644
--- a/community/gtkspell3/PKGBUILD
+++ b/community/gtkspell3/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 97714 2013-09-27 20:04:38Z bgyorgy $
+# $Id: PKGBUILD 99802 2013-10-30 23:48:32Z allan $
 # Maintainer: Balló György <ballogyor+arch at gmail dot com>
 # Contributor: Roman Kyrylych <roman@archlinux.org>
 # Contributor: Ben <ben@benmazer.net>
@@ -12,7 +12,6 @@ arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 depends=('gtk3' 'enchant')
 makedepends=('intltool' 'gobject-introspection' 'vala')
-options=('!libtool')
 source=(http://gtkspell.sourceforge.net/download/$pkgname-$pkgver.tar.gz)
 md5sums=('d25b547507940738cf016936c3452113')
 
diff --git a/community/gtranslator/PKGBUILD b/community/gtranslator/PKGBUILD
index 8172c0ac2..31dc1f275 100644
--- a/community/gtranslator/PKGBUILD
+++ b/community/gtranslator/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 88692 2013-04-21 22:17:13Z heftig $
+# $Id: PKGBUILD 99803 2013-10-30 23:49:03Z allan $
 # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
 # Maintainer: Alexander Rødseth <rodseth@gmail.com>
 # Contributor: Hugo Doria <hugo@archlinux.org>
@@ -15,7 +15,6 @@ depends=('desktop-file-utils' 'gdl' 'gettext' 'gtksourceview3' 'gtkspell3' 'iso-
 makedepends=('intltool' 'itstool' 'gnome-doc-utils' 'gucharmap' 'json-glib' 'gnome-common' 'yelp-tools')
 optdepends=('gucharmap: for charmap plugin'
             'json-glib: for open-tran plugin')
-options=('!libtool')
 install="$pkgname.install"
 source=("http://ftp.acc.umu.se/pub/GNOME/sources/$pkgname/2.91/$pkgname-$pkgver.tar.xz"
         'gtkspell3-port.patch')
diff --git a/community/guake/PKGBUILD b/community/guake/PKGBUILD
index af49cd896..3d8f8711a 100644
--- a/community/guake/PKGBUILD
+++ b/community/guake/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 78192 2012-10-17 10:24:02Z allan $
+# $Id: PKGBUILD 99804 2013-10-30 23:49:26Z allan $
 # Maintainer: Balló György <ballogyor+arch at gmail dot com>
 # Contributor: Angel Velasquez <angvp@archlinux.org>
 # Contributor: Wilson Pinto Júnior (N3RD3X) <n3rd3x@linuxmail.org>
@@ -12,7 +12,6 @@ url="http://guake.org/"
 license=('GPL')
 depends=('python2-notify' 'vte' 'python2-gconf' 'python2-dbus' 'python2-xdg' 'hicolor-icon-theme' 'xdg-utils')
 makedepends=('intltool')
-options=('!libtool')
 install=$pkgname.install
 source=(http://guake.org/files/$pkgname-$pkgver.tar.gz
         guake-fix-notification.patch)
diff --git a/community/guichan/PKGBUILD b/community/guichan/PKGBUILD
index d948c2b66..4c7c841d3 100644
--- a/community/guichan/PKGBUILD
+++ b/community/guichan/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 70598 2012-05-12 11:22:15Z jlichtblau $
+# $Id: PKGBUILD 99805 2013-10-30 23:49:55Z allan $
 # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
 # Contributor: Mateusz Herych <heniekk@gmail.com>
 # Contributor: Bjørn Lindeijer <bjorn@lindeijer.nl>
@@ -11,7 +11,7 @@ arch=('i686' 'x86_64' 'mips64el')
 url="http://guichan.sourceforge.net/"
 license=('BSD')
 makedepends=('sdl_image' 'allegro4' 'libgl' 'glut')
-options=('!libtool' '!strip')
+options=('!strip')
 source=(http://guichan.googlecode.com/files/$pkgname-$pkgver.tar.gz)
 sha256sums=('eedf206eae5201eaae027b133226d0793ab9a287bfd74c5f82c7681e3684eeab')
 
diff --git a/community/guifications/PKGBUILD b/community/guifications/PKGBUILD
index 94a0683b9..13600adb7 100644
--- a/community/guifications/PKGBUILD
+++ b/community/guifications/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 58837 2011-11-18 17:38:20Z jelle $
+# $Id: PKGBUILD 99806 2013-10-30 23:50:22Z allan $
 # Maintainer : Ionut Biru <ibiru@archlinux.org>
 # Contributor: Link Dupont <link@.subpop.net>
 
@@ -11,7 +11,6 @@ url="http://plugins.guifications.org/trac/wiki/Guifications"
 license=("GPL")
 depends=('pidgin')
 makedepends=('perlxml')
-options=('!libtool')
 source=("https://www.guifications.org/attachments/download/145/pidgin-guifications-2.16.tar.gz")
 md5sums=('43fd9022160f15b4b262c4662ba62fc9')
 
diff --git a/community/gwenhywfar/PKGBUILD b/community/gwenhywfar/PKGBUILD
index 902455871..999632594 100644
--- a/community/gwenhywfar/PKGBUILD
+++ b/community/gwenhywfar/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 85356 2013-03-01 10:32:40Z andrea $
+# $Id: PKGBUILD 99807 2013-10-30 23:50:53Z allan $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: William Rea <sillywilly@gmail.com>
 
@@ -9,7 +9,6 @@ pkgrel=2
 pkgdesc="OS abstraction functions for various projects"
 arch=(i686 x86_64 'mips64el')
 url="http://www.aquamaniac.de"
-options=('!libtool')
 license=("LGPL")
 depends=('openssl' 'gnutls' 'libgcrypt')
 makedepends=('gtk2' 'qt4')
diff --git a/community/haddock/PKGBUILD b/community/haddock/PKGBUILD
index e1cf57db0..c67a180f2 100644
--- a/community/haddock/PKGBUILD
+++ b/community/haddock/PKGBUILD
@@ -1,23 +1,24 @@
-# $Id: PKGBUILD 90316 2013-05-11 13:01:51Z arodseth $
+# $Id: PKGBUILD 99417 2013-10-28 12:23:37Z arodseth $
 # Maintainer: Alexander Rødseth <rodseth@gmail.com>
 # Contributor: Vesa Kaihlavirta <vesa@archlinux.org>
 # Contributor: Arch Haskell Team <arch-haskell@haskell.org>
 
 pkgname=haddock
 pkgver=2.13.2
-pkgrel=1
+pkgrel=2
 pkgdesc='Tool for generating documentation for Haskell libraries'
 url='http://hackage.haskell.org/package/haddock/'
 license=('custom:BSD3')
 arch=('x86_64' 'i686' 'mips64el')
 makedepends=('alex' 'happy')
-depends=('ghc=7.6.3-1' 'haskell-xhtml=3000.2.1' 'haskell-ghc-paths')
+depends=('ghc' 'haskell-xhtml' 'haskell-ghc-paths')
 install="$pkgname.install"
 source=("http://hackage.haskell.org/packages/archive/$pkgname/$pkgver/$pkgname-$pkgver.tar.gz")
 sha256sums=('25e7d5819d38cbb1c9b1ff967e2a4093c776c3defaa0a249c8eabba1e70892e3')
+options=('staticlibs')
 
 build() {
-  cd "$srcdir/$pkgname-$pkgver"
+  cd "$pkgname-$pkgver"
 
   runhaskell Setup configure -O -p --enable-split-objs --enable-shared \
     --prefix=/usr --docdir=/usr/share/doc/"$pkgname" \
@@ -30,7 +31,7 @@ build() {
 }
 
 package() {
-  cd "$srcdir/$pkgname-$pkgver"
+  cd "$pkgname-$pkgver"
   
   install -Dm744 register.sh "$pkgdir/usr/share/haskell/$pkgname/register.sh"
   install -m744 unregister.sh \
diff --git a/community/haskell-bytestring-show/PKGBUILD b/community/haskell-bytestring-show/PKGBUILD
index 99fd4ebb6..7ed57a380 100644
--- a/community/haskell-bytestring-show/PKGBUILD
+++ b/community/haskell-bytestring-show/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 89293 2013-04-28 16:52:14Z td123 $
+# $Id: PKGBUILD 100508 2013-11-05 10:55:19Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 
 pkgname=haskell-bytestring-show
 pkgver=0.3.5.4
-pkgrel=4
+pkgrel=5
 pkgdesc="Efficient conversion of values into readable byte strings."
 url="http://hackage.haskell.org/package/bytestring-show"
 license=("BSD3")
diff --git a/community/haskell-ghc-paths/PKGBUILD b/community/haskell-ghc-paths/PKGBUILD
index d6776e052..c20665eff 100644
--- a/community/haskell-ghc-paths/PKGBUILD
+++ b/community/haskell-ghc-paths/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 68685 2012-03-31 16:54:07Z arodseth $
+# $Id: PKGBUILD 99206 2013-10-25 16:17:55Z arodseth $
 # Maintainer: Alexander Rødseth <rodseth@gmail.com>
 # Contributor: Arch Haskell Team <arch-haskell@haskell.org>
 
 pkgname=haskell-ghc-paths
 pkgver=0.1.0.9
-pkgrel=2
+pkgrel=3
 pkgdesc="Knowledge of GHC's installation directories"
 url='http://hackage.haskell.org/package/ghc-paths'
 license=('custom:BSD3')
@@ -13,10 +13,11 @@ arch=('x86_64' 'i686')
 depends=('ghc=7.6.3-1')
 source=("http://hackage.haskell.org/packages/archive/ghc-paths/$pkgver/ghc-paths-$pkgver.tar.gz")
 install="$pkgname.install"
+options=('staticlibs')
 sha256sums=('afa68fb86123004c37c1dc354286af2d87a9dcfb12ddcb80e8bd0cd55bc87945')
 
 build() {
-  cd "$srcdir/ghc-paths-$pkgver"
+  cd "ghc-paths-$pkgver"
 
   runhaskell Setup configure -O -p --enable-split-objs --enable-shared \
      --prefix=/usr --docdir="/usr/share/doc/$pkgname" \
@@ -29,7 +30,7 @@ build() {
 }
 
 package() {
-  cd "$srcdir/ghc-paths-$pkgver"
+  cd "ghc-paths-$pkgver"
 
   install -Dm 744 register.sh \
     "$pkgdir/usr/share/haskell/$pkgname/register.sh"
diff --git a/community/haskell-hslogger/PKGBUILD b/community/haskell-hslogger/PKGBUILD
index aa4edb5f6..a27bad530 100644
--- a/community/haskell-hslogger/PKGBUILD
+++ b/community/haskell-hslogger/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 89306 2013-04-28 16:52:27Z td123 $
+# $Id: PKGBUILD 100510 2013-11-05 10:55:37Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: Arch Haskell Team <arch-haskell@haskell.org>
 
 pkgname=haskell-hslogger
 pkgver=1.2.1
-pkgrel=4
+pkgrel=5
 pkgdesc="Versatile logging framework"
 url="http://hackage.haskell.org/package/hslogger"
 license=('LGPL')
diff --git a/community/haskell-quickcheck/PKGBUILD b/community/haskell-quickcheck/PKGBUILD
index 937d26326..83c7e7307 100644
--- a/community/haskell-quickcheck/PKGBUILD
+++ b/community/haskell-quickcheck/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 89314 2013-04-28 16:52:36Z td123 $
+# $Id: PKGBUILD 99290 2013-10-26 17:33:27Z arodseth $
 # Maintainer: Alexander Rødseth <rodseth@gmail.com>
 # Contributor: Vesa Kaihlavirta <vesa@archlinux.org>
 # Contributor: Arch Haskell Team <arch-haskell@haskell.org>
@@ -6,18 +6,19 @@
 _hkgname=QuickCheck
 pkgname=haskell-quickcheck
 pkgver=2.6
-pkgrel=2
+pkgrel=3
 pkgdesc='Automatic testing of Haskell programs'
 url='http://hackage.haskell.org/package/QuickCheck'
 license=('custom:BSD3')
 arch=('x86_64' 'i686')
-depends=('ghc=7.6.3-1' 'haskell-random=1.0.1.1-5' 'sh')
-source=("http://hackage.haskell.org/packages/archive/${_hkgname}/$pkgver/${_hkgname}-$pkgver.tar.gz")
-install=${pkgname}.install
+depends=('ghc' 'haskell-random')
+source=("http://hackage.haskell.org/packages/archive/$_hkgname/$pkgver/$_hkgname-$pkgver.tar.gz")
+install="$pkgname.install"
+options=('staticlibs')
 sha256sums=('8001c00a1892714d914e5007ba72cdd428c1ea4c6b8418c6cb5e7809753d970d')
 
 build() {
-  cd "$srcdir/$_hkgname-$pkgver"
+  cd "$_hkgname-$pkgver"
 
   runhaskell Setup configure -O -p \
     --enable-split-objs \
@@ -33,7 +34,7 @@ build() {
 }
 
 package() {
-  cd "$srcdir/$_hkgname-$pkgver"
+  cd "$_hkgname-$pkgver"
 
   install -Dm744 register.sh "$pkgdir/usr/share/haskell/$pkgname/register.sh"
   install -m744 unregister.sh \
diff --git a/community/haskell-regex-base/PKGBUILD b/community/haskell-regex-base/PKGBUILD
index c966e3963..06c9793c9 100644
--- a/community/haskell-regex-base/PKGBUILD
+++ b/community/haskell-regex-base/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 89315 2013-04-28 16:52:37Z td123 $
+# $Id: PKGBUILD 99318 2013-10-26 21:05:51Z jelle $
 # Maintainer: Vesa Kaihlavirta <vesa@archlinux.org>
 # Contributor: Arch Haskell Team <arch-haskell@haskell.org>
 # Contributor: Alexander Rødseth <rodseth@gmail.com>
@@ -6,18 +6,19 @@
 _hkgname=regex-base
 pkgname=haskell-regex-base
 pkgver=0.93.2
-pkgrel=13
+pkgrel=15
 pkgdesc='Interface API for regex-posix,pcre,parsec,tdfa,dfa'
 url='http://hackage.haskell.org/cgi-bin/hackage-scripts/package/regex-base'
 license=('custom:BSD3')
 arch=('x86_64' 'i686')
-depends=('ghc=7.6.3-1' 'sh' 'haskell-mtl=2.1.2')
-source=("http://hackage.haskell.org/packages/archive/${_hkgname}/$pkgver/${_hkgname}-$pkgver.tar.gz")
-install=$pkgname.install
+depends=('ghc' 'haskell-mtl')
+source=("http://hackage.haskell.org/packages/archive/$_hkgname/$pkgver/$_hkgname-$pkgver.tar.gz")
+install="$pkgname.install"
+options=('staticlibs')
 sha256sums=('20dc5713a16f3d5e2e6d056b4beb9cfdc4368cd09fd56f47414c847705243278')
 
 build() {
-  cd "$srcdir/$_hkgname-$pkgver"
+  cd "$_hkgname-$pkgver"
 
   runhaskell Setup configure -O -p --enable-split-objs --enable-shared --prefix=/usr \
     --docdir=/usr/share/doc/${pkgname} --libsubdir=\$compiler/site-local/\$pkgid
@@ -29,7 +30,7 @@ build() {
 }
 
 package() {
-  cd "$srcdir/$_hkgname-$pkgver"
+  cd "$_hkgname-$pkgver"
 
   install -D -m744 register.sh   ${pkgdir}/usr/share/haskell/${pkgname}/register.sh
   install    -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh
diff --git a/community/haskell-regex-compat/PKGBUILD b/community/haskell-regex-compat/PKGBUILD
index fc0738ada..4a85ba633 100644
--- a/community/haskell-regex-compat/PKGBUILD
+++ b/community/haskell-regex-compat/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 89316 2013-04-28 16:52:38Z td123 $
+# $Id: PKGBUILD 99394 2013-10-28 10:42:23Z arodseth $
 # Maintainer: Alexander Rødseth <rodseth@gmail.com>
 # Contributor: Vesa Kaihlavirta <vesa@archlinux.org>
 # Contributor: Arch Haskell Team <arch-haskell@haskell.org>
@@ -6,36 +6,39 @@
 _hkgname=regex-compat
 pkgname=haskell-regex-compat
 pkgver=0.95.1
-pkgrel=5
+pkgrel=7
 pkgdesc='Replaces and enhances Text.Regex'
 url="http://hackage.haskell.org/package/${_hkgname}"
 license=('custom:BSD3')
 arch=('x86_64' 'i686')
-depends=('ghc=7.6.3-1' 'sh' 'haskell-regex-base=0.93.2' 'haskell-regex-posix=0.95.2')
-source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz)
-install=${pkgname}.install
+depends=('ghc' 'haskell-regex-base' 'haskell-regex-posix')
+source=("http://hackage.haskell.org/packages/archive/$_hkgname/$pkgver/$_hkgname-$pkgver.tar.gz")
+install="$pkgname.install"
+options=('staticlibs')
 sha256sums=('d57cb1a5a4d66753b18eaa37a1621246f660472243b001894f970037548d953b')
 
 build() {
-    cd ${srcdir}/${_hkgname}-${pkgver}
-    runhaskell Setup configure -O -p --enable-split-objs --enable-shared --prefix=/usr \
-      --docdir=/usr/share/doc/${pkgname} --libsubdir=\$compiler/site-local/\$pkgid
-    runhaskell Setup build
-    runhaskell Setup haddock
-    runhaskell Setup register   --gen-script
-    runhaskell Setup unregister --gen-script
-    sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
+  cd "$_hkgname-$pkgver"
+
+  runhaskell Setup configure -O -p --enable-split-objs --enable-shared --prefix=/usr \
+    --docdir="/usr/share/doc/$pkgname" --libsubdir=\$compiler/site-local/\$pkgid
+  runhaskell Setup build
+  runhaskell Setup haddock
+  runhaskell Setup register --gen-script
+  runhaskell Setup unregister --gen-script
+  sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
 }
 
 package() {
-    cd ${srcdir}/${_hkgname}-${pkgver}
-    install -D -m744 register.sh   ${pkgdir}/usr/share/haskell/${pkgname}/register.sh
-    install    -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh
-    install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries
-    ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname}
-    runhaskell Setup copy --destdir=${pkgdir}
-    install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
-    rm -f ${pkgdir}/usr/share/doc/${pkgname}/LICENSE
+  cd "$_hkgname-$pkgver"
+
+  install -Dm744 register.sh "$pkgdir/usr/share/haskell/$pkgname/register.sh"
+  install -m744 unregister.sh "$pkgdir/usr/share/haskell/$pkgname/unregister.sh"
+  install -d -m755 "$pkgdir/usr/share/doc/ghc/html/libraries"
+  ln -s "/usr/share/doc/$pkgname/html" "$pkgdir/usr/share/doc/ghc/html/libraries/$_hkgname"
+  runhaskell Setup copy --destdir="$pkgdir"
+  install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+  rm -f "$pkgdir/usr/share/doc/$pkgname/LICENSE"
 }
 
 # vim:set ts=2 sw=2 et:
diff --git a/community/haskell-regex-posix/PKGBUILD b/community/haskell-regex-posix/PKGBUILD
index 45597f8d6..2ee285bcb 100644
--- a/community/haskell-regex-posix/PKGBUILD
+++ b/community/haskell-regex-posix/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 89317 2013-04-28 16:52:39Z td123 $
+# $Id: PKGBUILD 99396 2013-10-28 10:47:29Z arodseth $
 # Maintainer: Alexander Rødseth <rodseth@gmail.com>
 # Maintainer: Vesa Kaihlavirta <vesa@archlinux.org>
 # Contributor: Arch Haskell Team <arch-haskell@haskell.org>
@@ -6,20 +6,22 @@
 _hkgname=regex-posix
 pkgname=haskell-regex-posix
 pkgver=0.95.2
-pkgrel=4
+pkgrel=6
 pkgdesc='The posix regex backend for regex-base'
-url="http://hackage.haskell.org/package/${_hkgname}"
+url="http://hackage.haskell.org/package/$_hkgname"
 license=('custom:BSD3')
-arch=('i686' 'x86_64')
-depends=('ghc=7.6.3-1' 'sh' 'haskell-regex-base=0.93.2')
-source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz)
-install=${pkgname}.install
+arch=('x86_64' 'i686')
+depends=('ghc' 'haskell-regex-base')
+source=("http://hackage.haskell.org/packages/archive/$_hkgname/$pkgver/$_hkgname-$pkgver.tar.gz")
+install="$pkgname.install"
+options=('staticlibs')
 sha256sums=('56019921cd4a4c9682b81ec614236fea816ba8ed8785a1640cd66d8b24fc703e')
 
 build() {
-  cd ${srcdir}/${_hkgname}-${pkgver}
+  cd "$_hkgname-$pkgver"
+
   runhaskell Setup configure -O -p --enable-split-objs --enable-shared --prefix=/usr \
-    --docdir=/usr/share/doc/${pkgname} --libsubdir=\$compiler/site-local/\$pkgid
+    --docdir="/usr/share/doc/$pkgname" --libsubdir=\$compiler/site-local/\$pkgid
   runhaskell Setup build
   runhaskell Setup haddock
   runhaskell Setup register   --gen-script
@@ -28,14 +30,15 @@ build() {
 }
 
 package() {
-  cd ${srcdir}/${_hkgname}-${pkgver}
-  install -D -m744 register.sh   ${pkgdir}/usr/share/haskell/${pkgname}/register.sh
-  install    -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh
-  install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries
-  ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname}
-  runhaskell Setup copy --destdir=${pkgdir}
-  install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
-  rm -f ${pkgdir}/usr/share/doc/${pkgname}/LICENSE
+  cd "$_hkgname-$pkgver"
+
+  install -Dm744 register.sh "$pkgdir/usr/share/haskell/$pkgname/register.sh"
+  install -m744 unregister.sh "$pkgdir/usr/share/haskell/$pkgname/unregister.sh"
+  install -d -m755 "$pkgdir/usr/share/doc/ghc/html/libraries"
+  ln -s "/usr/share/doc/$pkgname/html" "$pkgdir/usr/share/doc/ghc/html/libraries/$_hkgname"
+  runhaskell Setup copy --destdir="$pkgdir"
+  install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+  rm -f "$pkgdir/usr/share/doc/$pkgname/LICENSE"
 }
 
 # vim:set ts=2 sw=2 et:
diff --git a/community/haskell-tar/PKGBUILD b/community/haskell-tar/PKGBUILD
index 968bcb1cd..6f62a0f20 100644
--- a/community/haskell-tar/PKGBUILD
+++ b/community/haskell-tar/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 89321 2013-04-28 16:52:43Z td123 $
+# $Id: PKGBUILD 99400 2013-10-28 10:58:26Z arodseth $
 # Maintainer: Alexander Rødseth <rodseth@gmail.com>
 # Contributor: Arch Haskell Team <arch-haskell@haskell.org>
 
 pkgname=haskell-tar
 pkgver=0.4.0.1
-pkgrel=5
+pkgrel=6
 pkgdesc='Reading, writing and manipulating tar archive files'
 url='http://hackage.haskell.org/package/tar'
 license=('custom:BSD3')
@@ -13,6 +13,7 @@ depends=('ghc=7.6.3-1')
 source=("http://hackage.haskell.org/packages/archive/tar/$pkgver/tar-$pkgver.tar.gz")
 install=haskell-tar.install
 sha256sums=('a408274d8325f4e3144c5aa154d72f1ee7b0a7342570fd6805e3be3fe0d97a6d')
+options=('staticlibs')
 
 build() {
   cd "$srcdir/tar-$pkgver"
diff --git a/community/haskell-vector/PKGBUILD b/community/haskell-vector/PKGBUILD
index bbd867873..b6fa033e1 100644
--- a/community/haskell-vector/PKGBUILD
+++ b/community/haskell-vector/PKGBUILD
@@ -1,15 +1,16 @@
-# $Id: PKGBUILD 89326 2013-04-28 16:52:52Z td123 $
+# $Id: PKGBUILD 100512 2013-11-05 10:55:55Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 
 pkgname=haskell-vector
 pkgver=0.10.0.1
-pkgrel=4
+pkgrel=5
 pkgdesc="Efficient Arrays"
 url="http://code.haskell.org/vector"
 license=("custom:BSD3")
 arch=('i686' 'x86_64')
 makedepends=()
-depends=("ghc=7.6.3" "haskell-primitive")
+# deps adjusted to specific versions in package()
+depends=("ghc" "haskell-primitive")
 options=('strip')
 install="${pkgname}.install"
 source=("http://hackage.haskell.org/packages/archive/vector/${pkgver}/vector-${pkgver}.tar.gz")
@@ -28,6 +29,9 @@ build() {
 }
 
 package() {
+  _ghcver=`pacman -Q ghc | cut -f2 -d\  | cut -f1 -d-`
+  depends=("ghc=${_ghcver}" "haskell-primitive")
+
   cd ${srcdir}/vector-${pkgver}
   install -Dm744 register.sh   ${pkgdir}/usr/share/haskell/${pkgname}/register.sh
   install -Dm744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh
diff --git a/community/haskell-xhtml/PKGBUILD b/community/haskell-xhtml/PKGBUILD
index 67ee0ad24..8f85d691d 100644
--- a/community/haskell-xhtml/PKGBUILD
+++ b/community/haskell-xhtml/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 68685 2012-03-31 16:54:07Z arodseth $
+# $Id: PKGBUILD 99398 2013-10-28 10:55:23Z arodseth $
 # Maintainer: Alexander Rødseth <rodseth@gmail.com>
 # Contributor: Vesa Kaihlavirta <vesa@archlinux.org>
 # Contributor: Arch Haskell Team <arch-haskell@haskell.org>
@@ -6,14 +6,15 @@
 _hkgname=xhtml
 pkgname=haskell-xhtml
 pkgver=3000.2.1
-pkgrel=4
+pkgrel=5
 pkgdesc='Combinators for producing XHTML 1.0'
 url='http://hackage.haskell.org/package/xhtml'
 license=('custom:BSD3')
 arch=('x86_64' 'i686')
 depends=('ghc=7.6.3-1' 'sh')
 source=("http://hackage.haskell.org/packages/archive/$_hkgname/$pkgver/$_hkgname-$pkgver.tar.gz")
-install=$pkgname.install
+install="$pkgname.install"
+options=('staticlibs')
 sha256sums=('33020782170c1c083bc59fc3bfcb72cec2db223e02d1181c07ae23b9fa7fdcd8')
 
 build() {
diff --git a/community/haveged/PKGBUILD b/community/haveged/PKGBUILD
index cef51e118..e764207f8 100644
--- a/community/haveged/PKGBUILD
+++ b/community/haveged/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 92888 2013-06-18 08:41:07Z bpiotrowski $
+# $Id: PKGBUILD 100564 2013-11-05 21:52:50Z heftig $
 # Maintainer:  Bartłomiej Piotrowski <barthalion@gmail.com>
 # Contributor: kfgz <kfgz at interia dot pl>
 # Contributor: pootzko <pootzko at gmail dot com>
@@ -6,17 +6,22 @@
 pkgname=haveged
 pkgver=1.7.c
 _pkgver=${pkgver/.c/c}
-pkgrel=1
+pkgrel=3
 pkgdesc='Entropy harvesting daemon using CPU timings'
 arch=('i686' 'x86_64' 'mips64el')
 url='http://www.issihosts.com/haveged'
 license=('GPL')
 depends=('glibc')
-options=('!libtool')
 source=($url/$pkgname-$_pkgver.tar.gz
-        service)
+        service cleanexit.patch)
 sha256sums=('40397eded96fc0d624a6a81c8e888ab023e46f3114f1ee699994e645531bf121'
-            'badf8ceb5484d45888a089fabdfba5f44f6ec2930bca203c50200051a4d83e12')
+            'badf8ceb5484d45888a089fabdfba5f44f6ec2930bca203c50200051a4d83e12'
+            'be896659dd96cb85915ac5a9c2bd8d81d1ff348508362d1b71d64b207f69fa5c')
+
+prepare() {
+  cd $pkgname-$_pkgver
+  patch -Np1 -i ../cleanexit.patch
+}
 
 build() {
   cd $pkgname-$_pkgver
diff --git a/community/haveged/cleanexit.patch b/community/haveged/cleanexit.patch
new file mode 100644
index 000000000..01f8c7f94
--- /dev/null
+++ b/community/haveged/cleanexit.patch
@@ -0,0 +1,21 @@
+diff -u -r haveged-1.7c/src/haveged.c haveged-1.7c-cleanexit/src/haveged.c
+--- haveged-1.7c/src/haveged.c	2013-01-12 19:20:04.000000000 +0100
++++ haveged-1.7c-cleanexit/src/haveged.c	2013-11-05 22:40:22.202935493 +0100
+@@ -642,7 +642,16 @@
+ static void tidy_exit(           /* OUT: nothing      */
+    int signum)                   /* IN: signal number */
+ {
+-   error_exit("Stopping due to signal %d\n", signum);
++#ifndef NO_DAEMON
++   if (params->detached!=0) {
++      unlink(params->pid_file);
++      syslog(LOG_INFO, "%s Stopping due to signal %d", params->daemon, signum);
++      }
++   else
++#endif
++      fprintf(stderr, "%s Stopping due to signal %d\n", params->daemon, signum);
++   havege_destroy(handle);
++   exit(0);
+ }
+ /**
+  * send usage display to stderr
diff --git a/community/hercules/PKGBUILD b/community/hercules/PKGBUILD
index bce962aad..7e2d83fa6 100644
--- a/community/hercules/PKGBUILD
+++ b/community/hercules/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 85609 2013-03-03 23:25:19Z arodseth $
+# $Id: PKGBUILD 99809 2013-10-31 01:50:39Z allan $
 # Maintainer: Alexander Rødseth <rodseth@gmail.com>
 # Contributor: Kevin Piche <kevin@archlinux.org>
 # Contributor: Tom Newsom <Jeepster@gmx.co.uk>
@@ -11,7 +11,6 @@ pkgdesc='Software implementation of System/370 and ESA/390'
 url='http://www.hercules-390.eu/'
 source=("http://downloads.hercules-390.eu/$pkgname-$pkgver.tar.gz")
 license=('custom')
-options=('!libtool')
 depends=('bzip2' 'libgcrypt' 'zlib' 'perl')
 sha256sums=('85e217773587f2278d4b6cb6bc815e042cfc982d0fc14baa0da4a84dea399e9d')
 
diff --git a/community/highlight/PKGBUILD b/community/highlight/PKGBUILD
index 880fa3218..7f1101e51 100644
--- a/community/highlight/PKGBUILD
+++ b/community/highlight/PKGBUILD
@@ -1,16 +1,16 @@
-# $Id: PKGBUILD 98015 2013-10-03 17:42:09Z bluewind $
+# $Id: PKGBUILD 100546 2013-11-05 19:47:43Z bluewind $
 # Maintainer: Florian Pritz <flo@xinu.at>
 # Contributor: Jan Fader <jan.fader@web.de>
 pkgbase=highlight
 pkgname=(highlight highlight-gui)
-pkgver=3.16
+pkgver=3.16.1
 pkgrel=1
 url="http://www.andre-simon.de/doku/highlight/highlight.html"
 license=('GPL')
 arch=('i686' 'x86_64' 'mips64el')
 makedepends=(qt4 lua boost)
 source=(http://www.andre-simon.de/zip/$pkgname-$pkgver.tar.bz2{,.asc})
-md5sums=('88558766efc5109f07b7f5b78e62aea2'
+md5sums=('688bb537db149dc720b9ef1ffc796ced'
          'SKIP')
 
 build() {
diff --git a/community/homebank/PKGBUILD b/community/homebank/PKGBUILD
index e17d1f4a8..baf1ff193 100644
--- a/community/homebank/PKGBUILD
+++ b/community/homebank/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 98074 2013-10-05 17:19:13Z jlichtblau $
+# $Id: PKGBUILD 100085 2013-11-01 13:55:56Z eric $
 # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
 # Contributor: William Rea <sillywilly@gmail.com>
 
 pkgname=homebank
 pkgver=4.5.4
-pkgrel=1
+pkgrel=2
 pkgdesc="Free, easy, personal accounting for everyone"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://homebank.free.fr/"
diff --git a/community/ibus-anthy/PKGBUILD b/community/ibus-anthy/PKGBUILD
index ec3e113a2..d60d1ab20 100644
--- a/community/ibus-anthy/PKGBUILD
+++ b/community/ibus-anthy/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 96949 2013-09-09 05:39:55Z fyan $
+# $Id: PKGBUILD 99811 2013-10-31 01:51:20Z allan $
 # Maintainer: Felix Yan <felixonmars@gmail.com>
 # Contributor: Rainy <rainylau(at)gmail(dot)com>
 # Contributor: Lee.MaRS <leemars at gmail dot com>
@@ -13,7 +13,6 @@ license=('LGPL')
 url='http://ibus.googlecode.com'
 depends=('ibus' 'anthy' 'python2' 'pygtk' 'gtk-update-icon-cache')
 makedepends=('swig' 'intltool')
-options=('!libtool')
 install=$pkgname.install
 source=("http://ibus.googlecode.com/files/${pkgname}-${pkgver}.tar.gz")
 
diff --git a/community/ibus-kkc/PKGBUILD b/community/ibus-kkc/PKGBUILD
index 75c2c22d1..1d69d1497 100644
--- a/community/ibus-kkc/PKGBUILD
+++ b/community/ibus-kkc/PKGBUILD
@@ -8,7 +8,6 @@ pkgdesc="libkkc (Japanese Kana Kanji input method) engine for ibus"
 arch=('i686' 'x86_64' 'mips64el')
 url="https://bitbucket.org/libkkc"
 license=('GPL')
-options=(!libtool)
 depends=('ibus' 'libkkc' 'libkkc-data' 'skk-jisyo')
 makedepends=('vala' 'intltool')
 source=(https://bitbucket.org/libkkc/${pkgname}/downloads/${pkgname}-${pkgver}.tar.gz)
diff --git a/community/ibus-qt/0001-Do-not-crash-on-missing-invalid-DISPLAY-envvar.patch b/community/ibus-qt/0001-Do-not-crash-on-missing-invalid-DISPLAY-envvar.patch
deleted file mode 100644
index eab3a51fe..000000000
--- a/community/ibus-qt/0001-Do-not-crash-on-missing-invalid-DISPLAY-envvar.patch
+++ /dev/null
@@ -1,75 +0,0 @@
-From fab6dc760edc39b9b4e561cfbf21b38c4fa86234 Mon Sep 17 00:00:00 2001
-From: Peter Wu <lekensteyn@gmail.com>
-Date: Tue, 4 Sep 2012 19:40:08 +0200
-Subject: [PATCH] Do not crash on missing/invalid DISPLAY envvar.
-
-- Check whether the passed DISPLAY environment variable contains ":".
-
-- Fallback to "-display" parameter passed to QApplication.
----
- src/CMakeLists.txt |  2 ++
- src/qibusbus.cpp   | 23 ++++++++++++++++-------
- 2 files changed, 18 insertions(+), 7 deletions(-)
-
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index 2ad5588..8866ac0 100644
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -92,9 +92,11 @@ set_target_properties(
- target_link_libraries(
-     ibus-qt
-     debug ${QT_QTCORE_LIBRARY_DEBUG}
-+    debug ${QT_QTGUI_LIBRARY_DEBUG}
-     debug ${QT_QTDBUS_LIBRARY_DEBUG}
-     debug ${QT_QTXML_LIBRARY_DEBUG}
-     optimized ${QT_QTCORE_LIBRARY_RELEASE}
-+    optimized ${QT_QTGUI_LIBRARY_RELEASE}
-     optimized ${QT_QTDBUS_LIBRARY_RELEASE}
-     optimized ${QT_QTXML_LIBRARY_RELEASE}
-     ${DBUS_LIBRARIES}
-diff --git a/src/qibusbus.cpp b/src/qibusbus.cpp
-index 6a45d65..ed8248a 100644
---- a/src/qibusbus.cpp
-+++ b/src/qibusbus.cpp
-@@ -12,7 +12,8 @@
- #include "qibusbus.h"
- #include "qibusibusproxy.h"
- #include "qibusdbusproxy.h"
--
-+#include <X11/Xlib.h>
-+#include <QX11Info>
- 
- namespace IBus {
- /**
-@@ -121,15 +122,23 @@ QString
- Bus::getSocketPath (void)
- {
-     QString display = getenv ("DISPLAY");
--    QStringList strs = display.split(":");
-     QString hostname = "unix";
-     QString display_number = "0";
-+    /* fallback when -display is passed to QApplication with no DISPLAY env */
-+    if (display == NULL) {
-+        Display * dpy = QX11Info::display();
-+        if (dpy)
-+            display = XDisplayString(dpy);
-+    }
-+    if (display != NULL && display.contains(':')) {
-+        QStringList strs = display.split(":");
- 
--    if (!strs[0].isEmpty())
--        hostname = strs[0];
--    strs = strs[1].split(".");
--    if (!strs[0].isEmpty())
--        display_number = strs[0];
-+        if (!strs[0].isEmpty())
-+            hostname = strs[0];
-+        strs = strs[1].split(".");
-+        if (!strs[0].isEmpty())
-+            display_number = strs[0];
-+    }
- 
-     QString path =
-         QDir::homePath() +
--- 
-1.7.12
diff --git a/community/ibus-qt/PKGBUILD b/community/ibus-qt/PKGBUILD
index e59fc4e32..ba304ca07 100644
--- a/community/ibus-qt/PKGBUILD
+++ b/community/ibus-qt/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 87047 2013-03-26 11:49:40Z foutrelis $
+# $Id: PKGBUILD 98741 2013-10-17 14:01:48Z andyrtr $
 # Maintainer: Felix Yan <felixonmars@gmail.com>
 # Contributor: Thomas Dziedzic < gostrc at gmail >
 # Contributor: garion < garion @ mailoo.org >
@@ -6,7 +6,7 @@
 
 pkgname=ibus-qt
 pkgver=1.3.2
-pkgrel=1
+pkgrel=2
 pkgdesc='IBus qt library and IBus qt input method plugin'
 arch=('i686' 'x86_64' 'mips64el')
 license=('LGPL')
diff --git a/community/icewm-utils/PKGBUILD b/community/icewm-utils/PKGBUILD
deleted file mode 100644
index cb8825e45..000000000
--- a/community/icewm-utils/PKGBUILD
+++ /dev/null
@@ -1,113 +0,0 @@
-# $Id: PKGBUILD 87991 2013-04-09 21:31:23Z eric $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Contributor: Dominika Solarz <dominikasolarz@gmail.com>
-
-pkgname=icewm-utils
-pkgver=1.0
-
-_mcver=2.1
-_tsver=1.4
-_bgsetver=1.3
-_kedver=1.5
-_woedver=1.8
-_sndcfgver=1.3
-_ccver=2.9
-_cursorscfgver=0.6
-_iconcvtver=1.0
-_rrunver=0.5
-_mergeprefsver=0.5
-
-pkgrel=6.1
-pkgdesc="Suite of tools for IceWM"
-arch=('i686' 'x86_64' 'mips64el')
-license=("GPL")
-url="http://icecc.sourceforge.net/"
-depends=('qt3' 'python2')
-optdepends=('pyqt3' 'gvim')
-source=("http://downloads.sourceforge.net/icecc/icemc-$_mcver.tar.bz2"
-	"http://downloads.sourceforge.net/sourceforge/icecc/icets-$_tsver.tar.bz2"
-	"http://downloads.sourceforge.net/sourceforge/icecc/icebgset-$_bgsetver.tar.bz2"
-	"http://downloads.sourceforge.net/sourceforge/icecc/iceked-$_kedver.tar.bz2"
-	"http://downloads.sourceforge.net/sourceforge/icecc/icewoed-$_woedver.tar.bz2"
-	"http://downloads.sourceforge.net/sourceforge/icecc/icesndcfg-$_sndcfgver.tar.bz2"
-	"http://downloads.sourceforge.net/sourceforge/icecc/icecc-$_ccver.tar.bz2"
-	"http://downloads.sourceforge.net/sourceforge/icecc/icecursorscfg-$_cursorscfgver.tar.bz2"
-	"http://downloads.sourceforge.net/sourceforge/icecc/iceiconcvt-$_iconcvtver.tar.bz2"
-	"http://downloads.sourceforge.net/sourceforge/icecc/icerrun-$_rrunver.tar.bz2"
-	"http://downloads.sourceforge.net/sourceforge/icecc/icemergeprefs-$_mergeprefsver.tar.bz2"
-	icets-fix-icewmtray-crash.diff)
-md5sums=('cb2afc6efaa0f9d77b0119b29d528667'
-         '1d87c93f5cb27da16c90f47531b7fb21'
-         '7086b771fc7877369924affc5b5f5e41'
-         '47761a8dc59880ddda2a00de9cd187f5'
-         '518f05c02cb24a7e36715ce0d0672c8e'
-         '2113c524ebbbf38ce7eb174b9997c202'
-         'e3ddbb3536941745435f727053816865'
-         '000ec299a83dbae269f2f335910bd50e'
-         '64463287b6c535b31cb2823d97bfe299'
-         'cea2fd7726b9f01b080e3861d325ec24'
-         'b34931566da118e7a14ddcb529e739c6'
-         '5116da930c0063dd8c478dd8e473b08f')
-
-build() {
-  cd $srcdir
-  # fix default global path to IceWM
-  for file in icewoed-$_woedver/qcentralwidget.cpp \
-             icemc-$_mcver/qcentralwidget.cpp \
-             icets-$_tsver/icets.cpp
-  do
-    sed -i 's|/usr/local/|/usr/|' $file
-  done
-
-  # python2 fix
-  for file in $(find . -name '*.py' -print); do
-    sed -i 's_#!.*/usr/bin/python$_#!/usr/bin/python2_' $file
-    sed -i 's_#!.*/usr/bin/env.*python$_#!/usr/bin/env python2_' $file
-  done
-
-  (cd icets-$_tsver && patch -p0 <$srcdir/icets-fix-icewmtray-crash.diff)
-
-  cd $srcdir/icemc-$_mcver
-  qmake-qt3
-  make MOC=/usr/bin/moc-qt3 UIC=/usr/bin/uic-qt3 INCPATH+='-I/usr/include/qt3'
-
-  cd $srcdir/icets-$_tsver
-  qmake-qt3
-  make MOC=/usr/bin/moc-qt3 UIC=/usr/bin/uic-qt3 INCPATH+='-I/usr/include/qt3'
-
-  cd $srcdir/icebgset-$_bgsetver
-  qmake-qt3
-  make MOC=/usr/bin/moc-qt3 UIC=/usr/bin/uic-qt3 INCPATH+='-I/usr/include/qt3'
-
-  cd $srcdir/iceked-$_kedver
-  qmake-qt3
-  make MOC=/usr/bin/moc-qt3 UIC=/usr/bin/uic-qt3 INCPATH+='-I/usr/include/qt3'
-
-  cd $srcdir/icecc-$_ccver
-  qmake-qt3
-  make MOC=/usr/bin/moc-qt3 UIC=/usr/bin/uic-qt3 INCPATH+='-I/usr/include/qt3'
-
-  cd $srcdir/icesndcfg-$_sndcfgver
-  qmake-qt3
-  make MOC=/usr/bin/moc-qt3 UIC=/usr/bin/uic-qt3 INCPATH+='-I/usr/include/qt3'
-
-  cd $srcdir/icewoed-$_woedver
-  qmake-qt3
-  make MOC=/usr/bin/moc-qt3 UIC=/usr/bin/uic-qt3 INCPATH+='-I/usr/include/qt3'
-}
-
-package() {
-  mkdir -p $pkgdir/usr/bin
-  cp $srcdir/icemc-$_mcver/icemc $pkgdir/usr/bin/
-  cp $srcdir/icets-$_tsver/icets $pkgdir/usr/bin/
-  cp $srcdir/icebgset-$_bgsetver/icebgset $pkgdir/usr/bin/
-  cp $srcdir/iceked-$_kedver/iceked $pkgdir/usr/bin/
-  cp $srcdir/icecc-$_ccver/icecc $pkgdir/usr/bin/
-  cp $srcdir/icesndcfg-$_sndcfgver/icesndcfg $pkgdir/usr/bin/
-  cp $srcdir/icewoed-$_woedver/icewoed $pkgdir/usr/bin/
-  cp $srcdir/icecursorscfg-$_cursorscfgver/icecurcfg.py $pkgdir/usr/bin/icecurcfg
-  cp $srcdir/iceiconcvt-$_iconcvtver/iceiconcvt.py $pkgdir/usr/bin/iceiconcvt
-  cp $srcdir/icemergeprefs-$_mergeprefsver/icemergeprefs.py $pkgdir/usr/bin/icemergeprefs
-  cp $srcdir/icerrun-$_rrunver/icerrun.py $pkgdir/usr/bin/icerrun
-  cp $srcdir/icerrun-$_rrunver/icerrrun.py $pkgdir/usr/bin/icerrrun
-}
diff --git a/community/icewm-utils/icets-fix-icewmtray-crash.diff b/community/icewm-utils/icets-fix-icewmtray-crash.diff
deleted file mode 100644
index 3a3b62bcc..000000000
--- a/community/icewm-utils/icets-fix-icewmtray-crash.diff
+++ /dev/null
@@ -1,13 +0,0 @@
---- ./icets.cpp.orig	2010-03-22 00:42:19.231913625 +1000
-+++ ./icets.cpp	2010-03-22 00:43:34.611221044 +1000
-@@ -311,7 +311,9 @@
-      }/* if(bakFile.exists()) */
- 
-     //restart IceWM
--    system("pkill -1 icewm");
-+    // Use killall instead of pkill, because pkill kills all icewm processes
-+    // like icewmtray - in this case we lost view of running tray apps
-+    system("killall -1 icewm");
- }/* setTheme() */
- 
- /**
diff --git a/community/iec16022/PKGBUILD b/community/iec16022/PKGBUILD
index 18f1015fd..cc47bcf7b 100644
--- a/community/iec16022/PKGBUILD
+++ b/community/iec16022/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 69134 2012-04-09 18:02:18Z bgyorgy $
+# $Id: PKGBUILD 99813 2013-10-31 01:52:00Z allan $
 # Maintainer: Balló György <ballogyor+arch at gmail dot com>
 
 pkgname=iec16022
@@ -9,7 +9,6 @@ arch=('i686' 'x86_64' 'mips64el')
 url="http://datenfreihafen.org/projects/iec16022.html"
 license=('GPL')
 depends=('popt' 'zlib')
-options=('!libtool')
 source=(http://datenfreihafen.org/~stefan/$pkgname/$pkgname-$pkgver.tar.gz)
 md5sums=('9395108f1deaa2c4bd6d05a9e7c91431')
 
diff --git a/community/inn/PKGBUILD b/community/inn/PKGBUILD
index e6e50750a..7e55110be 100644
--- a/community/inn/PKGBUILD
+++ b/community/inn/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 95240 2013-08-07 11:39:42Z spupykin $
+# $Id: PKGBUILD 100176 2013-11-01 20:58:57Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: Edward Tjörnhammar <xhemi@cube2.se>
 # Contributor: Edward Tjörnhammar <xhemi@cube2.se>
 
 pkgname=inn
 pkgver=2.5.3
-pkgrel=8
+pkgrel=9
 pkgdesc="Complete open source Usenet system. De facto standard for handling news routing, news spool and serving the spool to customers."
 url="http://www.isc.org/software/inn/"
 arch=('i686' 'x86_64' 'mips64el')
diff --git a/community/inotify-tools/PKGBUILD b/community/inotify-tools/PKGBUILD
index 7a4ddbeb4..bec9004cd 100644
--- a/community/inotify-tools/PKGBUILD
+++ b/community/inotify-tools/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 65568 2012-02-21 08:59:52Z spupykin $
+# $Id: PKGBUILD 100108 2013-11-01 17:15:48Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Alessandro Sagratini
 
 pkgname=inotify-tools
 pkgver=3.14
-pkgrel=2.1
+pkgrel=3
 pkgdesc="inotify-tools is a C library and a set of command-line programs for Linux providing a simple interface to inotify."
 arch=('i686' 'x86_64' 'mips64el')
 url="http://inotify-tools.sourceforge.net/"
@@ -18,5 +18,9 @@ build() {
   cd $srcdir/$pkgname-$pkgver
   ./configure --prefix=/usr
   make
+}
+
+package() {
+  cd $srcdir/$pkgname-$pkgver
   make DESTDIR=$pkgdir install
 }
diff --git a/community/intel-gpu-tools/PKGBUILD b/community/intel-gpu-tools/PKGBUILD
index e0d17e5f8..20eac3d15 100644
--- a/community/intel-gpu-tools/PKGBUILD
+++ b/community/intel-gpu-tools/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 97300 2013-09-17 05:47:11Z thestinger $
+# $Id: PKGBUILD 99814 2013-10-31 01:52:21Z allan $
 # Maintainer: Daniel Micay <danielmicay@gmail.com>
 # Contributor: Mikael Eriksson <mikael_eriksson@miffe.org>
 # Originally by: Denis Smirnov <detanator@gmail.com>
@@ -12,7 +12,6 @@ license=(MIT)
 url="http://cgit.freedesktop.org/xorg/app/intel-gpu-tools/"
 depends=('libdrm' 'libpciaccess' 'cairo' python)
 makedepends=(swig)
-options=(!libtool)
 source=(http://xorg.freedesktop.org/releases/individual/app/$pkgname-$pkgver.tar.bz2)
 md5sums=('bfa2ff70c09c95fcad46e7d332e08d28')
 
diff --git a/community/io/PKGBUILD b/community/io/PKGBUILD
new file mode 100644
index 000000000..52ddc03cb
--- /dev/null
+++ b/community/io/PKGBUILD
@@ -0,0 +1,32 @@
+# $Id: PKGBUILD 99046 2013-10-23 12:00:03Z arodseth $
+# Maintainer: Alexander Rødseth <rodseth@gmail.com>
+# Contributor: Gergely Imreh <imrehg(at)gmail(dot)com>
+ 
+pkgname=io
+pkgver=2011.09.12
+pkgrel=1
+pkgdesc='IO programming language'
+arch=('x86_64' 'i686')
+url='http://iolanguage.com/'
+license=('BSD')
+depends=('pcre' 'libsndfile' 'libxmu' 'freetype2' 'libedit' 'libxml2' 'libtiff' 'libevent' 'yajl' 'libmysqlclient' 'lzo2' 'libpng' 'python2' 'util-linux' 'freeglut' 'libjpeg-turbo' 'libtheora')
+makedepends=('cmake')
+source=("$pkgname-$pkgver.tar.gz::https://github.com/stevedekorte/io/tarball/$pkgver")
+options=('!makeflags' '!buildflags')
+sha256sums=('7b4cb97a0aa3abb562703e1dbfe46925c22820eeca6969865b979c397799d092')
+
+build() {
+  mkdir -p stevedekorte-io-23afbcc/build
+  cd stevedekorte-io-23afbcc/build
+  cmake -DCMAKE_INSTALL_PREFIX=/usr ..
+  make
+}
+
+package() {
+  cd stevedekorte-io-23afbcc/build
+  make DESTDIR="$pkgdir" install
+  install -Dm644 ../license/bsd_license.txt \
+    "$pkgdir/usr/share/licenses/$pkgname/bsd_license.txt"
+}
+
+# vim:set ts=2 sw=2 et:
diff --git a/community/ipset/PKGBUILD b/community/ipset/PKGBUILD
index 75d272a46..aa5475044 100644
--- a/community/ipset/PKGBUILD
+++ b/community/ipset/PKGBUILD
@@ -1,19 +1,18 @@
-# $Id: PKGBUILD 90514 2013-05-12 23:45:55Z seblu $
+# $Id: PKGBUILD 99568 2013-10-29 21:15:35Z seblu $
 # Maintainer: Sébastien Luttringer
 
 pkgname=ipset
-pkgver=6.19
-pkgrel=2
+pkgver=6.20.1
+pkgrel=1
 pkgdesc='Administration tool for IP sets'
 arch=('i686' 'x86_64' 'mips64el')
 url='http://ipset.netfilter.org'
 license=('GPL2')
-depends=('libmnl' 'bash')
+depends=('libmnl')
 backup=("etc/$pkgname.conf")
-options=('!libtool')
 source=("http://ipset.netfilter.org/$pkgname-$pkgver.tar.bz2"
         "$pkgname.service")
-md5sums=('cabba1bd63a93f6e1c3db3fb22412b64'
+md5sums=('8af741492752fbf24d3a28a9d1473d40'
          '6be6a2b34c1f38fc8ad60828403e2077')
 
 build() {
diff --git a/community/iverilog/PKGBUILD b/community/iverilog/PKGBUILD
index a2dd806f6..aabd4b6cd 100644
--- a/community/iverilog/PKGBUILD
+++ b/community/iverilog/PKGBUILD
@@ -5,7 +5,7 @@
 
 pkgname=iverilog
 pkgver=0.9.7
-pkgrel=1
+pkgrel=3
 pkgdesc='Icarus Verilog compiler and simulation tool'
 arch=('x86_64' 'i686')
 url='http://iverilog.icarus.com/'
@@ -13,20 +13,19 @@ url='http://iverilog.icarus.com/'
 license=('GPL')
 makedepends=('readline' 'gperf')
 depends=('bzip2' 'sh' 'gcc-libs' 'zlib')
+options=('staticlibs')
 source=("ftp://ftp.icarus.com/pub/eda/verilog/v0.9/verilog-$pkgver.tar.gz")
 sha256sums=('7a5e72e17bfb4c3a59264d8f3cc4e70a7c49c1307173348fdd44e079388e7454')
 
 build() {
-  cd "$srcdir/${pkgname/i}-$pkgver"
+  cd "${pkgname/i}-$pkgver"
 
   ./configure --prefix=/usr
   make
 }
 
 package() {
-  cd "$srcdir/${pkgname/i}-$pkgver"
-
-  make -j1 prefix="$pkgdir/usr" install
+  make -C "${pkgname/i}-$pkgver" -j1 prefix="$pkgdir/usr" install
 }
 
 # vim:set ts=2 sw=2 et:
diff --git a/community/jack2/PKGBUILD b/community/jack2/PKGBUILD
index 4bd49a92a..e59542bb9 100644
--- a/community/jack2/PKGBUILD
+++ b/community/jack2/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 92144 2013-06-01 12:22:16Z schiv $
+# $Id: PKGBUILD 100543 2013-11-05 18:38:02Z schiv $
 # Maintainer: Ray Rashif <schiv@archlinux.org>
 # Contributor: Daniele Paolella <danielepaolella@email.it>
 # Contributor: Philipp Überbacher <hollunder at gmx dot at>
@@ -9,12 +9,12 @@ pkgname=('jack2' 'jack2-dbus')
 #pkgname= # single build (overrides split)
 _tarname=jack
 pkgver=1.9.9.5
-pkgrel=3
+pkgrel=4
 arch=('i686' 'x86_64' 'mips64el')
 url="http://jackaudio.org/"
 backup=(etc/security/limits.d/99-audio.conf)
 license=('GPL')
-makedepends=('python2' 'celt' 'opus' 'libsamplerate')
+makedepends=('python2-dbus' 'celt' 'opus' 'libsamplerate')
 [ "$CARCH" != "mips64el" ] && makedepends+=('libffado')
 source=("https://dl.dropbox.com/u/28869550/jack-1.9.9.5.tar.bz2"
         '99-audio.conf'
@@ -88,8 +88,8 @@ package_jack2() {
   ! _isbuild jack2 && return 0
 
   pkgdesc="The next-generation JACK with SMP support"
-  depends=('libsamplerate' 'celt' 'opus')
-  optdepends=('python2: jack_control')
+  depends=('libsamplerate' 'celt' 'opus' 'libffado')
+  optdepends=('python2-dbus: jack_control')
   [ "$CARCH" != "mips64el" ] && depends+=('libffado')
   conflicts=('jack')
   provides=('jack' 'jackmp' 'jackdmp' 'jackdbus')
@@ -116,7 +116,7 @@ package_jack2-dbus() {
   pkgdesc="The next-generation JACK with SMP support (for D-BUS interaction only)"
   depends=('libsamplerate' 'celt' 'opus')
   [ "$CARCH" != "mips64el" ] && depends+=('libffado')
-  optdepends=('python2: jack_control')
+  optdepends=('python2-dbus: jack_control')
   conflicts=('jack' 'jack2')
   provides=('jack' 'jack2' 'jackmp' 'jackdmp' 'jackdbus')
 
diff --git a/community/jansson/PKGBUILD b/community/jansson/PKGBUILD
index 695218e3b..cf79fd9f1 100644
--- a/community/jansson/PKGBUILD
+++ b/community/jansson/PKGBUILD
@@ -1,16 +1,16 @@
-# $Id: PKGBUILD 97810 2013-09-30 00:05:41Z kkeen $
+# $Id: PKGBUILD 99106 2013-10-24 13:00:22Z kkeen $
 # Maintainer: Kyle Keen <keenerd@gmail.com>
 # Contributor: Dave Reisner <d@falconindy.com>
 
 pkgname=jansson
 pkgver=2.5
-pkgrel=1
+pkgrel=2
 pkgdesc='C library for encoding, decoding and manipulating JSON data'
 arch=('i686' 'x86_64' 'mips64el')
 url='http://www.digip.org/jansson/'
 depends=('glibc')
 license=('MIT')
-options=('!libtool')
+options=('staticlibs')
 source=("http://www.digip.org/$pkgname/releases/$pkgname-$pkgver.tar.bz2")
 md5sums=('ab239be8c08871c8463b27cf7610947c')
 
diff --git a/community/java-rxtx/PKGBUILD b/community/java-rxtx/PKGBUILD
index 5aa7bedcc..9dded2e80 100644
--- a/community/java-rxtx/PKGBUILD
+++ b/community/java-rxtx/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 96587 2013-09-01 23:49:41Z bgyorgy $
+# $Id: PKGBUILD 99816 2013-10-31 01:53:02Z allan $
 # Maintainer: Balló György <ballogyor+arch at gmail dot com>
 # Contributor: Vitaliy Berdinskikh ur6lad[at]i.ua
 
@@ -12,7 +12,6 @@ url="http://rxtx.qbang.org/"
 license=('LGPL')
 depends=('glibc' 'java-runtime')
 makedepends=('java-environment')
-options=('!libtool')
 provides=("$_pkgname=$pkgver")
 replaces=("$_pkgname")
 install=$_pkgname.install
diff --git a/community/javasqlite/PKGBUILD b/community/javasqlite/PKGBUILD
index 7a630833e..e6b174c40 100644
--- a/community/javasqlite/PKGBUILD
+++ b/community/javasqlite/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 69678 2012-04-22 12:35:52Z guillaume $
+# $Id: PKGBUILD 99817 2013-10-31 01:53:22Z allan $
 # Maintainer: Guillaume ALAUX <guillaume@archlinux.org>
 # Contributor: Jaroslaw Swierczynski <swiergot@aur.archlinux.org>
 
@@ -11,7 +11,6 @@ url="http://www.ch-werner.de/javasqlite/"
 license=('custom:BSD-style')
 depends=('java-runtime' 'sqlite')
 makedepends=('java-environment')
-options=('!libtool')
 source=(http://www.ch-werner.de/$pkgname/$pkgname-$pkgver.tar.gz)
 md5sums=('a5c4f7760ed002749560068b2bd4bb25')
 sha1sums=('76aebb0a11b9e1f861ebaeab9ea3e5818b753ab3')
diff --git a/community/jbig2dec/PKGBUILD b/community/jbig2dec/PKGBUILD
index eb7a8b8e2..3ec4977a6 100644
--- a/community/jbig2dec/PKGBUILD
+++ b/community/jbig2dec/PKGBUILD
@@ -1,16 +1,15 @@
-# $Id: PKGBUILD 90049 2013-05-06 19:37:57Z foutrelis $
+# $Id: PKGBUILD 99818 2013-10-31 01:53:42Z allan $
 # Maintainer:  Bartłomiej Piotrowski
 # Contributor: Stefan Husmann <stefan-husmann@t-online.de>
 
 pkgname=jbig2dec
 pkgver=0.11
-pkgrel=6
+pkgrel=7
 pkgdesc="decoder implementation of the JBIG2 image compression format"
 arch=('x86_64' 'i686' 'mips64el')
 url="http://jbig2dec.sourceforge.net/"
 license=('GPL3')
 depends=('glibc' 'libpng')
-options=('!libtool')
 source=(https://github.com/rillian/jbig2dec/archive/$pkgver.tar.gz
         $pkgname-$pkgver-libpng15.patch)
 sha256sums=('8af7b94b6026aff718d4b41ad990f2702f8fd4a348d565c4b48a695988ca0e9a'
diff --git a/community/jbigkit/PKGBUILD b/community/jbigkit/PKGBUILD
index d78b3fbeb..64b27e5e8 100644
--- a/community/jbigkit/PKGBUILD
+++ b/community/jbigkit/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 65580 2012-02-21 09:05:55Z spupykin $
+# $Id: PKGBUILD 100180 2013-11-01 20:59:44Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Angel 'angvp' Velasquez <angvp[at]archlinux.com.ve>
 # Contributor: Frank Ickstadt (frank dot ickstadt at gmail dot com)
 
 pkgname=jbigkit
 pkgver=2.0
-pkgrel=3
+pkgrel=4
 pkgdesc="Data compression library/utilities for bi-level high-resolution images"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.cl.cam.ac.uk/~mgk25/jbigkit/"
@@ -16,8 +16,11 @@ md5sums=('3dd87f605abb1a97a22dc79d8b3e8f6c')
 
 build() {
   cd $srcdir/$pkgname
-
   make
+}
+
+package() {
+  cd $srcdir/$pkgname
 
   install -D -m644 $srcdir/$pkgname/libjbig/libjbig.a $pkgdir/usr/lib/libjbig.a
   install -D -m644 $srcdir/$pkgname/libjbig/libjbig85.a $pkgdir/usr/lib/libjbig85.a
diff --git a/community/jemalloc/PKGBUILD b/community/jemalloc/PKGBUILD
index f7fba3d86..8531768e4 100644
--- a/community/jemalloc/PKGBUILD
+++ b/community/jemalloc/PKGBUILD
@@ -1,16 +1,19 @@
-# $Id: PKGBUILD 92707 2013-06-13 08:34:56Z mtorromeo $
+# $Id: PKGBUILD 99648 2013-10-30 17:30:37Z mtorromeo $
 # Maintainer: Massimiliano Torromeo <massimiliano.torromeo@gmail.com>
 # Contributor: Kovivchak Evgen <oneonfire@gmail.com>
 
 pkgname=jemalloc
-pkgver=3.4.0
-pkgrel=1
+pkgver=3.4.1
+pkgrel=2
 pkgdesc="General-purpose scalable concurrent malloc implementation"
 arch=('i686' 'x86_64' 'mips64el')
 license=('BSD')
 url="http://www.canonware.com/jemalloc/"
 depends=('glibc')
-makedepends=('autoconf' 'make')
+makedepends=('autoconf' 'make' 'bash')
+optdepends=(
+	'perl: memory profiler'
+)
 source=(http://www.canonware.com/download/jemalloc/$pkgname-$pkgver.tar.bz2)
 
 build() {
@@ -27,4 +30,4 @@ package() {
 	install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING"
 }
 
-sha256sums=('f60802c4c2c60bc24598fd052494aea96f4426f3d4decd832eadeed520ff81c0')
+sha256sums=('7341953fe9f21342b005b6c7e798631678ae713293a64d5fa61dea7449fc10fb')
diff --git a/community/jshon/PKGBUILD b/community/jshon/PKGBUILD
index 770502826..dcd6d6554 100644
--- a/community/jshon/PKGBUILD
+++ b/community/jshon/PKGBUILD
@@ -1,7 +1,7 @@
-# $Id: PKGBUILD 95722 2013-08-16 00:46:12Z kkeen $
+# $Id: PKGBUILD 100535 2013-11-05 17:02:10Z kkeen $
 # Maintainer: Kyle Keen <keenerd@gmail.com>
 pkgname=jshon
-pkgver=20130815
+pkgver=20131105
 pkgrel=1
 pkgdesc="A json parser for the shell."
 arch=('i686' 'x86_64' 'mips64el')
@@ -9,7 +9,7 @@ url="http://kmkeen.com/jshon/"
 license=('MIT')
 depends=('jansson')
 source=(http://kmkeen.com/$pkgname/$pkgname-$pkgver.tar.gz)
-md5sums=('3ef31b1954ef0838f67bcaf20993dcdd')
+md5sums=('84596bcf2d6cde7bbc0fcb4626765b99')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
diff --git a/community/judy/PKGBUILD b/community/judy/PKGBUILD
index 1af50ede4..c48a78700 100644
--- a/community/judy/PKGBUILD
+++ b/community/judy/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 65582 2012-02-21 09:06:42Z spupykin $
+# $Id: PKGBUILD 100110 2013-11-01 17:16:07Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: d'Ronin <daronin@2600.com>
 
 pkgname=judy
 pkgver=1.0.5
-pkgrel=3.1
+pkgrel=4
 arch=('i686' 'x86_64' 'mips64el')
 pkgdesc="C library creating and accessing dynamic arrays"
 makedepends=(gcc)
@@ -14,10 +14,13 @@ url="http://judy.sourceforge.net/"
 source=(http://downloads.sourceforge.net/judy/Judy-$pkgver.tar.gz)
 md5sums=('115a0d26302676e962ae2f70ec484a54')
 
-build()
-{
+build() {
   cd $srcdir/$pkgname-$pkgver
   [ $NOEXTRACT -eq 1 ] || ./configure --prefix=/usr
   make -j1
+}
+
+package() {
+  cd $srcdir/$pkgname-$pkgver
   make DESTDIR=$pkgdir install
 }
diff --git a/community/kakasi/PKGBUILD b/community/kakasi/PKGBUILD
index bf10796c1..0e75362c1 100644
--- a/community/kakasi/PKGBUILD
+++ b/community/kakasi/PKGBUILD
@@ -11,7 +11,6 @@ license=('GPL')
 source=("http://kakasi.namazu.org/stable/${pkgname}-${pkgver}.tar.gz")
 depends=('sh')
 md5sums=(4eff51aafbd56c9635791a20c03efa8f)
-options=(!libtool)
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
diff --git a/community/kdbg/PKGBUILD b/community/kdbg/PKGBUILD
index 1aba9c568..9a983df84 100644
--- a/community/kdbg/PKGBUILD
+++ b/community/kdbg/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 89959 2013-05-06 10:40:38Z spupykin $
+# $Id: PKGBUILD 99820 2013-10-31 01:54:27Z allan $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Eric Belanger <belanger@astro.umontreal.ca>
 # Contributor: Jason Taylor <jftaylor21@gmail.com>
@@ -13,7 +13,6 @@ url="http://www.kdbg.org"
 license=('GPL')
 depends=('kdebase-runtime' 'gdb')
 makedepends=('automoc4' 'cmake' 'optipng')
-options=('!libtool')
 source=("http://downloads.sourceforge.net/project/kdbg/Source%20Code/$pkgver/kdbg-$pkgver.tar.gz")
 md5sums=('345183d07eb11a9c841d3dc34b734613')
 
diff --git a/community/keybinder2/PKGBUILD b/community/keybinder2/PKGBUILD
index aff471889..0398adbc7 100644
--- a/community/keybinder2/PKGBUILD
+++ b/community/keybinder2/PKGBUILD
@@ -9,7 +9,6 @@ arch=('i686' 'x86_64' 'mips64el')
 url='http://kaizer.se/wiki/keybinder/'
 license=('GPL')
 makedepends=('pygtk')
-options=(!libtool)
 source=(http://kaizer.se/publicfiles/${_offname}/${_offname}-${pkgver}.tar.gz)
 sha256sums=('42863ca0174d568a8c02c6fb243fee1681823825e8bcb1718c51611d8e9793bb')
 
diff --git a/community/kid3/PKGBUILD b/community/kid3/PKGBUILD
index ead10403c..d025bc4bf 100644
--- a/community/kid3/PKGBUILD
+++ b/community/kid3/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 94888 2013-08-01 06:55:03Z bpiotrowski $
+# $Id: PKGBUILD 100349 2013-11-02 14:50:28Z jlichtblau $
 # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
 # Contributor: Alois Nespor <alois.nespor@gmail.com>
 
 pkgname=kid3
-pkgver=2.3
-pkgrel=2
+pkgver=3.0.1
+pkgrel=1
 pkgdesc="An MP3, Ogg/Vorbis and FLAC tag editor for KDE"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://kid3.sourceforge.net/"
@@ -15,12 +15,7 @@ options=('!makeflags')
 install=$pkgname.install
 changelog=$pkgname.changelog
 source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz)
-sha256sums=('8426b40b065f5a968796d1ff92da8d7a96d67cd963df837ce30ff1cf795ae301')
-
-prepare() {
-  cd ${pkgname}-${pkgver}
-  sed -i 's/AVCODEC_MAX_AUDIO_FRAME_SIZE/192000/' src/core/import/ffmpegfingerprintdecoder.cpp
-}
+sha256sums=('ebbae8b277c14083f87d49bcde5a86295c1874c4004fc5db2d5764ff53f15d59')
 
 build() {
   cd ${pkgname}-${pkgver}
diff --git a/community/kid3/kid3.changelog b/community/kid3/kid3.changelog
index 9376c5d71..270612022 100644
--- a/community/kid3/kid3.changelog
+++ b/community/kid3/kid3.changelog
@@ -1,3 +1,6 @@
+2013-11-02 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
+	* kid3 3.0.1-1
+
 2013-03-12 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
 	* kid3 2.3-1
 
diff --git a/community/kmscon/PKGBUILD b/community/kmscon/PKGBUILD
index 801f87927..faa619be2 100644
--- a/community/kmscon/PKGBUILD
+++ b/community/kmscon/PKGBUILD
@@ -1,46 +1,26 @@
-# $Id: PKGBUILD 85313 2013-02-28 21:20:56Z thestinger $
+# $Id: PKGBUILD 100312 2013-11-02 08:59:03Z thestinger $
 # Maintainer: Daniel Micay <danielmicay@gmail.com>
 # Contributor: David Herrmann <dh.herrmann@googlemail.com>
 pkgname=kmscon
-pkgver=7
+pkgver=8
 pkgrel=1
 pkgdesc='Terminal emulator based on Kernel Mode Setting (KMS)'
 arch=(i686 x86_64)
 url='https://github.com/dvdhrm/kmscon'
 license=('MIT')
-depends=(systemd libdrm mesa libegl libgbm libgles pango libxkbcommon libpciaccess xkeyboard-config)
+depends=(systemd libdrm mesa libegl libgbm libgles pango libxkbcommon xkeyboard-config libtsm)
 makedepends=(git libxslt docbook-xsl linux-api-headers)
-options=(!libtool)
-
-__gitroot=https://github.com/dvdhrm/kmscon.git
-__gitname=kmscon
+source=(git://github.com/dvdhrm/kmscon#tag=kmscon-$pkgver)
+md5sums=(SKIP)
 
 build() {
-  cd "$srcdir"
-
-  msg "Connecting to GIT server...."
-
-  if [[ -d "$__gitname" ]]; then
-    cd "$__gitname" && git pull origin
-    msg "The local files are updated."
-  else
-    git clone "$__gitroot" "$__gitname"
-  fi
-
-  msg "GIT checkout done or server timeout"
-  msg "Starting build..."
-
-  rm -rf "$srcdir/$__gitname-build"
-  git clone "$srcdir/$__gitname" "$srcdir/$__gitname-build"
-  cd "$srcdir/$__gitname-build"
-
-  git checkout $pkgname-$pkgver
+  cd $pkgname
   ./autogen.sh --prefix=/usr --disable-wlterm
   make
 }
 
 package() {
-  cd "$srcdir/$__gitname-build"
+  cd $pkgname
   make DESTDIR="$pkgdir/" install
   mkdir -p "$pkgdir/usr/share/licenses/$pkgname" "$pkgdir/usr/lib/systemd/system"
   cp COPYING "$pkgdir/usr/share/licenses/$pkgname/"
diff --git a/community/kmymoney/PKGBUILD b/community/kmymoney/PKGBUILD
index 60ea59808..09b1f406e 100644
--- a/community/kmymoney/PKGBUILD
+++ b/community/kmymoney/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 98121 2013-10-06 08:45:27Z jlichtblau $
+# $Id: PKGBUILD 100086 2013-11-01 13:55:58Z eric $
 # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
 # Maintainer: Laurent Carlier <lordheavym@gmail.com>
 # Contributor: Vamp898 <vamp898@web.de>
@@ -8,7 +8,7 @@
 
 pkgname=kmymoney
 pkgver=4.6.4
-pkgrel=1
+pkgrel=2
 pkgdesc="Personal finance manager for KDE which operates similarly to MS-Money or Quicken"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://kmymoney2.sourceforge.net/"
@@ -18,7 +18,7 @@ makedepends=('cmake' 'automoc4' 'docbook-xml' 'docbook-xsl' 'boost')
 replaces=('kmymoney2')
 install=$pkgname.install
 changelog=$pkgname.changelog
-options=('!makeflags')
+#options=('!makeflags')
 source=(http://downloads.sourceforge.net/project/kmymoney2/KMyMoney-KDE4/$pkgver/$pkgname-$pkgver.tar.xz)
 sha256sums=('89522fadb4a9f06f3f20e2d6ac47a147f70b4265abad2fdf3aa6672fe2a3c012')
 
@@ -31,7 +31,7 @@ build() {
   cmake ../ \
     -DCMAKE_INSTALL_PREFIX=/usr \
     -DCMAKE_BUILD_TYPE=RELEASE -DCMAKE_SKIP_RPATH=YES
-  make VERBOSE=1
+  make
 }
 
 package() {
diff --git a/community/ktoblzcheck/PKGBUILD b/community/ktoblzcheck/PKGBUILD
index f03dc1e49..a3a1e5e61 100644
--- a/community/ktoblzcheck/PKGBUILD
+++ b/community/ktoblzcheck/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 92372 2013-06-04 12:30:22Z spupykin $
+# $Id: PKGBUILD 99823 2013-10-31 01:55:26Z allan $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Philipp Sandhaus <philipp.sandhaus@gmx.de>
 
@@ -8,7 +8,6 @@ pkgrel=1
 pkgdesc="A library to check account numbers and bank codes of German banks"
 arch=(i686 x86_64 'mips64el')
 url="http://ktoblzcheck.sourceforge.net"
-options=('!libtool')
 license=("LGPL")
 depends=('gcc-libs' 'python')
 optdepends=('perl')
diff --git a/community/kvirc/PKGBUILD b/community/kvirc/PKGBUILD
index 5cfdaa45a..828af8709 100644
--- a/community/kvirc/PKGBUILD
+++ b/community/kvirc/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 91653 2013-05-26 09:24:37Z bluewind $
+# $Id: PKGBUILD 100026 2013-10-31 04:13:45Z allan $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 
 pkgname=kvirc
@@ -10,7 +10,6 @@ depends=('python2' 'libxss' 'qtwebkit')
 arch=(i686 x86_64 mips64el)
 makedepends=('cmake')
 license=('GPL')
-options=("!libtool")
 install=kvirc.install
 source=(ftp://ftp.kvirc.de/pub/kvirc/$pkgver/source/$pkgname-$pkgver.tar.bz2)
 md5sums=('bf7229aaae132933a18b6a35125a2328')
diff --git a/community/kyotocabinet/PKGBUILD b/community/kyotocabinet/PKGBUILD
index bf2381288..241470c2f 100644
--- a/community/kyotocabinet/PKGBUILD
+++ b/community/kyotocabinet/PKGBUILD
@@ -1,28 +1,27 @@
-# $Id: PKGBUILD 90164 2013-05-07 16:07:18Z fyan $
+# $Id: PKGBUILD 99150 2013-10-25 05:03:47Z fyan $
 # Maintainer: Felix Yan <felixonmars@gmail.com>
 # Contributor: Alexander Duscheleit <jinks@archlinux.us>
 # Contributor: Joaquim Pedro (osmano807) <osmano807@gmail.com>
 
 pkgname=kyotocabinet
 pkgver=1.2.76
-pkgrel=3
+pkgrel=4
 pkgdesc="a modern implementation of DBM in C++"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://fallabs.com/kyotocabinet"
 license=('LGPL3')
-makedepends=('gcc' 'make' 'pkgconfig' 'zlib')
 depends=('zlib' 'gcc-libs')
 source=("http://fallabs.com/${pkgname}/pkg/${pkgname}-${pkgver}.tar.gz")
 
 build() {
-  cd "$srcdir/$pkgname-$pkgver"
+  cd $pkgname-$pkgver
 
   ./configure --prefix=/usr --disable-opt
   make
 }
 
 package() {
-  cd "$srcdir/$pkgname-$pkgver"
+  cd $pkgname-$pkgver
 
   make install DESTDIR="$pkgdir/"
 }
diff --git a/community/lash/PKGBUILD b/community/lash/PKGBUILD
index bf3632c61..fbb357dfd 100644
--- a/community/lash/PKGBUILD
+++ b/community/lash/PKGBUILD
@@ -1,14 +1,13 @@
-# $Id$
+# $Id: PKGBUILD 100336 2013-11-02 11:38:23Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: DonVla <donvla@users.sourceforge.net>
 
 pkgname=lash
 pkgver=0.6.0~rc2
 _relver=0.6.0.594
-pkgrel=6.1
+pkgrel=7
 pkgdesc="A session management system for JACK and ALSA"
 arch=('i686' 'x86_64' 'mips64el')
-options=('!libtool')
 #url="http://lash-audio.org"
 url="http://lash.nongnu.org/"
 license=('GPL')
@@ -26,7 +25,9 @@ build() {
   export PYTHON="python2"
   sed -i "s#env python#&2#" clients/lash_control
 
-  ./configure --prefix=/usr LIBS=-lm
+  export LDFLAGS="-ldl -lm"
+
+  ./configure --prefix=/usr
   make
 }
 
diff --git a/community/ldc/PKGBUILD b/community/ldc/PKGBUILD
index df83c72ca..b93f4c0e5 100644
--- a/community/ldc/PKGBUILD
+++ b/community/ldc/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 97980 2013-10-02 14:03:48Z dicebot $
+# $Id: PKGBUILD 99051 2013-10-23 12:11:03Z dicebot $
 # Maintainer: Mihails Strasuns <public@dicebot.lv>
 # Contributor: Sven-Hendrik Haase <sh@lutzhaase.com>
 pkgname=('ldc' 'liblphobos-devel')
 groups=('dlang' 'dlang-ldc')
-pkgver=0.11.0
+pkgver=0.12.0
 epoch=1
-pkgrel=4
+pkgrel=1
 pkgdesc="A D Compiler based on the LLVM Compiler Infrastructure including D runtime and libphobos2"
 arch=('i686' 'x86_64')
 url="https://github.com/ldc-developers/ldc"
@@ -59,6 +59,7 @@ package_ldc() {
 package_liblphobos-devel() {
     depends=("ldc")
     provides=("d-runtime" "d-stdlib")
+	options=("staticlibs")
 
     # libraries
     install -D -m644 $srcdir/ldc/build/lib/libphobos-ldc.a $pkgdir/usr/lib/liblphobos.a
diff --git a/community/leptonica/PKGBUILD b/community/leptonica/PKGBUILD
index ca4bbe875..8333b1a01 100644
--- a/community/leptonica/PKGBUILD
+++ b/community/leptonica/PKGBUILD
@@ -1,15 +1,14 @@
-# $Id: PKGBUILD 94927 2013-08-01 07:01:21Z bpiotrowski $
+# $Id: PKGBUILD 100182 2013-11-01 21:05:03Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: Christoph Drexler <chrdr at gmx dot at>
 
 pkgname=leptonica
 pkgver=1.69
-pkgrel=8
+pkgrel=9
 pkgdesc="Software that is broadly useful for image processing and image analysis applications"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.leptonica.com/"
 license=('custom')
-options=(!libtool)
 depends=('giflib' 'libjpeg' 'libpng' 'libtiff' 'zlib' 'libwebp')
 source=(http://www.leptonica.com/source/leptonica-${pkgver}.tar.gz
 	giflib6.patch)
diff --git a/community/libacpi/PKGBUILD b/community/libacpi/PKGBUILD
index be13c8864..24fc27577 100644
--- a/community/libacpi/PKGBUILD
+++ b/community/libacpi/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 57009 2011-10-18 09:29:14Z spupykin $
+# $Id: PKGBUILD 100184 2013-11-01 21:05:24Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 
 pkgname=libacpi
 pkgver=0.2
-pkgrel=3
+pkgrel=4
 pkgdesc="general purpose lib to gather ACPI data"
 arch=(i686 x86_64 'mips64el')
 url="http://www.ngolde.de/libacpi.html"
@@ -19,5 +19,9 @@ build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
   patch -p1 <$srcdir/libacpi_${pkgver}-4.diff
   make PREFIX=/usr
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
   make PREFIX=/usr DESTDIR="${pkgdir}" install
 }
diff --git a/community/libcec/PKGBUILD b/community/libcec/PKGBUILD
index 762e02be1..68c88279c 100644
--- a/community/libcec/PKGBUILD
+++ b/community/libcec/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 93498 2013-07-04 12:44:24Z idevolder $
+# $Id: PKGBUILD 99035 2013-10-22 19:26:05Z idevolder $
 # Maintainer: BlackIkeEagle <ike DOT devolder AT gmail DOT com>
 # Contributor: Philippe Cherel <philippe.cherel@mayenne.org>
 # vim: ft=sh:
 
 pkgname=libcec
 pkgver=2.1.3
-pkgrel=1
+pkgrel=3
 pkgdesc="Pulse-Eight's libcec for the Pulse-Eight USB-CEC adapter"
 arch=('i686' 'x86_64' 'mips64el')
 url="https://github.com/Pulse-Eight/libcec"
@@ -13,7 +13,6 @@ license=('GPL')
 depends=('udev' 'lockdev')
 source=("$pkgname-$pkgver.tar.gz::https://github.com/Pulse-Eight/libcec/tarball/$pkgname-$pkgver")
 _srcfolder=Pulse-Eight-libcec-54be21e
-options=(!libtool)
 sha256sums=('2aa88451b528184b02077ee8c6cd10e2f89121a6a05b1b35b4b792b03108a9d1')
 
 build() {
diff --git a/community/libclastfm/PKGBUILD b/community/libclastfm/PKGBUILD
index 76601fdc0..8c6b8cea8 100644
--- a/community/libclastfm/PKGBUILD
+++ b/community/libclastfm/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 72448 2012-06-14 16:10:56Z ttopper $
+# $Id: PKGBUILD 99439 2013-10-28 21:06:50Z ttoepper $
 # Maintainer: Thorsten Töpper <atsutane-tu@freethoughts.de>
 pkgname=libclastfm
 pkgver=0.5
-pkgrel=1
+pkgrel=2
 pkgdesc="An unofficial C-API for the Last.fm web service"
 arch=("i686" "x86_64" "mips64el")
 url="http://liblastfm.sourceforge.net/"
diff --git a/community/libclens/PKGBUILD b/community/libclens/PKGBUILD
new file mode 100644
index 000000000..5e521a830
--- /dev/null
+++ b/community/libclens/PKGBUILD
@@ -0,0 +1,43 @@
+# $Id: PKGBUILD 99539 2013-10-29 11:41:22Z spupykin $
+# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
+# Maintainer: Dan Ziemba <zman0900@gmail.com>
+
+pkgname=libclens
+pkgver=0.7.0
+pkgrel=1
+pkgdesc="Convenience library to aid in porting code from OpenBSD"
+arch=(i686 x86_64)
+url="https://opensource.conformal.com/wiki/clens"
+license=(ISC)
+makedepends=(libbsd)
+options=('staticlibs')
+source=(https://opensource.conformal.com/snapshots/clens/clens-$pkgver.tar.gz)
+sha1sums=('71eb0011eef16f1e87131b5aba34d44db92b1145')
+
+build() {
+	cd "clens-$pkgver"
+	mkdir -p obj
+	make LOCALBASE=/usr
+}
+
+package() {
+	cd "clens-$pkgver"
+	make LOCALBASE=/usr DESTDIR="$pkgdir" install
+
+	mkdir -p $pkgdir/usr/share/licenses/libclens
+	cat <<EOF >$pkgdir/usr/share/licenses/libclens/LICENSE
+    ISC
+    .
+    Permission to use, copy, modify, and distribute this software for any
+    purpose with or without fee is hereby granted, provided that the above
+    copyright notice and this permission notice appear in all copies.
+    .
+    THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+    WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+    MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+    ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+    WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER
+    IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
+    OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+EOF
+}
diff --git a/community/libcss/PKGBUILD b/community/libcss/PKGBUILD
index 05a2b7e1c..e3ff2505f 100644
--- a/community/libcss/PKGBUILD
+++ b/community/libcss/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 89131 2013-04-27 00:42:21Z arodseth $
+# $Id: PKGBUILD 99623 2013-10-30 16:28:44Z arodseth $
 # Maintainer: Alexander Rødseth <rodseth@gmail.com>
 # Contributor: Brad Fanella <bradfanella@archlinux.us>
 # Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
 
 pkgname=libcss
 pkgver=0.2.0
-pkgrel=1
+pkgrel=2
 pkgdesc='CSS parser and selection engine'
 arch=('x86_64' 'i686' 'mips64el')
 url='http://www.netsurf-browser.org/projects/libcss/'
@@ -16,18 +16,18 @@ source=("http://download.netsurf-browser.org/libs/releases/libcss-$pkgver-src.ta
 sha256sums=('31b08f6f2259366ccad8b455440f364dc33e7dc78cdb0cf4905da56d5372f613')
 
 build() {
-  cd "$srcdir/$pkgname-$pkgver"
+  cd "$pkgname-$pkgver"
   
   export CFLAGS="-Wno-error=unused-but-set-variable"
   make PREFIX=/usr COMPONENT_TYPE="lib-shared"
-  make PREFIX=/usr COMPONENT_TYPE="lib-static"
+  #make PREFIX=/usr COMPONENT_TYPE="lib-static"
 }
 
 package() {
-  cd "$srcdir/$pkgname-$pkgver"
+  cd "$pkgname-$pkgver"
   
   make install PREFIX=/usr DESTDIR="$pkgdir" COMPONENT_TYPE="lib-shared"
-  make install PREFIX=/usr DESTDIR="$pkgdir" COMPONENT_TYPE="lib-static"
+  #make install PREFIX=/usr DESTDIR="$pkgdir" COMPONENT_TYPE="lib-static"
   install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING"
 }
 
diff --git a/community/libdaq/PKGBUILD b/community/libdaq/PKGBUILD
index 83cc6f1b7..744a8d92d 100644
--- a/community/libdaq/PKGBUILD
+++ b/community/libdaq/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 74193 2012-07-22 19:47:13Z lfleischer $
+# $Id: PKGBUILD 99826 2013-10-31 01:56:41Z allan $
 # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de>
 
 pkgname=libdaq
@@ -10,7 +10,6 @@ url='http://www.snort.org/'
 license=('GPL')
 depends=('libpcap')
 makedepends=('ca-certificates')
-options=('!libtool')
 source=("http://www.snort.org/dl/snort-current/daq-${pkgver}.tar.gz"{,.sig})
 md5sums=('bc204ea09165b4ecbb1bb49c7c1a2ad4'
          '3ec4c252249b09adaf5c96e2626a1f74')
diff --git a/community/libdbi-drivers/PKGBUILD b/community/libdbi-drivers/PKGBUILD
index 573816667..b8d5419c2 100644
--- a/community/libdbi-drivers/PKGBUILD
+++ b/community/libdbi-drivers/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 87120 2013-03-27 15:21:01Z ttoepper $
+# $Id: PKGBUILD 99828 2013-10-31 01:57:20Z allan $
 # Maintainer: Thorsten Töpper <atsutane-tu@freethoughts.de>
 # Contributor: Olivier Médoc <o_medoc@yahoo.fr>
 # Contributor: Ashok `ScriptDevil` Gautham <ScriptDevil.Arch@gmail.com>
@@ -16,7 +16,6 @@ optdepends=("postgresql-libs: To work with postgresql using libdbdpgsql "
 			"sqlite3: To work with sqlite3 using libdbdsqlite3"
 			"libmariadbclient: To work with mysql using libdbdmysql"
 			"sqlite2: To work with sqlite2 using libdbdsqlite")
-options=(!libtool)
 install=libdbi-drivers.install
 source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}/${pkgname}-${pkgver}/${pkgname}-${pkgver}.tar.gz")
 sha1sums=('8472875d30c216540d48d591b442e40ba4f7df5d')
diff --git a/community/libdbi/PKGBUILD b/community/libdbi/PKGBUILD
index 0959bad92..c42addb7b 100644
--- a/community/libdbi/PKGBUILD
+++ b/community/libdbi/PKGBUILD
@@ -1,16 +1,15 @@
-# $Id: PKGBUILD 87114 2013-03-27 13:46:18Z ttoepper $
+# $Id: PKGBUILD 99827 2013-10-31 01:57:00Z allan $
 # Maintainer: Thorsten Töpper <atsutane-tu@freethoughts.de>
 # Contributor: Carl Flippin <carlf@photocarl.org>
 
 pkgname=libdbi
 pkgver=0.9.0
-pkgrel=1
+pkgrel=2
 pkgdesc="A database independant abstraction layer for C"
 url="http://libdbi.sourceforge.net"
 license=('LGPL')
 arch=('i686' 'x86_64' 'mips64el')
 depends=('glibc')
-options=(!libtool)
 install=libdbi.install
 source=("http://downloads.sourceforge.net/project/${pkgname}/${pkgname}/${pkgname}-${pkgver}/${pkgname}-${pkgver}.tar.gz")
 sha1sums=('6c1ecfb78f43a921d5f914299304bd6c82cb0e23')
diff --git a/community/libdbusmenu/PKGBUILD b/community/libdbusmenu/PKGBUILD
new file mode 100644
index 000000000..ca900239e
--- /dev/null
+++ b/community/libdbusmenu/PKGBUILD
@@ -0,0 +1,46 @@
+# $Id: PKGBUILD 99160 2013-10-25 08:29:02Z alucryd $
+# Maintainer: Maxime Gauduin <alucryd at gmail dot com>
+# Contributor: Balló György <ballogyor+arch at gmail dot com>
+# Contributor: Branchini Massimo <max dot bra dot gtalk at gmail dot com
+
+pkgbase=libdbusmenu
+pkgname=('libdbusmenu-glib' 'libdbusmenu-gtk3')
+pkgver=12.10.2
+pkgrel=3
+pkgdesc="A library for passing menus over DBus"
+arch=('i686' 'x86_64')
+url="https://launchpad.net/libdbusmenu"
+license=('GPL3')
+makedepends=('gnome-doc-utils' 'gobject-introspection' 'gtk3' 'intltool' 'vala')
+options=('!emptydirs')
+source=("http://launchpad.net/dbusmenu/${pkgver%.?}/${pkgver}/+download/${pkgbase}-${pkgver}.tar.gz")
+sha256sums=('9d6ad4a0b918b342ad2ee9230cce8a095eb601cb0cee6ddc1122d0481f9d04c9')
+
+build() {
+  cd ${pkgbase}-${pkgver}
+
+  export HAVE_VALGRIND_TRUE='#'
+  export HAVE_VALGRIND_FALSE=''
+  ./configure --prefix='/usr' --sysconfdir='/etc' --localstatedir='/var' --disable-{dumper,static,tests}
+  make
+}
+
+package_libdbusmenu-glib() {
+depends=('glib2')
+
+  cd ${pkgbase}-${pkgver}
+
+  make -C libdbusmenu-glib DESTDIR="${pkgdir}" install
+}
+
+package_libdbusmenu-gtk3() {
+depends=('gtk3' 'libdbusmenu-glib')
+
+  cd ${pkgbase}-${pkgver}
+
+  make -C libdbusmenu-glib DESTDIR="${pkgdir}" install
+  make -C libdbusmenu-gtk DESTDIR="${pkgdir}" install
+  make -C libdbusmenu-glib DESTDIR="${pkgdir}" uninstall
+}
+
+# vim: ts=2 sw=2 et:
diff --git a/community/libdlna/PKGBUILD b/community/libdlna/PKGBUILD
index 263f045f2..78cfd31d6 100644
--- a/community/libdlna/PKGBUILD
+++ b/community/libdlna/PKGBUILD
@@ -1,15 +1,15 @@
-# $Id: PKGBUILD 94889 2013-08-01 06:55:04Z bpiotrowski $
+# $Id: PKGBUILD 100186 2013-11-01 21:05:42Z spupykin $
 # Maintainer: Kessia 'even' Pinheiro <kessiapinheiro at gmail.com> 
 # Contributor: kastor <kastor@fobos.org.ar>
 
 pkgname=libdlna
 pkgver=0.2.4
-pkgrel=12
+pkgrel=13
 pkgdesc="An open-source implementation of DLNA (Digital Living Network Alliance) standards "
 url="http://libdlna.geexbox.org"
 license=("LGPL")
 arch=('i686' 'x86_64' 'mips64el')
-options=('!libtool' '!makeflags')  # not parallel safe, error find -ldlna  
+options=('!makeflags')  # not parallel safe, error find -ldlna  
 #makedepends=('ctags')
 depends=('glibc' 'ffmpeg')
 source=("http://libdlna.geexbox.org/releases/${pkgname}-${pkgver}.tar.bz2")
diff --git a/community/libdnet/PKGBUILD b/community/libdnet/PKGBUILD
index 2b2493659..28ab014d9 100644
--- a/community/libdnet/PKGBUILD
+++ b/community/libdnet/PKGBUILD
@@ -1,17 +1,16 @@
-# $Id: PKGBUILD 91834 2013-05-28 17:04:24Z spupykin $
+# $Id: PKGBUILD 100188 2013-11-01 21:06:01Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: James Fryman <jfryman@gmail.com>
 
 pkgname=libdnet
 pkgver=1.12
-pkgrel=7
+pkgrel=8
 pkgdesc="A simplified, portable interface to several low-level networking routines"
 arch=(i686 x86_64 'mips64el')
 makedepends=(python2)
 optdepends=(python2)
 license=("BSD")
 url="http://code.google.com/p/libdnet/"
-options=('!libtool')
 source=(http://libdnet.googlecode.com/files/libdnet-$pkgver.tgz)
 md5sums=('9253ef6de1b5e28e9c9a62b882e44cc9')
 
diff --git a/community/libdom/PKGBUILD b/community/libdom/PKGBUILD
index 60ff3e123..d04fd65aa 100644
--- a/community/libdom/PKGBUILD
+++ b/community/libdom/PKGBUILD
@@ -1,31 +1,31 @@
-# $Id: PKGBUILD 89135 2013-04-27 01:19:34Z arodseth $
+# $Id: PKGBUILD 99607 2013-10-30 13:18:31Z arodseth $
 # Maintainer: Alexander Rødseth <rodseth@gmail.com>
 
 pkgname=libdom
 pkgver=0.0.1
-pkgrel=1
+pkgrel=2
 pkgdesc='Implementation of the W3C DOM'
 arch=('x86_64' 'i686' 'mips64el')
 url='http://www.netsurf-browser.org/projects/libdom/'
 license=('MIT')
-depends=('hubbub>=0.2.0' 'libwapcaplet>=0.2.0' 'expat')
+depends=('libhubbub>=0.2.0' 'libwapcaplet>=0.2.0' 'expat')
 makedepends=('netsurf-buildsystem')
 source=("http://download.netsurf-browser.org/libs/releases/$pkgname-$pkgver-src.tar.gz")
 sha256sums=('2aa75861c8a8291b6b3d1a3856c65ca615677afeec64ccfdf35a113a292c36b1')
 
 build() {
-  cd "$srcdir/$pkgname-$pkgver"
+  cd "$pkgname-$pkgver"
   
   export CFLAGS="-Wno-error=unused-but-set-variable"
   make PREFIX=/usr COMPONENT_TYPE="lib-shared"
-  make PREFIX=/usr COMPONENT_TYPE="lib-static"
+  #make PREFIX=/usr COMPONENT_TYPE="lib-static"
 }
 
 package() {
-  cd "$srcdir/$pkgname-$pkgver"
+  cd "$pkgname-$pkgver"
   
   make install PREFIX=/usr DESTDIR="$pkgdir" COMPONENT_TYPE="lib-shared"
-  make install PREFIX=/usr DESTDIR="$pkgdir" COMPONENT_TYPE="lib-static"
+  #make install PREFIX=/usr DESTDIR="$pkgdir" COMPONENT_TYPE="lib-static"
   install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING"
 }
 
diff --git a/community/libee/PKGBUILD b/community/libee/PKGBUILD
index a46834697..fb76b4faa 100644
--- a/community/libee/PKGBUILD
+++ b/community/libee/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 91836 2013-05-28 17:04:46Z spupykin $
+# $Id: PKGBUILD 100190 2013-11-01 21:08:05Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: Brian Knox <taotetek@gmail.com>
 
 pkgname=libee
 pkgver=0.4.1
-pkgrel=2
+pkgrel=3
 pkgdesc="event expression library inspired by CEE"
 url="http://www.libee.org/"
 arch=('i686' 'x86_64' 'mips64el')
@@ -12,7 +12,6 @@ license=('LGPL2.1')
 depends=('libestr' 'glibc')
 makedepends=()
 optdepends=()
-options=(!libtool)
 source=("http://www.libee.org/files/download/libee-$pkgver.tar.gz")
 md5sums=('7bbf4160876c12db6193c06e2badedb2')
 
diff --git a/community/libesmtp/PKGBUILD b/community/libesmtp/PKGBUILD
index c0501f961..92112d78b 100644
--- a/community/libesmtp/PKGBUILD
+++ b/community/libesmtp/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 57896 2011-11-04 08:47:23Z lfleischer $
+# $Id: PKGBUILD 99832 2013-10-31 01:58:40Z allan $
 # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de>
 # Contributor: Roman Kyrylych <roman@archlinux.org>
 # Contributor: Tom Newsom <Jeepster@gmx.co.uk>
@@ -13,7 +13,6 @@ license=('LGPL')
 depends=('openssl')
 source=("http://www.stafford.uklinux.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2")
 md5sums=('bf3915e627fd8f35524a8fdfeed979c8')
-options=('!libtool')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/community/libestr/PKGBUILD b/community/libestr/PKGBUILD
index 69b5a4d80..0c7fdb6a3 100644
--- a/community/libestr/PKGBUILD
+++ b/community/libestr/PKGBUILD
@@ -1,16 +1,15 @@
-# $Id: PKGBUILD 88518 2013-04-19 10:30:46Z spupykin $
+# $Id: PKGBUILD 100192 2013-11-01 21:08:24Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: Brian Knox <taotetek@gmail.com>
 
 pkgname=libestr
 pkgver=0.1.5
-pkgrel=1
+pkgrel=2
 pkgdesc="essentials for string handling (and a bit more)"
 url="http://libestr.adiscon.com/"
 arch=('i686' 'x86_64' 'mips64el')
 license=('LGPL2.1')
 depends=()
-options=(!libtool)
 source=("http://libestr.adiscon.com/files/download/libestr-$pkgver.tar.gz")
 md5sums=('f180c0cdc82883d161eba3f2e8a34eb4')
 
diff --git a/community/libev/PKGBUILD b/community/libev/PKGBUILD
index 7b577b88e..f293b35a9 100644
--- a/community/libev/PKGBUILD
+++ b/community/libev/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 92911 2013-06-18 17:53:17Z bpiotrowski $
+# $Id: PKGBUILD 99834 2013-10-31 01:59:20Z allan $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Allan McRae <allan@archlinux.org>
 # Contributor: Thomas Haider <t.haider@vcnc.org>
@@ -11,7 +11,6 @@ arch=('i686' 'x86_64' 'mips64el')
 url="http://software.schmorp.de/pkg/libev.html"
 license=('BSD')
 depends=('glibc')
-options=('!libtool')
 source=(http://dist.schmorp.de/${pkgname}/${pkgname}-${pkgver}.tar.gz)
 sha1sums=('88655b1e2c0b328c9f90a6df7e72361a97fa8dc3')
 
diff --git a/community/libexosip2/PKGBUILD b/community/libexosip2/PKGBUILD
index 16e730aec..f69d7b728 100644
--- a/community/libexosip2/PKGBUILD
+++ b/community/libexosip2/PKGBUILD
@@ -1,17 +1,16 @@
-# $Id: PKGBUILD 96139 2013-08-20 09:34:21Z spupykin $
+# $Id: PKGBUILD 100194 2013-11-01 21:08:42Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Darwin Bautista <djclue917@gmail.com>
 
 pkgname=libexosip2
 epoch=1
 pkgver=4.0.0
-pkgrel=1
+pkgrel=2
 pkgdesc="A library that hides the complexity of using SIP for multimedia session establishement"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://savannah.nongnu.org/projects/exosip/"
 license=('GPL')
 depends=('libosip2>=4.0.0' 'openssl')
-options=(!libtool)
 source=(http://download.savannah.nongnu.org/releases/exosip/libeXosip2-${pkgver/_/-}.tar.gz)
 md5sums=('aa385b85f6a17876763a0a860fe2afbf')
 
diff --git a/community/libextractor/PKGBUILD b/community/libextractor/PKGBUILD
index 4832ce7c8..c77f0539e 100644
--- a/community/libextractor/PKGBUILD
+++ b/community/libextractor/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 85587 2013-03-03 17:28:54Z dreisner $
+# $Id: PKGBUILD 99836 2013-10-31 02:00:00Z allan $
 # Maintainer: Sergej Pupykin <pupykin.s@gmail.com>
 # Contributor: damir <damir@archlinux.org>
 
@@ -19,7 +19,7 @@ optdepends=('flac: flac support'
 	    'libgsf: (optional) for ODF support'
 	    'libmpeg2: mpeg support'
 	    'libvorbis: ogg/vorbis support')
-options=('!libtool' '!makeflags')
+options=('!makeflags')
 install=libextractor.install
 source=("http://ftp.gnu.org/gnu/libextractor/${pkgname}-${pkgver}.tar.gz"{,.sig})
 md5sums=('593c40670fd7fc8c3ae7adc3df557f64'
diff --git a/community/libfakekey/PKGBUILD b/community/libfakekey/PKGBUILD
index 708f37af1..8c4b4de50 100644
--- a/community/libfakekey/PKGBUILD
+++ b/community/libfakekey/PKGBUILD
@@ -9,7 +9,6 @@ arch=('i686' 'x86_64' 'mips64el')
 url='http://matchbox-project.org/'
 license=('GPL')
 depends=('libxtst')
-options=('!libtool')
 source=("http://matchbox-project.org/sources/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.bz2")
 md5sums=('83dbde4d77e8baf0176fe4291d8a2303')
 
diff --git a/community/libfbclient/PKGBUILD b/community/libfbclient/PKGBUILD
index 44cb112af..dd1adb3ae 100644
--- a/community/libfbclient/PKGBUILD
+++ b/community/libfbclient/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 88481 2013-04-18 13:13:14Z lcarlier $
+# $Id: PKGBUILD 98742 2013-10-17 14:01:49Z andyrtr $
 # Maintainer: Carlier Laurent <lordheavym@gmail.com>
 # Contributor: Douglas Soares de Andrade <dsa@aur.archlinux.org>
 
 pkgname=libfbclient
 pkgver=2.5.2.26540
-pkgrel=1
+pkgrel=2
 pkgdesc="Client library for Firebird."
 arch=('i686' 'x86_64')
 url="http://www.firebirdsql.org/"
diff --git a/community/libfm/PKGBUILD b/community/libfm/PKGBUILD
index bb388197f..35699fa8f 100644
--- a/community/libfm/PKGBUILD
+++ b/community/libfm/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 97020 2013-09-10 14:26:57Z bpiotrowski $
+# $Id: PKGBUILD 99838 2013-10-31 02:00:46Z allan $
 # Maintainer:  Bartłomiej Piotrowski <nospam@bpiotrowski.pl>
 # Contributor: Unknown47 <unknown47r@gmail.com>
 # Contributor: Angel Velasquez <angvp@archlinux.org>
@@ -6,13 +6,12 @@
 
 pkgname=libfm
 pkgver=1.1.2.2
-pkgrel=1
+pkgrel=2
 pkgdesc='Library for file management'
 url='http://pcmanfm.sourceforge.net/'
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 groups=('lxde')
-options=('!libtool')
 install=libfm.install
 depends=('gtk2' 'menu-cache' 'shared-mime-info' 'udisks' 'desktop-file-utils')
 makedepends=('intltool')
@@ -33,6 +32,6 @@ package() {
   make DESTDIR="$pkgdir" install
 
   # Temporary fix to FS#32361
-  rm "$pkgdir"/usr/include/libfm
+  rm -rf "$pkgdir"/usr/include/libfm
   mv "$pkgdir"/usr/include/libfm-1.0/ "$pkgdir"/usr/include/libfm 
 }
diff --git a/community/libgdamm/PKGBUILD b/community/libgdamm/PKGBUILD
index 36de8c0e7..2b71688f2 100644
--- a/community/libgdamm/PKGBUILD
+++ b/community/libgdamm/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 91044 2013-05-18 13:45:43Z jlichtblau $
+# $Id: PKGBUILD 99839 2013-10-31 02:01:06Z allan $
 # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
 # Contributor: Ionut Biru <ibiru@archlinux.org>
 # Contributor: Jan de Groot <jan@jgc.homeip.net>
@@ -11,7 +11,7 @@ arch=('i686' 'x86_64' 'mips64el')
 makedepends=('libgda' 'libsigc++' 'glibmm' 'glibmm-docs')
 url="http://www.gtkmm.org/"
 license=('LGPL')
-options=('!libtool' '!emptydirs')
+options=('!emptydirs')
 source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgbase/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
 sha256sums=('5b864ddc7d5555c6c2d7fb5c6a3856c690911d12837148511a7b9f85100ca06c')
 
diff --git a/community/libgeotiff/PKGBUILD b/community/libgeotiff/PKGBUILD
index fe4316fc1..a391e2128 100644
--- a/community/libgeotiff/PKGBUILD
+++ b/community/libgeotiff/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 78993 2012-10-28 17:33:39Z jlichtblau $
+# $Id: PKGBUILD 99840 2013-10-31 02:01:25Z allan $
 # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
 # Contributor: Brad Fanella <bradfanella@archlinux.us>
 # Contributor: dibblethewrecker dibblethewrecker.at.jiwe.dot.org
@@ -12,7 +12,7 @@ arch=('i686' 'x86_64' 'mips64el')
 url="http://www.remotesensing.org/geotiff"
 license=('custom')
 depends=('libtiff' 'proj' 'libjpeg>=7')
-options=('!makeflags' '!libtool')
+options=('!makeflags')
 changelog=$pkgname.changelog
 source=(ftp://ftp.remotesensing.org/pub/geotiff/libgeotiff/$pkgname-$pkgver.tar.gz)
 sha256sums=('d0acb8d341fd6a8f2c673456e09fdb8f50f91e3166ac934719fe05b30d328329')
diff --git a/community/libgexiv2/PKGBUILD b/community/libgexiv2/PKGBUILD
index ca711e0ce..9adbc5efb 100644
--- a/community/libgexiv2/PKGBUILD
+++ b/community/libgexiv2/PKGBUILD
@@ -1,23 +1,22 @@
-# $Id: PKGBUILD 96280 2013-08-23 12:38:44Z arodseth $
+# $Id: PKGBUILD 100330 2013-11-02 11:06:06Z arodseth $
 # Maintainer: Alexander Rødseth <rodseth@gmail.com>
 # Contributor: Ionut Biru <ibiru@archlinux.org>
 
 pkgname=libgexiv2
-pkgver=0.6.1
-pkgrel=2
+pkgver=0.7.0
+pkgrel=1
 pkgdesc='GObject-based wrapper around the Exiv2 library'
 arch=('x86_64' 'i686' 'mips64el')
-url='http://redmine.yorba.org/projects/gexiv2/roadmap'
 # http://yorba.org/download/gexiv2/
+url='http://redmine.yorba.org/projects/gexiv2/roadmap'
 license=('GPL2')
-depends=('exiv2' 'gobject-introspection')
+depends=('exiv2' 'glib2')
 makedepends=('python-gobject' 'python2-gobject')
-options=('!libtool')
-source=("http://yorba.org/download/gexiv2/${pkgver%.1}/${pkgname}_$pkgver.tar.xz")
-sha256sums=('72ee2fcc6a98c9e83467adea45b10d1b61c55654c204dcce9c2463615389a9e3')
+source=("http://yorba.org/download/gexiv2/${pkgver%.0}/$pkgname-$pkgver.tar.xz")
+sha256sums=('44ae5e74ec82a6b19e366cf6877ce34693ace85c5cb519a7158bdcfcb7e28e64')
 
 build() {
-  cd "$srcdir/$pkgname-$pkgver"
+  cd "$pkgname-$pkgver"
 
   # In order for the build process to include any python-related files,
   # 'import gi; print(gi._overridesdir)' must work with either python or
@@ -27,9 +26,7 @@ build() {
 }
 
 package() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  make DESTDIR="$pkgdir" install
+  make -C "$pkgname-$pkgver" DESTDIR="$pkgdir" install
 }
 
 # vim:set ts=2 sw=2 et:
diff --git a/community/libgig/PKGBUILD b/community/libgig/PKGBUILD
index fe4509612..9858312bd 100644
--- a/community/libgig/PKGBUILD
+++ b/community/libgig/PKGBUILD
@@ -1,18 +1,18 @@
-# $Id: PKGBUILD 67536 2012-03-13 11:11:23Z lcarlier $
+# $Id: PKGBUILD 100359 2013-11-02 20:24:57Z schiv $
 # Maintainer: Ray Rashif <schiv@archlinux.org>
 # Contributor: svoufff <svoufff at gmail dot com>
 # Contributor: Shinlun Hsieh <yngwiexx@yahoo.com.tw>
 
 pkgname=libgig
 pkgver=3.3.0
-pkgrel=2
+pkgrel=3
 pkgdesc="C++ library for loading Gigasampler and DLS files"
 arch=(i686 x86_64 'mips64el')
 url="http://www.linuxsampler.org/libgig/"
 license=('GPL')
-depends=('gcc-libs' 'util-linux-ng' 'libsndfile')
-options=('!libtool' '!makeflags')
-source=(http://download.linuxsampler.org/packages/$pkgname-$pkgver.tar.bz2)
+depends=('util-linux' 'libsndfile')
+options=('!makeflags') # code chokes on parallel build
+source=("http://download.linuxsampler.org/packages/$pkgname-$pkgver.tar.bz2")
 md5sums=('fc33e8e948ed2db9b7003a3ecdb78549')
 
 build() {
@@ -25,7 +25,7 @@ build() {
 package() {
   cd "$srcdir/$pkgname-$pkgver"
 
-  make DESTDIR="$pkgdir/" install
+  make DESTDIR="$pkgdir" install
 }
 
 # vim:set ts=2 sw=2 et:
diff --git a/community/libgit2-glib/PKGBUILD b/community/libgit2-glib/PKGBUILD
index 38f5b31d5..bb1484a33 100644
--- a/community/libgit2-glib/PKGBUILD
+++ b/community/libgit2-glib/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 93394 2013-07-02 20:55:40Z eric $
+# $Id: PKGBUILD 99843 2013-10-31 02:02:27Z allan $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 
 pkgname=libgit2-glib
@@ -9,7 +9,6 @@ url="http://live.gnome.org/Libgit2-glib"
 license=(LGPL2.1)
 arch=(i686 x86_64)
 depends=(glib2 libgit2 gobject-introspection)
-options=('!libtool')
 source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
 sha256sums=('bda84b5ab6fbe2922a4cf386b4e6d4401863dec7bea1879e86939d005cd521f6')
 
diff --git a/community/libgnome-media-profiles/PKGBUILD b/community/libgnome-media-profiles/PKGBUILD
index ca269f05d..f001ff5e4 100644
--- a/community/libgnome-media-profiles/PKGBUILD
+++ b/community/libgnome-media-profiles/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 87928 2013-04-08 18:08:07Z bgyorgy $
+# $Id: PKGBUILD 99844 2013-10-31 02:02:46Z allan $
 # Maintainer: Balló György <ballogyor+arch at gmail dot com>
 # Contributor: Ionut Biru <ibiru@archlinux.org>
 
@@ -11,7 +11,6 @@ url="https://git.gnome.org/browse/libgnome-media-profiles"
 license=('GPL2')
 depends=('gconf' 'gtk3' 'gstreamer0.10-base-plugins')
 makedepends=('intltool' 'gnome-doc-utils')
-options=('!libtool')
 install=$pkgname.install
 source=(http://download.gnome.org/sources/${pkgname}/3.0/${pkgname}-${pkgver}.tar.bz2)
 sha256sums=('ab1288e53a8fccca3e8fa59757ef586901e236e09a737a1178eeb8d74428c061')
diff --git a/community/libgoom2/PKGBUILD b/community/libgoom2/PKGBUILD
index a50c3ad34..c5e5ae06c 100644
--- a/community/libgoom2/PKGBUILD
+++ b/community/libgoom2/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 66115 2012-02-23 01:28:54Z giovanni $
+# $Id: PKGBUILD 99845 2013-10-31 02:03:06Z allan $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: danitool
 
@@ -10,7 +10,7 @@ arch=('i686' 'x86_64' 'mips64el')
 url="http://www.fovea.cc/?page=details_produits&id=goom"
 license=('LGPL')
 depends=('glibc')
-options=('!libtool' '!emptydirs')
+options=('!emptydirs')
 source=("http://downloads.sourceforge.net/project/goom/goom2k4/0/goom-2k4-0-src.tar.gz")
 md5sums=('8100dd07e0c6784fdf079eeaa53a5c7f')
 
diff --git a/community/libgringotts/PKGBUILD b/community/libgringotts/PKGBUILD
index eee7ec628..8b15c485f 100644
--- a/community/libgringotts/PKGBUILD
+++ b/community/libgringotts/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 70182 2012-05-01 12:27:33Z andrea $
+# $Id: PKGBUILD 99846 2013-10-31 02:03:26Z allan $
 # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
 
 pkgname=libgringotts
@@ -10,7 +10,6 @@ url="http://developer.berlios.de/projects/gringotts"
 license=('GPL')
 depends=('bzip2' 'libmcrypt' 'mhash' 'zlib')
 changelog=$pkgname.changelog
-options=('!libtool')
 source=(http://download.berlios.de/gringotts/$pkgname-$pkgver.tar.bz2)
 md5sums=('b2b1bad56ef33153f251ccd9500860be')
 
diff --git a/community/libgtksourceviewmm2/PKGBUILD b/community/libgtksourceviewmm2/PKGBUILD
index 6c710e88a..36657aa47 100644
--- a/community/libgtksourceviewmm2/PKGBUILD
+++ b/community/libgtksourceviewmm2/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 88627 2013-04-20 17:41:57Z jlichtblau $
+# $Id: PKGBUILD 99847 2013-10-31 02:03:46Z allan $
 # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.orgg>
 # Contributor: Roman Kyrylych <roman@archlinux.org>
 
@@ -11,7 +11,7 @@ url='http://projects.gnome.org/gtksourceviewmm/'
 license=('LGPL')
 depends=('gtkmm' 'gtksourceview2')
 makedepends=('doxygen' 'glibmm-docs')
-options=('!libtool' '!emptydirs')
+options=('!emptydirs')
 source=(http://ftp.gnome.org/pub/GNOME/sources/gtksourceviewmm/2.10/gtksourceviewmm-$pkgver.tar.xz)
 sha256sums=('0000df1b582d7be2e412020c5d748f21c0e6e5074c6b2ca8529985e70479375b')
 
diff --git a/community/libharu/PKGBUILD b/community/libharu/PKGBUILD
index 9f3105118..e03cea793 100644
--- a/community/libharu/PKGBUILD
+++ b/community/libharu/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 90053 2013-05-06 19:38:05Z foutrelis $
+# $Id: PKGBUILD 100196 2013-11-01 21:09:00Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer : SpepS <dreamspepser at yahoo dot it>
 # Contributor: Auguste <auguste@gmail.com>
@@ -6,13 +6,12 @@
 
 pkgname=libharu
 pkgver=2.2.1
-pkgrel=4
+pkgrel=5
 pkgdesc="C/C++ library for generating PDF documents"
 url="http://libharu.org/wiki/Main_Page"
 arch=('i686' 'x86_64' 'mips64el')
 license=('custom:ZLIB')
 depends=('libpng' 'gcc-libs')
-options=(!libtool)
 source=("http://libharu.org/files/$pkgname-$pkgver.tar.gz"
 	libpng15.patch)
 md5sums=('63da8e087744f1d6cf16f9501b1cb766'
diff --git a/community/hubbub/PKGBUILD b/community/libhubbub/PKGBUILD
index 1a84ac701..eb5badc32 100644
--- a/community/hubbub/PKGBUILD
+++ b/community/libhubbub/PKGBUILD
@@ -1,33 +1,36 @@
-# $Id: PKGBUILD 89120 2013-04-26 23:11:48Z arodseth $
+# $Id: PKGBUILD 99603 2013-10-30 12:29:32Z arodseth $
 # Maintainer: Alexander Rødseth <rodseth@gmail.com>
 # Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
 # Contributor: Paulo Matias <matiasΘarchlinux-br·org>
 
-pkgname=hubbub
+pkgname=libhubbub
 pkgver=0.2.0
-pkgrel=1
+pkgrel=3
 pkgdesc='HTML5 compliant parsing library'
 arch=('x86_64' 'i686' 'mips64el')
 url='http://www.netsurf-browser.org/projects/hubbub/'
 license=('MIT')
+provides=('hubbub')
+replaces=('hubbub')
+conflicts=('hubbub')
 depends=('libparserutils>=0.1.2')
 makedepends=('netsurf-buildsystem')
-source=("http://download.netsurf-browser.org/libs/releases/lib$pkgname-$pkgver-src.tar.gz")
+source=("http://download.netsurf-browser.org/libs/releases/$pkgname-$pkgver-src.tar.gz")
 sha256sums=('91c90965fdbbfb9137c7881b33736a03fc80bd16f5cd7808e1efff3d63000eaf')
 
 build() {
-  cd "$srcdir/lib$pkgname-$pkgver"
+  cd "$pkgname-$pkgver"
 
   sed -i 's:-Werror::' Makefile
   make PREFIX=/usr COMPONENT_TYPE='lib-shared'
-  make PREFIX=/usr COMPONENT_TYPE='lib-static'
+  #make PREFIX=/usr COMPONENT_TYPE='lib-static'
 }
 
 package() {
-  cd "$srcdir/lib$pkgname-$pkgver"
+  cd "$pkgname-$pkgver"
 
   make install PREFIX=/usr DESTDIR="$pkgdir" COMPONENT_TYPE='lib-shared'   
-  make install PREFIX=/usr DESTDIR="$pkgdir" COMPONENT_TYPE='lib-static'
+  #make install PREFIX=/usr DESTDIR="$pkgdir" COMPONENT_TYPE='lib-static'
   install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING"
 }
 
diff --git a/community/libhx/PKGBUILD b/community/libhx/PKGBUILD
index 782cd278a..a5ca96a87 100644
--- a/community/libhx/PKGBUILD
+++ b/community/libhx/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 89905 2013-05-05 14:47:57Z spupykin $
+# $Id: PKGBUILD 99849 2013-10-31 02:04:27Z allan $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: Max Roder <maxroder@web.de>
 # Contributor: Nathan Owe <ndowens.aur at gmail dot com>
@@ -11,7 +11,6 @@ arch=('i686' 'x86_64' 'mips64el')
 url=('http://libhx.sourceforge.net/')
 license=('GPL')
 depends=()
-options=('!libtool')
 source=("http://downloads.sourceforge.net/${pkgname}/libHX-${pkgver}.tar.xz")
 md5sums=('0165d6aa994a094b2a170d93a48599e0')
 
diff --git a/community/libident/PKGBUILD b/community/libident/PKGBUILD
index 0729a7e0f..62b274ff8 100644
--- a/community/libident/PKGBUILD
+++ b/community/libident/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 90500 2013-05-12 23:26:42Z arodseth $
+# $Id: PKGBUILD 99850 2013-10-31 02:04:47Z allan $
 # Maintainer: Alexander Rødseth <rodseth@gmail.com>
 # Contributor: Mateusz Herych <heniekk@gmail.com>
 
@@ -10,7 +10,7 @@ arch=('x86_64' 'i686' 'mips64el')
 url='http://www.remlab.net/libident/'
 license=('custom')
 depends=('glibc')
-options=('!emptydirs' '!libtool')
+options=('!emptydirs')
 source=("http://www.remlab.net/files/libident/libident-$pkgver.tar.gz"
         'libident.pc')
 sha256sums=('8cc8fb69f1c888be7cffde7f4caeb3dc6cd0abbc475337683a720aa7638a174b'
diff --git a/community/libinfinity/PKGBUILD b/community/libinfinity/PKGBUILD
index 2990b0a98..81c623de6 100644
--- a/community/libinfinity/PKGBUILD
+++ b/community/libinfinity/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 95152 2013-08-06 11:50:40Z spupykin $
+# $Id: PKGBUILD 100198 2013-11-01 21:12:34Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
 # Contributor: Gregory Haynes <greg@greghaynes.net>
 
 pkgname=libinfinity
 pkgver=0.5.4
-pkgrel=1
+pkgrel=2
 pkgdesc="An implementation of the Infininote protocol written in GObject-based C"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://gobby.0x539.de"
@@ -14,7 +14,6 @@ depends=('gnutls>=1.7.2' 'gsasl>=0.2.21' 'glib2>=2.16' 'libxml2>=2.0' 'gtk2')
 makedepends=('gtk-doc' 'pkgconfig')
 optdepends=('avahi: zeroconf support'
             'gtk2: gtk support')
-options=('!libtool')
 source=("http://releases.0x539.de/${pkgname}/${pkgname}-${pkgver}.tar.gz")
 md5sums=('1e83ec8b3ed3159d0c883c056b153429')
 
diff --git a/community/libiptcdata/PKGBUILD b/community/libiptcdata/PKGBUILD
index 083775c8e..3a876c3a8 100644
--- a/community/libiptcdata/PKGBUILD
+++ b/community/libiptcdata/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 64858 2012-02-18 18:11:08Z stativ $
+# $Id: PKGBUILD 99852 2013-10-31 02:05:27Z allan $
 # Maintainer: Lukas Jirkovsky <l.jirkovsky@gmail.com>
 pkgname=libiptcdata
 pkgver=1.0.4
@@ -8,7 +8,6 @@ arch=('i686' 'x86_64' 'mips64el')
 url="http://libiptcdata.sourceforge.net/"
 license=('GPL')
 depends=('glibc')
-options=(!libtool)
 source=(http://downloads.sourceforge.net/sourceforge/libiptcdata/$pkgname-$pkgver.tar.gz)
 md5sums=('af886556ecb129b694f2d365d03d95a8')
 
diff --git a/community/libkkc/PKGBUILD b/community/libkkc/PKGBUILD
index 133589843..2ff6438c6 100644
--- a/community/libkkc/PKGBUILD
+++ b/community/libkkc/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 97217 2013-09-15 11:42:40Z fyan $
+# $Id: PKGBUILD 99853 2013-10-31 02:05:47Z allan $
 # Maintainer: Felix Yan <felixonmars@gmail.com>
 # Contributor: ponsfoot <cabezon dot hashimoto at gmail dot com>
 
@@ -9,7 +9,6 @@ pkgdesc="Japanese Kana Kanji conversion library"
 arch=('i686' 'x86_64')
 url="https://bitbucket.org/libkkc"
 license=('GPL')
-options=(!libtool)
 depends=('marisa' 'json-glib' 'libgee06')
 makedepends=('vala' 'gobject-introspection' 'intltool' 'python2-marisa')
 optdepends=('sh: to use kkc-package-data')
diff --git a/community/liblinebreak/PKGBUILD b/community/liblinebreak/PKGBUILD
index 90c90b904..7c558a7f5 100644
--- a/community/liblinebreak/PKGBUILD
+++ b/community/liblinebreak/PKGBUILD
@@ -1,24 +1,26 @@
-# $Id: PKGBUILD 74591 2012-07-31 10:04:29Z spupykin $
+# $Id: PKGBUILD 100200 2013-11-01 21:12:55Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Orivej Desh <smpuj@bk.ru>
 
 pkgname=liblinebreak
 pkgver=2.1
-pkgrel=1
+pkgrel=2
 pkgdesc="An implementation of the line breaking algorithm as described in Unicode 5.2.0 Standard Annex 14, Revision 24"
 arch=("i686" "x86_64" 'mips64el')
 url="http://vimgadgets.sourceforge.net/liblinebreak/"
 license=("custom:zlib/libpng")
 depends=("glibc")
-makedepends=()
-options=("!libtool")
-source=("http://downloads.sourceforge.net/vimgadgets/liblinebreak/2.1/liblinebreak-$pkgver.tar.gz")
+source=("http://downloads.sourceforge.net/vimgadgets/liblinebreak-$pkgver.tar.gz")
 md5sums=('9fe73b4b230434765be2305e50f8fe45')
 
 build() {
   cd "$srcdir/liblinebreak-$pkgver"
   ./configure --prefix=/usr
   make
+}
+
+package() {
+  cd "$srcdir/liblinebreak-$pkgver"
   make DESTDIR="$pkgdir" install
   install -Dm644 LICENCE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
 }
diff --git a/community/liblockfile/PKGBUILD b/community/liblockfile/PKGBUILD
index a44fb49d3..2aaf6e987 100644
--- a/community/liblockfile/PKGBUILD
+++ b/community/liblockfile/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 66217 2012-02-23 03:31:35Z spupykin $
+# $Id: PKGBUILD 100202 2013-11-01 21:13:53Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Andreas Wagner <Andreas dot Wagner at em dot uni-frankfurt dot de>
 
 pkgname=liblockfile
 pkgver=1.08_4
 _basever=1.08
-pkgrel=2.1
+pkgrel=3
 pkgdesc="a library with NFS-safe locking functions"
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
diff --git a/community/libmaa/PKGBUILD b/community/libmaa/PKGBUILD
index 1537dc611..746cb652e 100644
--- a/community/libmaa/PKGBUILD
+++ b/community/libmaa/PKGBUILD
@@ -1,16 +1,15 @@
-# $Id: PKGBUILD 88315 2013-04-16 13:28:16Z spupykin $
+# $Id: PKGBUILD 100204 2013-11-01 21:14:11Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 
 pkgname=libmaa
 pkgver=1.3.2
-pkgrel=1
+pkgrel=2
 pkgdesc="Provides many low-level data structures which are helpful for writing compilers"
 url="http://sourceforge.net/projects/dict/"
 license=('GPL')
 arch=('i686' 'x86_64' 'mips64el')
 depends=('glibc')
 makedepends=('flex')
-options=('!libtool')
 source=("http://downloads.sourceforge.net/dict/${pkgname}-${pkgver}.tar.gz")
 md5sums=('01dab2cde2e0a322653e45bfa63537ee')
 
diff --git a/community/libmatchbox/PKGBUILD b/community/libmatchbox/PKGBUILD
index 587889d00..df26bbd52 100644
--- a/community/libmatchbox/PKGBUILD
+++ b/community/libmatchbox/PKGBUILD
@@ -1,15 +1,14 @@
-# $Id: PKGBUILD 90054 2013-05-06 19:38:07Z foutrelis $
+# $Id: PKGBUILD 100206 2013-11-01 21:15:51Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Henrique C. Alves <hcarvalhoalves@gmail.com>
 
 pkgname=libmatchbox
 pkgver=1.10
-pkgrel=2
+pkgrel=3
 pkgdesc="Base library for Matchbox WM"
 arch=('i686' 'x86_64' 'mips64el')
 license=('LGPL')
 depends=('pango' 'libpng' 'libjpeg>=7' 'xsettings-client' 'libxext')
-options=('!libtool')
 url="http://matchbox-project.org/"
 source=(http://downloads.yoctoproject.org/releases/matchbox/libmatchbox/$pkgver/libmatchbox-$pkgver.tar.gz)
 md5sums=('042c5874631dfb95151aa793dc1434b8')
diff --git a/community/libmediainfo/PKGBUILD b/community/libmediainfo/PKGBUILD
index 61ddcef5d..712949278 100644
--- a/community/libmediainfo/PKGBUILD
+++ b/community/libmediainfo/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 90920 2013-05-15 13:45:55Z spupykin $
+# $Id: PKGBUILD 99856 2013-10-31 02:07:03Z allan $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer:  hydro <hydro@freenet.de>
 
 pkgname=libmediainfo
-pkgver=0.7.63
+pkgver=0.7.64
 pkgrel=1
 pkgdesc="shared library for mediainfo"
 arch=('i686' 'x86_64' 'mips64el')
@@ -11,10 +11,9 @@ url="http://mediainfo.sourceforge.net"
 license=('GPL')
 depends=( 'curl' 'libmms' 'libzen')
 makedepends=('libtool' 'automake' 'autoconf')
-options=(!libtool)
 source=(http://downloads.sourceforge.net/mediainfo/${pkgname}_${pkgver}.tar.bz2
 	libmediainfo-0.7.50-libmms.patch)
-md5sums=('7a50881744a29dac6f93a8f6cbaebc0c'
+md5sums=('27a6afbf5993c894bd38fab9b8e0fc27'
          '2f4b21cc250f663d52b497dedb963e3b')
 
 build() {
diff --git a/community/libmemcached/PKGBUILD b/community/libmemcached/PKGBUILD
index 6ebe63f59..7ad459d62 100644
--- a/community/libmemcached/PKGBUILD
+++ b/community/libmemcached/PKGBUILD
@@ -1,16 +1,15 @@
-# $Id: PKGBUILD 93008 2013-06-22 07:02:22Z foutrelis $
+# $Id: PKGBUILD 98953 2013-10-21 15:55:33Z foutrelis $
 # Maintainer: Evangelos Foutras <evangelos@foutrelis.com>
 
 pkgname=libmemcached
 pkgver=1.0.17
-pkgrel=1
+pkgrel=2
 pkgdesc="C and C++ client library to the memcached server"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://libmemcached.org/"
 license=('GPL')
 depends=('glibc' 'libsasl' 'libevent')
 makedepends=('perl' 'memcached' 'python-sphinx')
-options=('!libtool')
 source=(http://launchpad.net/$pkgname/1.0/$pkgver/+download/$pkgname-$pkgver.tar.gz
         gcc-4.8.patch)
 sha256sums=('7bb27b2589400f918df1cf5002cb01ef7ccac6e23f818604e2386de62c80bba5'
diff --git a/community/libmicrohttpd/PKGBUILD b/community/libmicrohttpd/PKGBUILD
index 47a902e6c..5a2721991 100644
--- a/community/libmicrohttpd/PKGBUILD
+++ b/community/libmicrohttpd/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 89934 2013-05-05 21:30:28Z spupykin $
+# $Id: PKGBUILD 100208 2013-11-01 21:16:12Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: Norberto Lopes <shelika@mail.telepac.pt>
 # Contributor: Kao Dome <kaodome@gmail.com>
@@ -7,12 +7,11 @@
 
 pkgname=libmicrohttpd
 pkgver=0.9.27
-pkgrel=1
+pkgrel=2
 pkgdesc="a small C library that is supposed to make it easy to run an HTTP server as part of another application."
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.gnu.org/software/libmicrohttpd/"
 license=('LGPL')
-options=('!libtool')
 depends=('gnutls' 'libgcrypt')
 install=libmicrohttpd.install
 source=(ftp://ftp.gnu.org/gnu/libmicrohttpd/$pkgname-$pkgver.tar.gz)
diff --git a/community/libmirage/PKGBUILD b/community/libmirage/PKGBUILD
index 47312a7ae..1c9d76c81 100644
--- a/community/libmirage/PKGBUILD
+++ b/community/libmirage/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 92550 2013-06-08 08:15:45Z heftig $
+# $Id: PKGBUILD 99858 2013-10-31 02:07:43Z allan $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Contributor: Mateusz Herych <heniekk@gmail.com>
 # Contributor: Charles Lindsay <charles@chaoslizard.org>
@@ -12,7 +12,6 @@ url="http://cdemu.sourceforge.net/"
 license=(GPL)
 depends=(glib2 libsndfile libsamplerate zlib bzip2 xz shared-mime-info)
 makedepends=(gtk-doc gobject-introspection cmake)
-options=(!libtool)
 install=libmirage.install
 source=(http://downloads.sourceforge.net/cdemu/$pkgname-$pkgver.tar.bz2)
 sha256sums=('fb30eea15b8c1fc55e194e1af55127fa3b3860a79fec0b6c60588cf9ae8d1ca9')
diff --git a/community/libmnl/PKGBUILD b/community/libmnl/PKGBUILD
index 5df9aa2a4..6d4201da0 100644
--- a/community/libmnl/PKGBUILD
+++ b/community/libmnl/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 71327 2012-05-26 23:26:09Z seblu $
+# $Id: PKGBUILD 99859 2013-10-31 02:08:03Z allan $
 # Maintainer: Sébastien Luttringer <seblu@aur.archlinux.org>
 # Contributor: Christian Hesse <mail@earthworm.de>
 
@@ -10,7 +10,6 @@ arch=('i686' 'x86_64' 'mips64el')
 url='http://www.netfilter.org/projects/libmnl/'
 license=('LGPL2.1')
 depends=('glibc')
-options=('!libtool')
 source=("http://www.netfilter.org/projects/$pkgname/files/$pkgname-$pkgver.tar.bz2")
 sha1sums=('c27e25f67c6422ebf893fc3a844af8085a1c5b63')
 
diff --git a/community/libnetfilter_acct/PKGBUILD b/community/libnetfilter_acct/PKGBUILD
index 55ca10d73..7c22f8fb9 100644
--- a/community/libnetfilter_acct/PKGBUILD
+++ b/community/libnetfilter_acct/PKGBUILD
@@ -13,7 +13,6 @@ url="http://www.netfilter.org/projects/libnetfilter_acct/index.html"
 license=('GPL')
 depends=('libnfnetlink' 'libmnl')
 makedepends=('pkgconfig')
-options=('!libtool')
 source=(http://www.netfilter.org/projects/$pkgname/files/$pkgname-$pkgver.tar.bz2)
 md5sums=('2118d9514c079839ebd9cb3144ad2ad7')
 
diff --git a/community/libnetfilter_conntrack/PKGBUILD b/community/libnetfilter_conntrack/PKGBUILD
index 746a003ab..b7b1204fc 100644
--- a/community/libnetfilter_conntrack/PKGBUILD
+++ b/community/libnetfilter_conntrack/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 95229 2013-08-07 09:04:58Z seblu $
+# $Id: PKGBUILD 99861 2013-10-31 02:08:43Z allan $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: Sébastien Luttringer
 # Contributor: Alessandro Sagratini <ale_sagra@hotmail.com>
@@ -12,7 +12,6 @@ arch=('i686' 'x86_64' 'mips64el')
 depends=('libnfnetlink' 'libmnl')
 url='http://www.netfilter.org/projects/libnetfilter_conntrack/'
 license=('GPL')
-options=('!libtool')
 source=("http://www.netfilter.org/projects/$pkgname/files/$pkgname-$pkgver.tar.bz2"{,.sig})
 md5sums=('18cf80c4b339a3285e78822dbd4f08d7'
          'SKIP')
diff --git a/community/libnetfilter_cthelper/PKGBUILD b/community/libnetfilter_cthelper/PKGBUILD
index fbbe5992d..9adab5d8e 100644
--- a/community/libnetfilter_cthelper/PKGBUILD
+++ b/community/libnetfilter_cthelper/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 77960 2012-10-16 01:20:23Z seblu $
+# $Id: PKGBUILD 99862 2013-10-31 02:09:04Z allan $
 # Maintainer: Sébastien Luttringer <seblu@aur.archlinux.org>
 
 pkgname=libnetfilter_cthelper
@@ -9,7 +9,6 @@ arch=('i686' 'x86_64' 'mips64el')
 url='http://www.netfilter.org/projects/libnetfilter_cthelper/'
 license=('GPL2')
 depends=('libmnl')
-options=('!libtool')
 source=("http://www.netfilter.org/projects/$pkgname/files/$pkgname-$pkgver.tar.bz2")
 md5sums=('b2efab1a3a198a5add448960ba011acd')
 
diff --git a/community/libnetfilter_cttimeout/PKGBUILD b/community/libnetfilter_cttimeout/PKGBUILD
index fb0f4d967..767015f89 100644
--- a/community/libnetfilter_cttimeout/PKGBUILD
+++ b/community/libnetfilter_cttimeout/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 72544 2012-06-16 15:53:38Z seblu $
+# $Id: PKGBUILD 99863 2013-10-31 02:09:24Z allan $
 # Maintainer: Sébastien Luttringer <seblu@aur.archlinux.org>
 
 pkgname=libnetfilter_cttimeout
@@ -9,7 +9,6 @@ arch=('i686' 'x86_64' 'mips64el')
 url='http://www.netfilter.org/projects/libnetfilter_cttimeout/'
 license=('GPL2')
 depends=('libmnl')
-options=('!libtool')
 source=("http://www.netfilter.org/projects/$pkgname/files/$pkgname-$pkgver.tar.bz2")
 md5sums=('7697437fc9ebb6f6b83df56a633db7f9')
 
diff --git a/community/libnetfilter_log/PKGBUILD b/community/libnetfilter_log/PKGBUILD
index 40af7468c..2a683ad59 100644
--- a/community/libnetfilter_log/PKGBUILD
+++ b/community/libnetfilter_log/PKGBUILD
@@ -12,7 +12,6 @@ arch=('i686' 'x86_64' 'mips64el')
 url='http://www.netfilter.org/projects/libnetfilter_log/'
 license=('GPL')
 depends=('libnfnetlink')
-options=('!libtool')
 source=("http://www.netfilter.org/projects/$pkgname/files/$pkgname-$pkgver.tar.bz2")
 md5sums=('2a4bb0654ae675a52d2e8d1c06090b94')
 
diff --git a/community/libnetfilter_queue/PKGBUILD b/community/libnetfilter_queue/PKGBUILD
index f9559cb90..b053c487e 100644
--- a/community/libnetfilter_queue/PKGBUILD
+++ b/community/libnetfilter_queue/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 77377 2012-10-09 09:50:14Z seblu $
+# $Id: PKGBUILD 99865 2013-10-31 02:10:04Z allan $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: Sébastien Luttringer <seblu@aur.archlinux.org>
 # Contributor: Kevin Edmonds <edmondskevin@hotmail.com>
@@ -12,7 +12,6 @@ arch=('i686' 'x86_64' 'mips64el')
 url='http://www.netfilter.org/projects/libnetfilter_queue/'
 license=('GPL')
 depends=('libnfnetlink' 'libmnl')
-options=('!libtool')
 source=("http://www.netfilter.org/projects/$pkgname/files/$pkgname-$pkgver.tar.bz2")
 md5sums=('df09befac35cb215865b39a36c96a3fa')
 
diff --git a/community/libnewt/PKGBUILD b/community/libnewt/PKGBUILD
index 45b010194..7fc7caeb9 100644
--- a/community/libnewt/PKGBUILD
+++ b/community/libnewt/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 95249 2013-08-07 17:07:06Z arodseth $
+# $Id: PKGBUILD 99611 2013-10-30 13:59:02Z arodseth $
 # Maintainer: Alexander Rødseth <rodseth@gmail.com>
 # Contributor: Roman Kyrylych <roman@archlinux.org>
 # Contributor: Tom Killian <tomk@runbox.com>
@@ -6,7 +6,7 @@
 
 pkgname=libnewt
 pkgver=0.52.16
-pkgrel=1
+pkgrel=2
 _tclver=8.6
 pkgdesc="Not Erik's Windowing Toolkit - text mode windowing with slang"
 arch=('i686' 'x86_64' 'mips64el')
@@ -21,7 +21,7 @@ source=("https://fedorahosted.org/releases/n/e/newt/newt-$pkgver.tar.gz")
 sha256sums=('1b9574bc9c8fb7b25cd26e5c3f2840e8c17fde5dd09c759604925919b3589cd3')
 
 prepare() {
-  cd "$srcdir/newt-$pkgver"
+  cd "newt-$pkgver"
   
   sed -i "s:tcl8.4:tcl$_tclver:" Makefile.in
   sed -i 's:bin/python:bin/python2:' *.py
@@ -29,14 +29,14 @@ prepare() {
 }
 
 build() {
-  cd "$srcdir/newt-$pkgver"
+  cd "newt-$pkgver"
 
   ./configure --prefix=/usr --with-gpm-support
   make
 }
 
 package() {
-  cd "$srcdir/newt-$pkgver"
+  cd "newt-$pkgver"
   
   make prefix="$pkgdir/usr" install
 }
diff --git a/community/libnfnetlink/PKGBUILD b/community/libnfnetlink/PKGBUILD
index cd0661983..cb6ae288e 100644
--- a/community/libnfnetlink/PKGBUILD
+++ b/community/libnfnetlink/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 77381 2012-10-09 10:06:36Z seblu $
+# $Id: PKGBUILD 99866 2013-10-31 02:10:24Z allan $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: Sébastien Luttringer <seblu@aur.archlinux.org>
 # Contributor: Kevin Edmonds <edmondskevin@hotmail.com>
@@ -12,7 +12,6 @@ arch=('i686' 'x86_64' 'mips64el')
 url='http://www.netfilter.org/projects/libnfnetlink/'
 license=('GPL')
 depends=('glibc')
-options=('!libtool')
 source=("http://www.netfilter.org/projects/$pkgname/files/$pkgname-$pkgver.tar.bz2")
 md5sums=('98927583d2016a9fb1936fed992e2c5e')
 
diff --git a/community/libnfs/PKGBUILD b/community/libnfs/PKGBUILD
index 528f3a06c..7aa7fa0f3 100644
--- a/community/libnfs/PKGBUILD
+++ b/community/libnfs/PKGBUILD
@@ -1,17 +1,16 @@
-# $Id: PKGBUILD 92631 2013-06-10 08:52:37Z idevolder $
+# $Id: PKGBUILD 99036 2013-10-22 19:26:33Z idevolder $
 # Maintainer: BlackIkeEagle <ike DOT devolder AT gmail DOT com>
 
 pkgname=libnfs
-pkgver=1.6.0
-pkgrel=1
+pkgver=1.7.0
+pkgrel=2
 pkgdesc="client library for accessing NFS shares"
 arch=('i686' 'x86_64' 'mips64el')
 url="https://github.com/sahlberg/libnfs"
 license=('GPL')
 depends=('glibc')
 source=("https://github.com/sahlberg/$pkgname/archive/$pkgname-$pkgver.tar.gz")
-sha256sums=('19a497044f086d2bed973d0e89392bd41d1a8e9f524d5787f3090f966e20ccc3')
-options=(!libtool)
+sha256sums=('724e0b15cb2099ab3bbdb8456eaab54bc6d1de76da4b4f3251323471523e2114')
 
 build() {
   cd "$pkgname-$pkgname-$pkgver"
diff --git a/community/libnids/PKGBUILD b/community/libnids/PKGBUILD
index c690d59d0..6b2fada30 100644
--- a/community/libnids/PKGBUILD
+++ b/community/libnids/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 67519 2012-03-12 22:18:06Z lcarlier $
+# $Id: PKGBUILD 100211 2013-11-01 21:20:12Z spupykin $
 # Maintainer:
 # Contributor: Essien Ita Essien <essiene@datavibe.net>
 # Contributor: damir <damir@archlinux.org>
 
 pkgname=libnids
 pkgver=1.24
-pkgrel=2
+pkgrel=3
 pkgdesc="An implementation of an E-component of Network Intrusion Detection System."
 arch=('i686' 'x86_64' 'mips64el')
 url="http://libnids.sourceforge.net/"
diff --git a/community/libnsbmp/PKGBUILD b/community/libnsbmp/PKGBUILD
index 392c8257d..c90f8c954 100644
--- a/community/libnsbmp/PKGBUILD
+++ b/community/libnsbmp/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 89122 2013-04-26 23:30:55Z arodseth $
+# $Id: PKGBUILD 99625 2013-10-30 16:31:25Z arodseth $
 # Maintainer: Alexander Rødseth <rodseth@gmail.com>
 # Contributor: Paulo Matias <matiasΘarchlinux-br·org>
 # Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
 
 pkgname=libnsbmp
 pkgver=0.1.0
-pkgrel=1
+pkgrel=2
 pkgdesc='Decoding library for BMP and ICO image file formats'
 arch=('x86_64' 'i686' 'mips64el')
 url='http://www.netsurf-browser.org/projects/libnsbmp/'
@@ -16,17 +16,17 @@ source=("http://download.netsurf-browser.org/libs/releases/$pkgname-$pkgver-src.
 sha256sums=('fb576af6bd4d02d3626d5c2092bc06c80b2a80089a14decf40c813d9ec80ddc0')
 
 build() {
-  cd "$srcdir/$pkgname-$pkgver"
+  cd "$pkgname-$pkgver"
 
   make PREFIX=/usr COMPONENT_TYPE="lib-shared" 
-  make PREFIX=/usr COMPONENT_TYPE="lib-static"
+  #make PREFIX=/usr COMPONENT_TYPE="lib-static"
 }
 
 package() {
-  cd "$srcdir/$pkgname-$pkgver"
+  cd "$pkgname-$pkgver"
 
   make install PREFIX=/usr DESTDIR="$pkgdir" COMPONENT_TYPE="lib-shared"   
-  make install PREFIX=/usr DESTDIR="$pkgdir" COMPONENT_TYPE="lib-static"
+  #make install PREFIX=/usr DESTDIR="$pkgdir" COMPONENT_TYPE="lib-static"
   install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING"
 }
 
diff --git a/community/libnsgif/PKGBUILD b/community/libnsgif/PKGBUILD
index 0fb40c823..8016b6b16 100644
--- a/community/libnsgif/PKGBUILD
+++ b/community/libnsgif/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 89124 2013-04-26 23:34:05Z arodseth $
+# $Id: PKGBUILD 99628 2013-10-30 16:34:52Z arodseth $
 # Maintainer: Alexander Rødseth <rodseth@gmail.com>
 # Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
 # Contributor: Paulo Matias <matiasΘarchlinux-br·org>
 
 pkgname=libnsgif
 pkgver=0.1.0
-pkgrel=1
+pkgrel=2
 pkgdesc='Decoding library for the GIF image file format'
 arch=('x86_64' 'i686' 'mips64el')
 url='http://www.netsurf-browser.org/projects/libnsgif/'
@@ -16,18 +16,18 @@ source=("http://download.netsurf-browser.org/libs/releases/$pkgname-$pkgver-src.
 sha256sums=('e7dc7ee887fefc19e7c7985c5a2b057870e0fa3dd0dcfc1fdb4e98da1f36593c')
 
 build() {
-  cd "$srcdir/$pkgname-$pkgver"
+  cd "$pkgname-$pkgver"
 
   CFLAGS="$CFLAGS -fno-strict-aliasing" 
   make PREFIX=/usr COMPONENT_TYPE="lib-shared" 
-  make PREFIX=/usr COMPONENT_TYPE="lib-static"
+  #make PREFIX=/usr COMPONENT_TYPE="lib-static"
 }
 
 package() {
-  cd "$srcdir/$pkgname-$pkgver"
+  cd "$pkgname-$pkgver"
 
   make install PREFIX=/usr DESTDIR="$pkgdir" COMPONENT_TYPE="lib-shared"   
-  make install PREFIX=/usr DESTDIR="$pkgdir" COMPONENT_TYPE="lib-static"
+  #make install PREFIX=/usr DESTDIR="$pkgdir" COMPONENT_TYPE="lib-static"
   install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING"
 }
 
diff --git a/community/liboggz/PKGBUILD b/community/liboggz/PKGBUILD
index ac73928d6..6e2ea2734 100644
--- a/community/liboggz/PKGBUILD
+++ b/community/liboggz/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 68273 2012-03-21 06:40:28Z giovanni $
+# $Id: PKGBUILD 99867 2013-10-31 02:10:44Z allan $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Vincent Cappe <vcappe at gmail dot com>
 # Contributor: Jeff Bailes <thepizzaking at gmail dot com>
@@ -13,7 +13,6 @@ url="http://www.xiph.org/oggz/"
 license=('custom:BSD')
 depends=('libogg' 'sh')
 makedepends=('doxygen' 'pkg-config')
-options=('!libtool')
 source=("http://downloads.xiph.org/releases/${pkgname}/${pkgname}-${pkgver}.tar.gz")
 md5sums=('3649a657f8e368b881ba8b1b57381ff7')
 
diff --git a/community/libopenraw/PKGBUILD b/community/libopenraw/PKGBUILD
index 233f2bdf3..9838b0545 100644
--- a/community/libopenraw/PKGBUILD
+++ b/community/libopenraw/PKGBUILD
@@ -1,32 +1,30 @@
-# $Id: PKGBUILD 62429 2012-01-19 22:28:28Z foutrelis $
+# $Id: PKGBUILD 99868 2013-10-31 02:11:04Z allan $
 # Maintainer: Alexander Rødseth <rodseth@gmail.com>
 # Contributor: Ronald van Haren <ronald.archlinux.org>
 # Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
 # Contributor: <boromil@gmail.com>
+
 pkgname=libopenraw
 pkgver=0.0.9
-pkgrel=2.1
-pkgdesc="Library for decoding RAW files"
+pkgrel=3
+pkgdesc='Library for decoding RAW files'
 arch=('i686' 'x86_64' 'mips64el')
-url="http://libopenraw.freedesktop.org/"
+url='http://libopenraw.freedesktop.org/'
 license=('LGPL')
 depends=('gdk-pixbuf2')
 makedepends=('boost' 'libxml2')
-options=('!libtool')
 source=("http://libopenraw.freedesktop.org/download/$pkgname-$pkgver.tar.bz2")
-md5sums=('3611d8aea870d25314665ef53093288e')
+sha256sums=('49fd1adf0a0228c7a17a79bf98d8d03664195feae1e50f4ddd1b20162626e18f')
 
 build() {
-  cd "$srcdir/$pkgname-$pkgver"
+  cd "$pkgname-$pkgver"
 
   ./configure --prefix=/usr
   make
 }
 
 package() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  make DESTDIR="$pkgdir" install
+  make -C "$pkgname-$pkgver" DESTDIR="$pkgdir" install
 }
 
 # vim:set ts=2 sw=2 et:
diff --git a/community/libopensync/PKGBUILD b/community/libopensync/PKGBUILD
index 92565954f..390d4f26b 100644
--- a/community/libopensync/PKGBUILD
+++ b/community/libopensync/PKGBUILD
@@ -12,7 +12,6 @@ license=('LGPL')
 arch=('i686' 'x86_64' 'mips64el')
 makedepends=('python2' 'cmake' 'chrpath')
 depends=('glib2' 'libxml2' 'sqlite3' 'libxslt')
-options=('!libtool')
 source=(http://www.opensync.org/download/releases/$pkgver/$pkgname-$pkgver.tar.bz2)
 md5sums=('733211e82b61e2aa575d149dda17d475')
 
diff --git a/community/liboping/PKGBUILD b/community/liboping/PKGBUILD
index 02cd017ea..9249ca7b5 100644
--- a/community/liboping/PKGBUILD
+++ b/community/liboping/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 64661 2012-02-17 14:00:22Z bisson $
+# $Id: PKGBUILD 99870 2013-10-31 02:11:43Z allan $
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
 
 pkgname=liboping
@@ -8,7 +8,6 @@ pkgdesc='C library to generate ICMP echo requests, better known as "ping packets
 url='http://verplant.org/liboping/'
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
-options=('!libtool')
 depends=('libcap')
 makedepends=('ncurses')
 optdepends=('perl: perl bindings'
diff --git a/community/libosip2/PKGBUILD b/community/libosip2/PKGBUILD
index a7a689303..74f714e53 100644
--- a/community/libosip2/PKGBUILD
+++ b/community/libosip2/PKGBUILD
@@ -1,17 +1,17 @@
-# $Id: PKGBUILD 96140 2013-08-20 09:34:42Z spupykin $
+# $Id: PKGBUILD 100213 2013-11-01 21:20:33Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Michal Hybner <dta081@gmail.com>
 
 pkgname=libosip2
 epoch=1
 pkgver=4.0.0
-pkgrel=1
+pkgrel=2
 pkgdesc="oSIP is an implementation of SIP"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.gnu.org/software/osip/"
 license=('LGPL')
 depends=(glibc)
-options=(!emptydirs !libtool)
+options=(!emptydirs)
 source=(http://ftp.gnu.org/gnu/osip/libosip2-${pkgver/_/-}.tar.gz)
 md5sums=('c6a2c175d39ce75c15026c5738732dab')
 
diff --git a/community/libpaper/PKGBUILD b/community/libpaper/PKGBUILD
index c8dd1ff0b..82c85b7a9 100644
--- a/community/libpaper/PKGBUILD
+++ b/community/libpaper/PKGBUILD
@@ -1,22 +1,21 @@
-# $Id: PKGBUILD 90780 2013-05-13 21:25:37Z arodseth $
+# $Id: PKGBUILD 99872 2013-10-31 02:12:23Z allan $
 # Maintainer: Alexander Rødseth <rodseth@gmail.com>
 # Contributor: Mateusz Herych <heniekk@gmail.com>
 # Contributor: royrocks <royrocks13@gmail.com>
 
 pkgname=libpaper
 pkgver=1.1.24
-pkgrel=5
+pkgrel=6
 pkgdesc='Library for handling paper characteristics'
 arch=('x86_64' 'i686' 'mips64el')
 url='http://packages.debian.org/unstable/source/libpaper'
 license=('GPL')
 depends=('sh')
-options=('!libtool')
 source=("http://ftp.de.debian.org/debian/pool/main/libp/$pkgname/${pkgname}_$pkgver+nmu2.tar.gz")
 sha256sums=('c5bdd6d9dff179699160675dbb61651d9b3158f6da27558fdaba00e7c427ba96')
 
 build() {
-  cd "$srcdir/$pkgname-$pkgver+nmu2"
+  cd "$pkgname-$pkgver+nmu2"
 
   ./configure \
     --prefix=/usr \
@@ -26,9 +25,7 @@ build() {
 }
 
 package() {
-  cd "$srcdir/$pkgname-$pkgver+nmu2"
-
-  make DESTDIR="$pkgdir" install
+  make -C "$pkgname-$pkgver+nmu2" DESTDIR="$pkgdir" install
 }
 
 # vim:set ts=2 sw=2 et:
diff --git a/community/libpar2/PKGBUILD b/community/libpar2/PKGBUILD
index f27dfef72..7c05827c2 100644
--- a/community/libpar2/PKGBUILD
+++ b/community/libpar2/PKGBUILD
@@ -11,7 +11,6 @@ url="http://parchive.sourceforge.net/"
 license=('GPL')
 depends=('libsigc++2.0')
 makedepends=('autoconf' 'automake' 'pkgconfig')
-options=('!libtool')
 source=(http://downloads.sourceforge.net/sourceforge/parchive/${pkgname}-${pkgver}.tar.gz
         libpar2-0.2-bugfixes.patch libpar2-0.2-cancel.patch)
 sha256sums=('074fbf840f73b1e13e0405fce261078c81c8c0a4859e30a7bba10510f9199908'
diff --git a/community/libparserutils/PKGBUILD b/community/libparserutils/PKGBUILD
index 8d9a6edc4..461322824 100644
--- a/community/libparserutils/PKGBUILD
+++ b/community/libparserutils/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 89113 2013-04-26 21:37:10Z arodseth $
+# $Id: PKGBUILD 99637 2013-10-30 16:54:57Z arodseth $
 # Maintainer: Alexander Rødseth <rodseth@gmail.com>
 # Contributor: Brad Fanella <bradfanella@archlinux.us>
 # Contributor: Paulo Matias <matiasΘarchlinux-br·org>
@@ -6,7 +6,7 @@
 
 pkgname=libparserutils
 pkgver=0.1.2
-pkgrel=1
+pkgrel=2
 pkgdesc='Library for building efficient parsers'
 arch=('x86_64' 'i686' 'mips64el')
 url='http://www.netsurf-browser.org/projects/libparserutils'
@@ -17,18 +17,18 @@ source=("http://download.netsurf-browser.org/libs/releases/$pkgname-$pkgver-src.
 sha256sums=('0a21efd3882c19965f57161c4ecda85a363a71dbe090030dfa69f9aecd2160aa')
 
 build() {
-	cd "$srcdir/$pkgname-$pkgver"
+	cd "$pkgname-$pkgver"
 
 	sed 's:-Wall::' -i Makefile
 	make PREFIX=/usr COMPONENT_TYPE="lib-shared"
-	make PREFIX=/usr COMPONENT_TYPE="lib-static"
+	#make PREFIX=/usr COMPONENT_TYPE="lib-static"
 }
 
 package() {
-	cd "$srcdir/$pkgname-$pkgver"
+	cd "$pkgname-$pkgver"
 
 	make install PREFIX=/usr DESTDIR="$pkgdir" COMPONENT_TYPE="lib-shared" 
-	make install PREFIX=/usr DESTDIR="$pkgdir" COMPONENT_TYPE="lib-static"
+	#make install PREFIX=/usr DESTDIR="$pkgdir" COMPONENT_TYPE="lib-static"
 	install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING"
 }
 
diff --git a/community/libpinyin/PKGBUILD b/community/libpinyin/PKGBUILD
index 8e311c4fa..4019029f3 100644
--- a/community/libpinyin/PKGBUILD
+++ b/community/libpinyin/PKGBUILD
@@ -1,34 +1,35 @@
-# $Id: PKGBUILD 93183 2013-06-27 13:57:26Z fyan $
+# $Id: PKGBUILD 100397 2013-11-03 12:30:24Z fyan $
 # Maintainer: Felix Yan <felixonmars@gmail.com>
 # Contributor: Yangtse <yangtsesu@gmail.com> 
 # Contributor: WU Jun <quark at lihdd dot net>
 
 pkgname=libpinyin
-pkgver=0.9.93
+pkgver=0.9.94
+_modelver=7
 pkgrel=1
 pkgdesc="Library to deal with pinyin"
 arch=('i686' 'x86_64' 'mips64el')
 url="https://github.com/libpinyin/libpinyin"
 license=('GPL')
 depends=('db' 'glib2')
-options=(!libtool)
 source=("https://github.com/libpinyin/libpinyin/archive/${pkgver}.tar.gz"
-        "http://downloads.sourceforge.net/libpinyin/model6.text.tar.gz")
-noextract=("model6.text.tar.gz")
+        "http://downloads.sourceforge.net/libpinyin/model${_modelver}.text.tar.gz")
+noextract=("model${_modelver}.text.tar.gz")
 
 build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+  cd ${pkgname}-${pkgver}
 
-  cp "${srcdir}/model6.text.tar.gz" "${srcdir}/${pkgname}-${pkgver}/data/"
-  sed -i '/wget.*model6\.text\.tar\.gz/ d' ${srcdir}/${pkgname}-${pkgver}/data/Makefile.am
+  cp ../model${_modelver}.text.tar.gz data/
+  sed -i "/wget.*model${_modelver}\.text\.tar\.gz/ d" data/Makefile.am
 
   aclocal && libtoolize --force && autoheader && automake -a && autoconf
   ./configure --prefix=/usr && make
 }
 
 package() {
-  cd "${srcdir}/libpinyin-$pkgver"
+  cd ${pkgname}-$pkgver
   make DESTDIR="${pkgdir}" install
 }
-sha512sums=('7214c7913ed116a5557e89958d0d117e7a2781dcbbcc8b1c6713fb569ca121a5763e5cf1dedfdb4607638f773875c374112865d3a306876906a126954c4ef387'
-            '8719d99b2efb22438ec067c046f8d45addb3e0d336e8d6ec4b8ed22370fe81366d19a34934bb059230f86e74c379acb62822ee3458850437880d531de8ff3e0e')
+
+sha512sums=('733083a8ed1dc0d230c8830e67c4d23b28ecf4c2b4adf386aee5f1e3cd9849363951c60720d5ae5fe9c075b4dbdda88969473c19bb1a8c8187cbc21e35445108'
+            '74a56a23cdca24124037f688ed85a921089155a1b9a0b61e646f805b2bb698c56682c5d6a47ff86657c8b131a831dbee9d5cc5165d4c1f235b77fcd5b2e480ad')
diff --git a/community/libpng12/PKGBUILD b/community/libpng12/PKGBUILD
index 595584942..d114db206 100644
--- a/community/libpng12/PKGBUILD
+++ b/community/libpng12/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 95950 2013-08-19 02:17:35Z dwallace $
+# $Id: PKGBUILD 100367 2013-11-02 21:33:40Z dwallace $
 # Maintainer: Daniel Wallace <danielwallace at gtmanfred dot com>
 # Contributor:	dorphell			<archlinux.org: dorphell>
 # Contributor:	Travis Willard			<archlinux.org: travis>
@@ -8,13 +8,12 @@
 pkgname=libpng12
 _realname=libpng
 pkgver=1.2.50
-pkgrel=3
+pkgrel=4
 pkgdesc="A collection of routines used to create PNG format graphics files"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.libpng.org/pub/png/libpng.html"
 license=('custom')
 depends=('zlib')
-options=('!libtool')
 source=("http://sourceforge.net/projects/libpng/files/libpng-${pkgver}.tar.xz"
         "http://sourceforge.net/projects/apng/files/libpng/libpng12/libpng-${pkgver}-apng.patch.gz")
 
diff --git a/community/libpqxx/PKGBUILD b/community/libpqxx/PKGBUILD
index b34535ba5..98246dd75 100644
--- a/community/libpqxx/PKGBUILD
+++ b/community/libpqxx/PKGBUILD
@@ -1,16 +1,15 @@
-# $Id: PKGBUILD 83662 2013-02-04 10:17:35Z spupykin $
+# $Id: PKGBUILD 100215 2013-11-01 21:20:51Z spupykin $
 # Contributor: Giovanni Scafora <giovanni@archlinux.org>
 
 pkgname=libpqxx
 pkgver=4.0.1
-pkgrel=1
+pkgrel=2
 pkgdesc="C++ client API for PostgreSQL"
 arch=('i686' 'x86_64' 'mips64el')
 license=('custom')
 url="http://pqxx.org/development/libpqxx/"
 depends=('postgresql-libs>=8.4.1')
 makedepends=('python2')
-options=('!libtool')
 source=("http://pqxx.org/download/software/${pkgname}/${pkgname}-${pkgver}.tar.gz")
 md5sums=('6ea888b9ba85dd7cef1b182dc5f223a2')
 
@@ -19,6 +18,10 @@ build() {
   sed -i 's|python|python2|' tools/splitconfig
   ./configure --prefix=/usr --enable-shared
   make
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
   make prefix="${pkgdir}/usr" install
   install -D -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
 }
diff --git a/community/libraw/PKGBUILD b/community/libraw/PKGBUILD
index 871d225c8..b767a9218 100644
--- a/community/libraw/PKGBUILD
+++ b/community/libraw/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 98350 2013-10-08 20:37:21Z jlichtblau $
+# $Id: PKGBUILD 99878 2013-10-31 02:14:23Z allan $
 # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
 # Contributor: Ionut Biru <ibiru@archlinux.org>
 # Contributor: Joeny Ang <ang(dot)joeny(at)gmail(dot)com>
@@ -12,7 +12,7 @@ arch=('i686' 'x86_64' 'mips64el')
 url="http://www.libraw.org/"
 license=('CDDL' 'LGPL' 'custom')
 depends=('lcms')
-options=('!makeflags' '!libtool')
+options=('!makeflags')
 changelog=$pkgname.changelog
 source=(http://www.libraw.org/data/LibRaw-${pkgver}.tar.gz)
 sha256sums=('b3fcfee33bc34ae5869a9741880e28a62f029f196cb1d1a007ab156f4a110f79')
diff --git a/community/librcc/PKGBUILD b/community/librcc/PKGBUILD
index 14cf05865..8d3411e31 100644
--- a/community/librcc/PKGBUILD
+++ b/community/librcc/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 97710 2013-09-27 19:26:53Z bgyorgy $
+# $Id: PKGBUILD 100237 2013-11-02 08:40:16Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 
 pkgname=librcc
 pkgver=0.2.10
-pkgrel=2
+pkgrel=3
 pkgdesc="Charset Conversion Library"
 arch=(i686 x86_64 'mips64el')
 url="http://rusxmms.sourceforge.net/"
@@ -11,7 +11,6 @@ license=('GPL')
 depends=('aspell' 'enca' 'libxml2' 'librcd')
 makedepends=('patch' 'gtk' 'gtk2')
 install=librcc.install
-options=('!libtool')
 source=(http://downloads.sourceforge.net/rusxmms/${pkgname}-${pkgver}.tar.bz2)
 md5sums=('077260cf58ae9624c964652b79fbb5fb')
 
diff --git a/community/librcd/PKGBUILD b/community/librcd/PKGBUILD
index 4c28958e6..a8bc99b1c 100644
--- a/community/librcd/PKGBUILD
+++ b/community/librcd/PKGBUILD
@@ -1,16 +1,15 @@
-# $Id: PKGBUILD 66203 2012-02-23 03:17:12Z spupykin $
+# $Id: PKGBUILD 100239 2013-11-02 08:40:36Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com>
 
 pkgname=librcd
 pkgver=0.1.11
-pkgrel=3.1
+pkgrel=4
 pkgdesc="Charset Detection Library"
 arch=(i686 x86_64 'mips64el')
 url="http://rusxmms.sourceforge.net/"
 depends=(glibc)
 license=('GPL')
-options=('!libtool')
 source=(http://downloads.sourceforge.net/rusxmms/${pkgname}-${pkgver}.tar.bz2)
 md5sums=('17fcea35961f85c21c58a233d54a508c')
 
@@ -18,5 +17,9 @@ build() {
   cd $srcdir/$pkgname-${pkgver}
   ./configure --prefix=/usr
   make
+}
+
+package() {
+  cd $srcdir/$pkgname-${pkgver}
   make DESTDIR=$pkgdir install
 }
diff --git a/community/librsync/PKGBUILD b/community/librsync/PKGBUILD
index 720de9a1a..2eb2650cb 100644
--- a/community/librsync/PKGBUILD
+++ b/community/librsync/PKGBUILD
@@ -1,17 +1,16 @@
-# $Id: PKGBUILD 64645 2012-02-17 13:31:34Z foutrelis $
+# $Id: PKGBUILD 98947 2013-10-21 15:00:15Z foutrelis $
 # Maintainer: Evangelos Foutras <evangelos@foutrelis.com>
 # Contributor: Alessio 'mOLOk' Bolognino <themolok@gmail.com>
 # Contributor: Christoph 'delmonico' Neuroth <delmonico@gmx.net>
 
 pkgname=librsync
 pkgver=0.9.7
-pkgrel=6.1
+pkgrel=7
 pkgdesc="A free software library that implements the rsync remote-delta algorithm (rdiff)"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://librsync.sourceforge.net/"
 license=('GPL')
 depends=('popt' 'zlib' 'bzip2')
-options=('!libtool')
 source=(http://downloads.sourceforge.net/sourceforge/librsync/$pkgname-$pkgver.tar.gz
         lfs-overflow.patch)
 sha256sums=('6633e4605662763a03bb6388529cbdfd3b11a9ec55b8845351c1bd9a92bc41d6'
diff --git a/community/librtfcomp/PKGBUILD b/community/librtfcomp/PKGBUILD
index bef8b1e17..59199c9f4 100644
--- a/community/librtfcomp/PKGBUILD
+++ b/community/librtfcomp/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 96043 2013-08-19 12:12:47Z spupykin $
+# $Id: PKGBUILD 100112 2013-11-01 17:16:26Z spupykin $
 # Contributor: Bartek Iwaniec <hash87 [at] gmail [dot] com>
 
 pkgname=librtfcomp
 pkgver=1.3
-pkgrel=1
+pkgrel=2
 pkgdesc="SynCE librtfcomp library"
 arch=(i686 x86_64 'mips64el')
 license=('GPL')
diff --git a/community/libshairport/PKGBUILD b/community/libshairport/PKGBUILD
index b662faa13..dd3ee5f66 100644
--- a/community/libshairport/PKGBUILD
+++ b/community/libshairport/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 87587 2013-04-03 13:29:16Z idevolder $
+# $Id: PKGBUILD 99037 2013-10-22 19:26:56Z idevolder $
 # Maintainer: BlackIkeEagle <ike DOT devolder AT gmail DOT com>
 
 pkgname=libshairport
@@ -6,7 +6,7 @@ _developer='amejia1'
 _version=1.2.1.20121215
 _commithash='16395d8'
 pkgver=${_version}
-pkgrel=1
+pkgrel=3
 pkgdesc="emulates an AirPort Express"
 arch=('i686' 'x86_64' 'mips64el')
 url='https://github.com/amejia1/libshairport'
@@ -14,7 +14,6 @@ license=('GPL')
 depends=('openssl' 'libao')
 source=("$pkgname-$pkgver.tar.gz::https://github.com/amejia1/libshairport/tarball/$_commithash")
 sha256sums=('98b73313d0a8f2abcb32e11f4fd4b422777a495cd62dbe881d5061b91959d1d5')
-options=(!libtool)
 
 _srcfolder=$_developer-$pkgname-$_commithash
 
diff --git a/community/libsieve/PKGBUILD b/community/libsieve/PKGBUILD
index f8ab98ef5..e895bfcf9 100644
--- a/community/libsieve/PKGBUILD
+++ b/community/libsieve/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 96725 2013-09-03 13:55:48Z spupykin $
+# $Id: PKGBUILD 99881 2013-10-31 02:15:24Z allan $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 
 pkgname=libsieve
@@ -8,7 +8,6 @@ pkgdesc="sieve interpretator lib"
 arch=(i686 x86_64 'mips64el')
 url="http://libsieve.sourceforge.net/"
 license=('GPL')
-options=('!libtool')
 source=("https://github.com/downloads/sodabrew/libsieve/libsieve-$pkgver.tar.gz"
 	"glibc-regex.patch"
 	"crash-fix.patch")
diff --git a/community/libsmf/PKGBUILD b/community/libsmf/PKGBUILD
index d85f7045d..114e23732 100644
--- a/community/libsmf/PKGBUILD
+++ b/community/libsmf/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 60154 2011-12-06 08:54:54Z spupykin $
+# $Id: PKGBUILD 99882 2013-10-31 02:15:44Z allan $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: SpepS <dreamspepser at yahoo dot it>
 
@@ -10,7 +10,6 @@ arch=('i686' 'x86_64' 'mips64el')
 url="http://sourceforge.net/projects/libsmf/"
 license=('BSD')
 depends=('glib2' 'readline')
-options=('!libtool')
 source=("http://downloads.sourceforge.net/project/libsmf/libsmf/$pkgver/$pkgname-$pkgver.tar.gz")
 md5sums=('eb698f1bc0bad9d5bce4c10386347486')
 
diff --git a/community/libsodium/PKGBUILD b/community/libsodium/PKGBUILD
index 3cef1c18a..193e5eb5b 100644
--- a/community/libsodium/PKGBUILD
+++ b/community/libsodium/PKGBUILD
@@ -1,17 +1,16 @@
-# $Id: PKGBUILD 96998 2013-09-10 02:39:45Z fyan $
+# $Id: PKGBUILD 99151 2013-10-25 05:03:48Z fyan $
 # Maintainer: Felix Yan <felixonmars@gmail.com>
 # Contributor: namelessjon <jonathan.stott@gmail.com>
 # Contributor: Alessio Sergi <asergi at archlinux dot us>
 
 pkgname=libsodium
-pkgver=0.4.3
+pkgver=0.4.5
 pkgrel=1
 pkgdesc="P(ortable|ackageable) NaCl-based crypto library"
 arch=('i686' 'x86_64')
 url="https://github.com/jedisct1/libsodium"
 license=('custom:ISC')
 depends=('glibc')
-options=('!libtool')
 source=(http://download.dnscrypt.org/$pkgname/releases/$pkgname-${pkgver}.tar.gz)
 
 build() {
@@ -35,4 +34,4 @@ package() {
 }
 
 # vim:set ts=2 sw=2 et:
-sha512sums=('479016922fa522409eac80e65046129b4ea3a34642483e6f56331c430c9cb21cf69ec4650a6717560283096d1416bf15035dbf56eba3c35259ddfc8feccda331')
+sha512sums=('8c446b62c0400ed972f11c399a03f334cead80fc48513c4b5eba6f569725e28cf98d71cd6d46da5602fc553719a18e74598008c311fe02b2f05b61c7bc72525b')
diff --git a/community/libstatgrab/PKGBUILD b/community/libstatgrab/PKGBUILD
index 09d7249d9..fee9a815c 100644
--- a/community/libstatgrab/PKGBUILD
+++ b/community/libstatgrab/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 83514 2013-02-02 11:47:44Z jlichtblau $
+# $Id: PKGBUILD 99883 2013-10-31 02:16:04Z allan $
 # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
 # Contributor: Eric Belanger <eric@archlinux.org>
 # Contributor: Hugo Ideler <hugoideler@dse.nl>
@@ -11,7 +11,7 @@ arch=('i686' 'x86_64' 'mips64el')
 url="http://www.i-scream.org/libstatgrab"
 license=('LGPL' 'GPL')
 depends=('ncurses' 'perl')
-options=('!libtool' '!makeflags')
+options=('!makeflags')
 changelog=$pkgname.changelog
 source=(http://www.mirrorservice.org/sites/ftp.i-scream.org/pub/i-scream/$pkgname/$pkgname-$pkgver.tar.gz)
 sha256sums=('bbaa88c6bde8bd3cf2720b81a26528cc055a7e83e4ea3bdb1d0a3c4287cceb88')
diff --git a/community/libsynaptics/PKGBUILD b/community/libsynaptics/PKGBUILD
index 33a07cf8c..0185453a6 100644
--- a/community/libsynaptics/PKGBUILD
+++ b/community/libsynaptics/PKGBUILD
@@ -1,17 +1,16 @@
-# $Id: PKGBUILD 66206 2012-02-23 03:20:15Z spupykin $
+# $Id: PKGBUILD 100241 2013-11-02 08:40:55Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 
 pkgname=libsynaptics
 pkgver=0.14.6c
-pkgrel=5
+pkgrel=6
 pkgdesc="Library for accessing synaptics touchpads"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://qsynaptics.sourceforge.net"
 license=('GPL')
 depends=('gcc-libs')
 makedepends=('xproto')
-options=('!libtool')
 source=(http://qsynaptics.sourceforge.net/$pkgname-$pkgver.tar.bz2 libsynaptics-gcc433.patch)
 md5sums=('fedf8b31171d288954ff2e83b251de44'
          '5e1df34fe8c2480b803a8ea6520bdda8')
@@ -22,5 +21,9 @@ build() {
   sed -i '1,1i#include <stdio.h>' pad.cpp
   ./configure --prefix=/usr
   make
+}
+
+package() {
+  cd $srcdir/$pkgname-$pkgver
   make DESTDIR=$pkgdir install
 }
diff --git a/community/libtaginfo/PKGBUILD b/community/libtaginfo/PKGBUILD
index 841fba7b0..a24121fc6 100644
--- a/community/libtaginfo/PKGBUILD
+++ b/community/libtaginfo/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 88454 2013-04-18 04:14:11Z fyan $
+# $Id: PKGBUILD 99234 2013-10-26 09:47:13Z fyan $
 # Maintainer: Felix Yan <felixonmars@gmail.com>
 
 pkgname=libtaginfo
 pkgver=0.1.6
-pkgrel=1
+pkgrel=2
 pkgdesc="Library for reading media metadata"
 arch=('i686' 'x86_64' 'mips64el')
 url="https://bitbucket.org/shuerhaaken/libtaginfo"
diff --git a/community/libtorrent/PKGBUILD b/community/libtorrent/PKGBUILD
index 6684a6e83..f70f88b61 100644
--- a/community/libtorrent/PKGBUILD
+++ b/community/libtorrent/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 90569 2013-05-13 09:41:28Z bisson $
+# $Id: PKGBUILD 99885 2013-10-31 02:16:43Z allan $
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
 # Contributor: Daenyth <Daenyth+Arch [at] gmail [dot] com>
 # Contributor: Jeff Mickey <jeff@archlinux.org>
@@ -15,7 +15,6 @@ depends=('openssl')
 source=("http://libtorrent.rakshasa.no/downloads/${pkgname}-${pkgver}.tar.gz")
 sha1sums=('e65a20b9e6d5c04b4e0849543d58befb60d948b7')
 
-options=('!libtool')
 
 build() {
 	cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/community/libtsm/PKGBUILD b/community/libtsm/PKGBUILD
new file mode 100644
index 000000000..af30bda3a
--- /dev/null
+++ b/community/libtsm/PKGBUILD
@@ -0,0 +1,26 @@
+# Maintainer: Daniel Micay <danielmicay@gmail.com>
+# Contributor: David Herrmann <dh.herrmann@gmail.com>
+pkgname=libtsm
+pkgver=3
+pkgrel=3
+pkgdesc='Terminal-emulator State Machine'
+arch=('i686' 'x86_64')
+url="http://www.freedesktop.org/wiki/Software/kmscon/$pkgname"
+license=('MIT')
+depends=(glibc)
+makedepends=('libxkbcommon')
+options=(!libtool)
+source=(http://www.freedesktop.org/software/kmscon/releases/$pkgname-$pkgver.tar.xz)
+md5sums=('c1b297a69d11a72f207ec35ae5ce7d69')
+
+build() {
+  cd "$srcdir/$pkgname-$pkgver"
+  ./configure --prefix=/usr
+  make
+}
+
+package() {
+  cd "$srcdir/$pkgname-$pkgver"
+  install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING"
+  make DESTDIR="$pkgdir" install
+}
diff --git a/community/libuhd/PKGBUILD b/community/libuhd/PKGBUILD
new file mode 100644
index 000000000..c3758b43d
--- /dev/null
+++ b/community/libuhd/PKGBUILD
@@ -0,0 +1,45 @@
+# $Id: PKGBUILD 99249 2013-10-26 12:30:40Z kkeen $
+# Maintainer: Kyle Keen <keenerd@gmail.com>
+# Contributor: Dominik Heidler <dheidler@gmail.com>
+
+pkgname=libuhd
+pkgver=3.5.4
+_verstring=003_005_004
+pkgrel=2
+pkgdesc="Universal Software Radio Peripheral (USRP) userspace driver"
+arch=('x86_64' 'i686')
+url="http://code.ettus.com/redmine/ettus/projects/uhd/wiki"
+license=('GPL')
+depends=('boost-libs' 'orc' 'libusbx')
+makedepends=('cmake' 'boost' 'python2-cheetah')
+install='libuhd.install'
+
+source=("libuhd-$pkgver.tar.gz::https://codeload.github.com/EttusResearch/uhd/tar.gz/release_$_verstring")
+md5sums=('e90c95483a52b75cacc85f4fb0ef63ed')
+
+build() {
+  cd "$srcdir/uhd-release_$_verstring/host"
+  # fix for py2
+  find -name "*.py" | xargs sed -i "s|#!/usr/bin/env python$|#!/usr/bin/env python2|"
+  mkdir -p build
+  cd build
+  cmake .. -DCMAKE_INSTALL_PREFIX=/usr/ \
+           -DPYTHON_EXECUTABLE=/usr/bin/python2 \
+           -DENABLE_EXAMPLES=OFF \
+           -DENABLE_UTILS=ON \
+           -DENABLE_TESTS=OFF \
+           -DENABLE_E100=ON
+  # e100 is disabled by default for now, check that on future releases
+  make
+}
+
+check() {
+  cd "$srcdir/uhd-release_$_verstring/host/build"
+  make test
+}
+
+package() {
+  cd "$srcdir/uhd-release_$_verstring/host/build"
+  make DESTDIR="$pkgdir" install
+  install -Dm644 "$pkgdir/usr/share/uhd/utils/uhd-usrp.rules" "$pkgdir/usr/lib/udev/rules.d/10-uhd-usrp.rules"
+} 
diff --git a/community/libuhd/libuhd.install b/community/libuhd/libuhd.install
new file mode 100644
index 000000000..8a8592faf
--- /dev/null
+++ b/community/libuhd/libuhd.install
@@ -0,0 +1,7 @@
+post_install() {
+	ldconfig
+}
+
+post_upgrade() {
+	ldconfig
+}
diff --git a/community/libunibreak/PKGBUILD b/community/libunibreak/PKGBUILD
new file mode 100644
index 000000000..040d94c4d
--- /dev/null
+++ b/community/libunibreak/PKGBUILD
@@ -0,0 +1,28 @@
+# $Id: PKGBUILD 83714 2013-02-04 16:20:13Z spupykin $
+# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
+# Contributor: Orivej Desh <smpuj@bk.ru>
+
+pkgname=libunibreak
+pkgver=1.1
+pkgrel=1
+pkgdesc="An implementation of the line breaking algorithm as described in Unicode 5.2.0 Standard Annex 14, Revision 24"
+arch=("i686" "x86_64")
+url="http://vimgadgets.sourceforge.net/libunibreak/"
+license=("custom:zlib/libpng")
+depends=("glibc")
+replaces=('liblinebreak')
+source=("$pkgname-$pkgver.tar.gz::https://github.com/adah1972/libunibreak/archive/libunibreak_${pkgver//./_}.tar.gz")
+md5sums=('80c933a03493bd920553c9380aa7f13d')
+
+build() {
+  cd "$srcdir/libunibreak-libunibreak_${pkgver//./_}"
+  ./bootstrap
+  ./configure --prefix=/usr
+  make
+}
+
+package() {
+  cd "$srcdir/libunibreak-libunibreak_${pkgver//./_}"
+  make DESTDIR="$pkgdir" install
+  install -Dm644 LICENCE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+}
diff --git a/community/libunwind/PKGBUILD b/community/libunwind/PKGBUILD
index 03c724f3b..ede7689ee 100644
--- a/community/libunwind/PKGBUILD
+++ b/community/libunwind/PKGBUILD
@@ -1,18 +1,17 @@
 # $id$
-# Maintainer: Sébastien Luttringer <seblu@archlinux.org>
+# Maintainer: Sébastien Luttringer
 # Contributor: Lawrence Lee <valheru@facticius.net>
 # Contributor: Phillip Marvin <phillip.marvin@gmail.com>
 # Contributor: keystone <phillip.marvin@gmail.com>
 
 pkgname=libunwind
 pkgver=1.1
-pkgrel=1
+pkgrel=2
 pkgdesc='Portable and efficient C programming interface (API) to determine the call-chain of a program'
 arch=('i686' 'x86_64' 'mips64el')
 url='http://www.nongnu.org/libunwind/'
 license=('GPL')
 depends=('glibc' 'xz')
-options=(!libtool)
 source=("http://download.savannah.gnu.org/releases/$pkgname/$pkgname-$pkgver.tar.gz")
 md5sums=('fb4ea2f6fbbe45bf032cd36e586883ce')
 
diff --git a/community/libuser/PKGBUILD b/community/libuser/PKGBUILD
index 03f8fe40b..77ea33225 100644
--- a/community/libuser/PKGBUILD
+++ b/community/libuser/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 91838 2013-05-28 17:05:08Z spupykin $
+# $Id: PKGBUILD 99886 2013-10-31 02:17:17Z allan $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: Thomas Dziedzic < gostrc at gmail >
 
@@ -10,7 +10,6 @@ arch=('i686' 'x86_64' 'mips64el')
 license=('LGPL')
 url='https://fedorahosted.org/libuser/'
 depends=('python2' 'glib2' 'popt')
-options=('!libtool')
 backup=('etc/libuser.conf')
 source=("https://fedorahosted.org/releases/l/i/libuser/libuser-${pkgver}.tar.xz")
 md5sums=('22835cbfec894b1e9491845ed5023244')
diff --git a/community/libvirt-glib/PKGBUILD b/community/libvirt-glib/PKGBUILD
index ff5edb19c..a68820cb9 100644
--- a/community/libvirt-glib/PKGBUILD
+++ b/community/libvirt-glib/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 98284 2013-10-08 01:35:38Z bgyorgy $
+# $Id: PKGBUILD 99889 2013-10-31 02:18:18Z allan $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: Stefano Facchini <stefano.facchini@gmail.com>
 
@@ -11,7 +11,6 @@ url="http://libvirt.org"
 license=('LGPL2.1')
 depends=('libvirt')
 makedepends=('intltool' 'gobject-introspection' 'vala')
-options=('!libtool')
 source=(ftp://libvirt.org/libvirt/glib/$pkgname-$pkgver.tar.gz)
 sha256sums=('39652c07d95f980ff30b39e0fd072e768fb85d778d65432da24b17dee9d36429')
 
diff --git a/community/libvirt/PKGBUILD b/community/libvirt/PKGBUILD
index a1aff7e55..2bd806bc9 100644
--- a/community/libvirt/PKGBUILD
+++ b/community/libvirt/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 98038 2013-10-04 13:33:02Z spupykin $
+# $Id: PKGBUILD 100495 2013-11-05 10:05:13Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Jonathan Wiersma <archaur at jonw dot org>
 
 pkgname=libvirt
-pkgver=1.1.3
+pkgver=1.1.4
 pkgrel=1
 pkgdesc="API for controlling virtualization engines (openvz,kvm,qemu,virtualbox,xen,etc)"
 arch=('i686' 'x86_64' 'mips64el')
@@ -21,7 +21,7 @@ optdepends=('bridge-utils: for briged networking (default)'
 	    'radvd'
 	    'ebtables')
 [ "$CARCH" != "mips64el" ] && optdepends+=('dmidecode')
-options=('emptydirs' '!libtool')
+options=('emptydirs')
 backup=('etc/conf.d/libvirtd'
 	'etc/conf.d/libvirt-guests'
 	'etc/libvirt/libvirtd.conf'
@@ -33,7 +33,7 @@ source=("http://libvirt.org/sources/$pkgname-$pkgver.tar.gz"
 	libvirtd.conf.d
 	libvirtd-guests.conf.d
 	libvirt.tmpfiles.d)
-md5sums=('b0dfe373ebe0c588b42a28c14d36a3e6'
+md5sums=('0b21e97ad5d3c27d18806896e16ef82b'
          '3ed0e24f5b5e25bf553f5427d64915e6'
          '0a96ed876ffb1fcb9dff5a9b3a609c1e'
          '020971887442ebbf1b6949e031c8dd3f')
diff --git a/community/libwapcaplet/PKGBUILD b/community/libwapcaplet/PKGBUILD
index 0ebecac37..ffd971658 100644
--- a/community/libwapcaplet/PKGBUILD
+++ b/community/libwapcaplet/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 89126 2013-04-26 23:37:42Z arodseth $
+# $Id: PKGBUILD 99641 2013-10-30 16:58:53Z arodseth $
 # Maintainer: Alexander Rødseth <rodseth@gmail.com>
 # Contributor: Brad Fanella <bradfanella@archlinux.us>
 # Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
 
 pkgname=libwapcaplet
 pkgver=0.2.0
-pkgrel=1
+pkgrel=2
 pkgdesc='String internment library with rapid string comparison'
 arch=('x86_64' 'i686' 'mips64el')
 url='http://www.netsurf-browser.org/projects/libwapcaplet/'
@@ -16,17 +16,17 @@ source=("http://download.netsurf-browser.org/libs/releases/$pkgname-$pkgver-src.
 sha256sums=('5fb49841ba335b0c7a1420d92c3a60480df63696c50353c02724aa8c6b45cb24')
 
 build() {
-  cd "$srcdir/$pkgname-$pkgver"
+  cd "$pkgname-$pkgver"
   
   make PREFIX=/usr COMPONENT_TYPE="lib-shared" 
-  make PREFIX=/usr COMPONENT_TYPE="lib-static"
+  #make PREFIX=/usr COMPONENT_TYPE="lib-static"
 }
 
 package() {
-  cd "$srcdir/$pkgname-$pkgver"
+  cd "$pkgname-$pkgver"
   
   make install PREFIX=/usr DESTDIR="$pkgdir" COMPONENT_TYPE="lib-shared" 
-  make install PREFIX=/usr DESTDIR="$pkgdir" COMPONENT_TYPE="lib-static"
+  #make install PREFIX=/usr DESTDIR="$pkgdir" COMPONENT_TYPE="lib-static"
   install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING"
 }
 
diff --git a/community/libwww/PKGBUILD b/community/libwww/PKGBUILD
index 808861c42..ef82322c1 100644
--- a/community/libwww/PKGBUILD
+++ b/community/libwww/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 57429 2011-10-27 16:42:35Z spupykin $
+# $Id: PKGBUILD 99890 2013-10-31 02:18:38Z allan $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Buharev Vasilij <buharev.v.p@gmail.com>
 
@@ -11,7 +11,6 @@ url="http://www.w3.org/Library/"
 license=('W3C')
 depends=()
 makedepends=('gcc pkgconfig perl zlib openssl')
-options=('!libtool')
 source=(http://www.w3.org/Library/Distribution/w3c-$pkgname-$pkgver.tgz)
 md5sums=('c3734ca6caa405707e134cc8c6d7e422')
 
diff --git a/community/libxdg-basedir/PKGBUILD b/community/libxdg-basedir/PKGBUILD
index 1a5bb14d6..1a089307a 100644
--- a/community/libxdg-basedir/PKGBUILD
+++ b/community/libxdg-basedir/PKGBUILD
@@ -11,7 +11,6 @@ license=('MIT')
 depends=('glibc')
 source=(http://n.ethz.ch/student/nevillm/download/${pkgname}/${pkgname}-${pkgver}.tar.gz
 	'LICENSE')
-options=('!libtool')
 sha1sums=('b924afe4e29c52358ad67476887e9ca0dcf90f7c'
           'c76efede60d0632d4241d718919d8b4ec62056b3')
 
diff --git a/community/libyaml/PKGBUILD b/community/libyaml/PKGBUILD
index fed2b6dbb..b8802167e 100644
--- a/community/libyaml/PKGBUILD
+++ b/community/libyaml/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 66208 2012-02-23 03:22:37Z spupykin $
+# $Id: PKGBUILD 100114 2013-11-01 17:16:45Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Michal Bozon <michal.bozon__at__gmail.com>
 
 pkgname=libyaml
 pkgver=0.1.4
-pkgrel=2.1
+pkgrel=3
 pkgdesc="YAML 1.1 library"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://pyyaml.org/wiki/LibYAML"
diff --git a/community/libzdb/PKGBUILD b/community/libzdb/PKGBUILD
index 21be84187..8332420bf 100644
--- a/community/libzdb/PKGBUILD
+++ b/community/libzdb/PKGBUILD
@@ -1,15 +1,14 @@
-# $Id: PKGBUILD 97586 2013-09-24 15:30:59Z spupykin $
+# $Id: PKGBUILD 100245 2013-11-02 08:41:34Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 
 pkgname=libzdb
 pkgver=2.12
-pkgrel=1
+pkgrel=2
 pkgdesc="Zild Database Library"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.tildeslash.com/libzdb/"
 license=('GPL')
 depends=('postgresql-libs' 'sqlite' 'libmariadbclient')
-options=('!libtool')
 source=(http://www.tildeslash.com/libzdb/dist/libzdb-$pkgver.tar.gz)
 md5sums=('dd95114cae471d1b5dfda1f263b222c1')
 
diff --git a/community/libzen/PKGBUILD b/community/libzen/PKGBUILD
index 4290c6d99..11fb32935 100644
--- a/community/libzen/PKGBUILD
+++ b/community/libzen/PKGBUILD
@@ -1,17 +1,16 @@
-# $Id: PKGBUILD 90922 2013-05-15 13:46:19Z spupykin $
+# $Id: PKGBUILD 100247 2013-11-02 08:41:54Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: hydro <hydro@freenet.de>
 
 pkgname=libzen
 pkgver=0.4.29
-pkgrel=1
+pkgrel=2
 pkgdesc="shared library for libmediainfo and mediainfo"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://mediainfo.sourceforge.net"
 license=('BSD')
 depends=('gcc-libs')
 makedepends=('libtool' 'automake' 'autoconf')
-options=('!libtool')
 source=(http://downloads.sourceforge.net/zenlib/${pkgname}_${pkgver}.tar.bz2)
 md5sums=('a103218d3438c63fe246cda71ad0ca88')
 
diff --git a/community/lightdm/PKGBUILD b/community/lightdm/PKGBUILD
index 5fe0c9f2c..d868449c1 100755
--- a/community/lightdm/PKGBUILD
+++ b/community/lightdm/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 98444 2013-10-10 16:19:18Z alucryd $
+# $Id: PKGBUILD 100484 2013-11-05 08:34:50Z alucryd $
 # Maintainer: Maxime Gauduin <alucryd@gmail.com>
 # Contributor: Morfeo <morfeo89@hotmail.it>
 
 pkgbase=lightdm
 pkgname=('lightdm' 'liblightdm-qt4' 'liblightdm-qt5')
-pkgver=1.8.1
+pkgver=1.8.4
 pkgrel=1
 epoch=1
 pkgdesc="A lightweight display manager"
@@ -12,7 +12,6 @@ arch=('i686' 'x86_64' 'mips64el')
 url="https://launchpad.net/lightdm"
 license=('GPL3' 'LGPL3')
 makedepends=('gobject-introspection' 'gtk-doc' 'intltool' 'itstool' 'libxklavier' 'polkit' 'qt4' 'qt5-base')
-options=('!libtool')
 source=("https://launchpad.net/lightdm/${pkgver%.*}/${pkgver}/+download/${pkgbase}-${pkgver}.tar.xz"
         'lightdm.service'
         'lightdm.tmpfiles'
@@ -21,7 +20,7 @@ source=("https://launchpad.net/lightdm/${pkgver%.*}/${pkgver}/+download/${pkgbas
         'lightdm.rules'
         'lightdm-default-config.patch'
         'Xsession')
-sha256sums=('e749ea72ac2517f592a8dfcd8bbdf7aba6729cb75c569c03347751d87f99305a'
+sha256sums=('92242d397628256c237dc5d66ac08a85207f4a6ddcc2e5c485ccb4b0b253cc56'
             '0d2adba25cdbe59e97ffd302083db9d5e23920780f41e04f64512cd6b633289a'
             'b29521fbd7a48a8f60b93ecca3b30c30bcb71560de8033c8d39b25c22c6f696f'
             'e8c4c5fd3b801a390d201166fd1fb9730e78a5c62928768103b870b6bd980ea0'
@@ -65,7 +64,7 @@ install="${pkgbase}.install"
   make DESTDIR="${pkgdir}" -C liblightdm-qt uninstall
   install -m 755 ../Xsession "${pkgdir}"/etc/lightdm/Xsession
   rm -rf "${pkgdir}"/etc/init
-  rm -rf "${pkgdir}"/usr/include/lightdm-qt{,5}-2
+  rm -rf "${pkgdir}"/usr/include/lightdm-qt{,5}-*
 
   install -dm 770 "${pkgdir}"/var/lib/lightdm
   install -dm 711 "${pkgdir}"/var/log/lightdm
diff --git a/community/linphone/PKGBUILD b/community/linphone/PKGBUILD
index 81146509b..fb14de962 100644
--- a/community/linphone/PKGBUILD
+++ b/community/linphone/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 96141 2013-08-20 09:35:09Z spupykin $
+# $Id: PKGBUILD 99895 2013-10-31 02:20:19Z allan $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Darwin Bautista <djclue917@gmail.com>
 
@@ -13,7 +13,7 @@ depends=('alsa-lib' 'ffmpeg' 'gtk2' 'libexosip2' 'speex' 'libv4l' 'libglade' 'v4
 	 'libpulse' 'libxv' 'mediastreamer' 'ortp' 'libzrtpcpp' 'bcg729' 'libsoup')
 makedepends=('pkgconfig' 'perlxml' 'intltool' 'sgmltools-lite')
 optdepends=('pulseaudio')
-options=('!libtool' '!emptydirs')
+options=('!emptydirs')
 source=("http://download-mirror.savannah.gnu.org/releases/${pkgname}/3.6.x/sources/${pkgname}-$pkgver.tar.gz"
 	"port-to-exosip-4.patch")
 md5sums=('f59b99ec2501ebbb02969c885be4c4c5'
diff --git a/community/liteide/PKGBUILD b/community/liteide/PKGBUILD
index 6d5a7c483..d94bb5526 100644
--- a/community/liteide/PKGBUILD
+++ b/community/liteide/PKGBUILD
@@ -1,16 +1,16 @@
-# $Id: PKGBUILD 96319 2013-08-25 13:45:50Z arodseth $
+# $Id: PKGBUILD 99195 2013-10-25 12:43:33Z arodseth $
 # Maintainer: Alexander Rødseth <rodseth@gmail.com>
 # Contributor: spambanane <happy.house@gmx.de>
 # Contributor: Matteo <matteo.dek@gmail.com>
 
 pkgname=liteide
 pkgver=19
-pkgrel=3
+pkgrel=4
 pkgdesc='IDE for editing and building projects written in the Go programming language ("golangide")'
 license=('LGPL')
 arch=('x86_64' 'i686')
 url='https://github.com/visualfc/liteide'
-depends=('go' 'libpng12' 'qt5-webkit')
+depends=('go' 'qt5-webkit')
 replaces=('golangide')
 conflicts=('golangide')
 makedepends=('gendesk')
@@ -23,15 +23,13 @@ sha256sums=('182694341940878cf5df4f083a750659bffc97eb4ae517410e157bebc14f97df'
             '5d6f05b072586c31e3a4a08ea2d7332dd0a78f5db6b2d088fb76e8cb032672f0')
 
 prepare() {
-  cd "$srcdir"
-
   gendesk -n --name 'Golang IDE' --pkgname "$pkgname" --pkgdesc "$pkgdesc"
   cd "liteide-x$pkgver/build"
   chmod +x build_linux.sh
 }
 
 build() {
-  cd "$srcdir/liteide-x$pkgver/build"
+  cd "liteide-x$pkgver/build"
 
   QTDIR=/usr ./build_linux.sh
 
@@ -42,7 +40,7 @@ build() {
 }
 
 package() {
-  cd "$srcdir/liteide-x$pkgver/build/liteide"
+  cd "liteide-x$pkgver/build/liteide"
 
   msg2 'Creating directories...'
   mkdir -p \
diff --git a/community/lksctp-tools/PKGBUILD b/community/lksctp-tools/PKGBUILD
index d5f3c6a01..bfde05d0f 100644
--- a/community/lksctp-tools/PKGBUILD
+++ b/community/lksctp-tools/PKGBUILD
@@ -4,13 +4,12 @@
 
 pkgname=lksctp-tools
 pkgver=1.0.15
-pkgrel=1
+pkgrel=2
 pkgdesc='An implementation of the SCTP protocol'
 arch=('i686' 'x86_64' 'mips64el')
 url='http://lksctp.sourceforge.net/'
 license=('GPL2' 'LGPL2.1')
 depends=('bash')
-options=('!libtool')
 source=("http://downloads.sourceforge.net/sourceforge/lksctp/$pkgname-$pkgver.tar.gz")
 md5sums=('d829677541fb41061e7f4d61f8413b07')
 
diff --git a/community/lmms/PKGBUILD b/community/lmms/PKGBUILD
index 41063a57b..4db7c0102 100644
--- a/community/lmms/PKGBUILD
+++ b/community/lmms/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 92797 2013-06-15 10:20:30Z lfleischer $
+# $Id: PKGBUILD 99896 2013-10-31 02:20:39Z allan $
 # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de>
 # Contributor: Shinlun Hsieh <yngwiexx@yahoo.com.tw>
 # Contributor: Mateusz Herych <heniekk@gmail.com>
@@ -21,7 +21,7 @@ makedepends=('cmake' 'ladspa' 'libxft' 'freetype2' 'fftw' 'stk')
 [[ $CARCH = i686 ]] && makedepends+=('wine')
 provides=('lmms-extras')
 conflicts=('lmms-extras')
-options=('!libtool' '!makeflags')
+options=('!makeflags')
 install=lmms.install
 source=("http://downloads.sourceforge.net/sourceforge/lmms/${pkgname}-${pkgver}.tar.bz2"
         zynaddsubfx_unlink.patch)
diff --git a/community/log4cpp/PKGBUILD b/community/log4cpp/PKGBUILD
index b0ded1abc..ada721110 100644
--- a/community/log4cpp/PKGBUILD
+++ b/community/log4cpp/PKGBUILD
@@ -1,16 +1,15 @@
-# $Id: PKGBUILD 89526 2013-04-29 18:41:08Z stativ $
+# $Id: PKGBUILD 99897 2013-10-31 02:20:59Z allan $
 # Maintainer: Lukas Jirkovsky <l.jirkovsky@gmail.com>
 # Contributor : Geraud Le Falher <daureg@gmail.com>
 
 pkgname=log4cpp
 pkgver=1.1
-pkgrel=1
+pkgrel=2
 pkgdesc="A library of C++ classes for flexible logging to files, syslog, IDSA and other destinations."
 arch=('i686' 'x86_64' 'mips64el')
 url="http://log4cpp.sourceforge.net/"
 license=('LGPL')
 depends=('gcc-libs')
-options=('!libtool')
 source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz)
 md5sums=('b9ef6244baa5e5e435f35e0b9474b35d')
 
diff --git a/community/lomoco/PKGBUILD b/community/lomoco/PKGBUILD
index 806e93064..25cc6a165 100644
--- a/community/lomoco/PKGBUILD
+++ b/community/lomoco/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 68931 2012-04-06 00:04:27Z dreisner $
+# $Id: PKGBUILD 99898 2013-10-31 02:21:19Z allan $
 # Maintainer: Jeff Mickey <j@codemac.net>
 # Contributor: Shadowhand <woody.gilk@gmail.com>
 
@@ -11,7 +11,6 @@ license=('GPL')
 depends=('libusb-compat')
 replaces=('lmctl')
 arch=('i686' 'x86_64' 'mips64el')
-options=(!libtool)
 backup=(etc/udev/lomoco_mouse.conf)
 source=(http://www.lomoco.org/${pkgname}-${pkgver}.tar.gz
 	"lomoco_mx518.patch::https://bugs.archlinux.org/task/28180?getfile=8163"
diff --git a/community/lorcon/PKGBUILD b/community/lorcon/PKGBUILD
index 9f749da53..54f483b48 100644
--- a/community/lorcon/PKGBUILD
+++ b/community/lorcon/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 64291 2012-02-11 15:46:46Z arodseth $
+# $Id: PKGBUILD 99899 2013-10-31 02:21:39Z allan $
 # Maintainer: Alexander Rødseth <rodseth@gmail.com>
 # Contributor: Brad Fanella <bradfanella@archlinux.us>
 # Contributor: fnord0 [fnord0 <AT> riseup <DOT> net]
@@ -14,7 +14,6 @@ arch=('x86_64' 'i686' 'mips64el')
 depends=('libpcap')
 makedepends=('subversion')
 replaces=('lorcon-old-svn')
-options=('!libtool')
 _svntrunk="http://802.11ninja.net/svn/lorcon/trunk"
 _svnrev=$pkgver
 
diff --git a/community/lrzip/PKGBUILD b/community/lrzip/PKGBUILD
index 31645276e..ed199df0a 100644
--- a/community/lrzip/PKGBUILD
+++ b/community/lrzip/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 96966 2013-09-09 13:06:19Z arodseth $
+# $Id: PKGBUILD 99900 2013-10-31 02:21:59Z allan $
 # Maintainer: Alexander Rødseth <rodseth@gmail.com>
 # Contributor: graysky <graysky AT archlinux DOT us>
 # Contributor: kastor@fobos.org.ar
@@ -16,7 +16,6 @@ then
   makedepends+=('nasm')
   _flag="--enable-asm"
 fi
-options=('!libtool')
 source=("http://ck.kolivas.org/apps/$pkgname/$pkgname-$pkgver.tar.bz2")
 sha256sums=('982d5a8db4d8bbbced6e33fbbcd589c9b3fc4275110155d7bd71cbeff4a235ae')
 
diff --git a/community/ltris/PKGBUILD b/community/ltris/PKGBUILD
index b21b1e5cc..d51179880 100644
--- a/community/ltris/PKGBUILD
+++ b/community/ltris/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 60814 2011-12-18 17:13:32Z jlichtblau $
+# $Id: PKGBUILD 100352 2013-11-02 15:47:29Z jlichtblau $
 # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
 # Contributor: Eric Belanger <eric@archlinux.org>
 # Contributor: SmackleFunky <smacklefunky@optusnet.com.au>
 
 pkgname=ltris
-pkgver=1.0.18
+pkgver=1.0.19
 pkgrel=1
 pkgdesc="A tetris clone where you have a bowl with blocks falling down"
 arch=('i686' 'x86_64' 'mips64el')
@@ -15,7 +15,7 @@ backup=('var/games/ltris.hscr')
 install=$pkgname.install
 changelog=$pkgname.changelog
 source=(http://downloads.sourceforge.net/lgames/$pkgname-$pkgver.tar.gz)
-sha256sums=('3cba90365d50e79601368499af77d54cb03c0cf2544324e5df246eb1eeaa0e30')
+sha256sums=('8f6a9e7719d22004aee153db29ffd9ca41c7a6cd87fc791591994eecc2e625a1')
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
diff --git a/community/ltris/ltris.changelog b/community/ltris/ltris.changelog
index 4cf7b905f..325b8d524 100644
--- a/community/ltris/ltris.changelog
+++ b/community/ltris/ltris.changelog
@@ -1,3 +1,8 @@
+2013-11-02  Jaroslav Lichtblau  <dragonlord@aur.archlinux.org>
+
+	* ltris 1.0.19-1
+	* Upstream update
+
 2011-12-18  Jaroslav Lichtblau  <dragonlord@aur.archlinux.org>
 
 	* ltris 1.0.18-1
diff --git a/community/luaposix/PKGBUILD b/community/luaposix/PKGBUILD
index 578633a39..c888f5ae1 100644
--- a/community/luaposix/PKGBUILD
+++ b/community/luaposix/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 93201 2013-06-28 13:21:16Z seblu $
+# $Id: PKGBUILD 99901 2013-10-31 02:22:19Z allan $
 # Maintainer: Sébastien Luttringer
 # Contributor: SpepS <dreamspepser at yahoo dot it>
 # Contributor: Laszlo Papp <djszapi at archlinux us>
@@ -6,20 +6,31 @@
 
 pkgbase=luaposix
 pkgname=('lua-posix' 'lua51-posix')
-pkgver=29
+pkgver=31
 pkgrel=1
 pkgdesc='A POSIX library for Lua programming language'
 arch=('i686' 'x86_64' 'mips64el')
 url='https://github.com/luaposix/luaposix'
 license=('GPL' 'LGPL')
-makedepends=('lua' 'lua51' 'lua51-bitop' 'git')
-options=('!libtool')
-source=("$pkgname-$pkgver.tar.gz::https://github.com/luaposix/luaposix/archive/v$pkgver.tar.gz")
-md5sums=('5c3e49c51caeee6eb5f9dcb2bb082bed')
+makedepends=('lua' 'lua51' 'lua51-bitop' 'git' 'help2man')
+options=('!makeflags')
+source=("$pkgbase-$pkgver.tar.gz::https://github.com/$pkgbase/$pkgbase/archive/v$pkgver.tar.gz"
+        'git+git://git.sv.gnu.org/gnulib'
+        'git+git://github.com/gvvaughan/slingshot')
+md5sums=('7b17b9a3f25d9658de967c6bfd50c138'
+         'SKIP'
+         'SKIP')
 
 prepare() {
-  # do bootstrap in prepare, as it clone external git
+  # replace git submodules by source one.
+  # this allow us to cache and avoid clone each time
+  for _rep in gnulib slingshot; do
+    rmdir $pkgbase-$pkgver/$_rep
+    ln -s "$srcdir/$_rep" $pkgbase-$pkgver/$_rep
+  done
+  # bootstraping
   (cd $pkgbase-$pkgver && ./bootstrap)
+  # copy source for lua 5.1 build
   cp -r $pkgbase-$pkgver $pkgbase-$pkgver-51
 }
 
diff --git a/community/luasec/PKGBUILD b/community/luasec/PKGBUILD
index f3276cc50..bb3f199a5 100644
--- a/community/luasec/PKGBUILD
+++ b/community/luasec/PKGBUILD
@@ -1,49 +1,59 @@
-# $Id: PKGBUILD 81569 2012-12-24 14:48:29Z spupykin $
+# $Id: PKGBUILD 98944 2013-10-21 14:45:17Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: Dwayne Bent <dbb.1@liqd.org>
 # Contributor: Paul-Sebastian Manole <brokenthorn@gmail.com>
 
 pkgbase=luasec
-pkgname=(lua51-sec)
-pkgver=0.4.1
-pkgrel=4
+pkgname=(lua-sec lua51-sec)
+pkgver=20131021git
+pkgrel=1
 pkgdesc='Lua bindings for OpenSSL library to provide TLS/SSL communication.'
 arch=('i686' 'x86_64' 'mips64el')
-url='http://luasec.luaforge.net/'
+url='https://github.com/brunoos/luasec/wiki'
 license=('MIT')
-#makedepends=('openssl' 'lua' 'lua-socket' 'lua51' 'lua51-socket')
-makedepends=('openssl' 'lua51' 'lua51-socket')
-source=("http://www.inf.puc-rio.br/~brunoos/luasec/download/luasec-$pkgver.tar.gz")
-md5sums=('b8a5fde3b3fdb6174f54cd51d7f53e12')
+makedepends=('openssl' 'lua' 'lua-socket' 'lua51' 'lua51-socket' 'git')
+source=("luasec::git://github.com/brunoos/luasec.git")
+md5sums=('SKIP')
 
 build() {
-    cp -a luasec-$pkgver luasec-$pkgver-51
-    msg2 'Building with lua 5.2'
-    cd luasec-$pkgver
-    make linux
-    msg2 'Building with lua 5.1'
-    cd ../luasec-$pkgver-51
-    make INCDIR=-I/usr/include/lua5.1 linux
+  cp -a luasec luasec-51
+
+  unset CFLAGS
+  unset LDFLAGS
+
+  msg2 'Building with lua 5.2'
+  cd luasec
+  make linux
+
+  msg2 'Building with lua 5.1'
+  cd ../luasec-51
+  find . -type f -name \*.[ch] -exec sed -i \
+    -e 's|include .lua.h.|include "lua5.1/lua.h"|g' \
+    -e 's|include .lualib.h.|include "lua5.1/lualib.h"|g' \
+    -e 's|include .luaconf.h.|include "lua5.1/luaconf.h"|g' \
+    -e 's|include .lauxlib.h.|include "lua5.1/lauxlib.h"|g' \
+    {} \;
+  make linux
 }
 
-#package_lua-sec() {
-#    depends=('openssl' 'lua' 'lua-socket')
-#
-#    install -dm755 "$pkgdir/usr/lib/lua/5.2"
-#    cd luasec-$pkgver
-#    make LUACPATH="$pkgdir/usr/lib/lua/5.2" LUAPATH="$pkgdir/usr/share/lua/5.2" install
-#    install -Dm644 "LICENSE" "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
-#}
+package_lua-sec() {
+  depends=('openssl' 'lua' 'lua-socket')
+
+  install -dm755 "$pkgdir/usr/lib/lua/5.2"
+  cd luasec
+  make LUACPATH="$pkgdir/usr/lib/lua/5.2" LUAPATH="$pkgdir/usr/share/lua/5.2" install
+  install -Dm644 "LICENSE" "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+}
 
 package_lua51-sec() {
-    depends=('openssl' 'lua51' 'lua51-socket')
-    conflicts=('luasec')
-    replaces=('luasec')
-
-    install -dm755 "$pkgdir/usr/lib/lua/5.1"
-    cd luasec-$pkgver-51
-    make LUACPATH="$pkgdir/usr/lib/lua/5.1" LUAPATH="$pkgdir/usr/share/lua/5.1" install
-    install -Dm644 "LICENSE" "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+  depends=('openssl' 'lua51' 'lua51-socket')
+  conflicts=('luasec')
+  replaces=('luasec')
+
+  install -dm755 "$pkgdir/usr/lib/lua/5.1"
+  cd luasec-51
+  make LUACPATH="$pkgdir/usr/lib/lua/5.1" LUAPATH="$pkgdir/usr/share/lua/5.1" install
+  install -Dm644 "LICENSE" "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
 }
 
 # vim:set ts=4 sw=4 et:
diff --git a/community/luasocket/PKGBUILD b/community/luasocket/PKGBUILD
index ddb1b58d8..3974075a8 100644
--- a/community/luasocket/PKGBUILD
+++ b/community/luasocket/PKGBUILD
@@ -1,50 +1,49 @@
-# $Id: PKGBUILD 81274 2012-12-15 15:00:36Z seblu $
+# $Id: PKGBUILD 99083 2013-10-24 09:31:56Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Anders Bergh <anders1@gmail.com>
 
 pkgbase=luasocket
-pkgname=(lua51-socket)
-pkgver=2.0.2
-pkgrel=5
+pkgname=(lua-socket lua51-socket)
+pkgver=3.0rc1
+pkgrel=3
 pkgdesc='Networking support library for the Lua language'
 arch=('i686' 'x86_64' 'mips64el')
-url='http://www.cs.princeton.edu/~diego/professional/luasocket/'
+url='https://github.com/diegonehab/luasocket'
 license=('MIT')
-replaces=('luasocket')
-conflicts=('luasocket')
 makedepends=('lua' 'lua51')
-source=("http://luaforge.net/frs/download.php/2664/luasocket-$pkgver.tar.gz"
-        'luasocket-unixsocket.patch')
-md5sums=('41445b138deb7bcfe97bff957503da8e'
-         '8d116bb70bd7a2fa15cbe949d4cfc35e')
+source=("$pkgname-$pkgver.tar.gz::https://github.com/diegonehab/luasocket/archive/v${pkgver/rc/-rc}.tar.gz")
+md5sums=('08bd2f265b244eb4bf5c2c36bf89b759')
 
 build() {
-#  cp -a luasocket-$pkgver luasocket-$pkgver-52
-#  msg2 'Building with lua 5.2'
-#  pushd luasocket-$pkgver-52
-#  patch -Np1 -i "$srcdir/luasocket-unixsocket.patch"
-#  make
-#  popd
+  cp -a luasocket-${pkgver/rc/-rc} luasocket-${pkgver/rc/-rc}-52
+  msg2 'Building with lua 5.2'
+  pushd luasocket-${pkgver/rc/-rc}-52
+  make LUAV=5.2
+  popd
   msg2 'Building with lua 5.1'
-  cd luasocket-$pkgver
-  patch -Np1 -i "$srcdir/luasocket-unixsocket.patch"
-  make LUAINC=-I/usr/include/lua5.1
+  cd luasocket-${pkgver/rc/-rc}
+  find . -type f -name \*.[ch] -exec sed -i \
+    -e 's|include "lua.h|include "lua5.1/lua.h|g' \
+    -e 's|include "lualib.h|include "lua5.1/lualib.h|g' \
+    -e 's|include "luaconf.h|include "lua5.1/luaconf.h|g' \
+    -e 's|include "lauxlib.h|include "lua5.1/lauxlib.h|g' \
+    {} \;
+  make LUAV=5.1
 }
 
-#package_lua-socket() {
-#  depends=('lua')
-#  cd luasocket-$pkgver-52
-#  make DESTDIR="$pkgdir/" \
-#    INSTALL_TOP_SHARE='$(DESTDIR)/usr/share/lua/5.2' \
-#    INSTALL_TOP_LIB='$(DESTDIR)/usr/lib/lua/5.2' install
-#  install -D -m0644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
-#}
+package_lua-socket() {
+  depends=('lua')
+  cd luasocket-${pkgver/rc/-rc}-52
+  make DESTDIR="$pkgdir/" LUAV=5.2 prefix=/usr install-unix
+  install -D -m0644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+}
 
 package_lua51-socket() {
   depends=('lua51')
-  cd luasocket-$pkgver
-  make DESTDIR="$pkgdir/" \
-    INSTALL_TOP_SHARE='$(DESTDIR)/usr/share/lua/5.1' \
-    INSTALL_TOP_LIB='$(DESTDIR)/usr/lib/lua/5.1' install
+  replaces=('luasocket')
+  conflicts=('luasocket')
+
+  cd luasocket-${pkgver/rc/-rc}
+  make DESTDIR="$pkgdir/" LUAV=5.1 prefix=/usr install-unix
   install -D -m0644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
 }
diff --git a/community/luasocket/luasocket-unixsocket.patch b/community/luasocket/luasocket-unixsocket.patch
deleted file mode 100644
index 07c9401fa..000000000
--- a/community/luasocket/luasocket-unixsocket.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-diff -wbBur luasocket-2.0.2/makefile luasocket-2.0.2.my/makefile
---- luasocket-2.0.2/makefile	2007-10-15 04:21:05.000000000 +0000
-+++ luasocket-2.0.2.my/makefile	2011-03-09 12:00:54.000000000 +0000
-@@ -10,6 +10,8 @@
- INSTALL_SOCKET_LIB=$(INSTALL_TOP_LIB)/socket
- INSTALL_MIME_SHARE=$(INSTALL_TOP_SHARE)/mime
- INSTALL_MIME_LIB=$(INSTALL_TOP_LIB)/mime
-+#
-+INSTALL_UNIX_LIB=$(INSTALL_SOCKET_LIB)
- 
- all clean:
- 	cd src; $(MAKE) $@
-@@ -45,6 +47,8 @@
- 	#cd src; $(INSTALL_DATA) $(TO_MIME_SHARE) $(INSTALL_MIME_SHARE)
- 	cd src; mkdir -p $(INSTALL_MIME_LIB)
- 	cd src; $(INSTALL_EXEC) $(MIME_SO) $(INSTALL_MIME_LIB)/core.$(EXT)
-+	cd src; mkdir -p $(INSTALL_UNIX_LIB)
-+	cd src; $(INSTALL_EXEC) $(UNIX_SO) $(INSTALL_UNIX_LIB)/$(UNIX_SO)
- 
- #------
- # End of makefile
-diff -wbBur luasocket-2.0.2/src/makefile luasocket-2.0.2.my/src/makefile
---- luasocket-2.0.2/src/makefile	2007-10-15 04:21:05.000000000 +0000
-+++ luasocket-2.0.2.my/src/makefile	2011-03-09 12:02:25.000000000 +0000
-@@ -47,7 +47,7 @@
- 	usocket.o \
- 	unix.o
- 
--all: $(SOCKET_SO) $(MIME_SO) 
-+all: $(SOCKET_SO) $(MIME_SO) $(UNIX_SO)
- 
- $(SOCKET_SO): $(SOCKET_OBJS)
- 	$(LD) $(LDFLAGS) -o $@ $(SOCKET_OBJS)
diff --git a/community/luxrays/PKGBUILD b/community/luxrays/PKGBUILD
index 9d3769717..fd6f427da 100644
--- a/community/luxrays/PKGBUILD
+++ b/community/luxrays/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 94030 2013-07-13 12:33:25Z svenstaro $
+# $Id: PKGBUILD 99666 2013-10-30 21:24:19Z stativ $
 # Maintainer: Lukas Jirkovsky <l.jirkovsky@gmail.com>
 pkgname=('luxrays' 'luxmark')
-pkgver=1.2.1
-_pkgver=475fbf15f0ca
+pkgver=1.3
+_pkgver=d16b0f132b4a
 pkgrel=1
 pkgdesc="Accelerate the ray intersection process by using GPUs"
 arch=('i686' 'x86_64')
@@ -10,19 +10,28 @@ url="http://www.luxrender.net/"
 license=('GPL')
 depends=('freeimage' 'libcl' 'libgl')
 makedepends=('cmake' 'boost' 'mesa' 'opencl-headers' 'glew' 'freeglut' 'qt4')
+options=('staticlibs')
 source=(https://bitbucket.org/luxrender/luxrays/get/$_pkgver.tar.bz2 \
         http://www.luxrender.net/release/luxmark/room_scene_v2.1.zip \
-        luxmark_scenes_path.diff)
-md5sums=('ac98e9a42ecc20d97d4c12dcdf17e315'
+        luxmark_scenes_path.diff QTBUG-22829.diff)
+md5sums=('1bece7823fe1f9e177fec4efdf637ca5'
          'ae917f025e32e20b1d20ebf8d22204cb'
-         '1fd2a6f32e2822b5e0f147304292a1b9')
+         '1fd2a6f32e2822b5e0f147304292a1b9'
+         '6e20ee7ea64c578431d51065d0871abc')
 
-build() {
+prepare() {
   cd "$srcdir/luxrender-luxrays-$_pkgver"
 
   # change the path to luxmark scenes
   patch -Np1 < "$srcdir/luxmark_scenes_path.diff" || true
 
+  # workaround QTBUG-22829 (moc doesn't work with boost headers)
+  patch -Np1 < "$srcdir/QTBUG-22829.diff" || true
+}
+
+build() {
+  cd "$srcdir/luxrender-luxrays-$_pkgver"
+
   export CXXFLAGS="$CXXFLAGS -lpthread"
   cmake -DCMAKE_INSTALL_PREFIX=/usr \
     -DCMAKE_SKIP_RPATH=ON \
diff --git a/community/luxrays/QTBUG-22829.diff b/community/luxrays/QTBUG-22829.diff
new file mode 100644
index 000000000..5625856bf
--- /dev/null
+++ b/community/luxrays/QTBUG-22829.diff
@@ -0,0 +1,17 @@
+diff -rup luxrender-luxrays-d16b0f132b4a/samples/luxmark/slgdefs.h luxrender-luxrays-d16b0f132b4a.new/samples/luxmark/slgdefs.h
+--- luxrender-luxrays-d16b0f132b4a/samples/luxmark/slgdefs.h	2013-10-16 11:16:00.000000000 +0200
++++ luxrender-luxrays-d16b0f132b4a.new/samples/luxmark/slgdefs.h	2013-10-30 20:29:36.768650444 +0100
+@@ -41,11 +41,13 @@
+ #include "luxrays/core/utils.h"
+ #include "luxrays/utils/atomic.h"
+ 
++#ifndef Q_MOC_RUN
+ #include "slg/slg.h"
+ #include "slg/rendersession.h"
+ #include "slg/renderconfig.h"
+ #include "slg/sdl/scene.h"
+ #include "slg/film/film.h"
++#endif
+ 
+ #include "mainwindow.h"
+ 
diff --git a/community/lwp/PKGBUILD b/community/lwp/PKGBUILD
index 0b7fd4329..7aebd5175 100644
--- a/community/lwp/PKGBUILD
+++ b/community/lwp/PKGBUILD
@@ -1,14 +1,13 @@
-# $Id: PKGBUILD 66195 2012-02-23 03:06:28Z spupykin $
+# $Id: PKGBUILD 100249 2013-11-02 08:42:16Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: William Rea <sillywilly@gmail.com>
 
 pkgname=lwp
 pkgver=2.6
-pkgrel=2.1
+pkgrel=3
 pkgdesc="Light weight process library"
 arch=(i686 x86_64 'mips64el')
 url="http://www.coda.cs.cmu.edu"
-options=('!libtool')
 license=("LGPL")
 depends=(glibc)
 source=(http://www.coda.cs.cmu.edu/pub/lwp/src/lwp-$pkgver.tar.gz)
@@ -18,5 +17,9 @@ build() {
   cd $srcdir/lwp-$pkgver
   ./configure --prefix=/usr
   make
+}
+
+package() {
+  cd $srcdir/lwp-$pkgver
   make DESTDIR=$pkgdir install
 }
diff --git a/community/lxappearance-obconf/PKGBUILD b/community/lxappearance-obconf/PKGBUILD
index c202ac5f8..42bd6bdd0 100644
--- a/community/lxappearance-obconf/PKGBUILD
+++ b/community/lxappearance-obconf/PKGBUILD
@@ -1,38 +1,26 @@
-# $Id: PKGBUILD 96676 2013-09-03 01:00:14Z bgyorgy $
+# $Id: PKGBUILD 99903 2013-10-31 02:22:59Z allan $
 # Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl>
 
 pkgname=lxappearance-obconf
-pkgver=0.2.0
-pkgrel=2
-pkgdesc='A plugin for LXAppearance to configure Openbox'
+pkgver=0.2.1
+pkgrel=1
+pkgdesc='Plugin for LXAppearance to configure Openbox'
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL2')
-url="http://lxde.org/"
+url='http://lxde.org/'
 groups=('lxde')
 depends=('lxappearance' 'openbox')
 makedepends=('intltool')
-options=('!libtool')
-source=(http://downloads.sourceforge.net/lxde/$pkgname-$pkgver.tar.gz
-        obconf-rrbutton.patch)
-md5sums=('8bf23c90febe6a655e0f86c80e44725d'
-         '73cd418ff8dc68a76538fc829d6260c7')
-
-prepare() {
-  cd $srcdir/$pkgname-$pkgver
-
-  # Fix building with openbox-3.5.2
-  patch -Np1 -i ../obconf-rrbutton.patch
-}
+source=(http://downloads.sourceforge.net/lxde/$pkgname-$pkgver.tar.gz)
+md5sums=('1f061c96e0c78a6476421ca294ac24aa')
 
 build() {
-  cd $srcdir/$pkgname-$pkgver
+  cd $pkgname-$pkgver
   ./configure --prefix=/usr --disable-static
   make
 }
 
-
 package() {
-  cd $srcdir/$pkgname-$pkgver
+  cd $pkgname-$pkgver
   make DESTDIR="$pkgdir" install
 }
-
diff --git a/community/lxappearance/PKGBUILD b/community/lxappearance/PKGBUILD
index 96015aa1b..63cdfe77b 100644
--- a/community/lxappearance/PKGBUILD
+++ b/community/lxappearance/PKGBUILD
@@ -1,30 +1,28 @@
-#$Id: PKGBUILD 96680 2013-09-03 01:45:50Z bgyorgy $
+#$Id: PKGBUILD 99433 2013-10-28 19:01:06Z bpiotrowski $
 # Maintainer: Bartłomiej Piotrowski <barthalion@gmail.com>
 # Contributor: Angel Velasquez <angvp@archlinux.org>  
 # Contributor: Geoffroy Carrier <geoffroy.carrier@koon.fr>
 
 pkgname=lxappearance
-pkgver=0.5.2
-pkgrel=2
-pkgdesc="Feature-rich GTK+ theme switcher of the LXDE Desktop"
+pkgver=0.5.3
+pkgrel=1
+pkgdesc='Feature-rich GTK+ theme switcher of the LXDE Desktop'
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL2')
-url="http://lxde.org/"
+url='http://lxde.org/'
 groups=('lxde')
 depends=('gtk2')
 makedepends=('intltool')
 source=(http://downloads.sourceforge.net/sourceforge/lxde/${pkgname}-${pkgver}.tar.gz)
-md5sums=('a088c6ef08fd25df7dc3be5b07168bbe')
+md5sums=('9dfdc9bd45519d51b9df2ad6650c36f5')
 
 build() {
-    cd "$srcdir/$pkgname-$pkgver"
-
-    ./configure --sysconfdir=/etc --prefix=/usr 
-    make 
+  cd $pkgname-$pkgver
+  ./configure --sysconfdir=/etc --prefix=/usr 
+  make 
 }
 
 package() {
-    cd "$srcdir/$pkgname-$pkgver"
-
-    make DESTDIR="$pkgdir" install 
+  cd $pkgname-$pkgver
+  make DESTDIR="$pkgdir" install 
 }
diff --git a/community/lxshortcut/PKGBUILD b/community/lxshortcut/PKGBUILD
index b8b0ae126..b1f549ee8 100644
--- a/community/lxshortcut/PKGBUILD
+++ b/community/lxshortcut/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 71908 2012-06-03 08:11:43Z bpiotrowski $
+# $Id: PKGBUILD 99904 2013-10-31 02:23:19Z allan $
 # Maintainer:  Bartłomiej Piotrowski <nospam@bpiotrowski.pl>
 # Contributor: swanson <swansonwebaake at gmail dot com>
 # Contributor: zoulnix <http://goo.gl/HQaP>
@@ -14,7 +14,6 @@ license=('GPL')
 groups=('lxde')
 depends=('gtk2')
 makedepends=('autoconf' 'automake' 'gcc' 'intltool' 'make' 'pkg-config')
-options=(!libtool)
 source=(http://downloads.sourceforge.net/lxde/${pkgname}-${pkgver}.tar.gz) 
 md5sums=('72f0dfafa8098be853beae6e33b5e13b')
 
diff --git a/extra/lxsplit/PKGBUILD b/community/lxsplit/PKGBUILD
index 29b8b0ff2..a420b85a1 100644
--- a/extra/lxsplit/PKGBUILD
+++ b/community/lxsplit/PKGBUILD
@@ -1,24 +1,25 @@
-# $Id: PKGBUILD 137625 2011-09-10 08:31:27Z pierre $
+# $Id: PKGBUILD 99429 2013-10-28 18:50:40Z xyne $
 # Contributor: Damir Perisa <damir.perisa@bluewin.ch>
+# Maintainer: Xyne <ac xunilhcra enyx, backwards>
 
 pkgname=lxsplit
 pkgver=0.2.4
-pkgrel=2.1
+pkgrel=3
 pkgdesc="Command-line file splitter/joiner compatible with any HJSplit version"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://lxsplit.sourceforge.net/"
 license=('GPL')
 depends=('glibc')
 source=("http://downloads.sourceforge.net/sourceforge/lxsplit/lxsplit-${pkgver}.tar.gz")
-md5sums=('ed21a08c167c08d4d81c820782947cb1')
+sha256sums=('858fa939803b2eba97ccc5ec57011c4f4b613ff299abbdc51e2f921016845056')
 
 build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
+  cd "$srcdir/$pkgname-$pkgver"
   make
 }
 
 package() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  install -d ${pkgdir}/usr/bin
-  make INSTALL_PATH=${pkgdir}/usr/bin install
+  cd "$srcdir/$pkgname-$pkgver"
+  install -d "$pkgdir/usr/bin"
+  make INSTALL_PATH="$pkgdir/usr/bin" install
 }
diff --git a/community/lz4/PKGBUILD b/community/lz4/PKGBUILD
index 127a04730..ea5e83ec7 100644
--- a/community/lz4/PKGBUILD
+++ b/community/lz4/PKGBUILD
@@ -1,16 +1,16 @@
-# $Id: PKGBUILD 98004 2013-10-03 00:48:10Z seblu $
+# $Id: PKGBUILD 100408 2013-11-03 17:44:50Z seblu $
 # Maintainer: Sébastien Luttringer
 
 # Contacted by mail, author use svn commit as release version.
 # He only push tested release code into svn and support using revision as version
 
 pkgname=lz4
-pkgver=106
+pkgver=108
 pkgrel=1
 pkgdesc='Very fast lossless compression algorithm'
 arch=('i686' 'x86_64')
 url='https://code.google.com/p/lz4/'
-license=('BSD')
+license=('BSD' 'GPL2')
 makedepends=('svn')
 depends=('glibc')
 source=("$pkgname::svn+http://lz4.googlecode.com/svn/trunk/#revision=$pkgver")
diff --git a/community/mailman/PKGBUILD b/community/mailman/PKGBUILD
index 91ef3a656..5bbe42856 100644
--- a/community/mailman/PKGBUILD
+++ b/community/mailman/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 83707 2013-02-04 14:51:45Z seblu $
-# Maintainer: Sébastien Luttringer <seblu@archlinux.org>
+# $Id: PKGBUILD 99571 2013-10-29 21:25:25Z seblu $
+# Maintainer: Sébastien Luttringer
 # Contributor: Paul Mattal <paul@archlinux.org>
 
 pkgname=mailman
-pkgver=2.1.15
-pkgrel=3
+pkgver=2.1.16
+pkgrel=1
 pkgdesc='The GNU Mailing List Manager'
 arch=(i686 x86_64)
 license=('GPL')
@@ -20,7 +20,7 @@ source=("http://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tgz"
         "$pkgname.profile.sh"
         "$pkgname.profile.csh"
         "$pkgname.service")
-md5sums=('7d207489e8e9de0727cb334d46029833'
+md5sums=('ab8969dc68661f7a7af3beb797a46b3e'
          'ed04d062379eb21e39ce1e70e6b1ade2'
          'a9c71ec940c56173415fbd49087d10b0'
          '85a8c30ffc444e677b286f54df530482'
diff --git a/community/mailutils/PKGBUILD b/community/mailutils/PKGBUILD
index cef601ece..cf6cb2416 100644
--- a/community/mailutils/PKGBUILD
+++ b/community/mailutils/PKGBUILD
@@ -1,17 +1,16 @@
-# $Id: PKGBUILD 92555 2013-06-08 11:18:51Z bpiotrowski $
+# $Id: PKGBUILD 100116 2013-11-01 17:17:05Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com>
 
 pkgname=mailutils
 pkgver=2.2
-pkgrel=7
+pkgrel=9
 pkgdesc="MUA command line tool (mailx)"
 arch=(i686 x86_64 'mips64el')
 url="http://www.gnu.org/software/mailutils/"
 license=('GPL')
 depends=('libldap' 'pam' 'gnutls')
 makedepends=('emacs')
-conflicts=('libsieve')
 install=mailutils.install
 options=(zipman !emptydirs)
 source=(http://ftp.gnu.org/gnu/mailutils/mailutils-$pkgver.tar.bz2
diff --git a/community/mapnik/PKGBUILD b/community/mapnik/PKGBUILD
index 1ca7ab84d..a466fe4c1 100644
--- a/community/mapnik/PKGBUILD
+++ b/community/mapnik/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 94032 2013-07-13 12:33:54Z svenstaro $
+# $Id: PKGBUILD 98743 2013-10-17 14:01:50Z andyrtr $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: David Dent <thewinch@gmail.com>
 # Contributor: orbisvicis <orbisvicis@gmail.com>
 
 pkgname=mapnik
 pkgver=2.2.0
-pkgrel=3
+pkgrel=4
 pkgdesc="Free Toolkit for developing mapping applications. Above all Mapnik is about rendering beautiful maps"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://mapnik.org/"
@@ -15,7 +15,7 @@ depends=('boost-libs' 'icu' 'libpng' 'libjpeg' 'libtiff' 'freetype2'
 	 'postgresql-libs' 'postgis' 'gdal' 'curl' 'libltdl')
 optdepends=('libxslt:         Web Map Service'
             'python2-lxml:    Web Map Service'
-            'python-imaging:  Web Map Service'
+            'python2-pillow:  Web Map Service'
             'python-nose:     Web Map Service'
             'apache:          Web Map Service'
             'mod_fastcgi:     Web Map Service - or:'
diff --git a/community/marisa/PKGBUILD b/community/marisa/PKGBUILD
index 8413648f5..fcd7fec2a 100644
--- a/community/marisa/PKGBUILD
+++ b/community/marisa/PKGBUILD
@@ -8,7 +8,6 @@ pkgrel=2
 arch=('i686' 'x86_64' 'mips64el')
 url="https://code.google.com/p/marisa-trie/"
 license=('BSD' 'LGPL')
-options=(!libtool)
 makedepends=('python2' 'ruby' 'perl')
 changelog=ChangeLog
 source=(https://marisa-trie.googlecode.com/files/$pkgbase-$pkgver.tar.gz)
diff --git a/community/matchbox-desktop/PKGBUILD b/community/matchbox-desktop/PKGBUILD
index 3bce436ed..9a191644d 100644
--- a/community/matchbox-desktop/PKGBUILD
+++ b/community/matchbox-desktop/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 66229 2012-02-23 05:03:36Z spupykin $
+# $Id: PKGBUILD 99906 2013-10-31 02:23:59Z allan $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Henrique C. Alves <hcarvalhoalves@gmail.com>
 
@@ -10,7 +10,6 @@ arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 depends=('libmatchbox' 'startup-notification' 'libpng' 'gtk2')
 url="http://matchbox-project.org/"
-options=('!libtool')
 source=(http://matchbox-project.org/sources/$pkgname/$pkgver/$pkgname-$pkgver.tar.bz2)
 md5sums=('b0a4a47130272e2adab4e9feb43a6c9c')
 
diff --git a/community/mcabber/PKGBUILD b/community/mcabber/PKGBUILD
index ed16b1eb8..1e820fe12 100644
--- a/community/mcabber/PKGBUILD
+++ b/community/mcabber/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 80881 2012-12-05 10:05:02Z spupykin $
+# $Id: PKGBUILD 99907 2013-10-31 02:24:20Z allan $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: Thorsten Töpper <atsutane-tu@freethoughts.de>
 # Contributor:  3ED <kas1987@o2.pl>
@@ -12,7 +12,6 @@ url="http://www.lilotux.net/~mikael/mcabber/"
 license=('GPL')
 depends=('ncurses' 'glib2' 'loudmouth' 'gpgme' 'libotr3' 'aspell')
 makedepends=('pkg-config')
-options=('!libtool')
 source=(http://www.lilotux.net/~mikael/mcabber/files/$pkgname-${pkgver/_/-}.tar.bz2)
 md5sums=('6bb2302f5168ad4c28b647390e37f9b3')
 
diff --git a/community/mediainfo-gui/PKGBUILD b/community/mediainfo-gui/PKGBUILD
index d32b982d7..9e5634b80 100644
--- a/community/mediainfo-gui/PKGBUILD
+++ b/community/mediainfo-gui/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 90926 2013-05-15 13:47:03Z spupykin $
+# $Id: PKGBUILD 99528 2013-10-29 10:58:03Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: hydro <hydro@freenet.de>
 
 pkgname=mediainfo-gui
-pkgver=0.7.63
+pkgver=0.7.64
 pkgrel=1
 pkgdesc="GUI for mediainfo"
 arch=('i686' 'x86_64' 'mips64el')
@@ -13,7 +13,7 @@ depends=('libmediainfo' 'wxgtk')
 makedepends=('libtool' 'automake' 'autoconf')
 install=mediainfo-gui.install
 source=(http://downloads.sourceforge.net/mediainfo/mediainfo_${pkgver}.tar.bz2)
-md5sums=('bd794e4066b6bb197af23cb7b8ba832b')
+md5sums=('f5cb798cf3b121359ab3173d70526518')
 
 build() {
   cd $srcdir/MediaInfo/Project/GNU/GUI
diff --git a/community/mediainfo/PKGBUILD b/community/mediainfo/PKGBUILD
index bcb786f3e..a27414701 100644
--- a/community/mediainfo/PKGBUILD
+++ b/community/mediainfo/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 90924 2013-05-15 13:46:41Z spupykin $
+# $Id: PKGBUILD 99526 2013-10-29 10:57:46Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: hydro <hydro@freenet.de>
 
 pkgname=mediainfo
-pkgver=0.7.63
+pkgver=0.7.64
 pkgrel=1
 pkgdesc="supplies technical and tag information about a video or audio file"
 arch=('i686' 'x86_64' 'mips64el')
@@ -12,7 +12,7 @@ license=('GPL')
 depends=('libmediainfo')
 makedepends=('libtool' 'automake' 'autoconf')
 source=(http://downloads.sourceforge.net/mediainfo/${pkgname}_${pkgver}.tar.bz2)
-md5sums=('bd794e4066b6bb197af23cb7b8ba832b')
+md5sums=('f5cb798cf3b121359ab3173d70526518')
 
 build() {
   cd $srcdir/MediaInfo/Project/GNU/CLI
diff --git a/community/menu-cache/PKGBUILD b/community/menu-cache/PKGBUILD
index eba5b2401..08da98d0c 100644
--- a/community/menu-cache/PKGBUILD
+++ b/community/menu-cache/PKGBUILD
@@ -1,20 +1,19 @@
-# $Id: PKGBUILD 96685 2013-09-03 02:22:03Z bgyorgy $
+# $Id: PKGBUILD 99908 2013-10-31 02:24:40Z allan $
 # Maintainer:  Bartłomiej Piotrowski <nospam@bpiotrowski.pl>
 # Contributor: Angel Velasquez <angvp@archlinux.org>
 # Contributor: Juergen Hoetzel <juergen@archlinux.org>
 
 pkgname=menu-cache
-pkgver=0.5.0
-pkgrel=2
+pkgver=0.5.1
+pkgrel=1
 pkgdesc='Caching mechanism for freedesktop.org compliant menus'
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL2')
 url='http://lxde.org/'
 groups=('lxde')
 depends=('glib2')
-options=('!libtool')
 source=(http://downloads.sourceforge.net/lxde/$pkgname-$pkgver.tar.gz)
-sha256sums=('875a7441b34bb24debc1c8017d74d59987d7a704c4c023e81a0b4ebcc2d7904a')
+sha256sums=('08e658021faecd4eefb26cc21b207251a6b4e844e131cec491471aba9eaea122')
 
 build() {
   cd $pkgname-$pkgver
diff --git a/community/metacity/PKGBUILD b/community/metacity/PKGBUILD
index 546268cbf..423463db6 100644
--- a/community/metacity/PKGBUILD
+++ b/community/metacity/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 88820 2013-04-23 01:21:30Z bgyorgy $
+# $Id: PKGBUILD 99909 2013-10-31 02:25:00Z allan $
 # Maintainer: Balló György <ballogyor+arch at gmail dot com>
 # Contributor: Jan de Groot <jgc@archlinux.org>
 
@@ -11,7 +11,6 @@ license=('GPL')
 depends=('dconf' 'libcanberra' 'libgtop' 'gsettings-desktop-schemas' 'gtk2' 'startup-notification' 'zenity')
 makedepends=('intltool' 'itstool')
 url="https://live.gnome.org/Metacity"
-options=('!libtool')
 install=metacity.install
 source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz
         fix_compositing_startup.patch
diff --git a/community/metakit/PKGBUILD b/community/metakit/PKGBUILD
index 87a34ad2c..cd78b4af1 100644
--- a/community/metakit/PKGBUILD
+++ b/community/metakit/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 66530 2012-02-25 23:36:00Z lfleischer $
+# $Id: PKGBUILD 99910 2013-10-31 02:25:20Z allan $
 # Contributor: Tom Newsom <Jeepster@gmx.co.uk>
 
 pkgname=metakit
@@ -9,7 +9,6 @@ arch=('i686' 'x86_64' 'mips64el')
 url='http://www.equi4.com/metakit/'
 makedepends=('tcl' 'python2')
 license=('BSD')
-options=('!libtool')
 source=("http://www.equi4.com/pub/mk/${pkgname}-${pkgver}.tar.gz")
 md5sums=('17330257376eea657827ed632ea62c9e')
 
diff --git a/community/metamail/PKGBUILD b/community/metamail/PKGBUILD
index d3e5bd500..593c17190 100644
--- a/community/metamail/PKGBUILD
+++ b/community/metamail/PKGBUILD
@@ -1,20 +1,19 @@
-# $Id: PKGBUILD 66234 2012-02-23 05:08:28Z spupykin $
+# $Id: PKGBUILD 100520 2013-11-05 11:41:56Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Sekenre <sekenre at ukfsn dot org>
 # Contributor: Daenyth <Daenyth+Arch [AT] gmail [DOT] com>
 
 pkgname=metamail
 pkgver=2.7
-pkgrel=6.1
+pkgrel=7
 pkgdesc="Used to display and process MIME messages"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://packages.debian.org/stable/mail/metamail"
 license=('custom')
 depends=('ncurses')
-options=('!libtool')
 noextract=(metamail_$pkgver-52.diff.gz)
-source=("http://ftp.de.debian.org/debian/pool/main/m/metamail/metamail_$pkgver.orig.tar.gz" \
-	"http://ftp.de.debian.org/debian/pool/main/m/metamail/metamail_$pkgver-54.diff.gz" \
+source=("ftp://ftp.archlinux.org/other/community/metamail/metamail_$pkgver.orig.tar.gz" \
+	"ftp://ftp.archlinux.org/other/community/metamail/metamail_$pkgver-54.diff.gz" \
 	license)
 md5sums=('c6967e9bc5d3c919764b02df24efca01'
          '2071dc7b9c33345443ab9a619e640a69'
@@ -29,7 +28,10 @@ build() {
   sh ./bootstrap
   sh ./configure --prefix=/usr
   make
-  make DESTDIR=$pkgdir install
+}
 
+package() {
+  cd $srcdir/metamail-$pkgver.orig
+  make DESTDIR=$pkgdir install
   install -D -m0644 $srcdir/license $pkgdir/usr/share/licenses/$pkgname/license
 }
diff --git a/community/mfs/PKGBUILD b/community/mfs/PKGBUILD
index 2fc29c3d5..fd190cc51 100644
--- a/community/mfs/PKGBUILD
+++ b/community/mfs/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 87206 2013-03-28 15:53:12Z arodseth $
+# $Id: PKGBUILD 99912 2013-10-31 02:26:00Z allan $
 # Maintainer: Alexander Rødseth <rodseth@gmail.com>
 # Contributor: Thomas S Hatch <thatch45@gmail.com>
 
@@ -12,7 +12,6 @@ arch=('x86_64' 'i686' 'mips64el')
 license=('GPL3')
 depends=('zlib' 'fuse' 'python2' 'bash' 'xfsprogs')
 install="$pkgbase.install"
-options=('!libtool')
 source=("http://www.moosefs.org/tl_files/${pkgbase}code/$pkgbase-${pkgver/_/-}.tar.gz"
         'mfsmaster.service'
         'mfschunkserver.service'
diff --git a/community/mg/PKGBUILD b/community/mg/PKGBUILD
index 7254bc6eb..89f11c138 100644
--- a/community/mg/PKGBUILD
+++ b/community/mg/PKGBUILD
@@ -1,38 +1,41 @@
-# $Id: PKGBUILD 62917 2012-01-29 07:15:53Z spupykin $
+# $Id: PKGBUILD 99913 2013-10-31 02:26:20Z allan $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Hannes Rist <hrist@phreeknet.org>
 
 pkgname=mg
-pkgver=20110905
-pkgrel=1
+pkgver=20130922
+pkgrel=2
 pkgdesc="mg is Micro GNU/emacs, this is a portable version of the mg maintained by the OpenBSD team."
 arch=('i686' 'x86_64' 'mips64el')
 url="http://homepage.boetes.org/software/mg/"
-depends=('ncurses')
+depends=('ncurses' 'libbsd')
+makedepends=('bmake' 'libclens')
 license=('custom')
-options=(!libtool)
 source=(http://homepage.boetes.org/software/mg/mg-$pkgver.tar.gz
-	README
 	cleanup.patch)
-md5sums=('2de35316fa8ebafe6003efaae70b723e'
-         '8cc5195ad4fabcf7c6782764f9617748'
-         'e009afe0d249593f3436b2fea110f72e')
+md5sums=('35bd196ab32bae3531d6bc48be8779d0'
+         'abcea6e34c05425a52101b7c7fb60e7a')
 
-build() {
+prepare() {
   cd $srcdir/$pkgname-$pkgver
   patch -p1 <$srcdir/cleanup.patch
 
   # The scripts building this package won't see and fix the warnings,
   # even if they make the build fail.
-  sed -ri '/^CFLAGS\+=/d' Makefile.in
+  sed -ri '/^CFLAGS\+=/d' Makefile*
+}
 
-  ./configure
-  make prefix=/usr
+build() {
+  cd $srcdir/$pkgname-$pkgver
+  bmake prefix=/usr
+}
+
+package() {
+  cd $srcdir/$pkgname-$pkgver
 
   mkdir -p $pkgdir/usr/bin
-  make install prefix=$pkgdir/usr
+  bmake install INSTALL=install prefix=/usr DESTDIR=$pkgdir BINDIR=/usr/bin
 
   mkdir -p $pkgdir/usr/share/
-  mv $pkgdir/usr/man $pkgdir/usr/share/
-  install -D -m0644 $srcdir/README $pkgdir/usr/share/licenses/$pkgname/README
+  install -D -m0644 README $pkgdir/usr/share/licenses/$pkgname/README
 }
diff --git a/community/mg/README b/community/mg/README
deleted file mode 100644
index cf2d78917..000000000
--- a/community/mg/README
+++ /dev/null
@@ -1,74 +0,0 @@
-[This is an edited version of the original mg README, updated slightly to
-reflect changes in the last 20 years.]
-
-
-Mg (mg) is a Public Domain EMACS style editor.  It is "broadly"
-compatible with GNU Emacs, the latest creation of Richard M.
-Stallman, Chief GNUisance and inventor of Emacs.  GNU Emacs (and other
-portions of GNU as they are released) are essentially free, (there are
-handling charges for obtaining it) and so is Mg.  You may never have
-to learn another editor.  (But probably will, at least long enough to
-port Mg...)  Mg was formerly named MicroGnuEmacs, the name change was
-done at the request of Richard Stallman.
-
-Mg is not associated with the GNU project, and most of it does not
-have the copyright restrictions present in GNU Emacs.  (However, some
-of the system dependent modules and the regular expression module do
-have copyright notices.  Look at the source code for exact
-copyright restrictions.)  The Mg authors individually may or may not
-agree with the opinions expressed by Richard Stallman in "The GNU
-Manifesto".
-
-This program is intended to be a small, fast, and portable editor for
-people who can't (or don't want to) run real Emacs for one reason
-or another.  It is compatible with GNU because there shouldn't be
-any reason to learn more than one Emacs flavor.
-
-
-Beyond the work of Dave Conroy, author of the original public domain
-v30, the current version contains the work of:
-
-	blarson@ecla.usc.edu		Bob Larson
-	mic@emx.utexas.edu		Mic Kaczmarczik
-	mwm@violet.berkeley.edu		Mike Meyer
-	sandra@cs.utah.edu		Sandra Loosemore
-	mp1u+@andrew.cmu.edu		Michael Portuesi
-	RCKG01M@CALSTATE.BITNET		Stephen Walton
-	hakanson@mist.cs.orst.edu	Marion Hakanson
-
-People who have worked on previous versions of Mg:
-
-	rtech!daveb@sun.com		Dave Brower
-
-Currently maintained in the OpenBSD src tree, with contributions from
-many others.
-
-----------------------------------------------------------------------
-
-Known limitations:
-
-Recursive bindings may cause help and key rebinding code to go into
-an infinite loop, aborting with a stack overflow.
-
-Overwrite mode does not work in macros.	 (Characters are inserted
-rather than overwriting.)
-
-Dired mode has some problems:  Rename does not update the buffer.
-Doing a dired again will update the buffer (whether it needs it or
-not) and will lose any marks for deletion.  .. and . are not
-recognized as special cases.
-
-On systems with 16 bit integers, the kill buffer cannot exceed 32767
-bytes.
-
-
-
-New implementation oddities:
-
-insert and define-key are new commands corresponding to the mocklisp
-functions in Gnu Emacs.	 (Mg does not have non-command functions.)
-(Mg's insert will only insert one string.)
-
-The display wrap code does not work at all like that of GNU emacs.
-
-
diff --git a/community/mg/cleanup.patch b/community/mg/cleanup.patch
index 5a8e761cb..d4d29c50f 100644
--- a/community/mg/cleanup.patch
+++ b/community/mg/cleanup.patch
@@ -1,163 +1,36 @@
-Only in mg-20110120.my: autoexec.o
-Only in mg-20110120.my: basename.o
-Only in mg-20110120.my: basic.o
-Only in mg-20110120.my: buffer.o
-Only in mg-20110120.my: cinfo.o
-diff -wbBur mg-20110120/cmode.c mg-20110120.my/cmode.c
---- mg-20110120/cmode.c	2011-01-20 07:36:13.000000000 +0300
-+++ mg-20110120.my/cmode.c	2011-11-21 15:40:11.000000000 +0400
-@@ -158,7 +158,7 @@
- cc_indent(int f, int n)
+diff -wbBur mg-20130922/file.c mg-20130922.q/file.c
+--- mg-20130922/file.c	2013-09-22 13:09:36.000000000 +0400
++++ mg-20130922.q/file.c	2013-10-30 15:20:47.927840374 +0400
+@@ -669,9 +669,9 @@
  {
- 	int pi, mi;			/* Previous indents */
--	int ci, dci;			/* current indent, don't care */
-+	int ci;			/* current indent, don't care */
- 	struct line *lp;
- 	int ret;
- 	
-@@ -181,7 +181,7 @@
- 	/* Strip leading space on current line */
- 	delleadwhite(FFRAND, 1);
- 	/* current indent is computed only to current position */
--	dci = getindent(curwp->w_dotp, &ci);
-+	getindent(curwp->w_dotp, &ci);
- 	
- 	if (pi + ci < 0)
- 		ret = indent(FFOTHARG, 0);
-@@ -217,7 +217,6 @@
- {
- 	int lo, co;		/* leading space,  current offset*/
- 	int nicol = 0;		/* position count */
--	int ccol = 0;		/* current column */
- 	int c = '\0';		/* current char */
- 	int newind = 0;		/* new index value */
- 	int stringp = FALSE;	/* in string? */
-@@ -226,7 +225,6 @@
- 	int nparen = 0;		/* paren count */
- 	int obrace = 0;		/* open brace count */
- 	int cbrace = 0;		/* close brace count */
--	int contp = FALSE;	/* Continue? */
- 	int firstnwsp = FALSE;	/* First nonspace encountered? */
- 	int colonp = FALSE;	/* Did we see a colon? */
- 	int questionp = FALSE;	/* Did we see a question mark? */
-@@ -256,13 +254,11 @@
- 		nicol = 0;
+ 	struct stat	statbuf;
+ 	int	 s;
+-	char    *dp;
++	char    *dp = malloc(strlen(fn) + 1);
  
- 	newind = 0;
--	ccol = nicol;			/* current column */
- 	/* Compute modifiers */
- 	for (co = lo; co < llength(lp); co++) {
- 		c = lgetc(lp, co);
- 		/* We have a non-whitespace char */
- 		if (!firstnwsp && !isspace(c)) {
--			contp = TRUE;
- 			if (c == '#')
- 				cppp = TRUE;
- 			firstnwsp = TRUE; 
-@@ -285,7 +281,6 @@
- 		} else if (c == '{') {
- 			obrace++;
- 			firstnwsp = FALSE;
--			contp = FALSE;
- 		} else if (c == '}') {
- 			cbrace++;
- 		} else if (c == '?') {
-@@ -294,9 +289,6 @@
- 			/* ignore (foo ? bar : baz) construct */
- 			if (!questionp)
- 				colonp = TRUE;
--		} else if (c == ';') {
--			if (nparen > 0)
--				contp = FALSE;
- 		} else if (c == '/') {
- 			/* first nonwhitespace? -> indent */
- 			if (firstnwsp) {
-Only in mg-20110120.my: cmode.o
-diff -wbBur mg-20110120/config.h mg-20110120.my/config.h
---- mg-20110120/config.h	2011-01-20 07:37:40.000000000 +0300
-+++ mg-20110120.my/config.h	2011-11-21 15:39:43.000000000 +0400
-@@ -7,4 +7,8 @@
- #ifndef MAXLOGNAME
- #define MAXLOGNAME LOGIN_NAME_MAX
- #endif
--#define HAVE_ARC4RANDOM
-+#define HAVE_NOSTRTONUM
-+#define HAVE_NOSTRLCPY
-+#define HAVE_NOSTRLCAT
-+#define HAVE_NOFGETLN
-+#define GNU_LS
-Only in mg-20110120.my: config.log
-Only in mg-20110120.my: dired.o
-Only in mg-20110120.my: dirname.o
-Only in mg-20110120.my: dir.o
-Only in mg-20110120.my: display.o
-Only in mg-20110120.my: echo.o
-Only in mg-20110120.my: extend.o
-Only in mg-20110120.my: fgetln.o
-diff -wbBur mg-20110120/fileio.c mg-20110120.my/fileio.c
---- mg-20110120/fileio.c	2008-12-30 19:04:23.000000000 +0300
-+++ mg-20110120.my/fileio.c	2011-11-21 15:43:12.000000000 +0400
-@@ -121,10 +121,8 @@
- 	 * future writes will do the same thing.
- 	 */
- 	if (bp && bp->b_fi.fi_mode) {
--		int ret;
--
- 		fchmod(fd, bp->b_fi.fi_mode & 07777);
--		ret = fchown(fd, bp->b_fi.fi_uid, bp->b_fi.fi_gid);
-+		(void)fchown(fd, bp->b_fi.fi_uid, bp->b_fi.fi_gid);
- 	}
- 	return (FIOSUC);
- }
-Only in mg-20110120.my: fileio.o
-Only in mg-20110120.my: file.o
-Only in mg-20110120.my: funmap.o
-Only in mg-20110120.my: grep.o
-Only in mg-20110120.my: help.o
-Only in mg-20110120.my: kbd.o
-Only in mg-20110120.my: keymap.o
-Only in mg-20110120.my: line.o
-Only in mg-20110120.my: macro.o
-Only in mg-20110120.my: main.o
-Only in mg-20110120.my: Makefile
-Only in mg-20110120.my: match.o
-Only in mg-20110120.my: mg
-Only in mg-20110120.my: modes.o
-Only in mg-20110120.my: paragraph.o
-Only in mg-20110120.my: random.o
-Only in mg-20110120.my: region.o
-Only in mg-20110120.my: re_search.o
-Only in mg-20110120.my: search.o
-Only in mg-20110120.my: spawn.o
-Only in mg-20110120.my: strlcat.o
-Only in mg-20110120.my: strlcpy.o
-Only in mg-20110120.my: strtonum.o
-Only in mg-20110120.my: theo.o
-Only in mg-20110120.my: ttyio.o
-Only in mg-20110120.my: ttykbd.o
-Only in mg-20110120.my: tty.o
-diff -wbBur mg-20110120/undo.c mg-20110120.my/undo.c
---- mg-20110120/undo.c	2011-01-03 01:57:57.000000000 +0300
-+++ mg-20110120.my/undo.c	2011-11-21 15:41:05.000000000 +0400
-@@ -464,14 +464,14 @@
- 	struct undo_rec	*ptr, *nptr;
- 	int		 done, rval;
- 	struct line	*lp;
--	int		 offset, save, dot;
-+	int		 offset, save;
- 	static int	 nulled = FALSE;
- 	int		 lineno;
+-	dp = dirname(fn);
++	xdirname(dp, fn, strlen(fn));
  
- 	if (n < 0)
- 		return (FALSE);
+ 	if (stat(fn, &statbuf) == -1 && errno == ENOENT) {
+ 		errno = 0;
+diff -wbBur mg-20130922/Makefile mg-20130922.q/Makefile
+--- mg-20130922/Makefile	2013-09-22 18:06:43.000000000 +0400
++++ mg-20130922.q/Makefile	2013-10-30 15:20:34.201173866 +0400
+@@ -4,7 +4,7 @@
+ NOGCCERROR= true
+ PROG=	mg
  
--	dot = find_dot(curwp->w_dotp, curwp->w_doto);
-+	find_dot(curwp->w_dotp, curwp->w_doto);
+-LDADD+=	-lcurses -lutil -lclens
++LDADD+=	-lcurses -lutil -lclens -lbsd
+ DPADD+=	${LIBCURSES} ${LIBUTIL}
  
- 	ptr = curbp->b_undoptr;
+ # (Common) compile-time options:
+@@ -17,7 +17,7 @@
+ #
+ CFLAGS  = -O2
+ CFLAGS += -Wall -DFKEYS -DREGEX -DXKEYS
+-CFLAGS += -I/usr/local/include/clens
++CFLAGS += -I/usr/include/clens -isystem /usr/include/bsd -DLIBBSD_OVERLAY
  
-Only in mg-20110120.my: undo.o
-Only in mg-20110120.my: version.o
-Only in mg-20110120.my: window.o
-Only in mg-20110120.my: word.o
-Only in mg-20110120.my: yank.o
+ SRCS=	autoexec.c basic.c bell.c buffer.c cinfo.c dir.c display.c \
+ 	echo.c extend.c file.c fileio.c funmap.c help.c kbd.c keymap.c \
diff --git a/community/ming/PKGBUILD b/community/ming/PKGBUILD
index 2037b0efe..326ce0cb8 100644
--- a/community/ming/PKGBUILD
+++ b/community/ming/PKGBUILD
@@ -3,14 +3,14 @@
 
 pkgname=ming
 pkgver=0.4.5
-pkgrel=1
+pkgrel=2
 pkgdesc="SWF output library"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.libming.net/"
 license=('GPL' 'LGPL')
 depends=('freetype2' 'libpng' 'flex')
 makedepends=('bison' 'pkg-config' 'python2')
-options=('!libtool' '!emptydirs')
+options=('!emptydirs')
 source=(http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.bz2)
 md5sums=('73bcbcb837f3872ef1a936c539a2513c')
 
diff --git a/community/miniupnpc/PKGBUILD b/community/miniupnpc/PKGBUILD
index 4a13ff512..17f29a89f 100644
--- a/community/miniupnpc/PKGBUILD
+++ b/community/miniupnpc/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 92933 2013-06-19 14:29:17Z tredaelli $
+# $Id: PKGBUILD 99404 2013-10-28 11:22:46Z tredaelli $
 # Maintainer: Timothy Redaelli <timothy.redaelli@gmail.com>
 # Contributor: Florian Loitsch <archlinux@florian.loitsch.com>
 pkgname=miniupnpc
 pkgver=1.8
-pkgrel=1
+pkgrel=2
 pkgdesc="A small UPnP client library/tool to access Internet Gateway Devices"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://miniupnp.free.fr"
diff --git a/community/miniupnpd/PKGBUILD b/community/miniupnpd/PKGBUILD
new file mode 100644
index 000000000..d1c7bd977
--- /dev/null
+++ b/community/miniupnpd/PKGBUILD
@@ -0,0 +1,41 @@
+# $Id: PKGBUILD 99009 2013-10-22 08:59:17Z tredaelli $
+# Maintainer: Timothy Redaelli <timothy.redaelli@gmail.com>
+# Contributor: fauno <fauno@parabola.nu>
+pkgname=miniupnpd
+pkgver=1.8.20130730
+pkgrel=1
+pkgdesc="Lightweight UPnP IGD daemon"
+arch=('i686' 'x86_64')
+url="http://miniupnp.free.fr"
+license=('BSD')
+backup=(etc/miniupnpd/miniupnpd.conf)
+depends=('libnfnetlink' 'iptables' 'net-tools' 'util-linux')
+makedepends=('lsb-release')
+source=("http://miniupnp.free.fr/files/$pkgname-$pkgver.tar.gz"
+        miniupnpd.systemd)
+sha256sums=('919ab6ec719959fff9bdae3f1d83f6a39c43fa4a6d3f2c48077f43729d3d7d43'
+            '2707d028f28fbb28c3a9d13605c9c738e9628f828e22288a8a1492ac93f9ad7c')
+
+build() {
+	cd "$pkgname-$pkgver"
+
+	CONFIG_OPTIONS="--strict --ipv6 --leasefile" make -f Makefile.linux config.h
+	make -f Makefile.linux
+}
+
+package() {
+	cd "$pkgname-$pkgver"
+	mkdir -p "$pkgdir/usr/share/man/man8"
+
+	make PREFIX="$pkgdir/" SBININSTALLDIR="$pkgdir/usr/bin" -f Makefile.linux install
+
+	rm -r "${pkgdir}/etc/init.d"
+
+	install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+	install -Dm644 "${srcdir}/miniupnpd.systemd" "${pkgdir}/usr/lib/systemd/system/miniupnpd.service"
+
+	sed -i 's:/s\?bin/iptables:/usr/bin/iptables:
+	        s:eth0:"`cat /etc/miniupnpd/miniupnpd.conf | '"awk -F= '/^ext_ifname/ { print \$2 }'"'`":' "${pkgdir}"/etc/miniupnpd/*.sh
+	sed -i -e "s/^uuid=[-0-9a-f]*/uuid=00000000-0000-0000-0000-000000000000/
+	           s/make genuuid/uuidgen/" "${pkgdir}/etc/miniupnpd/miniupnpd.conf"
+}
diff --git a/community/miniupnpd/miniupnpd.systemd b/community/miniupnpd/miniupnpd.systemd
new file mode 100644
index 000000000..88973535c
--- /dev/null
+++ b/community/miniupnpd/miniupnpd.systemd
@@ -0,0 +1,12 @@
+[Unit]
+Description=Lightweight UPnP IGD daemon
+
+[Service]
+ExecStartPre=/etc/miniupnpd/iptables_init.sh
+ExecStart=/usr/bin/miniupnpd -f /etc/miniupnpd/miniupnpd.conf -d
+ExecStopPost=/etc/miniupnpd/iptables_removeall.sh
+PIDFile=/run/miniupnpd.pid
+StandardOutput=null
+
+[Install]
+WantedBy=network.target
diff --git a/community/minizip/PKGBUILD b/community/minizip/PKGBUILD
index 341bc678a..61a392d66 100644
--- a/community/minizip/PKGBUILD
+++ b/community/minizip/PKGBUILD
@@ -11,7 +11,6 @@ url='http://www.winimage.com/zLibDll/minizip.html'
 license=('ZLIB' 'custom')
 arch=('x86_64' 'i686' 'mips64el')
 depends=('zlib')
-options=('!libtool')
 source=("http://zlib.net/current/zlib-${pkgver}.tar.gz"
         'LICENSE')
 sha256sums=('36658cb768a54c1d4dec43c3116c27ed893e88b02ecfcb44f2166f9c0b7f2a0d'
diff --git a/community/miredo/PKGBUILD b/community/miredo/PKGBUILD
index 38cddc0e5..cf65e393e 100644
--- a/community/miredo/PKGBUILD
+++ b/community/miredo/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 91953 2013-05-30 09:43:18Z spupykin $
+# $Id: PKGBUILD 100251 2013-11-02 08:42:36Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 
 pkgname=miredo
 pkgver=1.2.6
-pkgrel=1
+pkgrel=2
 pkgdesc="Teredo client and server."
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.remlab.net/miredo/"
@@ -11,7 +11,6 @@ license=('GPL')
 depends=('judy' 'iproute2' 'libcap')
 backup=('etc/miredo/miredo.conf'
         'etc/miredo/client-hook')
-options=('!libtool')
 source=(http://www.remlab.net/files/${pkgname}/${pkgname}-${pkgver}.tar.xz
 	miredo.install
 	miredo.service)
diff --git a/community/mongodb/PKGBUILD b/community/mongodb/PKGBUILD
index b584ae1d5..65e91383f 100644
--- a/community/mongodb/PKGBUILD
+++ b/community/mongodb/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 96182 2013-08-21 06:12:24Z fyan $
+# $Id: PKGBUILD 100481 2013-11-05 02:40:41Z fyan $
 # Maintainer: Felix Yan <felixonmars@gmail.com>
 # Contributor: Sven-Hendrik Haase <sh@lutzhaase.com>
 # Contributor: Thomas Dziedzic < gostrc at gmail >
@@ -6,13 +6,13 @@
 # Contributor: Alec Thomas
 
 pkgname=mongodb
-pkgver=2.4.6
+pkgver=2.4.8
 pkgrel=1
 pkgdesc='A high-performance, open source, schema-free document-oriented database'
 arch=('i686' 'x86_64' 'mips64el')
 url='http://www.mongodb.org'
 license=('AGPL3')
-depends=('boost-libs' 'pcre' 'snappy' 'openssl' 'gperftools') # 'v8')
+depends=('boost-libs' 'pcre' 'snappy' 'openssl' 'gperftools')
 makedepends=('scons' 'boost' 'readline' 'ncurses' 'libpcap') # 'cyrus-sasl')
 checkdepends=('python2-pymongo')
 optdepends=('libpcap: needed for mongosniff')
@@ -37,8 +37,8 @@ build() {
     --use-system-tcmalloc \
     --ssl \
     --sharedclient
-    # --use-system-v8
     # --use-sasl-client
+    # --use-system-v8
 }
 
 <<COMMENT
@@ -68,15 +68,13 @@ package() {
     # --use-system-v8
     # --use-sasl-client
 
-  rm "$pkgdir/usr/lib/libmongoclient.a"
-
   install -Dm644 "$srcdir/mongodb.conf" "$pkgdir/etc/mongodb.conf"
   install -Dm644 "$srcdir/mongodb.service" "$pkgdir/usr/lib/systemd/system/mongodb.service"
   install -dm700 "$pkgdir/var/lib/mongodb"
   install -dm755 "$pkgdir/var/log/mongodb"
 }
 
-sha512sums=('73921d439f1bc2b6c1f358ab96f05f5f082db7b2c09f8964f2e3cc2d3cfd059e0c923d228a77fbfb8c8613eee1fbf16a35d5347b6316219aed3b0357dec97eae'
+sha512sums=('33202f101d00c796253c5fd333242ce2c5399352bf325e0af1df92d9c291d7a768bbed56f7b7fccfaa3cea2385cec941bd05cb27a635ca034485bd39ef4129a1'
             '05dead727d3ea5fe8af1a3c3888693f6b3e2b8cb7f197a5d793352e10d2c524e96c9a5c55ad2e88c1114643a9612ec0b26a2574b48a5260a9b51ec8941461f1c'
             '177251404b2e818ae2b546fe8b13cb76e348c99e85c7bef22a04b0f07b600fd515a309ede50214f4198594388a6d2b31f46e945b9dae84aabb4dfa13b1123bb9'
             'e709f76fa71a10d6b72d2eeae65d715e0a0a7e6cb93704114f22db8662d7102de77bd1e6706049351beb159aaa04548cfe4b14fe6ee498a166c5ad54c8275f84')
diff --git a/community/mpv/PKGBUILD b/community/mpv/PKGBUILD
index a02999b94..4ea19c68e 100644
--- a/community/mpv/PKGBUILD
+++ b/community/mpv/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 98298 2013-10-08 06:09:02Z bpiotrowski $
+# $Id: PKGBUILD 100387 2013-11-03 11:15:18Z bpiotrowski $
 # Maintainer:  Bartłomiej Piotrowski <nospam@bpiotrowski.pl>
 # Contributor: Eivind Uggedal <eivind@uggedal.com>
 
 pkgname=mpv
-pkgver=0.1.7
-pkgrel=3
+pkgver=0.2.2
+pkgrel=1
 pkgdesc='Video player based on MPlayer/mplayer2'
 arch=('i686' 'x86_64')
 license=('GPL')
@@ -12,11 +12,13 @@ url='http://mpv.io'
 depends=(
          'portaudio' 'ffmpeg' 'lcms2' 'libdvdread' 'libcdio-paranoia' 'libxinerama'
          'libquvi' 'mpg123' 'libxv' 'libxkbcommon' 'libva' 'lirc-utils'
+         'desktop-file-utils' 'hicolor-icon-theme' 'xdg-utils' 'lua51'
         )
 makedepends=('mesa' 'python-docutils')
 options=(!emptydirs)
-source=("https://github.com/mpv-player/$pkgname/archive/v$pkgver.tar.gz")
-md5sums=('69185e255fe6e8b6b13dcf6ea9b2fefb')
+install=mpv.install
+source=(https://github.com/mpv-player/$pkgname/archive/v$pkgver.tar.gz)
+md5sums=('632d1ee368fe7355563047bbdcd7b08a')
 
 build() {
   unset CFLAGS
@@ -49,5 +51,4 @@ package() {
     "$pkgdir"/usr/share/doc/mpv/examples
   install -m644 DOCS/{encoding.rst,tech-overview.txt} \
     "$pkgdir"/usr/share/doc/mpv
-  install -m755 TOOLS/mpv_identify.sh "$pkgdir"/usr/bin
 }
diff --git a/community/mpv/mpv.install b/community/mpv/mpv.install
new file mode 100644
index 000000000..5c501dc49
--- /dev/null
+++ b/community/mpv/mpv.install
@@ -0,0 +1,12 @@
+post_install() {
+  xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+  update-desktop-database -q
+}
+
+post_upgrade() {
+  post_install
+}
+
+post_remove() {
+  post_install
+}
diff --git a/community/muffin/PKGBUILD b/community/muffin/PKGBUILD
index db6729ef4..2be9654e6 100644
--- a/community/muffin/PKGBUILD
+++ b/community/muffin/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 98396 2013-10-09 15:37:53Z faidoc $
+# $Id: PKGBUILD 99916 2013-10-31 02:27:20Z allan $
 # Maintainer: Alexandre Filgueira <alexfilgueira@cinnarch.com>
 # Contributor: Adam Hani Schakaki <adam@schakaki.net>
 # Contributor: Ner0
 
 pkgname=muffin
-pkgver=2.0.1
+pkgver=2.0.3
 pkgrel=1
 pkgdesc="Cinnamon window manager based on Mutter"
 arch=('i686' 'x86_64' 'mips64el')
@@ -13,10 +13,10 @@ license=('GPL')
 depends=('clutter' 'gobject-introspection' 'cinnamon-desktop' 'libcanberra'
          'startup-notification' 'zenity' 'dconf')
 makedepends=('intltool' 'gnome-doc-utils' 'gnome-common')
-options=('!libtool' '!emptydirs')
+options=('!emptydirs')
 install=$pkgname.install
 source=("$pkgname-$pkgver.tar.gz::https://github.com/linuxmint/muffin/archive/$pkgver.tar.gz")
-sha256sums=('0643e10e4932ee575b864531e662df5bf209a87b64bd8e0324adbaee6d8af6dd')
+sha256sums=('5d3f3916dce25f1e4398b28452688db540800eec379cf8891a925d4d56322b8c')
 
 build() {
   cd ${pkgname}-${pkgver}
diff --git a/community/mumble/PKGBUILD b/community/mumble/PKGBUILD
index 03166c896..3d1a80521 100644
--- a/community/mumble/PKGBUILD
+++ b/community/mumble/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 92323 2013-06-04 02:33:32Z svenstaro $
+# $Id: PKGBUILD 99917 2013-10-31 02:27:44Z allan $
 # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
 # Contributor: Lauri Niskanen <ape@ape3000.com>
 # Contributor: Sebastian.Salich@gmx.de
@@ -16,7 +16,6 @@ license=('BSD')
 depends=('qt4' 'speex' 'lsb-release' 'libxi' 'avahi' 'libsndfile' 'protobuf' 'libpulse' 'opus')
 makedepends=('boost' 'mesa' 'avahi')
 #optdepends=('portaudio: for portaudio back-end' 'g15daemon: G15 Keyboard support')
-options=('!libtool') 
 install=mumble.install
 url="http://mumble.sourceforge.net/"
 source=("http://downloads.sourceforge.net/mumble/$pkgname-$pkgver.tar.gz")
diff --git a/community/mupdf/PKGBUILD b/community/mupdf/PKGBUILD
index ef5bb739a..709e2c14b 100644
--- a/community/mupdf/PKGBUILD
+++ b/community/mupdf/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 96830 2013-09-06 06:55:21Z bpiotrowski $
+# $Id: PKGBUILD 99335 2013-10-27 10:47:47Z bpiotrowski $
 # Maintainer:  Bartłomiej Piotrowski <nospam@bpiotrowski.pl>
 # Contributor: Brad Fanella <bradfanella@archlinux.us>
 # Contributor: Stefan Husmann <stefan-husmann@t-online.de>
@@ -7,13 +7,14 @@
 
 pkgname=mupdf
 pkgver=1.3
-pkgrel=5
+pkgrel=7
 pkgdesc='Lightweight PDF and XPS viewer'
 arch=('i686' 'x86_64' 'mips64el')
 url='http://mupdf.com'
 license=('GPL3')
 depends=('curl' 'desktop-file-utils' 'freetype2' 'jbig2dec' 'libjpeg' 'libxext' 'openssl')
 install=mupdf.install
+options=('staticlibs')
 source=(https://mupdf.googlecode.com/files/$pkgname-$pkgver-source.tar.gz
         mupdf-1.3-system-libcurl.patch)
 sha256sums=('aba8b31bee9cc0a16abedab5e31c81c65996cba5591e62a50a79bea2a63d4478'
diff --git a/community/mxml/PKGBUILD b/community/mxml/PKGBUILD
index c795e0f25..e77fc55e0 100644
--- a/community/mxml/PKGBUILD
+++ b/community/mxml/PKGBUILD
@@ -1,16 +1,16 @@
-# $Id: PKGBUILD 67931 2012-03-16 10:17:49Z spupykin $
+# $Id: PKGBUILD 100340 2013-11-02 11:47:21Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Roman Kyrylych <roman@archlinux.org>
 # Contributor: Johannes Sjolund <j.sjolund@gmail.com>
 
 pkgname=mxml
 pkgver=2.7
-pkgrel=1
+pkgrel=2
 pkgdesc="A small XML parsing library"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.minixml.org/"
 license=('LGPL')
-source=("http://ftp.easysw.com/pub/$pkgname/$pkgver/$pkgname-$pkgver.tar.gz")
+source=("http://www.msweet.org/files/project3/$pkgname-$pkgver.tar.gz")
 md5sums=('76f2ae49bf0f5745d5cb5d9507774dc9')
 
 build() {
diff --git a/community/mypaint/PKGBUILD b/community/mypaint/PKGBUILD
index 2adc42368..b936e54bc 100644
--- a/community/mypaint/PKGBUILD
+++ b/community/mypaint/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 90066 2013-05-06 19:38:37Z foutrelis $
+# $Id: PKGBUILD 100253 2013-11-02 08:42:59Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Jon Nordby <jononor@gmail.com>
 
 pkgname=mypaint
 pkgver=1.1.0
-pkgrel=2
+pkgrel=3
 pkgdesc="A fast and easy painting application for digital painters, with brush dynamics"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://mypaint.intilinux.com/"
diff --git a/community/mythplugins/PKGBUILD b/community/mythplugins/PKGBUILD
index 0ef3c338a..880831d93 100644
--- a/community/mythplugins/PKGBUILD
+++ b/community/mythplugins/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 97427 2013-09-19 14:38:19Z jconder $
+# $Id: PKGBUILD 99365 2013-10-27 17:21:57Z jconder $
 # Maintainer: Jonathan Conder <jonno.conder@gmail.com>
 # Contributor: Giovanni Scafora <giovanni@archlinux.org>
 
@@ -14,7 +14,7 @@ pkgname=('mythplugins-mytharchive'
          'mythplugins-mythweb'
          'mythplugins-mythzoneminder')
 pkgver=0.27
-pkgrel=1
+pkgrel=2
 epoch=1
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.mythtv.org"
@@ -28,8 +28,8 @@ makedepends=('cdrkit' 'dvdauthor' 'dvd+rw-tools' 'ffmpeg' 'flac' 'libexif'
 source=("mythtv-$pkgver.tar.gz::http://www.mythtv.org/download/mythtv/$pkgver"
         "mythweb-$pkgver.tar.gz::http://www.mythtv.org/download/mythweb/$pkgver"
 	'cdparanoia.patch')
-sha256sums=('670b378e379df05a4f2ac28cc3cb2578587b42cb03710e0b230b75d692f8e2b8'
-            'fe135281c4828a96762ea22a8a4cf622988b12e7f2189dce9273f1ce7bb367d3'
+sha256sums=('49789de705be73275325b1a4984b727cf8284fdc4ae6b041ad152857c830dc46'
+            'c6574a9d3029e00ef9e2fb4eff33be60804d06c71d517ad8cae27bed9b5275d3'
 	    '004f1e4734830709d2ab5ebb804560514f2bf525abc2f11142501a81eba0754c')
 
 prepare() {
diff --git a/community/mythtv/PKGBUILD b/community/mythtv/PKGBUILD
index a61dbdd84..669c837ad 100644
--- a/community/mythtv/PKGBUILD
+++ b/community/mythtv/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 97419 2013-09-19 04:04:04Z jconder $
+# $Id: PKGBUILD 99201 2013-10-25 13:44:56Z giovanni $
 # Maintainer: Jonathan Conder <jonno.conder@gmail.com>
 # Contributor: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Juergen Hoetzel <juergen@archlinux.org>
@@ -7,7 +7,7 @@
 
 pkgname=mythtv
 pkgver=0.27
-pkgrel=1
+pkgrel=3
 epoch=1
 pkgdesc="A Homebrew PVR project"
 arch=('i686' 'x86_64')
@@ -27,10 +27,10 @@ conflicts=('myththemes' 'mythplugins-mythvideo')
 replaces=('myththemes' 'mythplugins-mythvideo')
 backup=()
 install='mythtv.install'
-source=("http://www.$pkgname.org/download/$pkgname/$pkgver"
+source=("$pkgname-$pkgver.tar.gz::http://www.$pkgname.org/download/$pkgname/$pkgver"
         'mythbackend.service'
         'http://code.mythtv.org/trac/raw-attachment/ticket/11338/libcec-2-support.2.patch')
-sha256sums=('670b378e379df05a4f2ac28cc3cb2578587b42cb03710e0b230b75d692f8e2b8'
+sha256sums=('49789de705be73275325b1a4984b727cf8284fdc4ae6b041ad152857c830dc46'
             'f628f44164ce773ae54d320fb2f65353cacf9deec16981e4e56316ac33000a2f'
             '8270407c2074b305e0c32151f89c84f6bf980a32665a2da8e4727405fa3911f3')
 
diff --git a/community/namazu/PKGBUILD b/community/namazu/PKGBUILD
index 2ac8903a7..ee9524f20 100644
--- a/community/namazu/PKGBUILD
+++ b/community/namazu/PKGBUILD
@@ -1,16 +1,15 @@
-# $Id: PKGBUILD 56480 2011-10-07 10:10:22Z spupykin $
+# $Id: PKGBUILD 100255 2013-11-02 08:43:48Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Benjamin Andresen <bandresen gmail com>
 
 pkgname=namazu
 pkgver=2.0.21
-pkgrel=1
+pkgrel=2
 pkgdesc="Namazu is a full-text search engine intended for easy use."
 url="http://namazu.org/"
 license=('GPL')
 arch=('i686' 'x86_64' 'mips64el')
 depends=(perl-file-mmagic)
-options=(!libtool)
 source=(http://namazu.org/stable/$pkgname-$pkgver.tar.gz)
 md5sums=('8865d912a3de9c94f5ce01d0de5ccad9')
 
@@ -24,5 +23,9 @@ build() {
 	--libexecdir=/usr/lib/namazu \
 	--libdir=/usr/lib/namazu
   make
+}
+
+package() {
+  cd $srcdir/$pkgname-$pkgver
   make DESTDIR=$pkgdir install
 }
diff --git a/community/nautilus-actions/PKGBUILD b/community/nautilus-actions/PKGBUILD
index 4e4bef6f9..e0420b556 100644
--- a/community/nautilus-actions/PKGBUILD
+++ b/community/nautilus-actions/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 98372 2013-10-09 07:28:55Z bgyorgy $
+# $Id: PKGBUILD 99919 2013-10-31 02:28:23Z allan $
 # Maintainer: Balló György <ballogyor+arch at gmail dot com>
 # Contributor: Ionut Biru <ibiru@archlinux.org>
 # Contributor: Roman Kyrylych <roman@archlinux.org>
@@ -14,7 +14,6 @@ license=('GPL')
 depends=('nautilus' 'libunique3' 'libgtop' 'gconf')
 makedepends=('intltool' 'gnome-doc-utils')
 install=nautilus-actions.install
-options=('!libtool')
 source=(http://www.nautilus-actions.org/downloads/$pkgname-$pkgver.tar.gz)
 sha1sums=('af3b8017a13feeda221a52cfef4e61bea659e436')
 
diff --git a/community/nemesis/PKGBUILD b/community/nemesis/PKGBUILD
index 87f022f58..ca844974a 100644
--- a/community/nemesis/PKGBUILD
+++ b/community/nemesis/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 66248 2012-02-23 05:20:26Z spupykin $
+# $Id: PKGBUILD 99920 2013-10-31 02:28:43Z allan $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com>
 
@@ -10,7 +10,6 @@ arch=(i686 x86_64 'mips64el')
 url="http://nemesis.sourceforge.net/"
 license=('BSD')
 depends=()
-options=('!libtool')
 source=(http://downloads.sourceforge.net/sourceforge/nemesis/nemesis-$pkgver.tar.gz
 	http://archlinux-stuff.googlecode.com/files/libnet-1.0.2a.tar.gz
 	nemesis-proto_tcp.c.diff)
diff --git a/community/nemiver/PKGBUILD b/community/nemiver/PKGBUILD
index e01eca3da..c5e9f43be 100644
--- a/community/nemiver/PKGBUILD
+++ b/community/nemiver/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 95708 2013-08-15 20:25:40Z arodseth $
+# $Id: PKGBUILD 99921 2013-10-31 02:29:03Z allan $
 # Maintainer: Alexander Rødseth <rodseth@gmail.com>
 # Contributor: jordz <jordz@archlinux.us>
 
@@ -13,7 +13,7 @@ install="$pkgname.install"
 depends=('gdlmm' 'gdb' 'gtksourceviewmm' 'libgtop' 'vte3' 'ghex' 'gsettings-desktop-schemas')
 makedepends=('boost' 'intltool' 'itstool')
 source=("http://ftp.acc.umu.se/pub/GNOME/sources/nemiver/0.9/$pkgname-$pkgver.tar.xz")
-options=('!libtool' '!emptydirs')
+options=('!emptydirs')
 sha256sums=('12cc5b6092ba720f2524f59928bee4d736e5e5ffeeffb6fd06f99695f17d683f')
 
 build() {	
diff --git a/community/nemo-extensions/PKGBUILD b/community/nemo-extensions/PKGBUILD
new file mode 100644
index 000000000..5c312e523
--- /dev/null
+++ b/community/nemo-extensions/PKGBUILD
@@ -0,0 +1,175 @@
+# $Id$
+# Maintainer: Alexandre Filgueira <alexfilgueira@antergos.com>
+
+pkgbase=nemo-extensions
+pkgname=('nemo-fileroller'
+	 'nemo-preview'
+	 'nemo-python'
+	 'nemo-share'
+	 'nemo-seahorse')
+	#'nemo-media-columns'
+	#'nemo-pastebin'
+	#'nemo-compare'
+	#'nemo-rabbitvcs'
+pkgver=2.0.0
+_gitver=adeeeb12ea
+pkgrel=2
+arch=('i686' 'x86_64')
+license=('GPL2')
+url="https://github.com/linuxmint/nemo-extensions"
+depends=(nemo file-roller cjs clutter-gtk clutter-gst gst-plugins-good libmusicbrainz5
+         evince gtksourceview3 webkitgtk python2-gobject seahorse-nautilus samba)
+makedepends=(gconf gnome-common gtk-doc intltool) # python2-distutils-extra
+options=('!emptydirs')
+source=("${pkgbase}-${pkgver}.tar.gz::https://github.com/linuxmint/nemo-extensions/archive/${_gitver}.tar.gz")
+md5sums=('de6a36ee77265f2a1528b29526fd6afb')
+
+prepare() {
+  cd ${pkgbase}-${_gitver}*
+
+  # Python2 fix
+  find -type f | xargs sed -i 's@^#!.*python$@#!/usr/bin/python2@'
+
+  # Fix nemo-preview build
+  sed -i '/AM_GNU_GETTEXT/d' nemo-preview/configure.ac
+}
+
+build() {
+  cd ${pkgbase}-${_gitver}*
+
+  _configure_pkgs="nemo-fileroller nemo-seahorse nemo-share"
+  for dir in ${_configure_pkgs}
+  do
+    pushd ${dir}
+    autoreconf -fi
+    ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --libexecdir=/usr/lib/${dir} \
+                --disable-static --disable-schemas-compile
+    make
+    popd
+  done
+
+  _autogen_pkgs="nemo-preview nemo-python"
+  for dir in ${_autogen_pkgs}
+  do
+    pushd ${dir}
+    ./autogen.sh --prefix=/usr --sysconfdir=/etc --localstatedir=/var --libexecdir=/usr/lib/${dir} \
+                 --disable-static --disable-schemas-compile
+    make
+    popd
+  done
+
+    # # nemo-pastebin
+    # cd nemo-pastebin
+    # python2 ./setup.py build --build-base ${srcdir}/build/ || return 1
+    # cd ..
+
+  	# nemo-media-columns
+  	# Nothing to do here
+  	# Required python2-pypdf from AUR
+
+  	# nemo-compare
+  	# cd nemo-compare
+
+    # nemo-rabbitvcs
+    # Nothing to do here
+
+}
+
+package_nemo-fileroller(){
+  pkgdesc="File archiver extension for Nemo"
+  depends=(nemo file-roller)
+
+  cd ${pkgbase}-${_gitver}*/nemo-fileroller
+  make DESTDIR="${pkgdir}" install
+}
+
+package_nemo-preview(){
+  pkgdesc=("GtkClutter and Javascript-based quick previewer for Nemo")
+  depends=(nemo cjs clutter-gtk clutter-gst gst-plugins-good libmusicbrainz5 evince gtksourceview3 webkitgtk)
+
+  cd ${pkgbase}-${_gitver}*/nemo-preview
+  make DESTDIR="${pkgdir}" install
+}
+
+package_nemo-python() {
+  pkgdesc="Python2 binding for Nemo components"
+  depends=(nemo python2-gobject)
+
+  cd ${pkgbase}-${_gitver}*/nemo-python
+  make DESTDIR="${pkgdir}" install
+}
+
+package_nemo-seahorse(){
+  pkgdesc="PGP encryption and signing extension for Nemo"
+  depends=(nemo seahorse-nautilus)
+
+  cd ${pkgbase}-${_gitver}*/nemo-seahorse
+  make DESTDIR="${pkgdir}" install
+
+  # seahorse-tool is already in seahorse-nautilus package
+  make -C tool DESTDIR="${pkgdir}" uninstall
+}
+
+package_nemo-share(){
+  pkgdesc="Samba extension for Nemo"
+  depends=(nemo samba)
+
+  cd ${pkgbase}-${_gitver}*/nemo-share
+  make DESTDIR="${pkgdir}" install
+}
+
+# package_nemo-media-columns(){
+# 	cd ${pkgbase}-${_gitver}*/nemo-media-columns
+
+# 	pkgdesc=("A Nemo extension to display music/EXIF and PDF metadata info in the Nemo List View")
+# 	arch=(any)
+
+#   install -d ${pkgdir}/usr/share/nemo-python/extensions/
+# 	install -Dm755 ${srcdir}/nemo-media-columns.py \
+# 			${pkgdir}/usr/share/nemo-python/extensions/nemo-media-columns.py
+# }
+
+# package_nemo-pastebin(){
+# 	cd ${pkgbase}-${_gitver}*/nemo-pastebin
+
+# 	pkgdesc="Nemo extension to send files to a pastebin"
+# 	arch=(any)
+# 	depends=(nemo pastebinit nemo-python)
+#   install=nemo-pastebin.install
+
+# 	python2 ./setup.py install --prefix=/usr --root=${pkgdir} \
+# 		--no-compile -O0
+# }
+
+# package_nemo-compare() {
+#   cd ${pkgbase}-${_gitver}*/nemo-compare
+
+#   pkgdesc="Context menu comparison extension for Nemo file manager"
+#   depends=(python2 python2-xdg meld nemo-python)
+
+#   install -d ${pkgdir}/usr/share/applications/
+#   install -d ${pkgdir}/usr/share/nemo-compare/
+
+#   install -Dm755 ${srcdir}/data/nemo-compare-preferences.desktop \
+#                   /usr/share/applications/nemo-compare-preferences.desktop
+#   install -Dm755 ${srcdir}/data/nemo-compare-notification \
+#                   /usr/share/nemo-compare/nemo-compare-notification
+#   install -Dm755 ${srcdir}/src/nemo-compare.py \
+#                   /usr/share/nemo-compare/nemo-compare.py
+#   install -Dm755 ${srcdir}/src/utils.py \
+#                   /usr/share/nemo-compare/utils.py
+#   install -Dm755 ${srcdir}/src/nemo-compare-preferences.py \
+#                   /usr/share/nemo-compare/nemo-compare-preferences.py
+
+# }
+
+# package_nemo-rabbitvcs(){
+# 	cd ${pkgbase}-${_gitver}*/nemo-rabbitvcs
+
+#   depends=(nemo-python python2-dbus)
+
+#   install -d ${pkgdir}/usr/share/nemo-python/extensions/
+#   install -Dm755 ${srcdir}/RabbitVCS.py \
+#       ${pkgdir}/usr/share/nemo-python/extensions/RabbitVCS.py
+# }
+
diff --git a/community/nemo-extensions/nemo-pastebin.install b/community/nemo-extensions/nemo-pastebin.install
new file mode 100644
index 000000000..326aa98a2
--- /dev/null
+++ b/community/nemo-extensions/nemo-pastebin.install
@@ -0,0 +1,11 @@
+post_install() {
+  glib-compile-schemas usr/share/glib-2.0/schemas
+}
+
+post_upgrade() {
+  post_install
+}
+
+post_remove() {
+  post_install
+}
diff --git a/community/nemo-fileroller/PKGBUILD b/community/nemo-fileroller/PKGBUILD
deleted file mode 100644
index ee1311652..000000000
--- a/community/nemo-fileroller/PKGBUILD
+++ /dev/null
@@ -1,41 +0,0 @@
-
-# Maintainer: Alexandre Filgueira <alexfilgueira@cinnarch.com>
-# Contributor: twa022 <twa022 at gmail dot com>
-
-pkgname=nemo-fileroller
-pkgver=1.8.0
-pkgrel=1
-pkgdesc="Nemo fileroller extension"
-arch=('i686' 'x86_64' 'mips64el')
-url="https://github.com/linuxmint/nemo-extensions"
-license=('GPL')
-source=("configure.in_fix.patch"
-        "$pkgname-$pkgver.tar.gz::http://github.com/linuxmint/nemo-extensions/archive/master.tar.gz")
-
-depends=('nemo' 'file-roller')
-options=('!libtool' '!emptydirs')
-
-sha256sums=('3381a3421b2fd69746b610cfa3dfeb83d4795076ec692fcf28bcccf69bfe36d0'
-            'b89c4667b175ad6ad59b6938dab7e9b53c3bcdc25a5ac5177203662900aac2f5')
-
-
-build() {
-
-  
-  cd nemo-extensions-master/${pkgname}
-
-  ## I think they started with the nemo-dropbox source, so there
-  ## are some unnecessary python dependencies
-  patch -uNp2 -r- -i ${srcdir}/configure.in_fix.patch
-  autoreconf -fi
-  
-  ./configure --prefix=/usr --sysconfdir=/etc
-  make
-}
-
-package() {
-  cd nemo-extensions-master/${pkgname}
-  make DESTDIR="${pkgdir}" install
-}
-
-
diff --git a/community/nemo-fileroller/configure.in_fix.patch b/community/nemo-fileroller/configure.in_fix.patch
deleted file mode 100644
index 898c0abce..000000000
--- a/community/nemo-fileroller/configure.in_fix.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-diff -Naur nemo-fileroller.orig/configure.in nemo-fileroller/configure.in
---- ./nemo-fileroller.orig/configure.in	2012-10-28 16:48:29.000000000 +0100
-+++ ./nemo-fileroller/configure.in	2013-02-19 09:03:34.009486606 +0100
-@@ -6,7 +6,7 @@
- 
- AC_PREFIX_DEFAULT(/usr)
- 
--AM_CONFIG_HEADER(config.h)
-+AC_CONFIG_HEADERS(config.h)
- 
- # not ready for i18n yet
- #AC_PROG_INTLTOOL([0.29])
-@@ -29,10 +29,10 @@
- PKG_CHECK_MODULES(NEMO, libnemo-extension >= $NEMO_REQUIRED)
- PKG_CHECK_MODULES(GLIB, glib-2.0 >= $GLIB_REQUIRED)
- 
--AC_PATH_PROG([PYTHON], [python])
-+#AC_PATH_PROG([PYTHON], [python])
- 
--AC_PATH_PROG([RST2MAN], [rst2man], [python rst2man.py])
--AC_SUBST(RST2MAN)
-+#AC_PATH_PROG([RST2MAN], [rst2man], [python rst2man.py])
-+#AC_SUBST(RST2MAN)
- 
- # define module checking macro
- AC_DEFUN([PYTHON_CHECK_MODULE], [
-@@ -55,9 +55,9 @@
- fi
- ])
- 
--PYTHON_CHECK_MODULE(pygtk, gtk)
--PYTHON_CHECK_MODULE(gobject, gobject)
--PYTHON_CHECK_MODULE(docutils, docutils)
-+#PYTHON_CHECK_MODULE(pygtk, gtk)
-+#PYTHON_CHECK_MODULE(gobject, gobject)
-+#PYTHON_CHECK_MODULE(docutils, docutils)
- 
- # Make dependency CFLAGS and LIBS available
- AC_SUBST(NEMO_CFLAGS)
diff --git a/community/nemo/PKGBUILD b/community/nemo/PKGBUILD
index 99fd5d13d..ccf82a992 100644
--- a/community/nemo/PKGBUILD
+++ b/community/nemo/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 98197 2013-10-07 12:08:32Z jgc $
+# $Id: PKGBUILD 100532 2013-11-05 14:18:02Z faidoc $
 # Maintainer: Alexandre Filgueira <alexfilgueira@cinnarch.com>
 # Contributor: Ner0
 
 pkgname=nemo
-pkgver=2.0.0
-pkgrel=2
+pkgver=2.0.5
+pkgrel=1
 pkgdesc="Cinnamon file manager (Nautilus fork)"
 arch=('i686' 'x86_64' 'mips64el')
 url="https://github.com/linuxmint/nemo"
@@ -13,11 +13,10 @@ depends=('libexif' 'gvfs' 'dconf' 'desktop-file-utils' 'exempi' 'python2'
          'cinnamon-desktop' 'gnome-icon-theme' 'libnotify' 'libtracker-sparql' 'libxml2'
          'cinnamon-translations')
 makedepends=('gtk-doc' 'gobject-introspection' 'intltool' 'gnome-common')
-optdepends=('gksu: Open as Root')
-options=('!emptydirs' '!libtool')
+options=('!emptydirs')
 install=nemo.install
 source=("$pkgname-$pkgver.tar.gz::https://github.com/linuxmint/nemo/tarball/$pkgver")
-sha256sums=('3848d55a20134826aa6512898c78b05a953f5d2f353817e7003c1a4f6286e31c')
+sha256sums=('5c737c4ede5f4e000fbfe247d1f86086c885f4b0d0f38790db885bf62ac51fc6')
 
 prepare() {
   cd linuxmint-nemo-*
@@ -49,12 +48,4 @@ package() {
   cd linuxmint-nemo-*
 
   make DESTDIR="$pkgdir/" install
-
-  # Autostart only in Cinnamon to avoid conflict with GNOME Classic session
-  cp "$pkgdir/etc/xdg/autostart/nemo-autostart.desktop" \
-    "$pkgdir/etc/xdg/autostart/nemo-autostart2d.desktop"
-  sed -i 's/^AutostartCondition=.*/AutostartCondition=GNOME3 if-session cinnamon/' \
-    "$pkgdir/etc/xdg/autostart/nemo-autostart.desktop"
-  sed -i 's/^AutostartCondition=.*/AutostartCondition=GNOME3 if-session cinnamon2d/' \
-    "$pkgdir/etc/xdg/autostart/nemo-autostart2d.desktop"
 }
diff --git a/community/net6/PKGBUILD b/community/net6/PKGBUILD
index efdd4dbaf..b4e8db5d6 100644
--- a/community/net6/PKGBUILD
+++ b/community/net6/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 89936 2013-05-05 21:30:50Z spupykin $
+# $Id: PKGBUILD 100257 2013-11-02 08:44:07Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Angel 'angvp' Velasquez <angvp[at]archlinux.com.ve>
 # Contributor: William Rea <sillywilly@gmail.com>
@@ -6,13 +6,12 @@
 
 pkgname=net6
 pkgver=1.3.14
-pkgrel=1
+pkgrel=2
 pkgdesc="A library that provides a TCP protocol abstraction for C++"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://gobby.0x539.de/"
 license=('LGPL')
 depends=('gnutls' 'libsigc++2.0')
-options=('!libtool')
 source=(http://releases.0x539.de/$pkgname/$pkgname-$pkgver.tar.gz)
 md5sums=('be6db739f71c5c08421bf6181e77f3b2')
 
diff --git a/community/netcf/PKGBUILD b/community/netcf/PKGBUILD
index aebdc4f3d..1d2140e30 100644
--- a/community/netcf/PKGBUILD
+++ b/community/netcf/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 90691 2013-05-13 14:30:21Z spupykin $
+# $Id: PKGBUILD 99926 2013-10-31 02:30:50Z allan $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Aurélien Wailly <aurelien.wailly@gmail.com>
 
@@ -11,7 +11,6 @@ license=('LGPL')
 url="https://fedorahosted.org/netcf/"
 depends=('augeas>=0.7.4' 'netctl' 'libxslt' 'libxml2' 'libnl')
 makedepends=('gcc')
-options=(!libtool)
 source=("https://fedorahosted.org/released/netcf/$pkgname-$pkgver.tar.gz")
 md5sums=('bee292470b06201b59af0fad473a1b65')
 
diff --git a/community/newsbeuter/PKGBUILD b/community/newsbeuter/PKGBUILD
index 20d4f3ab6..95bd03b15 100644
--- a/community/newsbeuter/PKGBUILD
+++ b/community/newsbeuter/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 96640 2013-09-02 18:35:40Z jlichtblau $
+# $Id: PKGBUILD 99927 2013-10-31 02:31:10Z allan $
 # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
 # Contributor: Sven Pfleiderer <pfleidi@roothausen.de>
 
@@ -12,7 +12,6 @@ license=('custom: MIT')
 depends=('curl' 'json-c' 'libxml2' 'sqlite' 'stfl')
 makedepends=('swig' 'gettext')
 optdepends=('ruby')
-options=('!libtool')
 install=$pkgname.install
 changelog=$pkgname.changelog
 source=(http://www.newsbeuter.org/downloads/$pkgname-$pkgver.tar.gz)
diff --git a/community/nfacct/PKGBUILD b/community/nfacct/PKGBUILD
index e6e58955d..aba2b9572 100644
--- a/community/nfacct/PKGBUILD
+++ b/community/nfacct/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 90530 2013-05-13 00:24:07Z seblu $
+# $Id: PKGBUILD 99928 2013-10-31 02:31:30Z allan $
 # Maintainer: Sébastien Luttringer
 # Contributor: Alessandro Sagratini <ale_sagra@hotmail.com>
 
@@ -10,7 +10,6 @@ arch=('i686' 'x86_64' 'mips64el')
 url='http://www.netfilter.org/projects/nfacct/'
 license=('GPL2')
 depends=('libnetfilter_acct')
-options=(!libtool)
 source=("http://www.netfilter.org/projects/$pkgname/files/$pkgname-$pkgver.tar.bz2")
 md5sums=('992e863409d144350dbc8f0554a0f478')
 
diff --git a/community/nmon/PKGBUILD b/community/nmon/PKGBUILD
index c17e268d8..f4ccff67a 100644
--- a/community/nmon/PKGBUILD
+++ b/community/nmon/PKGBUILD
@@ -1,21 +1,21 @@
-# $Id: PKGBUILD 67998 2012-03-16 23:55:43Z giovanni $
+# $Id: PKGBUILD 99425 2013-10-28 14:29:30Z mtorromeo $
 # Maintainer: Massimiliano Torromeo <massimiliano.torromeo@gmail.com>
 
 pkgname=nmon
-pkgver=14g
-pkgrel=3
+pkgver=14i
+pkgrel=1
 pkgdesc="AIX & Linux Performance Monitoring tool"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://nmon.sourceforge.net"
 license=('GPL')
 depends=('ncurses')
 source=("http://downloads.sourceforge.net/${pkgname}/lmon$pkgver.c")
-md5sums=('e537f51446fb375140368b115dc8278b')
+sha256sums=('d401cb5048e3e8e8f1ad63e68a0499c73ec64d5d2b7c41a1aeb2b596374eaa86')
 
 build() {
   cd ${srcdir}
 
-  cc -o nmon lmon$pkgver.c -g -O2 -D JFS -D GETUSER -Wall -D LARGEMEM -lncurses -g
+  cc -o nmon lmon$pkgver.c -g -O2 -D JFS -D GETUSER -Wall -D LARGEMEM -lncurses -g -D X86
 }
 
 package() {
diff --git a/community/nodejs/PKGBUILD b/community/nodejs/PKGBUILD
index 3f4a845f0..0b41637b6 100644
--- a/community/nodejs/PKGBUILD
+++ b/community/nodejs/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 97916 2013-10-01 05:49:26Z bpiotrowski $
+# $Id: PKGBUILD 98813 2013-10-19 09:02:32Z bpiotrowski $
 # Maintainer:  Bartłomiej Piotrowski <nospam@bpiotrowski.pl>
 # Contributor: Thomas Dziedzic < gostrc at gmail >
 # Contributor: James Campos <james.r.campos@gmail.com>
@@ -8,7 +8,7 @@
 # Contributor: TIanyi Cui <tianyicui@gmail.com>
 
 pkgname=nodejs
-pkgver=0.10.20
+pkgver=0.10.21
 pkgrel=1
 pkgdesc='Evented I/O for V8 javascript'
 arch=('i686' 'x86_64' 'mips64el')
@@ -19,7 +19,7 @@ makedepends=('python2')
 checkdepends=('curl')
 options=('!emptydirs')
 source=(http://nodejs.org/dist/v$pkgver/node-v$pkgver.tar.gz)
-sha256sums=('b5af00d4d43644f37caa2dad5fa81e6f898ebb7b238f02a1cddfcff11c81e649')
+sha256sums=('7c125bf22c1756064f2a68310d4822f77c8134ce178b2faa6155671a8124140d')
 
 prepare() {
   cd node-v$pkgver
diff --git a/community/noise/PKGBUILD b/community/noise/PKGBUILD
new file mode 100644
index 000000000..e34eb3062
--- /dev/null
+++ b/community/noise/PKGBUILD
@@ -0,0 +1,40 @@
+# $Id: PKGBUILD 99111 2013-10-24 13:13:25Z alucryd $
+# Maintainer: Maxime Gauduin <alucryd at gmail dot com>
+
+pkgname=noise
+pkgver=0.2.4
+pkgrel=2
+pkgdesc="Simple, fast, and good looking music player"
+arch=('i686' 'x86_64')
+url="https://launchpad.net/noise"
+license=('GPL3')
+depends=('desktop-file-utils' 'granite' 'gstreamer0.10-base' 'json-glib' 'libgpod' 'libnotify' 'libpeas' 'libsoup' 'sqlheavy' 'taglib')
+makedepends=('cmake' 'vala')
+optdepends=('elementary-icon-theme: Missing UI icons'
+            'gstreamer0.10-base-plugins: "Base" plugin libraries'
+            'gstreamer0.10-good-plugins: "Good" plugin libraries'
+            'gstreamer0.10-bad-plugins: "Bad" plugin libraries'
+            'gstreamer0.10-ugly-plugins: "Ugly" plugin libraries')
+install="${pkgname}.install"
+source=("https://launchpad.net/${pkgname}/${pkgver%.?}/${pkgver}/+download/${pkgname}-${pkgver}.tgz")
+sha256sums=('ffcd5f2cba112af13707a7ba7f0ceace7b812d4b6082671684ff78d76fc1d8a9')
+
+build() {
+  cd ${pkgname}-${pkgver}
+
+  if [[ -d build ]]; then
+    rm -rf build
+  fi
+  mkdir build && cd build
+
+  cmake .. -DCMAKE_INSTALL_PREFIX='/usr' -DCMAKE_BUILD_TYPE='Release' -DGSETTINGS_COMPILE='OFF'
+  make
+}
+
+package() {
+  cd ${pkgname}-${pkgver}/build
+
+  make DESTDIR="${pkgdir}" install
+}
+
+# vim: ts=2 sw=2 et:
diff --git a/community/noise/noise.install b/community/noise/noise.install
new file mode 100644
index 000000000..20def33a9
--- /dev/null
+++ b/community/noise/noise.install
@@ -0,0 +1,17 @@
+post_install() {
+  glib-compile-schemas usr/share/glib-2.0/schemas
+  gtk-update-icon-cache -ftq usr/share/icons/hicolor
+  update-desktop-database -q
+}
+
+post_upgrade()
+{
+  post_install
+}
+
+post_remove()
+{
+  post_install
+}
+
+# vim: ts=2 sw=2 et:
diff --git a/community/nomacs/PKGBUILD b/community/nomacs/PKGBUILD
index 1b737b3d0..2d68c1826 100644
--- a/community/nomacs/PKGBUILD
+++ b/community/nomacs/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 94002 2013-07-13 00:27:24Z speps $
+# $Id: PKGBUILD 98765 2013-10-17 21:51:03Z speps $
 # Maintainer: speps <speps at aur dot archlinux dot org>
 
 pkgname=nomacs
-pkgver=1.4.0
+pkgver=1.6.0.2
 pkgrel=1
 pkgdesc="A Qt image viewer"
 arch=(i686 x86_64)
@@ -11,8 +11,8 @@ license=('GPL3')
 depends=('qt4' 'exiv2' 'libraw' 'opencv')
 makedepends=('cmake')
 install="$pkgname.install"
-source=("http://downloads.sourceforge.net/project/$pkgname/$pkgname-$pkgver/$pkgname-$pkgver-source.tar.bz2")
-md5sums=('ede84986dce5f67c270bb5ff7354e867')
+source=("http://downloads.sourceforge.net/project/$pkgname/$pkgname-${pkgver%.*}/$pkgname-$pkgver-source.tar.bz2")
+md5sums=('a5556ca94053eec9539c11454f633316')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
diff --git a/community/notification-daemon/PKGBUILD b/community/notification-daemon/PKGBUILD
index 7c2530761..cc820ae4a 100644
--- a/community/notification-daemon/PKGBUILD
+++ b/community/notification-daemon/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 90252 2013-05-10 04:00:26Z heftig $
+# $Id: PKGBUILD 99929 2013-10-31 02:31:50Z allan $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: Mark Rosenstand <mark@borkware.net>
 
@@ -11,7 +11,7 @@ license=(GPL)
 url="http://www.galago-project.org/specs/notification/"
 depends=(gtk3 libcanberra)
 makedepends=(pkgconfig intltool)
-options=('!libtool' '!emptydirs')
+options=('!emptydirs')
 source=(http://download.gnome.org/sources/${pkgname}/0.7/${pkgname}-${pkgver}.tar.xz)
 sha256sums=('64d0ce6fb12c94c3b73b701502c804c408cb5a94580bcae5ac37607639f7a0b3')
 
diff --git a/community/nsd/PKGBUILD b/community/nsd/PKGBUILD
index abc581a57..cf9d0322e 100644
--- a/community/nsd/PKGBUILD
+++ b/community/nsd/PKGBUILD
@@ -1,21 +1,23 @@
-# $Id: PKGBUILD 94613 2013-07-28 13:05:24Z bisson $
+# $Id: PKGBUILD 100223 2013-11-02 00:00:56Z bisson $
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
 # Contributor: Kaiting Chen <kaitocracy@gmail.com>
 # Contributor: Roberto Alsina <ralsina@kde.org>
 
 pkgname=nsd
-pkgver=3.2.16
-pkgrel=1
+pkgver=4.0.0
+pkgrel=2
 pkgdesc='Authoritative only, high performance and simple DNS server'
 url='http://www.nlnetlabs.nl/nsd/'
 license=('BSD')
-depends=('openssl')
-makedepends=('flex')
 arch=('i686' 'x86_64' 'mips64el')
+depends=('openssl' 'libevent')
+makedepends=('flex')
 source=("http://www.nlnetlabs.nl/downloads/${pkgname}/${pkgname}-${pkgver}.tar.gz"
+        'tmpfiles.d'
         'service')
-sha1sums=('cb95efa819902799365691a0a7ddb3690a97df88'
-          'f35ecb887e86ae0a54ac70aef5a7577fc8761877')
+sha1sums=('b3ebd669be8e830f62062d12be55242ca41da369'
+          '7ad2b8da961a893095eede8963cf8026b13186a1'
+          '491bf9c6e63644f7d6c81d3b16138f0d87706aa0')
 
 install=install
 
@@ -25,7 +27,7 @@ build() {
 		--prefix=/ \
 		--sbindir=/usr/bin \
 		--datarootdir=/usr/share \
-		--with-pidfile=/run/nsd.pid \
+		--with-pidfile=/run/nsd/nsd.pid \
 		--enable-ratelimit
 	make
 }
@@ -33,7 +35,10 @@ build() {
 package() {
 	cd "${srcdir}/${pkgname}-${pkgver}"
 	make DESTDIR="${pkgdir}" install
+	install -Dm644 ../tmpfiles.d "${pkgdir}"/usr/lib/tmpfiles.d/nsd.conf
 	install -Dm644 ../service "${pkgdir}"/usr/lib/systemd/system/nsd.service
+	rmdir "${pkgdir}"/{tmp,run/{nsd,}}
+
 	rm doc/differences.pdf
 	install -d "${pkgdir}"/usr/share/{doc,licenses}/"${pkgname}"
 	install -m644 doc/* "${pkgdir}"/usr/share/doc/"${pkgname}"
diff --git a/community/nsd/install b/community/nsd/install
index 5a5f41dd7..6e56e9ba1 100644
--- a/community/nsd/install
+++ b/community/nsd/install
@@ -5,6 +5,10 @@ post_install() {
 	chmod 700 /var/db/nsd
 }
 
+post_upgrade() {
+	usr/bin/systemd-tmpfiles --create nsd.conf || true
+}
+
 post_remove() {
 	getent passwd nsd &>/dev/null && userdel nsd >/dev/null
 	getent group nsd &>/dev/null && groupdel nsd >/dev/null
diff --git a/community/nsd/service b/community/nsd/service
index ca423c29c..b6125a686 100644
--- a/community/nsd/service
+++ b/community/nsd/service
@@ -3,11 +3,10 @@ Description=NSD Name Server Daemon
 After=network.target
 
 [Service]
-Type=forking
-PIDFile=/run/nsd.pid
-ExecStart=/usr/bin/nsdc start
-ExecReload=/usr/bin/nsdc reload
-ExecStop=/usr/bin/nsdc stop
+PIDFile=/run/nsd/nsd.pid
+ExecStart=/usr/bin/nsd -c /etc/nsd/nsd.conf
+ExecReload=/bin/kill -HUP $MAINPID
+ExecStop=/bin/kill -TERM $MAINPID
 
 [Install]
 WantedBy=multi-user.target
diff --git a/community/nsd/tmpfiles.d b/community/nsd/tmpfiles.d
new file mode 100644
index 000000000..3fd3273d0
--- /dev/null
+++ b/community/nsd/tmpfiles.d
@@ -0,0 +1 @@
+d /run/nsd 0755 nsd nsd
diff --git a/community/ntop/PKGBUILD b/community/ntop/PKGBUILD
index 94e93fe5f..bc3713b89 100644
--- a/community/ntop/PKGBUILD
+++ b/community/ntop/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 96996 2013-09-10 01:53:10Z bgyorgy $
+# $Id: PKGBUILD 99930 2013-10-31 02:32:10Z allan $
 # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de>
 # Contributor: Douglas Soares de Andrade <douglas@archlinux.org>
 
@@ -11,7 +11,7 @@ url='http://www.ntop.org/'
 license=('GPL')
 depends=('libevent' 'libpcap' 'gd' 'glibc' 'libxml2' 'openssl' 'rrdtool' 'pcre' 'geoip' 'lua' 'python2')
 makedepends=('subversion' 'wget' 'ca-certificates')
-options=('!libtool' '!makeflags')
+options=('!makeflags')
 install='ntop.install'
 source=("http://sourceforge.net/projects/${pkgname}/files/${pkgname}/Stable/${pkgname}-${pkgver}.tar.gz"
         'ntop.service')
diff --git a/community/oath-toolkit/PKGBUILD b/community/oath-toolkit/PKGBUILD
index 737acc1b9..d3d8ced44 100644
--- a/community/oath-toolkit/PKGBUILD
+++ b/community/oath-toolkit/PKGBUILD
@@ -1,19 +1,19 @@
-# $Id: PKGBUILD 94352 2013-07-22 08:32:55Z seblu $
+# $Id: PKGBUILD 98970 2013-10-21 20:20:39Z seblu $
 # Maintainer: Sébastien Luttringer
 # Contributor: Christian Hesse <mail@eworm.de>
 # Contributor: L42y <423300@gmail.com>
 
 pkgname=oath-toolkit
 pkgver=2.4.0
-pkgrel=1
+pkgrel=2
 pkgdesc='OATH one-time password toolkit'
 arch=('i686' 'x86_64' 'mips64el')
 url='http://www.nongnu.org/oath-toolkit/'
 license=('GPL3')
 depends=('glibc' 'pam' 'xmlsec')
-options=('!libtool')
-source=("http://download.savannah.nongnu.org/releases/$pkgname/$pkgname-$pkgver.tar.gz")
-md5sums=('456774fbc37d5267e4e8920694b7ad48')
+source=("http://download.savannah.nongnu.org/releases/$pkgname/$pkgname-$pkgver.tar.gz"{,.sig})
+md5sums=('456774fbc37d5267e4e8920694b7ad48'
+         'SKIP')
 
 build() {
   cd $pkgname-$pkgver
diff --git a/community/obby/PKGBUILD b/community/obby/PKGBUILD
index e7331c49c..fcfe8fba4 100644
--- a/community/obby/PKGBUILD
+++ b/community/obby/PKGBUILD
@@ -1,14 +1,13 @@
-# $Id: PKGBUILD 65712 2012-02-22 10:21:10Z spupykin $
+# $Id: PKGBUILD 100259 2013-11-02 08:44:27Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: William Rea <sillywilly@gmail.com>
 # Maintainer: Angel 'angvp' Velasquez <angvp[at]archlinux.com.ve>
 
 pkgname=obby
 pkgver=0.4.8
-pkgrel=1.1
+pkgrel=2
 pkgdesc="A library which provides synced document buffers"
 url="http://gobby.0x539.de"
-options=('!libtool')
 license=('GPL')
 arch=('i686' 'x86_64' 'mips64el')
 depends=('net6' 'avahi' 'libsigc++')
@@ -19,5 +18,9 @@ build() {
   cd $srcdir/obby-$pkgver
   ./configure --prefix=/usr --with-zeroconf --enable-ipv6
   make
+}
+
+package() {
+  cd $srcdir/obby-$pkgver
   make DESTDIR=$pkgdir install
 }
diff --git a/community/ogle/PKGBUILD b/community/ogle/PKGBUILD
index 9c4d8a993..1b4ae91c6 100644
--- a/community/ogle/PKGBUILD
+++ b/community/ogle/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 98421 2013-10-10 01:44:06Z eric $
+# $Id: PKGBUILD 99932 2013-10-31 02:32:50Z allan $
 # Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgname=ogle
@@ -10,7 +10,6 @@ url="http://www.dtek.chalmers.se/groups/dvd/"
 license=('GPL')
 depends=('sh' 'libxml2' 'libdvdread' 'libjpeg' 'libmad' 'libxinerama' 'libxv'
          'alsa-lib' 'a52dec' 'libxxf86vm')
-options=('!libtool')
 # http://www.dtek.chalmers.se/groups/dvd/dist/${pkgname}-${pkgver}.tar.gz
 source=(ftp://ftp.archlinux.org/other/ogle/${pkgname}-${pkgver}.tar.gz \
         xvideofix.patch	gcc34alsafix.patch gcc4.patch dvdread-4.1.3.patch \
diff --git a/community/oolite/PKGBUILD b/community/oolite/PKGBUILD
index 6d3ca4b2f..61fee0ad7 100644
--- a/community/oolite/PKGBUILD
+++ b/community/oolite/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 96992 2013-09-09 20:32:19Z bgyorgy $
+# $Id: PKGBUILD 99040 2013-10-23 00:39:15Z svenstaro $
 # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
 # Contributor: Lone_Wolf <lonewolf@xs4all.nl>
 pkgname=oolite
-pkgver=1.77
-pkgrel=3
+pkgver=1.77.1
+pkgrel=1
 pkgdesc="A space-sim based on the classic Elite"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://oolite-linux.berlios.de"
@@ -14,7 +14,7 @@ options=(!makeflags)
 source=(oolite
         http://download.berlios.de/oolite-linux/oolite-source-${pkgver}.tar.bz2)
 md5sums=('b182976fade9b64a3b3702e2a8c72bf0'
-         '78e0f1da12d1478534eb2af4d0983b01')
+         '6d446df433fde796964c68856389c8dd')
 
 build() {
     cd $srcdir
diff --git a/community/openarena/PKGBUILD b/community/openarena/PKGBUILD
deleted file mode 100644
index 5a7b25bce..000000000
--- a/community/openarena/PKGBUILD
+++ /dev/null
@@ -1,70 +0,0 @@
-# $Id: PKGBUILD 64715 2012-02-18 02:34:57Z svenstaro $
-# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
-# Contributor: Arkham <arkham at archlinux dot us>
-# Contributor: Christoph Zeiler <archNOSPAM_at_moonblade.dot.org>
-
-pkgname=openarena
-pkgver=0.8.8
-_oldver=0.8.1
-pkgrel=1
-pkgdesc="A violent, sexy, multiplayer first person shooter based on the ioquake3 engine"
-arch=('i686' 'x86_64' 'mips64el')
-url="http://openarena.ws/"
-license=('GPL')
-depends=('sdl' 'libvorbis' 'curl' 'openarena-data')
-makedepends=('openal' 'mesa')
-optdepends=('openal')
-source=(http://download.tuxfamily.org/$pkgname/rel/081/oa081.zip
-        http://download.tuxfamily.org/$pkgname/rel/085/oa085p.zip
-        http://178.63.102.135/svens_stuff/oa088p.zip
-        $url/svn/source/081/$pkgname-engine-$_oldver-1.tar.bz2
-        $pkgname.png
-        $pkgname-server.png
-        $pkgname.desktop
-        $pkgname-server.desktop
-        strcpy-memmove.patch)
-md5sums=('49006bcb02b4e8ea3d06749e8f4e4887'
-         'b2a0437da751cd50dd2351ed9e0c4e9d'
-         '45da37955eba40cfd0e6e0f89cbb4b61'
-         '4ee696eacc4b0350f9dbb5588dcd74a2'
-         'c69f824dc500d436fc631b78b6a62dc8'
-         '17e2f4fa060ed97ff6fe1eaff647bcfb'
-         '229c87648c10e48b523c25d24aba8372'
-         '00649517a4dd08cd9c6e99d6703f01f1'
-         '723ec16d949f454588d62da499bbefca')
-
-build() {
-    cd $srcdir/$pkgname-engine-$_oldver
-
-    patch -Np0 < $srcdir/strcpy-memmove.patch
-    sed -i 's/#define ALDRIVER_DEFAULT "libopenal.so.0"/#define ALDRIVER_DEFAULT "libopenal.so.1"/g' code/client/snd_openal.c
-
-    make DEFAULT_BASEDIR=/usr/share/$pkgname \
-        BUILD_CLIENT_SMP=0 \
-        USE_LOCAL_HEADERS=0 \
-        GENERATE_DEPENDENCIES=0 \
-        OPTIMIZE=
-}
-
-package() {
-    cd $srcdir/$pkgname-engine-$_oldver
-
-    install -d $pkgdir/usr/{bin,share/{$pkgname,applications,pixmaps}}
-
-    make COPYDIR=$pkgdir/usr/share/$pkgname copyfiles
-
-    [ "$CARCH" = "x86_64" ] && {
-        mv -f $pkgdir/usr/share/$pkgname/$pkgname.$CARCH $pkgdir/usr/bin/$pkgname
-        mv -f $pkgdir/usr/share/$pkgname/oa_ded.$CARCH $pkgdir/usr/bin/$pkgname-server
-    } || {
-        mv -f $pkgdir/usr/share/$pkgname/$pkgname.i386 $pkgdir/usr/bin/$pkgname
-        mv -f $pkgdir/usr/share/$pkgname/oa_ded.i386 $pkgdir/usr/bin/$pkgname-server
-    }
-
-    find $pkgdir/usr/share -type f -exec chmod 644 {} +
-
-    install -m 644 $srcdir/$pkgname{,-server}.png $pkgdir/usr/share/pixmaps/
-    install -m 644 $srcdir/$pkgname{,-server}.desktop $pkgdir/usr/share/applications/
-}
-
-# vim: sw=2:ts=2 et:
diff --git a/community/openarena/openarena-server.desktop b/community/openarena/openarena-server.desktop
deleted file mode 100644
index 47bc786a2..000000000
--- a/community/openarena/openarena-server.desktop
+++ /dev/null
@@ -1,8 +0,0 @@
-[Desktop Entry]
-Name=OpenArena Server
-Exec=openarena-server
-Icon=openarena-server
-Type=Application
-Terminal=true
-Comment=Run an OpenArena server
-Categories=Network;
diff --git a/community/openarena/openarena-server.png b/community/openarena/openarena-server.png
deleted file mode 100644
index 55c5177f5..000000000
--- a/community/openarena/openarena-server.png
+++ /dev/null
diff --git a/community/openarena/openarena.desktop b/community/openarena/openarena.desktop
deleted file mode 100644
index 321461a32..000000000
--- a/community/openarena/openarena.desktop
+++ /dev/null
@@ -1,7 +0,0 @@
-[Desktop Entry]
-Name=OpenArena
-Exec=openarena
-Icon=openarena
-Type=Application
-Comment=A Quake3-based FPS Game
-Categories=Game;ActionGame;
diff --git a/community/openarena/openarena.png b/community/openarena/openarena.png
deleted file mode 100644
index 0fa1f4ec3..000000000
--- a/community/openarena/openarena.png
+++ /dev/null
diff --git a/community/openarena/strcpy-memmove.patch b/community/openarena/strcpy-memmove.patch
deleted file mode 100644
index 0123af61a..000000000
--- a/community/openarena/strcpy-memmove.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- code/botlib/l_script.c.orig 2009-11-02 20:29:23.000000000 +0100
-+++ code/botlib/l_script.c	2009-11-02 22:21:40.000000000 +0100
-@@ -1118,7 +1118,7 @@
- {
-	if (*string == '\"')
-	{
--		strcpy(string, string+1);
-+		memmove(string, string+1, strlen(string));
-	} //end if
-	if (string[strlen(string)-1] == '\"')
-	{
-@@ -1135,7 +1135,7 @@
- {
-	if (*string == '\'')
-	{
--		strcpy(string, string+1);
-+		memmove(string, string+1, strlen(string));
-	} //end if
-	if (string[strlen(string)-1] == '\'')
-	{
diff --git a/community/openbox/PKGBUILD b/community/openbox/PKGBUILD
index 4a7c90e11..244ce68ad 100644
--- a/community/openbox/PKGBUILD
+++ b/community/openbox/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 98381 2013-10-09 08:18:19Z bgyorgy $
+# $Id: PKGBUILD 99934 2013-10-31 02:33:31Z allan $
 # Maintainer:  Bartłomiej Piotrowski <nospam@bpiotrowski.pl>
 # Contributor: Brad Fanella <bradfanella@archlinux.us>
 # Contributor: Andrea Scarpino <andrea@archlinux.org>
@@ -6,7 +6,7 @@
 
 pkgname=openbox
 pkgver=3.5.2
-pkgrel=5
+pkgrel=6
 pkgdesc='Highly configurable and lightweight X11 window manager'
 arch=('i686' 'x86_64' 'mips64el')
 url='http://openbox.org'
@@ -16,7 +16,6 @@ depends=('startup-notification' 'libxml2' 'libxinerama' 'libxrandr'
 optdepends=('kdebase-workspace: for the KDE/Openbox xsession'
             'python2-xdg: for the openbox-xdg-autostart script')
 groups=('lxde')
-options=('!libtool')
 backup=('etc/xdg/openbox/menu.xml' 'etc/xdg/openbox/rc.xml'
         'etc/xdg/openbox/autostart' 'etc/xdg/openbox/environment')
 source=(http://www.icculus.org/openbox/releases/$pkgname-$pkgver.tar.gz
diff --git a/community/opencc/PKGBUILD b/community/opencc/PKGBUILD
index c6913eebf..76630140b 100644
--- a/community/opencc/PKGBUILD
+++ b/community/opencc/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 95956 2013-08-19 06:36:39Z fyan $
+# $Id: PKGBUILD 99152 2013-10-25 05:05:17Z fyan $
 # Maintainer: Felix Yan <felixonmars@gmail.com>
 
 pkgbase=opencc
 pkgname=(opencc opencc-doc)
 pkgver=0.4.3
-pkgrel=1
+pkgrel=2
 url="http://code.google.com/p/opencc/"
 arch=('i686' 'x86_64' 'mips64el')
 license=('Apache')
@@ -12,7 +12,7 @@ makedepends=('cmake' 'doxygen')
 source=("http://opencc.googlecode.com/files/${pkgbase}-${pkgver}.tar.gz")
 
 build() {
-  cd "$srcdir/${pkgbase}-${pkgver}"
+  cd ${pkgbase}-${pkgver}
   cmake -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release -DBUILD_DOCUMENTATION:BOOL=ON
   make
 }
@@ -21,7 +21,7 @@ package_opencc() {
   pkgdesc="Library for Open Chinese Convert"
   depends=('glibc')
 
-  cd "$srcdir/${pkgbase}-${pkgver}"
+  cd ${pkgbase}-${pkgver}
   make DESTDIR="${pkgdir}" install
   
   # Remove docs - install in splitted package
@@ -31,7 +31,7 @@ package_opencc() {
 package_opencc-doc() {
   pkgdesc="Documentation for Library for Open Chinese Convert"
 
-  cd "$srcdir/${pkgbase}-${pkgver}/doc"
+  cd ${pkgbase}-${pkgver}/doc
   make DESTDIR="${pkgdir}" install
 
   # Remove manpages - already installed in main package
diff --git a/community/opendkim/PKGBUILD b/community/opendkim/PKGBUILD
index 16596caec..e735ca6a5 100644
--- a/community/opendkim/PKGBUILD
+++ b/community/opendkim/PKGBUILD
@@ -1,17 +1,17 @@
-# $Id: PKGBUILD 97519 2013-09-23 16:14:28Z spupykin $
+# $Id: PKGBUILD 100261 2013-11-02 08:44:51Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: Thomas Jost <schnouki@schnouki.net>
 
 pkgname=opendkim
 pkgver=2.8.4
-pkgrel=1
+pkgrel=2
 pkgdesc="An open source implementation of the DKIM sender authentication system. Based on a fork of dkim-milter."
 arch=(i686 x86_64)
 url="http://www.opendkim.org/"
 license=('BSD' 'custom:Sendmail')
 depends=("db" "openssl")
 makedepends=("libmilter")
-options=(!libtool !emptydirs)
+options=(!emptydirs)
 backup=(etc/conf.d/opendkim)
 install=opendkim.install
 source=(http://downloads.sourceforge.net/project/$pkgname/$pkgname-$pkgver.tar.gz
diff --git a/community/openjpeg2/PKGBUILD b/community/openjpeg2/PKGBUILD
new file mode 100644
index 000000000..70d22140d
--- /dev/null
+++ b/community/openjpeg2/PKGBUILD
@@ -0,0 +1,25 @@
+# $Id: PKGBUILD 99936 2013-10-31 02:34:11Z allan $
+# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
+
+pkgname=openjpeg2
+pkgver=2.0.0
+pkgrel=1
+pkgdesc="An open source JPEG 2000 codec, version ${pkgver}"
+arch=(i686 x86_64)
+license=('BSD')
+url="http://www.openjpeg.org"
+makedepends=('cmake')
+depends=('zlib')
+source=(http://openjpeg.googlecode.com/files/openjpeg-${pkgver}.tar.gz)
+sha1sums=('0af78ab2283b43421458f80373422d8029a9f7a7')
+
+build() {
+  cd "${srcdir}/openjpeg-${pkgver}"
+  cmake -DCMAKE_INSTALL_PREFIX=/usr .
+  make
+}
+
+package() {
+  cd "${srcdir}/openjpeg-${pkgver}"
+  make DESTDIR="${pkgdir}" install
+}
diff --git a/community/openmotif/PKGBUILD b/community/openmotif/PKGBUILD
index 53e19485f..5e435a054 100644
--- a/community/openmotif/PKGBUILD
+++ b/community/openmotif/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 90072 2013-05-06 19:38:52Z foutrelis $
+# $Id: PKGBUILD 100263 2013-11-02 08:45:17Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Enrico Morelli <morelli@cerm.unifi.it>
 
 pkgname=openmotif
 pkgver=2.3.4
-pkgrel=2
+pkgrel=3
 pkgdesc="Open Motif"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.motifzone.org/"
@@ -12,7 +12,6 @@ license=('GPL')
 depends=(libxext libxp libxft libxt libxmu libpng libjpeg)
 makedepends=(xbitmaps xproto printproto xextproto automake)
 conflicts=(lesstif)
-options=('!libtool')
 source=("http://downloads.sourceforge.net/project/motif/Motif%20$pkgver%20Source%20Code/motif-$pkgver-src.tgz")
 md5sums=('612bb8127d0d31da6e5474edf8a5c247')
 
diff --git a/community/openocd/PKGBUILD b/community/openocd/PKGBUILD
index e8e28114f..9d97f05f1 100644
--- a/community/openocd/PKGBUILD
+++ b/community/openocd/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 89932 2013-05-05 20:07:45Z bpiotrowski $
+# $Id: PKGBUILD 100265 2013-11-02 08:45:37Z spupykin $
 # Maintainer:  Bartłomiej Piotrowski <barthalion@gmail.com>
 # Contributor: Matthias Bauch <matthias.bauch@gmail.com>
 # Contributor: Laszlo Papp <djszapi2 at gmail com>
@@ -6,13 +6,13 @@
 
 pkgname=openocd
 pkgver=0.7.0
-pkgrel=1
+pkgrel=2
 pkgdesc='Debugging, in-system programming and boundary-scan testing for embedded target devices'
 arch=('i686' 'x86_64' 'mips64el')
 url='http://openocd.berlios.de'
 license=('GPL')
 depends=('libftdi')
-options=(!strip !libtool)
+options=(!strip)
 install=openocd.install
 source=(http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.bz2)
 sha256sums=('52237b786530c8460b221556c26fa4779f668b7dcb83ff14b8c5eb2050f38e63')
diff --git a/community/opensc/0001-pkcs15-regression-in-e35febe-compute-cert-length.patch b/community/opensc/0001-pkcs15-regression-in-e35febe-compute-cert-length.patch
new file mode 100644
index 000000000..057452e1b
--- /dev/null
+++ b/community/opensc/0001-pkcs15-regression-in-e35febe-compute-cert-length.patch
@@ -0,0 +1,114 @@
+From cc5a171ddcc8e49b2252135daac9ad3aa6d66ae7 Mon Sep 17 00:00:00 2001
+From: Viktor Tarasov <viktor.tarasov@gmail.com>
+Date: Tue, 25 Dec 2012 20:05:45 +0100
+Subject: [PATCH] pkcs15: regression in e35febe: compute cert length
+
+parse_x509_cert() reviewed.
+Now certificate's DER data are allocated and the DER data length is determined in one place.
+
+https://github.com/OpenSC/OpenSC/pull/114
+https://github.com/OpenSC/OpenSC/commit/e35febe
+---
+ src/libopensc/pkcs15-cert.c | 37 +++++++++++++++++++------------------
+ 1 file changed, 19 insertions(+), 18 deletions(-)
+
+diff --git a/src/libopensc/pkcs15-cert.c b/src/libopensc/pkcs15-cert.c
+index 86bea25..9b08aac 100644
+--- a/src/libopensc/pkcs15-cert.c
++++ b/src/libopensc/pkcs15-cert.c
+@@ -34,13 +34,13 @@
+ #include "pkcs15.h"
+ 
+ static int
+-parse_x509_cert(sc_context_t *ctx, const u8 *buf, size_t buflen, struct sc_pkcs15_cert *cert)
++parse_x509_cert(sc_context_t *ctx, struct sc_pkcs15_der *der, struct sc_pkcs15_cert *cert)
+ {
+ 	int r;
+ 	struct sc_algorithm_id sig_alg;
+-	struct sc_pkcs15_pubkey  * pubkey = NULL;
+-	u8 *serial = NULL;
+-	size_t serial_len = 0;
++	struct sc_pkcs15_pubkey *pubkey = NULL;
++	unsigned char *serial = NULL, *buf =  der->value;
++	size_t serial_len = 0, data_len = 0, buflen = der->len;
+ 	struct sc_asn1_entry asn1_version[] = {
+ 		{ "version", SC_ASN1_INTEGER, SC_ASN1_TAG_INTEGER, 0, &cert->version, NULL },
+ 		{ NULL, 0, 0, 0, NULL, NULL }
+@@ -87,30 +87,32 @@ parse_x509_cert(sc_context_t *ctx, const u8 *buf, size_t buflen, struct sc_pkcs1
+ 	if (obj == NULL)
+ 		LOG_TEST_RET(ctx, SC_ERROR_INVALID_ASN1_OBJECT, "X.509 certificate not found");
+ 
+-	cert->data.len = objlen + (obj - buf);
++	data_len = objlen + (obj - buf);
++	cert->data.value = malloc(data_len);
++	if (!cert->data.value)
++		LOG_FUNC_RETURN(ctx, SC_ERROR_OUT_OF_MEMORY);
++	memcpy(cert->data.value, buf, data_len);
++	cert->data.len = data_len;
++
+ 	r = sc_asn1_decode(ctx, asn1_cert, obj, objlen, NULL, NULL);
+ 	LOG_TEST_RET(ctx, r, "ASN.1 parsing of certificate failed");
+ 
+ 	cert->version++;
+ 
+-	if (pubkey) {
+-		cert->key = pubkey;
+-		pubkey = NULL;
+-	}
+-	else {
++	if (!pubkey)
+ 		LOG_TEST_RET(ctx, SC_ERROR_INVALID_ASN1_OBJECT, "Unable to decode subjectPublicKeyInfo from cert");
+-	}
++	cert->key = pubkey;
++
+ 	sc_asn1_clear_algorithm_id(&sig_alg);
+-	if (r < 0)
+-		return r;
+ 
+ 	if (serial && serial_len)   {
+ 		sc_format_asn1_entry(asn1_serial_number + 0, serial, &serial_len, 1);
+ 		r = sc_asn1_encode(ctx, asn1_serial_number, &cert->serial, &cert->serial_len);
+ 		free(serial);
++		LOG_TEST_RET(ctx, r, "ASN.1 encoding of serial failed");
+ 	}
+ 
+-	return r;
++	return SC_SUCCESS;
+ }
+ 
+ 
+@@ -125,7 +127,7 @@ sc_pkcs15_pubkey_from_cert(struct sc_context *ctx,
+ 	if (cert == NULL)
+ 		return SC_ERROR_OUT_OF_MEMORY;
+ 
+-	rv = parse_x509_cert(ctx, cert_blob->value, cert_blob->len, cert);
++	rv = parse_x509_cert(ctx, cert_blob, cert);
+ 
+ 	*out = cert->key;
+ 	cert->key = NULL;
+@@ -158,20 +160,19 @@ sc_pkcs15_read_certificate(struct sc_pkcs15_card *p15card, const struct sc_pkcs1
+ 		return SC_ERROR_OBJECT_NOT_FOUND;
+ 	}
+ 
+-
+ 	cert = malloc(sizeof(struct sc_pkcs15_cert));
+ 	if (cert == NULL) {
+ 		free(der.value);
+ 		return SC_ERROR_OUT_OF_MEMORY;
+ 	}
+ 	memset(cert, 0, sizeof(struct sc_pkcs15_cert));
+-	if (parse_x509_cert(p15card->card->ctx, der.value, der.len, cert)) {
++	if (parse_x509_cert(p15card->card->ctx, &der, cert)) {
+ 		free(der.value);
+ 		sc_pkcs15_free_certificate(cert);
+ 		return SC_ERROR_INVALID_ASN1_OBJECT;
+ 	}
++	free(der.value);
+ 
+-	cert->data = der;
+ 	*cert_out = cert;
+ 	return SC_SUCCESS;
+ }
+-- 
+1.8.4
+
diff --git a/community/opensc/0002-epass2003-properly-disable-padding.patch b/community/opensc/0002-epass2003-properly-disable-padding.patch
new file mode 100644
index 000000000..0e3ad65fb
--- /dev/null
+++ b/community/opensc/0002-epass2003-properly-disable-padding.patch
@@ -0,0 +1,39 @@
+From b1a4775310a4e30d8fd5c1cc91e60971f922e64a Mon Sep 17 00:00:00 2001
+From: Zbigniew Halas <zhalas@gmail.com>
+Date: Wed, 27 Feb 2013 23:44:02 +0000
+Subject: [PATCH] epass2003: properly disable padding
+
+EVP_CIPHER_CTX_set_padding needs to be called after EVP_EncryptInit_ex
+and EVP_DecryptInit_ex, otherwise padding is re-enabled, which in turn
+causes buffer overruns
+---
+ src/libopensc/card-epass2003.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/libopensc/card-epass2003.c b/src/libopensc/card-epass2003.c
+index 80088b9..6f04573 100644
+--- a/src/libopensc/card-epass2003.c
++++ b/src/libopensc/card-epass2003.c
+@@ -117,8 +117,8 @@
+ 
+ 	memcpy(iv_tmp, iv, EVP_MAX_IV_LENGTH);
+ 	EVP_CIPHER_CTX_init(&ctx);
+-	EVP_CIPHER_CTX_set_padding(&ctx, 0);
+ 	EVP_EncryptInit_ex(&ctx, cipher, NULL, key, iv_tmp);
++	EVP_CIPHER_CTX_set_padding(&ctx, 0);
+ 
+ 	if (!EVP_EncryptUpdate(&ctx, output, &outl, input, length))
+ 		goto out;
+@@ -146,8 +146,8 @@
+ 
+ 	memcpy(iv_tmp, iv, EVP_MAX_IV_LENGTH);
+ 	EVP_CIPHER_CTX_init(&ctx);
+-	EVP_CIPHER_CTX_set_padding(&ctx, 0);
+ 	EVP_DecryptInit_ex(&ctx, cipher, NULL, key, iv_tmp);
++	EVP_CIPHER_CTX_set_padding(&ctx, 0);
+ 
+ 	if (!EVP_DecryptUpdate(&ctx, output, &outl, input, length))
+ 		goto out;
+-- 
+1.8.4
+
diff --git a/community/opensc/PKGBUILD b/community/opensc/PKGBUILD
index d841f7f5c..5f07606f5 100644
--- a/community/opensc/PKGBUILD
+++ b/community/opensc/PKGBUILD
@@ -1,20 +1,29 @@
-# $Id: PKGBUILD 84027 2013-02-08 13:50:52Z seblu $
+# $Id: PKGBUILD 100414 2013-11-03 18:13:58Z seblu $
 # Maintainer: Sébastien Luttringer
 # Contributor: kevku <kevku@msn.com>
 
 pkgname=opensc
 pkgver=0.13.0
-pkgrel=2
-pkgdesc='Access smart cards that support cryptographic operations'
+pkgrel=4
+pkgdesc='Tools and libraries for smart cards'
 arch=('x86_64' 'i686' 'mips64el')
-url='http://www.opensc-project.org/opensc/'
+url='https://github.com/OpenSC/OpenSC/wiki'
 license=('LGPL')
 backup=('etc/opensc.conf')
 makedepends=('docbook-xsl')
 depends=('openssl' 'pcsclite' 'libltdl')
-options=('!libtool' '!emptydirs')
-source=("http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz")
-md5sums=('74a10de6c646bdaae307d6dc9e9accc0')
+options=('!emptydirs')
+source=("http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz"
+        '0001-pkcs15-regression-in-e35febe-compute-cert-length.patch'
+        '0002-epass2003-properly-disable-padding.patch')
+md5sums=('74a10de6c646bdaae307d6dc9e9accc0'
+         '49a0989c169decf6876a3a9631289dbc'
+         '68fe80c8fb6c28c0bcf9d36e3245e4ae')
+
+prepare() {
+  patch -p1 -d $pkgname-$pkgver < 0001-pkcs15-regression-in-e35febe-compute-cert-length.patch
+  patch -p1 -d $pkgname-$pkgver < 0002-epass2003-properly-disable-padding.patch
+}
 
 build() {
   cd $pkgname-$pkgver
diff --git a/community/openttd/PKGBUILD b/community/openttd/PKGBUILD
index c4f6e8eda..ab236ce97 100644
--- a/community/openttd/PKGBUILD
+++ b/community/openttd/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 94719 2013-07-29 13:10:04Z lcarlier $
+# $Id: PKGBUILD 98744 2013-10-17 14:01:51Z andyrtr $
 # Maintainer: Vesa Kaihlavirta <vegai@iki.fi>
 
 pkgname=openttd
 pkgver=1.3.2
-pkgrel=1
+pkgrel=2
 pkgdesc='An engine for running Transport Tycoon Deluxe.'
 arch=('i686' 'x86_64' 'mips64el')
 url='http://www.openttd.org'
diff --git a/community/oprofile/PKGBUILD b/community/oprofile/PKGBUILD
index 25c3339ef..4b60d5830 100644
--- a/community/oprofile/PKGBUILD
+++ b/community/oprofile/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 95213 2013-08-06 18:59:38Z bpiotrowski $
+# $Id: PKGBUILD 99941 2013-10-31 02:35:52Z allan $
 # Maintainer : Aaron Griffin <aaron@archlinux.org>
 
 pkgname=oprofile
@@ -11,7 +11,6 @@ license=('GPL')
 depends=('popt' 'gcc-libs' 'zlib' 'sh')
 makedepends=('qt4')
 optdepends=('qt4: for oprof_start gui')
-options=('!libtool')
 install=oprofile.install
 source=(http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.gz)
 sha1sums=('02a1f6609affb04a348dbddfdf8f03e66154f5be')
diff --git a/community/opusfile/PKGBUILD b/community/opusfile/PKGBUILD
index 9dcdffb38..0baa6a90f 100644
--- a/community/opusfile/PKGBUILD
+++ b/community/opusfile/PKGBUILD
@@ -1,28 +1,27 @@
-# $Id: PKGBUILD 81936 2013-01-03 21:13:51Z bpiotrowski $
+# $Id: PKGBUILD 99942 2013-10-31 02:36:12Z allan $
 # Maintainer:  Bartłomiej Piotrowski <nospam@bpiotrowski.pl>
 # Contributor: DrZaius <lou[at]fakeoutdoorsman[dot]com>
 
 pkgname=opusfile
 pkgver=0.2
-pkgrel=2
+pkgrel=3
 pkgdesc='Library for opening, seeking, and decoding .opus files'
 arch=('i686' 'x86_64' 'mips64el')
 url='http://www.opus-codec.org/'
 license=('custom')
 depends=('libogg' 'openssl' 'opus')
-options=('!libtool')
 source=(http://downloads.xiph.org/releases/opus/${pkgname}-${pkgver}.tar.gz)
 md5sums=('454375f51fb2f84bef9bf2fbf9535bb1')
 
 build() {
-  cd $srcdir/$pkgname-$pkgver
+  cd $pkgname-$pkgver
   ./configure --prefix=/usr
   make
 }
 
 package() {
-  cd $srcdir/$pkgname-$pkgver
-  make DESTDIR=$pkgdir install
+  cd $pkgname-$pkgver
+  make DESTDIR="$pkgdir" install
 
-  install -Dm644 COPYING $pkgdir/usr/share/licenses/opusfile/LICENSE
+  install -Dm644 COPYING "$pkgdir"/usr/share/licenses/opusfile/LICENSE
 }
diff --git a/community/orange/PKGBUILD b/community/orange/PKGBUILD
index bac0e9895..3e1a993da 100644
--- a/community/orange/PKGBUILD
+++ b/community/orange/PKGBUILD
@@ -1,16 +1,15 @@
-# $Id: PKGBUILD 96054 2013-08-19 13:05:21Z spupykin $
+# $Id: PKGBUILD 100269 2013-11-02 08:46:38Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Zhukov Pavel <gelios@gmail.com>
 
 pkgname=orange
 pkgver=0.4
-pkgrel=5
+pkgrel=6
 pkgdesc="a helper tool for synce"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://synce.sourceforge.net/"
 license=("GPL")
 depends=('dynamite' 'synce-libsynce' 'file' 'unshield')
-options=('!libtool')
 source=(http://downloads.sourceforge.net/sourceforge/synce/liborange-$pkgver.tar.gz)
 md5sums=('40e9ac3de389c74a60007f7493e072a5')
 
diff --git a/community/osmo/PKGBUILD b/community/osmo/PKGBUILD
index ba1f32ae5..f0cd673b5 100644
--- a/community/osmo/PKGBUILD
+++ b/community/osmo/PKGBUILD
@@ -1,36 +1,38 @@
-# $Id: PKGBUILD 90853 2013-05-14 21:40:39Z andrea $
+# $Id: PKGBUILD 100091 2013-11-01 14:16:00Z eric $
 # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
 # Contributor: Geoffroy Carrier <geoffroy.carrier@koon.fr>
 # Contributor: Benzo <mb_benzo@yahoo.es>
 
 pkgname=osmo
-pkgver=0.2.10
-pkgrel=8
+pkgver=0.2.12
+pkgrel=1
 pkgdesc="A handy personal organizer"
+_svnver=937
 arch=('i686' 'x86_64' 'mips64el')
 url="http://clayo.org/osmo/"
 license=('GPL')
-depends=('gtk2>=2.12' 'gtkspell' 'hicolor-icon-theme' 'libical' 'libnotify'  'libgtkhtml' 'libgringotts>=1.2.1' 'libxml2')
-makedepends=('pkgconfig' 'libtar')
+depends=('gtkspell' 'hicolor-icon-theme' 'libical' 'libnotify' 'webkitgtk2' 'libgringotts>=1.2.1' 'libxml2')
+makedepends=('libtar')
 optdepends=('sox: to play sounds')
-install=$pkgname.install
-source=("http://downloads.sourceforge.net/osmo-pim/$pkgname-$pkgver.tar.gz"
-        'osmo-0.2.10-libnotify-0.7.patch')
-md5sums=('a774db748228efee96186158d553ade9'
-         '0b146a548f2d3208dc88e6501a8f3448')
+install=osmo.install
+source=(ftp://ftp.archlinux.org/other/community/osmo/osmo-${_svnver}.tar.xz
+        osmo-0.2.10-configure.patch)
+md5sums=('ddcd0b23a24d8f1ec5abc904742233bf'
+         '122fc15441b6215081772a00aa532394')
 
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  patch -Np0 -i "$srcdir/osmo-0.2.10-libnotify-0.7.patch"
-
-  #libical 0.4.4 workaround
-  LIBICAL_CFLAGS='-I/usr/include/libical' ./configure --prefix=/usr
+prepare() {
+  cd osmo-pim
+  patch -Np1 -i ../osmo-0.2.10-configure.patch
+  autoreconf -fi
+}
 
+build() {
+  cd osmo-pim
+  ./configure --prefix=/usr
   make 
 }
 
 package() {
-  cd "$srcdir/$pkgname-$pkgver"
+  cd osmo-pim
   make DESTDIR="$pkgdir" install
 }
diff --git a/community/osmo/osmo-0.2.10-configure.patch b/community/osmo/osmo-0.2.10-configure.patch
new file mode 100644
index 000000000..c5e7895b2
--- /dev/null
+++ b/community/osmo/osmo-0.2.10-configure.patch
@@ -0,0 +1,24 @@
+--- osmo-pim/configure.ac	2011-08-15 19:06:25.184165142 -0700
++++ osmo-pim/configure.ac.new	2011-08-15 19:35:19.285312355 -0700
+@@ -4,7 +4,7 @@
+ AC_PREREQ(2.61)
+ AC_INIT([Osmo], [0.2.12], [pasp@users.sf.net])
+ AC_CONFIG_MACRO_DIR([m4])
+-AM_INIT_AUTOMAKE([-Wall -Werror foreign])
++AM_INIT_AUTOMAKE([-Werror foreign])
+ AC_CONFIG_SRCDIR([src/contacts.c])
+ AC_CONFIG_HEADER([config.h])
+ AC_MSG_CHECKING(for type of build)
+@@ -245,9 +245,9 @@
+ 			[configdir=$withval AC_SUBST([configdir])])
+ AM_CONDITIONAL([CONFIGDIR], [test x$configdir != x])
+ 
+-CFLAGS=${CFLAGS:="$BUILD_CFLAGS -Wall $PLATFORM_CFLAGS -D_GNU_SOURCE"}
+-CXXFLAGS=${CXXFLAGS:="$CFLAGS"}
+-CPPFLAGS=""
++CFLAGS="$BUILD_CFLAGS -Wall $PLATFORM_CFLAGS $CFLAGS"
++CXXFLAGS="$CFLAGS $CXXFLAGS"
++CPPFLAGS="-D_GNU_SOURCE"
+ LIBS="$gringotts_LIBS"
+ 
+ AC_CONFIG_FILES([
diff --git a/community/osmo/osmo.install b/community/osmo/osmo.install
index 66b9463d4..7b592b432 100644
--- a/community/osmo/osmo.install
+++ b/community/osmo/osmo.install
@@ -1,5 +1,5 @@
 post_install() {
-  which xdg-icon-resource 1>/dev/null 2>/dev/null && xdg-icon-resource forceupdate || true
+  gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor
 }
 
 post_upgrade() {
diff --git a/community/p2c/PKGBUILD b/community/p2c/PKGBUILD
index c55a1276d..87548c0cb 100644
--- a/community/p2c/PKGBUILD
+++ b/community/p2c/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 66145 2012-02-23 02:13:19Z spupykin $
+# $Id: PKGBUILD 100271 2013-11-02 08:46:57Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: tardo <tardo@nagi-fanboi.net>
 # Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com>
 
 pkgname=p2c
 pkgver=1.21alpha2
-pkgrel=10
+pkgrel=11
 pkgdesc="pascal to c/c++ converter"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://packages.debian.org/sid/p2c"
@@ -30,6 +30,10 @@ build() {
 	ABSHOMEDIR=/usr/lib/p2c \
 	ABSLIBDIR=/usr/lib \
 	ABSINCDIR=/usr/include/p2c
+}
+
+package() {
+  cd $srcdir/src
 
   mkdir -p  $pkgdir/usr/bin \
 	    $pkgdir/usr/share/man/man1 \
diff --git a/community/packagekit/PKGBUILD b/community/packagekit/PKGBUILD
index a7f65a030..84177351e 100644
--- a/community/packagekit/PKGBUILD
+++ b/community/packagekit/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 90942 2013-05-16 02:47:08Z jconder $
+# $Id: PKGBUILD 99944 2013-10-31 02:36:53Z allan $
 # Maintainer: Jonathan Conder <jonno.conder@gmail.com>
 pkgbase='packagekit'
 pkgname=('packagekit' 'packagekit-qt2' 'python2-packagekit')
@@ -11,7 +11,6 @@ license=('GPL')
 makedepends=('dbus-glib' 'gobject-introspection' 'gtk-doc' 'intltool'
              'networkmanager' 'pacman'  'pm-utils' 'polkit' 'python2' 'qt4'
              'shared-mime-info' 'sqlite' 'udev')
-options=('!libtool')
 source=("http://www.packagekit.org/releases/PackageKit-$pkgver.tar.xz"
         'adopt.patch'
 	'alpm.patch'
diff --git a/community/paco/PKGBUILD b/community/paco/PKGBUILD
index 4b0c5e107..c00c185b5 100644
--- a/community/paco/PKGBUILD
+++ b/community/paco/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 66147 2012-02-23 02:14:05Z spupykin $
+# $Id: PKGBUILD 100118 2013-11-01 17:17:26Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com>
 
 pkgname=paco
 pkgver=2.0.9
-pkgrel=2
+pkgrel=3
 pkgdesc="LFS packet manager"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://paco.sourceforge.net/index.html"
@@ -22,6 +22,10 @@ build() {
   patch -Np1 -i ${srcdir}/paco-2.0.9-glib.patch
   ./configure --prefix=/usr --sysconfdir=/etc
   make
+}
+
+package() {
+  cd $srcdir/$pkgname-$pkgver
   make DESTDIR=$pkgdir install
   rm -rf $pkgdir/home
 }
diff --git a/community/pam_mount/PKGBUILD b/community/pam_mount/PKGBUILD
index bf243f18b..17926b40c 100644
--- a/community/pam_mount/PKGBUILD
+++ b/community/pam_mount/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 91874 2013-05-28 17:46:11Z spupykin $
+# $Id: PKGBUILD 99945 2013-10-31 02:37:13Z allan $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributors: Sirius Bakke <sirius\at/nonline.org>
 
 pkgname=pam_mount
-pkgver=2.13
-pkgrel=5
+pkgver=2.14
+pkgrel=1
 pkgdesc="A PAM module that can mount volumes for a user session"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://pam-mount.sourceforge.net/"
@@ -12,15 +12,12 @@ license=('GPL')
 depends=('util-linux' 'libhx>=3.12.1' 'libxml2>=2.6' 'openssl>0.9.7' 'cryptsetup>=1.1.2')
 optdepends=('hxtools: If you have something like <logout wait="1000" hup="0" term="1" kill="1" /> in your config')
 backup=('etc/security/pam_mount.conf.xml')
-options=(!emptydirs !libtool)
-source=("http://downloads.sourceforge.net/project/pam-mount/$pkgname/$pkgver/$pkgname-$pkgver.tar.xz"
-	"$pkgname-git.patch")
-md5sums=('9f75fc8e84ea9cde619cdd6a62c7de33'
-         'f018cb901eb6a18447a3a1b0a50c14dd')
+options=(!emptydirs)
+source=("http://downloads.sourceforge.net/project/pam-mount/$pkgname/$pkgver/$pkgname-$pkgver.tar.xz")
+md5sums=('5a130e59395cb88071b22cf5519bc681')
 
 build() {
   cd -- "$srcdir/$pkgname-$pkgver"
-  patch -p1 <$srcdir/$pkgname-git.patch
   aclocal
   libtoolize
   automake --add-missing
diff --git a/community/pam_mysql/PKGBUILD b/community/pam_mysql/PKGBUILD
index 10da943ae..305786f7b 100644
--- a/community/pam_mysql/PKGBUILD
+++ b/community/pam_mysql/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 87013 2013-03-25 19:16:54Z bpiotrowski $
+# $Id: PKGBUILD 99946 2013-10-31 02:37:33Z allan $
 # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
 # Contributor: Arjan Timmerman<arjan@archlinux.org>
 # Contributor: Manolis Tzanidakis
@@ -12,7 +12,6 @@ url="http://pam-mysql.sourceforge.net"
 depends=('pam' 'mariadb' 'openssl')
 source=(http://sourceforge.net/projects/pam-mysql/files/pam-mysql/${pkgver}/${pkgname}-${pkgver}.tar.gz)
 md5sums=('6177183d7e98dc12f2e444c9fbd4f13c')
-options=(!libtool)
 
 build() {
   cd $srcdir/$pkgname-$pkgver
diff --git a/community/paps/PKGBUILD b/community/paps/PKGBUILD
index 853f36e19..2538bf134 100644
--- a/community/paps/PKGBUILD
+++ b/community/paps/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 93533 2013-07-05 01:34:25Z bisson $
+# $Id: PKGBUILD 98977 2013-10-22 05:29:32Z bisson $
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
 # Contributor: Artyom 'logus' Pervukhin <logus9@gmail.com>
 # Contributor: Tim Yang <tdy@gmx.com>
 
 pkgname=paps
 pkgver=0.6.8
-pkgrel=5
+pkgrel=6
 pkgdesc='UTF-8 to PostScript converter via Pango'
 url='http://paps.sourceforge.net/'
 license=('LGPL')
@@ -17,7 +17,7 @@ sha1sums=('83646b0de89deb8321f260c2c5a665bc7c8f5928')
 build() {
 	cd "${srcdir}/${pkgname}-${pkgver}"
 	export LDFLAGS=${LDFLAGS/,--as-needed/}
-	./configure --prefix=/usr --mandir=/usr/share/man --disable-static
+	./configure --prefix=/usr --mandir=/usr/share/man
 	make
 }
 
diff --git a/community/parcellite/ChangeLog b/community/parcellite/ChangeLog
deleted file mode 100644
index aff4a9e4b..000000000
--- a/community/parcellite/ChangeLog
+++ /dev/null
@@ -1,17 +0,0 @@
-2009-05-05  Biru Ionut  <biru.ionut at gmail.com>
-  * parcellite-0.9.1-1:
-  New upstream release.
-
-2008-12-14  Alexander Fehr  <pizzapunk gmail com>
-
-  * parcellite-0.9-1:
-  New upstream release.
-
-2008-08-14  Alexander Fehr  <pizzapunk gmail com>
-
-  * parcellite-0.8-1:
-  New upstream release.
-  Changed url.
-  Added make dependency on intltool.
-  Changed download location to downloads.sourceforge.net.
-  Added ChangeLog.
diff --git a/community/parcellite/PKGBUILD b/community/parcellite/PKGBUILD
index 68afddf8e..52e18a49c 100644
--- a/community/parcellite/PKGBUILD
+++ b/community/parcellite/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 95071 2013-08-05 10:50:54Z spupykin $
+# $Id: PKGBUILD 99050 2013-10-23 12:05:36Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: Alexander Fehr <pizzapunk gmail com>
 
diff --git a/community/parole/PKGBUILD b/community/parole/PKGBUILD
index eb2f558e3..c36810e5b 100644
--- a/community/parole/PKGBUILD
+++ b/community/parole/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 94522 2013-07-26 10:51:28Z spupykin $
+# $Id: PKGBUILD 99947 2013-10-31 02:37:53Z allan $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: TDY <tdy@gmx.com>
 
 pkgname=parole
-pkgver=0.5.2
+pkgver=0.5.3
 pkgrel=1
 pkgdesc="A modern media player based on the GStreamer framework"
 arch=('i686' 'x86_64' 'mips64el')
@@ -18,10 +18,9 @@ optdepends=('xulrunner: browser plugin'
 	    'gst-plugins-base'
 	    'gst-plugins-ugly')
 conflicts=('parole-media-player-git')
-options=('!libtool')
 install=parole.install
 source=(http://git.xfce.org/apps/parole/snapshot/parole-$pkgver.tar.bz2)
-md5sums=('ab87c3067e310cf200e26a61ed95cdf8')
+md5sums=('51c49684322079c216d80fe6193f1614')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
diff --git a/community/parrot/PKGBUILD b/community/parrot/PKGBUILD
index fb8cdeaf3..5f1a4027b 100644
--- a/community/parrot/PKGBUILD
+++ b/community/parrot/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 97838 2013-09-30 10:03:17Z spupykin $
+# $Id: PKGBUILD 100098 2013-11-01 16:34:40Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: mpie <michael.kyne-phillips1@ntlworld.com>
 
 pkgname=parrot
-pkgver=5.7.0
-#_rel=stable
-_rel=devel
+pkgver=5.9.0
+_rel=stable
+#_rel=devel
 pkgrel=1
 pkgdesc="Standalone VM that can execute bytecode compiled dynamic languages"
 arch=('x86_64' 'i686' 'mips64el')
@@ -16,7 +16,7 @@ makedepends=('perl-json')
 optdepends=('freeglut')
 options=('!makeflags')
 source=(ftp://ftp.parrot.org/pub/parrot/releases/$_rel/$pkgver/$pkgname-$pkgver.tar.bz2)
-md5sums=('3fcb1b21a3d71be8c4a4111fcac56278')
+md5sums=('8cecbd7bbc0e5c814f0de716a070e7d3')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
diff --git a/community/passenger/PKGBUILD b/community/passenger/PKGBUILD
index 0fa1263b2..ecb9c3533 100644
--- a/community/passenger/PKGBUILD
+++ b/community/passenger/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 96150 2013-08-20 11:37:13Z spupykin $
+# $Id: PKGBUILD 99543 2013-10-29 12:13:00Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 
 pkgname=passenger
-pkgver=4.0.14
+pkgver=4.0.21
 pkgrel=1
 pkgdesc="mod_rails passenger"
 arch=('i686' 'x86_64' 'mips64el')
@@ -14,11 +14,20 @@ makedepends=('apache')
 install=passenger.install
 options=('!emptydirs')
 source=($pkgname-$pkgver.tar.gz::https://github.com/FooBarWidget/passenger/archive/release-$pkgver.tar.gz)
-md5sums=('064ba40c29364351e2a67c2ac6a13ce4')
+md5sums=('200ba8636baa06c9a44d30c7bbb50ac3')
 
 prepare() {
   cd $srcdir/passenger-release-$pkgver
-  sed -i '1,1i#include <stdint.h>' ext/common/Utils/MD5.cpp
+  sed -i '1,1i#include <stdint.h>' \
+    ext/common/Utils/MD5.cpp \
+    ext/common/Logging.cpp \
+    ext/common/Utils/StrIntUtils.cpp \
+    ext/common/Utils.cpp \
+    ext/common/ApplicationPool2/AppTypes.cpp \
+    ext/boost/libs/thread/src/pthread/once.cpp \
+    ext/boost/libs/thread/src/pthread/once_atomic.cpp \
+    ext/boost/libs/thread/src/pthread/thread.cpp \
+    ext/boost/atomic/atomic.hpp
 }
 
 build(){
diff --git a/community/pcsclite/PKGBUILD b/community/pcsclite/PKGBUILD
index d21b66fae..56894c53a 100644
--- a/community/pcsclite/PKGBUILD
+++ b/community/pcsclite/PKGBUILD
@@ -1,19 +1,19 @@
-# $Id: PKGBUILD 91101 2013-05-19 13:42:04Z giovanni $
+# $Id: PKGBUILD 99948 2013-10-31 02:38:13Z allan $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Daniel Plaza <daniel.plaza.espi@gmail.com>
 
 pkgname=pcsclite
-pkgver=1.8.8
-pkgrel=3
+pkgver=1.8.10
+pkgrel=1
 pkgdesc="PC/SC Architecture smartcard middleware library"
 arch=('i686' 'x86_64' 'mips64el')
 url="https://alioth.debian.org/projects/pcsclite/"
 license=('BSD')
 depends=('python2' 'systemd')
 makedepends=('pkg-config')
-options=('!libtool' '!docs')
-source=("https://alioth.debian.org/frs/download.php/3862/pcsc-lite-${pkgver}.tar.bz2")
-md5sums=('069dc875a2ae2d85a2ebceac73252c0a')
+options=('!docs')
+source=("https://alioth.debian.org/frs/download.php/file/3963/pcsc-lite-${pkgver}.tar.bz2")
+md5sums=('7268cc5ef8fc01b785c7cea87adb1ade')
 
 build() {
   cd "${srcdir}/pcsc-lite-${pkgver}"
diff --git a/community/pcsxr/PKGBUILD b/community/pcsxr/PKGBUILD
index 984dfac74..164608a55 100644
--- a/community/pcsxr/PKGBUILD
+++ b/community/pcsxr/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 97005 2013-09-10 08:52:26Z schuay $
+# $Id: PKGBUILD 99949 2013-10-31 02:38:33Z allan $
 # Maintainer: schuay <jakob.gruber@gmail.com>
 # Contributor: quantax -- contact via Arch Linux forum or AUR
 # Contributor: Christoph Zeiler <archNOSPAM_at_moonblade.dot.org>
@@ -10,7 +10,6 @@ pkgdesc='A Sony PlayStation (PSX) emulator based on the PCSX-df project'
 arch=('i686' 'x86_64')
 url='http://pcsxr.codeplex.com/'
 license=('GPL')
-options=('!libtool')
 depends=('libcdio' 'libxv' 'sdl' 'gtk3')
 makedepends=('mesa' 'intltool')
 [[ $CARCH == 'i686' ]] && makedepends+=('nasm')
diff --git a/community/pd/PKGBUILD b/community/pd/PKGBUILD
index 9967b42cb..8a12e214f 100644
--- a/community/pd/PKGBUILD
+++ b/community/pd/PKGBUILD
@@ -1,23 +1,30 @@
-# $Id: PKGBUILD 92233 2013-06-03 06:13:55Z bpiotrowski $
+# $Id: PKGBUILD 99115 2013-10-24 15:22:27Z speps $
 # Maintainer : speps <speps at aur dot archlinux dot org>
 # Contributor: TDY <tdy@gmx.com>
 # Contributor: Shinlun Hsieh <yngwiexx@yahoo.com.tw>
 
 pkgname=pd
-pkgver=0.44.3
+pkgver=0.45.3
 _ver=${pkgver%.*}-${pkgver##*.}
-pkgrel=2
+pkgrel=1
 pkgdesc="The Pure Data real-time music and multimedia environment"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://crca.ucsd.edu/~msp/software.html"
 license=('custom:BSD')
 depends=('jack' 'fftw' 'tk')
 provides=('puredata')
-source=("http://crca.ucsd.edu/~msp/Software/pd-$_ver.src.tar.gz")
-md5sums=('a3e8ca0eab039dc472a6533ef9344582')
+source=("http://crca.ucsd.edu/~msp/Software/pd-$_ver.src.tar.gz"
+        "enable-fftw3.patch")
+md5sums=('461a3d0d558a4f45c49943234baa9ca8'
+         'bb907907a9b33f6c63312274c8523d40')
+
+prepare() {
+  cd pd-$_ver
+  patch -p1 -i ../${source[1]}
+}
 
 build() {
-  cd "$srcdir/pd-$_ver"
+  cd pd-$_ver
   ./autogen.sh
   ./configure --prefix=/usr \
               --enable-alsa \
@@ -28,7 +35,7 @@ build() {
 }
 
 package() {
-  cd "$srcdir/pd-$_ver"
+  cd pd-$_ver
   make DESTDIR="$pkgdir" install
 
   # license
diff --git a/community/pd/enable-fftw3.patch b/community/pd/enable-fftw3.patch
new file mode 100644
index 000000000..678e05862
--- /dev/null
+++ b/community/pd/enable-fftw3.patch
@@ -0,0 +1,19 @@
+diff -aur pd-0.45-3/configure.ac pd-0.45-3.fftw3/configure.ac
+--- pd-0.45-3/configure.ac	2013-10-03 18:22:29.000000000 +0200
++++ pd-0.45-3.fftw3/configure.ac	2013-10-24 02:14:09.555763309 +0200
+@@ -212,13 +212,13 @@
+ AM_CONDITIONAL(PORTMIDI, test x$portmidi = xyes)
+ if test x$portmidi = xyes; then echo Using included portmidi; fi
+ 
+-dnl fftw v2
++dnl fftw v3
+ AC_ARG_ENABLE([fftw],
+ 	[AS_HELP_STRING([--enable-fftw],
+ 		[use FFTW package])],
+     [fftw=$enableval])
+ if test x$fftw = xyes; then
+-    AC_CHECK_LIB(fftw, fftw_one, [LIBS="$LIBS -lfftw"],
++    AC_CHECK_LIB(fftw3f, fftwf_execute, [LIBS="$LIBS -lfftw3f"],
+         [AC_MSG_NOTICE([fftw package not found - using built-in FFT]); fftw=no])
+ fi
+ AM_CONDITIONAL(FFTW, test x$fftw = xyes)
diff --git a/community/pdflib-lite/PKGBUILD b/community/pdflib-lite/PKGBUILD
index 13047b971..83bec57cd 100644
--- a/community/pdflib-lite/PKGBUILD
+++ b/community/pdflib-lite/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=pdflib-lite
 _pkgnamecaps=PDFlib-Lite
 pkgver=7.0.5p3
 _basepkgver=${pkgver/p*/}
-pkgrel=2
+pkgrel=3
 pkgdesc="PDF manipulation library."
 url="http://www.pdflib.com"
 arch=(i686 x86_64 mips64el)
diff --git a/community/pdns-recursor/PKGBUILD b/community/pdns-recursor/PKGBUILD
index bd62b5abc..876f44eef 100644
--- a/community/pdns-recursor/PKGBUILD
+++ b/community/pdns-recursor/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 93880 2013-07-11 16:32:02Z arodseth $
+# $Id: PKGBUILD 100036 2013-10-31 11:20:57Z arodseth $
 # Maintainer: Alexander Rødseth <rodseth@gmail.com>
 # Contributor: Jan de Groot <jgc@archlinux.org>
 # Contributor: Jan Steffens <heftig@archlinux.org>
 
 pkgname=pdns-recursor
-pkgver=3.5.2
+pkgver=3.5.3
 pkgrel=1
 pkgdesc='PowerDNS recursor'
 url='https://www.powerdns.com/'
@@ -15,11 +15,11 @@ makedepends=('boost')
 backup=('etc/powerdns/recursor.conf')
 source=("http://downloads.powerdns.com/releases/$pkgname-$pkgver.tar.bz2"
         'pdns-recursor.service')
-sha256sums=('ffe3158ee5b3f62e927198fd44e839a01d3241a41a4e61afdca6709113c276bd'
+sha256sums=('192c0b47a1cfcdccaa88d70fd33766a4c381f4223f966416f15e169df5d58eaa'
             '51688d9576736fdf210048098fa96c8710bfbd6a63eb4d69d20bac57b299b5f9')
 
 build() {
-  cd "$srcdir/$pkgname-$pkgver"
+  cd "$pkgname-$pkgver"
 
   make -j1 LUA=1 \
     LUA_CPPFLAGS_CONFIG="$(pkg-config --cflags lua5.1)" \
@@ -27,7 +27,7 @@ build() {
 }
 
 package() {
-  cd "$srcdir/$pkgname-$pkgver"
+  cd "$pkgname-$pkgver"
 
   make SBINDIR="/usr/bin" DESTDIR="$pkgdir" install
   mv "$pkgdir/etc/powerdns/recursor.conf-dist" \
diff --git a/community/pdns/PKGBUILD b/community/pdns/PKGBUILD
index 58a45ff3e..3e0ec7c47 100644
--- a/community/pdns/PKGBUILD
+++ b/community/pdns/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 94038 2013-07-13 12:35:15Z svenstaro $
+# $Id: PKGBUILD 99950 2013-10-31 02:38:53Z allan $
 # Maintainer: Alexander Rødseth <rodseth@gmail.com>
 # Contributor: Jan de Groot <jgc@archlinux.org>
 # Contributor: Kevin Mihelich <kevin@archlinuxarm.org>
@@ -16,7 +16,7 @@ provides=('pdns-ldap' 'pdns-mysql' 'pdns-sqlite' 'pdns-pgsql')
 replaces=('pdns-ldap' 'pdns-mysql' 'pdns-sqlite' 'pdns-pgsql')
 conflicts=('pdns-ldap' 'pdns-mysql' 'pdns-sqlite' 'pdns-pgsql')
 install="$pkgname.install"
-options=('!makeflags' '!libtool')
+options=('!makeflags')
 backup=('etc/powerdns/pdns.conf')
 source=("http://downloads.powerdns.com/releases/$pkgname-$pkgver.tar.gz"
         'pdns.service'
diff --git a/community/percona-server/PKGBUILD b/community/percona-server/PKGBUILD
index 6a4f9f549..6ebe73bed 100644
--- a/community/percona-server/PKGBUILD
+++ b/community/percona-server/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 96790 2013-09-05 08:50:02Z mtorromeo $
+# $Id: PKGBUILD 99951 2013-10-31 02:39:14Z allan $
 # Maintainer: Massimiliano Torromeo <massimiliano.torromeo@gmail.com>
 
 pkgname=percona-server
-pkgver=5.5.33_rel31.1
+pkgver=5.6.14_rel62.0
 pkgrel=1
 pkgdesc="A backwards-compatible drop-in replacement for MySQL that provides improved performance, diagnostics and instrumentation"
 arch=('i686' 'x86_64' 'mips64el')
@@ -15,19 +15,20 @@ makedepends=('cmake' 'openssl' 'zlib')
 
 license=('GPL')
 url="http://www.percona.com/software/percona-server/"
-options=('!libtool' 'emptydirs')
+options=('emptydirs')
 backup=('etc/mysql/my.cnf')
 install=percona.install
-source=("http://www.percona.com/downloads/Percona-Server-${pkgver%.*_*}/Percona-Server-${pkgver/_rel/-}/source/Percona-Server-${pkgver/_/-}.tar.gz"
-        '0001-MDEV-4902-sql_yacc.yy-incompatible-with-bison-3.patch'
+source=("http://www.percona.com/downloads/Percona-Server-${pkgver%.*_*}/Percona-Server-${pkgver/_/-}/release-${pkgver/_rel/-}/483/source/Percona-Server-${pkgver/_/-}.tar.gz"
         'mysqld-post.sh'
         'mysqld.service'
-        'mysqld-tmpfile.conf')
+        'mysqld-tmpfile.conf'
+        'mysql56-bufsize.patch'
+        'mysql56-bison3.patch')
 
 prepare() {
-	cd "${srcdir}/Percona-Server-${pkgver/_/-}"
-	sed -i 's|ADD_SUBDIRECTORY(libmysqld/examples)|# ADD_SUBDIRECTORY(libmysqld/examples)|' CMakeLists.txt
-	patch -p1 -i "$srcdir/0001-MDEV-4902-sql_yacc.yy-incompatible-with-bison-3.patch"
+	cd "$srcdir/Percona-Server-${pkgver/_/-}"
+	patch -p0 -i "$srcdir/mysql56-bufsize.patch"
+	patch -p1 -i "$srcdir/mysql56-bison3.patch"
 }
 
 build() {
@@ -72,7 +73,7 @@ build() {
 		-DWITH_FEDERATED_STORAGE_ENGINE=OFF \
 		-DWITH_EXAMPLE_STORAGE_ENGINE=OFF \
 		-DCMAKE_C_FLAGS="-fPIC ${CFLAGS} -fno-strict-aliasing -DBIG_JOINS=1 -fomit-frame-pointer" \
-		-DCMAKE_CXX_FLAGS="-fPIC ${CXXFLAGS} -fno-strict-aliasing -DBIG_JOINS=1 -felide-constructors -fno-rtti -fpermissive"
+		-DCMAKE_CXX_FLAGS="-fPIC ${CXXFLAGS} -fno-strict-aliasing -DBIG_JOINS=1 -felide-constructors -fno-rtti"
 
 	make
 }
@@ -81,7 +82,7 @@ package() {
 	cd "${srcdir}"/build
 	make DESTDIR=${pkgdir} install
 
-	install -Dm644 "${pkgdir}"/usr/share/mysql/my-medium.cnf "${pkgdir}"/etc/mysql/my.cnf
+	install -Dm644 "${pkgdir}"/usr/share/mysql/my-default.cnf "${pkgdir}"/etc/mysql/my.cnf
 	install -Dm755 "${srcdir}"/mysqld-post.sh "${pkgdir}"/usr/bin/mysqld-post
 	install -Dm644 "${srcdir}"/mysqld-tmpfile.conf "${pkgdir}"/usr/lib/tmpfiles.d/mysqld.conf
 	install -Dm644 "${srcdir}"/mysqld.service "${pkgdir}"/usr/lib/systemd/system/mysqld.service
@@ -101,8 +102,9 @@ package() {
 	rm "${pkgdir}"/usr/share/man/man1/mysql-test-run.pl.1
 }
 
-sha256sums=('2039ae974d0973b765a4cdc7ffa1dc75ebd93540769fb134b3a8dc521dfc0b3a'
-            '35f5e7819d6c24863f3319462676ea989fd58f8a334925432444b6bf5c42fdaf'
+sha256sums=('69edc04585e72ac94c32598221c0762704e75190c2abe4fa680ad42ce202e280'
             '82a241d9fa4032187a26597d044e94ba810b209b53a7ce14bb6eb92555993a48'
             '9bc66470f3f80534c0bb62f9f8325ccf60b164f421f74ad74a963f065d7b1869'
-            'badf6a701d9dc6ea3b4ddca26cb0f42b6236432ccdbc14c64962147802594a60')
+            'badf6a701d9dc6ea3b4ddca26cb0f42b6236432ccdbc14c64962147802594a60'
+            '1039e232a7778544b00eb215c93bb06c588c95c2fd49cfb162dc50eb4dfbf729'
+            'd36c807f085b6051cc8fddb2abc5a1939be809650f1cfefc8a87731978958929')
diff --git a/community/percona-server/my.cnf b/community/percona-server/my.cnf
deleted file mode 100644
index afdd6dc2c..000000000
--- a/community/percona-server/my.cnf
+++ /dev/null
@@ -1,145 +0,0 @@
-# MySQL config file for medium systems.
-#
-# This is for a system with little memory (32M - 64M) where MySQL plays
-# an important part, or systems up to 128M where MySQL is used together with
-# other programs (such as a web server)
-#
-# MySQL programs look for option files in a set of
-# locations which depend on the deployment platform.
-# You can copy this option file to one of those
-# locations. For information about these locations, see:
-# http://dev.mysql.com/doc/mysql/en/option-files.html
-#
-# In this file, you can use all long options that a program supports.
-# If you want to know which options a program supports, run the program
-# with the "--help" option.
-
-# The following options will be passed to all MySQL clients
-[client]
-#password	= your_password
-port		    = 3306
-socket		= /run/mysqld/mysqld.sock
-
-# Here follows entries for some specific programs
-
-# The MySQL server
-[mysqld]
-port		    = 3306
-socket		= /run/mysqld/mysqld.sock
-datadir		= /var/lib/mysql
-skip-external-locking
-key_buffer_size = 16M
-max_allowed_packet = 1M
-table_open_cache = 64
-sort_buffer_size = 512K
-net_buffer_length = 8K
-read_buffer_size = 256K
-read_rnd_buffer_size = 512K
-myisam_sort_buffer_size = 8M
-
-# Don't listen on a TCP/IP port at all. This can be a security enhancement,
-# if all processes that need to connect to mysqld run on the same host.
-# All interaction with mysqld must be made via Unix sockets or named pipes.
-# Note that using this option without enabling named pipes on Windows
-# (via the "enable-named-pipe" option) will render mysqld useless!
-#
-skip-networking
-
-# Replication Master Server (default)
-# binary logging is required for replication
-log-bin=mysql-bin
-
-# binary logging format - mixed recommended
-binlog_format=mixed
-
-# required unique id between 1 and 2^32 - 1
-# defaults to 1 if master-host is not set
-# but will not function as a master if omitted
-server-id	= 1
-
-# Replication Slave (comment out master section to use this)
-#
-# To configure this host as a replication slave, you can choose between
-# two methods :
-#
-# 1) Use the CHANGE MASTER TO command (fully described in our manual) -
-#    the syntax is:
-#
-#    CHANGE MASTER TO MASTER_HOST=<host>, MASTER_PORT=<port>,
-#    MASTER_USER=<user>, MASTER_PASSWORD=<password> ;
-#
-#    where you replace <host>, <user>, <password> by quoted strings and
-#    <port> by the master's port number (3306 by default).
-#
-#    Example:
-#
-#    CHANGE MASTER TO MASTER_HOST='125.564.12.1', MASTER_PORT=3306,
-#    MASTER_USER='joe', MASTER_PASSWORD='secret';
-#
-# OR
-#
-# 2) Set the variables below. However, in case you choose this method, then
-#    start replication for the first time (even unsuccessfully, for example
-#    if you mistyped the password in master-password and the slave fails to
-#    connect), the slave will create a master.info file, and any later
-#    change in this file to the variables' values below will be ignored and
-#    overridden by the content of the master.info file, unless you shutdown
-#    the slave server, delete master.info and restart the slaver server.
-#    For that reason, you may want to leave the lines below untouched
-#    (commented) and instead use CHANGE MASTER TO (see above)
-#
-# required unique id between 2 and 2^32 - 1
-# (and different from the master)
-# defaults to 2 if master-host is set
-# but will not function as a slave if omitted
-#server-id       = 2
-#
-# The replication master for this slave - required
-#master-host     =   <hostname>
-#
-# The username the slave will use for authentication when connecting
-# to the master - required
-#master-user     =   <username>
-#
-# The password the slave will authenticate with when connecting to
-# the master - required
-#master-password =   <password>
-#
-# The port the master is listening on.
-# optional - defaults to 3306
-#master-port     =  <port>
-#
-# binary logging - not required for slaves, but recommended
-#log-bin=mysql-bin
-
-# Uncomment the following if you are using InnoDB tables
-#innodb_data_home_dir = /var/lib/mysql
-#innodb_data_file_path = ibdata1:10M:autoextend
-#innodb_log_group_home_dir = /var/lib/mysql
-# You can set .._buffer_pool_size up to 50 - 80 %
-# of RAM but beware of setting memory usage too high
-#innodb_buffer_pool_size = 16M
-#innodb_additional_mem_pool_size = 2M
-# Set .._log_file_size to 25 % of buffer pool size
-#innodb_log_file_size = 5M
-#innodb_log_buffer_size = 8M
-#innodb_flush_log_at_trx_commit = 1
-#innodb_lock_wait_timeout = 50
-
-[mysqldump]
-quick
-max_allowed_packet = 16M
-
-[mysql]
-no-auto-rehash
-# Remove the next comment character if you are not familiar with SQL
-#safe-updates
-
-[myisamchk]
-key_buffer_size = 20M
-sort_buffer_size = 20M
-read_buffer = 2M
-write_buffer = 2M
-
-[mysqlhotcopy]
-interactive-timeout
diff --git a/community/percona-server/0001-MDEV-4902-sql_yacc.yy-incompatible-with-bison-3.patch b/community/percona-server/mysql56-bison3.patch
index fda79cff3..b9767cf71 100644
--- a/community/percona-server/0001-MDEV-4902-sql_yacc.yy-incompatible-with-bison-3.patch
+++ b/community/percona-server/mysql56-bison3.patch
@@ -1,36 +1,17 @@
-From 6325837d6abf272b8c3dfac664f18435f8a2abf8 Mon Sep 17 00:00:00 2001
-From: Massimiliano Torromeo <massimiliano.torromeo@gmail.com>
-Date: Thu, 5 Sep 2013 09:52:54 +0200
-Subject: [PATCH] MDEV-4902 - sql_yacc.yy incompatible with bison 3
-
-- YYPARSE_PARAM and YYLEX_PARAM are removed in Bison 3.0. Deprecated
-  since Bison 1.875 in favor of %lex-param, %parse-param.
-- %pure_parser is deprecated in favor of %define api.pure.
-- %parse-param adds an argument to yyerror() as well, updated
-  MYSQLerror() accordingly.
-- %parse-param allows to declare proper type for argument. That's
-  what 99% of this patch is about.
----
- sql/sql_lex.cc   |  12 +-
- sql/sql_lex.h    |   2 +-
- sql/sql_parse.cc |   2 +-
- sql/sql_yacc.yy  | 799 ++++++++++++++++++++++++-------------------------------
- 4 files changed, 361 insertions(+), 454 deletions(-)
-
 diff --git a/sql/sql_lex.cc b/sql/sql_lex.cc
-index 18323f8..b01d451 100644
+index 75440c5..af50807 100644
 --- a/sql/sql_lex.cc
 +++ b/sql/sql_lex.cc
-@@ -29,7 +29,7 @@
- #include "sp.h"
- #include "sp_head.h"
+@@ -34,7 +34,7 @@
+ #include "sql_optimizer.h"             // JOIN
+ #include <mysql/psi/mysql_statement.h>
  
 -static int lex_one_token(void *arg, void *yythd);
 +static int lex_one_token(void *arg, THD *thd);
  
  /*
    We are using pointer to this variable for distinguishing between assignment
-@@ -869,9 +869,8 @@ bool consume_comment(Lex_input_stream *lip, int remaining_recursions_permitted)
+@@ -906,9 +906,8 @@ bool consume_comment(Lex_input_stream *lip, int remaining_recursions_permitted)
  				(which can't be followed by a signed number)
  */
  
@@ -41,7 +22,7 @@ index 18323f8..b01d451 100644
    Lex_input_stream *lip= & thd->m_parser_state->m_lip;
    YYSTYPE *yylval=(YYSTYPE*) arg;
    int token;
-@@ -889,7 +888,7 @@ int MYSQLlex(void *arg, void *yythd)
+@@ -927,7 +926,7 @@ int MYSQLlex(void *arg, void *yythd)
      return token;
    }
  
@@ -50,7 +31,7 @@ index 18323f8..b01d451 100644
  
    switch(token) {
    case WITH:
-@@ -900,7 +899,7 @@ int MYSQLlex(void *arg, void *yythd)
+@@ -938,7 +937,7 @@ int MYSQLlex(void *arg, void *yythd)
        to transform the grammar into a LALR(1) grammar,
        which sql_yacc.yy can process.
      */
@@ -58,8 +39,8 @@ index 18323f8..b01d451 100644
 +    token= lex_one_token(arg, thd);
      switch(token) {
      case CUBE_SYM:
-       return WITH_CUBE_SYM;
-@@ -923,14 +922,13 @@ int MYSQLlex(void *arg, void *yythd)
+       lip->m_digest_psi= MYSQL_ADD_TOKEN(lip->m_digest_psi, WITH_CUBE_SYM,
+@@ -967,14 +966,13 @@ int MYSQLlex(void *arg, void *yythd)
    return token;
  }
  
@@ -76,23 +57,23 @@ index 18323f8..b01d451 100644
    LEX *lex= thd->lex;
    YYSTYPE *yylval=(YYSTYPE*) arg;
 diff --git a/sql/sql_lex.h b/sql/sql_lex.h
-index 8648b32..ba37127 100644
+index 42a5e77..602f52a 100644
 --- a/sql/sql_lex.h
 +++ b/sql/sql_lex.h
-@@ -2820,7 +2820,7 @@ extern void lex_init(void);
+@@ -2857,7 +2857,7 @@ extern void lex_init(void);
  extern void lex_free(void);
  extern void lex_start(THD *thd);
  extern void lex_end(LEX *lex);
 -extern int MYSQLlex(void *arg, void *yythd);
 +extern int MYSQLlex(void *arg, THD *thd);
  
- extern void trim_whitespace(CHARSET_INFO *cs, LEX_STRING *str);
+ extern void trim_whitespace(const CHARSET_INFO *cs, LEX_STRING *str);
  
 diff --git a/sql/sql_parse.cc b/sql/sql_parse.cc
-index a1a79fd..d826b77 100644
+index c88dd69..fc30370 100644
 --- a/sql/sql_parse.cc
 +++ b/sql/sql_parse.cc
-@@ -7636,7 +7636,7 @@ bool check_host_name(LEX_STRING *str)
+@@ -8575,7 +8575,7 @@ bool check_host_name(LEX_STRING *str)
  }
  
  
@@ -102,10 +83,10 @@ index a1a79fd..d826b77 100644
  
  /**
 diff --git a/sql/sql_yacc.yy b/sql/sql_yacc.yy
-index 34ae03b..2a6d9aa 100644
+index e640073..f2c7bfb 100644
 --- a/sql/sql_yacc.yy
 +++ b/sql/sql_yacc.yy
-@@ -22,20 +22,13 @@
+@@ -22,21 +22,14 @@
  */
  
  %{
@@ -118,8 +99,10 @@ index 34ae03b..2a6d9aa 100644
 -#define YYTHD ((THD *)yythd)
 -#define YYLIP (& YYTHD->m_parser_state->m_lip)
 -#define YYPS (& YYTHD->m_parser_state->m_yacc)
+-#define YYCSCL  YYTHD->variables.character_set_client
 +#define YYLIP (& thd->m_parser_state->m_lip)
 +#define YYPS (& thd->m_parser_state->m_yacc)
++#define YYCSCL  thd->variables.character_set_client
  
  #define MYSQL_YACC
  #define YYINITDEPTH 100
@@ -129,33 +112,25 @@ index 34ae03b..2a6d9aa 100644
  #define Select Lex->current_select
  #include "sql_priv.h"
  #include "unireg.h"                    // REQUIRED: for other includes
-@@ -69,14 +62,14 @@
- #pragma warning (disable : 4065)
- #endif
- 
--int yylex(void *yylval, void *yythd);
-+int yylex(void *yylval, THD *thd);
- 
- #define yyoverflow(A,B,C,D,E,F)               \
-   {                                           \
+@@ -85,7 +78,7 @@ int yylex(void *yylval, void *yythd);
      ulong val= *(F);                          \
      if (my_yyoverflow((B), (D), &val))        \
      {                                         \
 -      yyerror((char*) (A));                   \
-+      yyerror(current_thd, (char*) (A));                   \
++      yyerror(current_thd, (char*) (A));      \
        return 2;                               \
      }                                         \
      else                                      \
-@@ -88,7 +81,7 @@ int yylex(void *yylval, void *yythd);
+@@ -97,7 +90,7 @@ int yylex(void *yylval, void *yythd);
  #define MYSQL_YYABORT                         \
    do                                          \
    {                                           \
 -    LEX::cleanup_lex_after_parse_error(YYTHD);\
-+    LEX::cleanup_lex_after_parse_error(thd);\
++    LEX::cleanup_lex_after_parse_error(thd);  \
      YYABORT;                                  \
    } while (0)
  
-@@ -174,10 +167,8 @@ void my_parse_error(const char *s)
+@@ -183,10 +176,8 @@ void my_parse_error(const char *s)
    to abort from the parser.
  */
  
@@ -167,7 +142,7 @@ index 34ae03b..2a6d9aa 100644
    /*
      Restore the original LEX if it was replaced when parsing
      a stored procedure. We must ensure that a parsing error
-@@ -780,7 +771,10 @@ static bool add_create_index (LEX *lex, Key::Keytype type,
+@@ -1024,7 +1015,10 @@ bool match_authorized_user(Security_context *ctx, LEX_USER *user)
  bool my_yyoverflow(short **a, YYSTYPE **b, ulong *yystacksize);
  %}
  
@@ -177,9 +152,9 @@ index 34ae03b..2a6d9aa 100644
 +%parse-param { THD *thd }
 +%lex-param { THD *thd }
  /*
-   Currently there are 168 shift/reduce conflicts.
+   Currently there are 161 shift/reduce conflicts.
    We should not introduce new conflicts any more.
-@@ -1668,7 +1662,6 @@ rule: <-- starts at col 1
+@@ -1972,7 +1966,6 @@ rule: <-- starts at col 1
  query:
            END_OF_INPUT
            {
@@ -187,7 +162,7 @@ index 34ae03b..2a6d9aa 100644
              if (!thd->bootstrap &&
                (!(thd->lex->select_lex.options & OPTION_FOUND_COMMENT)))
              {
-@@ -1682,7 +1675,7 @@ query:
+@@ -1986,7 +1979,7 @@ query:
            {
              Lex_input_stream *lip = YYLIP;
  
@@ -196,7 +171,7 @@ index 34ae03b..2a6d9aa 100644
                  lip->multi_statements &&
                  ! lip->eof())
              {
-@@ -1778,7 +1771,6 @@ statement:
+@@ -2083,7 +2076,6 @@ statement:
  deallocate:
            deallocate_or_drop PREPARE_SYM ident
            {
@@ -204,7 +179,7 @@ index 34ae03b..2a6d9aa 100644
              LEX *lex= thd->lex;
              lex->sql_command= SQLCOM_DEALLOCATE_PREPARE;
              lex->prepared_stmt_name= $3;
-@@ -1793,7 +1785,6 @@ deallocate_or_drop:
+@@ -2098,7 +2090,6 @@ deallocate_or_drop:
  prepare:
            PREPARE_SYM ident FROM prepare_src
            {
@@ -212,7 +187,7 @@ index 34ae03b..2a6d9aa 100644
              LEX *lex= thd->lex;
              lex->sql_command= SQLCOM_PREPARE;
              lex->prepared_stmt_name= $2;
-@@ -1803,14 +1794,12 @@ prepare:
+@@ -2118,14 +2109,12 @@ prepare:
  prepare_src:
            TEXT_STRING_sys
            {
@@ -227,7 +202,7 @@ index 34ae03b..2a6d9aa 100644
              LEX *lex= thd->lex;
              lex->prepared_stmt_code= $2;
              lex->prepared_stmt_code_is_varref= TRUE;
-@@ -1820,7 +1809,6 @@ prepare_src:
+@@ -2135,7 +2124,6 @@ prepare_src:
  execute:
            EXECUTE_SYM ident
            {
@@ -235,25 +210,34 @@ index 34ae03b..2a6d9aa 100644
              LEX *lex= thd->lex;
              lex->sql_command= SQLCOM_EXECUTE;
              lex->prepared_stmt_name= $2;
-@@ -1955,7 +1943,7 @@ master_def:
+@@ -2245,7 +2233,7 @@ master_def:
+             {
+               Lex_input_stream *lip= YYLIP;
+               const char *start= lip->get_tok_start();
+-              const char *msg= YYTHD->strmake(start, lip->get_ptr() - start);
++              const char *msg= thd->strmake(start, lip->get_ptr() - start);
+               my_error(ER_MASTER_DELAY_VALUE_OUT_OF_RANGE, MYF(0),
+                        msg, MASTER_DELAY_MAX);
+             }
+@@ -2305,7 +2293,7 @@ master_def:
              }
              if (Lex->mi.heartbeat_period > slave_net_timeout)
              {
--              push_warning_printf(YYTHD, MYSQL_ERROR::WARN_LEVEL_WARN,
-+              push_warning_printf(thd, MYSQL_ERROR::WARN_LEVEL_WARN,
+-              push_warning_printf(YYTHD, Sql_condition::WARN_LEVEL_WARN,
++              push_warning_printf(thd, Sql_condition::WARN_LEVEL_WARN,
                                    ER_SLAVE_HEARTBEAT_VALUE_OUT_OF_RANGE_MAX,
                                    ER(ER_SLAVE_HEARTBEAT_VALUE_OUT_OF_RANGE_MAX));
              }
-@@ -1963,7 +1951,7 @@ master_def:
+@@ -2313,7 +2301,7 @@ master_def:
              {
                if (Lex->mi.heartbeat_period != 0.0)
                {
--                push_warning_printf(YYTHD, MYSQL_ERROR::WARN_LEVEL_WARN,
-+                push_warning_printf(thd, MYSQL_ERROR::WARN_LEVEL_WARN,
+-                push_warning_printf(YYTHD, Sql_condition::WARN_LEVEL_WARN,
++                push_warning_printf(thd, Sql_condition::WARN_LEVEL_WARN,
                                      ER_SLAVE_HEARTBEAT_VALUE_OUT_OF_RANGE_MIN,
                                      ER(ER_SLAVE_HEARTBEAT_VALUE_OUT_OF_RANGE_MIN));
                  Lex->mi.heartbeat_period= 0.0;
-@@ -2038,7 +2026,6 @@ master_file_def:
+@@ -2396,7 +2384,6 @@ master_file_def:
  create:
            CREATE opt_table_options TABLE_SYM opt_if_not_exists table_ident
            {
@@ -261,24 +245,24 @@ index 34ae03b..2a6d9aa 100644
              LEX *lex= thd->lex;
              lex->sql_command= SQLCOM_CREATE_TABLE;
              if (!lex->select_lex.add_table_to_list(thd, $5, NULL,
-@@ -2063,13 +2050,13 @@ create:
+@@ -2422,7 +2409,6 @@ create:
            }
            create2
            {
--            LEX *lex= YYTHD->lex;
-+            LEX *lex= thd->lex;
+-            THD *thd= YYTHD;
+             LEX *lex= thd->lex;
              lex->current_select= &lex->select_lex; 
              if ((lex->create_info.used_fields & HA_CREATE_USED_ENGINE) &&
-                 !lex->create_info.db_type)
-             {
--              lex->create_info.db_type= ha_default_handlerton(YYTHD);
--              push_warning_printf(YYTHD, MYSQL_ERROR::WARN_LEVEL_WARN,
-+              lex->create_info.db_type= ha_default_handlerton(thd);
-+              push_warning_printf(thd, MYSQL_ERROR::WARN_LEVEL_WARN,
+@@ -2431,7 +2417,7 @@ create:
+               lex->create_info.db_type=
+                 lex->create_info.options & HA_LEX_CREATE_TMP_TABLE ?
+                 ha_default_temp_handlerton(thd) : ha_default_handlerton(thd);
+-              push_warning_printf(YYTHD, Sql_condition::WARN_LEVEL_WARN,
++              push_warning_printf(thd, Sql_condition::WARN_LEVEL_WARN,
                                    ER_WARN_USING_OTHER_HANDLER,
                                    ER(ER_WARN_USING_OTHER_HANDLER),
                                    ha_resolve_storage_engine_name(lex->create_info.db_type),
-@@ -2199,7 +2186,6 @@ server_option:
+@@ -2565,7 +2551,6 @@ server_option:
  event_tail:
            remember_name EVENT_SYM opt_if_not_exists sp_name
            {
@@ -286,16 +270,16 @@ index 34ae03b..2a6d9aa 100644
              LEX *lex=Lex;
  
              lex->stmt_definition_begin= $1;
-@@ -2266,7 +2252,7 @@ opt_ev_status:
+@@ -2632,7 +2617,7 @@ opt_ev_status:
  ev_starts:
            /* empty */
            {
--            Item *item= new (YYTHD->mem_root) Item_func_now_local();
-+            Item *item= new (thd->mem_root) Item_func_now_local();
+-            Item *item= new (YYTHD->mem_root) Item_func_now_local(0);
++            Item *item= new (thd->mem_root) Item_func_now_local(0);
              if (item == NULL)
                MYSQL_YYABORT;
              Lex->event_parse_data->item_starts= item;
-@@ -2316,7 +2302,6 @@ opt_ev_comment:
+@@ -2682,7 +2667,6 @@ opt_ev_comment:
  
  ev_sql_stmt:
            {
@@ -303,15 +287,15 @@ index 34ae03b..2a6d9aa 100644
              LEX *lex= thd->lex;
              Lex_input_stream *lip= YYLIP;
  
-@@ -2359,7 +2344,6 @@ ev_sql_stmt:
+@@ -2725,7 +2709,6 @@ ev_sql_stmt:
            }
            ev_sql_stmt_inner
            {
 -            THD *thd= YYTHD;
              LEX *lex= thd->lex;
  
-             /* return back to the original memory root ASAP */
-@@ -2418,11 +2402,10 @@ sp_name:
+             sp_finish_parsing(thd);
+@@ -2779,11 +2762,10 @@ sp_name:
              $$= new sp_name($1, $3, true);
              if ($$ == NULL)
                MYSQL_YYABORT;
@@ -323,138 +307,130 @@ index 34ae03b..2a6d9aa 100644
 -            THD *thd= YYTHD;
              LEX *lex= thd->lex;
              LEX_STRING db;
-             if (check_routine_name(&$1))
-@@ -2492,7 +2475,7 @@ call:
+             if (sp_check_name(&$1))
+@@ -2853,7 +2835,7 @@ call:
              lex->sql_command= SQLCOM_CALL;
              lex->spname= $2;
              lex->value_list.empty();
--            sp_add_used_routine(lex, YYTHD, $2, TYPE_ENUM_PROCEDURE);
-+            sp_add_used_routine(lex, thd, $2, TYPE_ENUM_PROCEDURE);
+-            sp_add_used_routine(lex, YYTHD, $2, SP_TYPE_PROCEDURE);
++            sp_add_used_routine(lex, thd, $2, SP_TYPE_PROCEDURE);
            }
            opt_sp_cparam_list {}
          ;
-@@ -2565,7 +2548,7 @@ sp_fdparam:
-                                                      (enum enum_field_types)$3,
-                                                      sp_param_in);
- 
--            if (lex->sphead->fill_field_definition(YYTHD, lex,
-+            if (lex->sphead->fill_field_definition(thd, lex,
-                                                    (enum enum_field_types) $3,
-                                                    &spvar->field_def))
-             {
-@@ -2602,7 +2585,7 @@ sp_pdparam:
-                                                      (enum enum_field_types)$4,
-                                                      (sp_param_mode_t)$1);
- 
--            if (lex->sphead->fill_field_definition(YYTHD, lex,
-+            if (lex->sphead->fill_field_definition(thd, lex,
-                                                    (enum enum_field_types) $4,
-                                                    &spvar->field_def))
-             {
-@@ -2665,13 +2648,12 @@ sp_decl:
+@@ -2914,7 +2896,6 @@ sp_init_param:
+ sp_fdparam:
+           ident sp_init_param type_with_opt_collate
            {
-             LEX *lex= Lex;
- 
--            lex->sphead->reset_lex(YYTHD);
-+            lex->sphead->reset_lex(thd);
-             lex->spcont->declare_var_boundary($2);
-           }
+-            THD *thd= YYTHD;
+             LEX *lex= thd->lex;
+             sp_head *sp= lex->sphead;
+             sp_pcontext *pctx= lex->get_sp_current_parsing_ctx();
+@@ -2955,7 +2936,6 @@ sp_pdparams:
+ sp_pdparam:
+           sp_opt_inout sp_init_param ident type_with_opt_collate
+           {
+-            THD *thd= YYTHD;
+             LEX *lex= thd->lex;
+             sp_head *sp= lex->sphead;
+             sp_pcontext *pctx= lex->get_sp_current_parsing_ctx();
+@@ -3031,7 +3011,6 @@ sp_decls:
+ sp_decl:
+           DECLARE_SYM sp_decl_idents
+           {
+-            THD *thd= YYTHD;
+             LEX *lex= thd->lex;
+             sp_head *sp= lex->sphead;
+             sp_pcontext *pctx= lex->get_sp_current_parsing_ctx();
+@@ -3042,7 +3021,6 @@ sp_decl:
            type_with_opt_collate
            sp_opt_default
            {
 -            THD *thd= YYTHD;
-             LEX *lex= Lex;
-             sp_pcontext *pctx= lex->spcont;
-             uint num_vars= pctx->context_var_count();
-@@ -2697,7 +2679,7 @@ sp_decl:
-               spvar->type= var_type;
-               spvar->dflt= dflt_value_item;
-             
--              if (lex->sphead->fill_field_definition(YYTHD, lex, var_type,
-+              if (lex->sphead->fill_field_definition(thd, lex, var_type,
-                                                      &spvar->field_def))
-               {
-                 MYSQL_YYABORT;
-@@ -2721,7 +2703,7 @@ sp_decl:
-             }
+             LEX *lex= thd->lex;
+             sp_head *sp= lex->sphead;
+             sp_pcontext *pctx= lex->get_sp_current_parsing_ctx();
+@@ -3115,7 +3093,6 @@ sp_decl:
+           }
+         | DECLARE_SYM ident CONDITION_SYM FOR_SYM sp_cond
+           {
+-            THD *thd= YYTHD;
+             LEX *lex= thd->lex;
+             sp_pcontext *pctx= lex->get_sp_current_parsing_ctx();
  
-             pctx->declare_var_boundary(0);
--            if (lex->sphead->restore_lex(YYTHD))
-+            if (lex->sphead->restore_lex(thd))
-               MYSQL_YYABORT;
-             $$.vars= $2;
-             $$.conds= $$.hndlrs= $$.curs= 0;
-@@ -2736,7 +2718,7 @@ sp_decl:
-               my_error(ER_SP_DUP_COND, MYF(0), $2.str);
-               MYSQL_YYABORT;
-             }
--            if(YYTHD->lex->spcont->push_cond(&$2, $5))
-+            if(thd->lex->spcont->push_cond(&$2, $5))
-               MYSQL_YYABORT;
-             $$.vars= $$.hndlrs= $$.curs= 0;
-             $$.conds= 1;
-@@ -2822,7 +2804,7 @@ sp_decl:
+@@ -3131,7 +3108,6 @@ sp_decl:
+           }
+         | DECLARE_SYM sp_handler_type HANDLER_SYM FOR_SYM
+           {
+-            THD *thd= YYTHD;
+             LEX *lex= thd->lex;
+             sp_head *sp= lex->sphead;
  
- sp_cursor_stmt:
+@@ -3171,7 +3147,6 @@ sp_decl:
+           }
+           sp_hcond_list sp_proc_stmt
            {
--            Lex->sphead->reset_lex(YYTHD);
-+            Lex->sphead->reset_lex(thd);
+-            THD *thd= YYTHD;
+             LEX *lex= Lex;
+             sp_head *sp= lex->sphead;
+             sp_pcontext *pctx= lex->get_sp_current_parsing_ctx();
+@@ -3205,7 +3180,6 @@ sp_decl:
            }
-           select
+         | DECLARE_SYM ident CURSOR_SYM FOR_SYM
            {
-@@ -2838,7 +2820,7 @@ sp_cursor_stmt:
-             }
-             lex->sp_lex_in_use= TRUE;
-             $$= lex;
--            if (lex->sphead->restore_lex(YYTHD))
-+            if (lex->sphead->restore_lex(thd))
-               MYSQL_YYABORT;
+-            THD *thd= YYTHD;
+             LEX *lex= Lex;
+             sp_head *sp= lex->sphead;
+ 
+@@ -3214,7 +3188,6 @@ sp_decl:
            }
-         ;
-@@ -2887,7 +2869,7 @@ sp_cond:
+           select
+           {
+-            THD *thd= YYTHD;
+             LEX *cursor_lex= Lex;
+             sp_head *sp= cursor_lex->sphead;
+ 
+@@ -3319,7 +3292,7 @@ sp_cond:
                my_error(ER_WRONG_VALUE, MYF(0), "CONDITION", "0");
                MYSQL_YYABORT;
              }
--            $$= (sp_cond_type_t *)YYTHD->alloc(sizeof(sp_cond_type_t));
-+            $$= (sp_cond_type_t *)thd->alloc(sizeof(sp_cond_type_t));
+-            $$= new (YYTHD->mem_root) sp_condition_value($1);
++            $$= new (thd->mem_root) sp_condition_value($1);
              if ($$ == NULL)
                MYSQL_YYABORT;
-             $$->type= sp_cond_type_t::number;
-@@ -2904,7 +2886,7 @@ sqlstate:
+           }
+@@ -3342,7 +3315,7 @@ sqlstate:
                my_error(ER_SP_BAD_SQLSTATE, MYF(0), $3.str);
                MYSQL_YYABORT;
              }
--            $$= (sp_cond_type_t *)YYTHD->alloc(sizeof(sp_cond_type_t));
-+            $$= (sp_cond_type_t *)thd->alloc(sizeof(sp_cond_type_t));
+-            $$= new (YYTHD->mem_root) sp_condition_value($3.str);
++            $$= new (thd->mem_root) sp_condition_value($3.str);
              if ($$ == NULL)
                MYSQL_YYABORT;
-             $$->type= sp_cond_type_t::state;
-@@ -2934,21 +2916,21 @@ sp_hcond:
+           }
+@@ -3373,19 +3346,19 @@ sp_hcond:
            }
          | SQLWARNING_SYM /* SQLSTATEs 01??? */
            {
--            $$= (sp_cond_type_t *)YYTHD->alloc(sizeof(sp_cond_type_t));
-+            $$= (sp_cond_type_t *)thd->alloc(sizeof(sp_cond_type_t));
+-            $$= new (YYTHD->mem_root) sp_condition_value(sp_condition_value::WARNING);
++            $$= new (thd->mem_root) sp_condition_value(sp_condition_value::WARNING);
              if ($$ == NULL)
                MYSQL_YYABORT;
-             $$->type= sp_cond_type_t::warning;
            }
          | not FOUND_SYM /* SQLSTATEs 02??? */
            {
--            $$= (sp_cond_type_t *)YYTHD->alloc(sizeof(sp_cond_type_t));
-+            $$= (sp_cond_type_t *)thd->alloc(sizeof(sp_cond_type_t));
+-            $$= new (YYTHD->mem_root) sp_condition_value(sp_condition_value::NOT_FOUND);
++            $$= new (thd->mem_root) sp_condition_value(sp_condition_value::NOT_FOUND);
              if ($$ == NULL)
                MYSQL_YYABORT;
-             $$->type= sp_cond_type_t::notfound;
            }
          | SQLEXCEPTION_SYM /* All other SQLSTATEs */
            {
--            $$= (sp_cond_type_t *)YYTHD->alloc(sizeof(sp_cond_type_t));
-+            $$= (sp_cond_type_t *)thd->alloc(sizeof(sp_cond_type_t));
+-            $$= new (YYTHD->mem_root) sp_condition_value(sp_condition_value::EXCEPTION);
++            $$= new (thd->mem_root) sp_condition_value(sp_condition_value::EXCEPTION);
              if ($$ == NULL)
                MYSQL_YYABORT;
-             $$->type= sp_cond_type_t::exception;
-@@ -2958,7 +2940,6 @@ sp_hcond:
+           }
+@@ -3394,7 +3367,6 @@ sp_hcond:
  signal_stmt:
            SIGNAL_SYM signal_value opt_set_signal_information
            {
@@ -462,7 +438,7 @@ index 34ae03b..2a6d9aa 100644
              LEX *lex= thd->lex;
              Yacc_state *state= & thd->m_parser_state->m_yacc;
  
-@@ -3008,7 +2989,7 @@ opt_signal_value:
+@@ -3447,7 +3419,7 @@ opt_signal_value:
  opt_set_signal_information:
            /* empty */
            {
@@ -471,25 +447,25 @@ index 34ae03b..2a6d9aa 100644
            }
          | SET signal_information_item_list
          ;
-@@ -3017,7 +2998,7 @@ signal_information_item_list:
+@@ -3456,7 +3428,7 @@ signal_information_item_list:
            signal_condition_information_item_name EQ signal_allowed_expr
            {
              Set_signal_information *info;
 -            info= & YYTHD->m_parser_state->m_yacc.m_set_signal_info;
-+            info= & thd->m_parser_state->m_yacc.m_set_signal_info;
++            info= &thd->m_parser_state->m_yacc.m_set_signal_info;
              int index= (int) $1;
              info->clear();
              info->m_item[index]= $3;
-@@ -3026,7 +3007,7 @@ signal_information_item_list:
+@@ -3465,7 +3437,7 @@ signal_information_item_list:
            signal_condition_information_item_name EQ signal_allowed_expr
            {
              Set_signal_information *info;
 -            info= & YYTHD->m_parser_state->m_yacc.m_set_signal_info;
-+            info= & thd->m_parser_state->m_yacc.m_set_signal_info;
++            info= &thd->m_parser_state->m_yacc.m_set_signal_info;
              int index= (int) $3;
              if (info->m_item[index] != NULL)
              {
-@@ -3097,7 +3078,6 @@ signal_condition_information_item_name:
+@@ -3536,7 +3508,6 @@ signal_condition_information_item_name:
  resignal_stmt:
            RESIGNAL_SYM opt_signal_value opt_set_signal_information
            {
@@ -497,149 +473,379 @@ index 34ae03b..2a6d9aa 100644
              LEX *lex= thd->lex;
              Yacc_state *state= & thd->m_parser_state->m_yacc;
  
-@@ -3172,7 +3152,6 @@ sp_proc_stmt_if:
+@@ -3557,7 +3528,7 @@ get_diagnostics:
+             info->set_which_da($2);
+ 
+             Lex->sql_command= SQLCOM_GET_DIAGNOSTICS;
+-            Lex->m_sql_cmd= new (YYTHD->mem_root) Sql_cmd_get_diagnostics(info);
++            Lex->m_sql_cmd= new (thd->mem_root) Sql_cmd_get_diagnostics(info);
+ 
+             if (Lex->m_sql_cmd == NULL)
+               MYSQL_YYABORT;
+@@ -3574,13 +3545,13 @@ which_area:
+ diagnostics_information:
+           statement_information
+           {
+-            $$= new (YYTHD->mem_root) Statement_information($1);
++            $$= new (thd->mem_root) Statement_information($1);
+             if ($$ == NULL)
+               MYSQL_YYABORT;
+           }
+         | CONDITION_SYM condition_number condition_information
+           {
+-            $$= new (YYTHD->mem_root) Condition_information($2, $3);
++            $$= new (thd->mem_root) Condition_information($2, $3);
+             if ($$ == NULL)
+               MYSQL_YYABORT;
+           }
+@@ -3589,7 +3560,7 @@ diagnostics_information:
+ statement_information:
+           statement_information_item
+           {
+-            $$= new (YYTHD->mem_root) List<Statement_information_item>;
++            $$= new (thd->mem_root) List<Statement_information_item>;
+             if ($$ == NULL || $$->push_back($1))
+               MYSQL_YYABORT;
+           }
+@@ -3604,7 +3575,7 @@ statement_information:
+ statement_information_item:
+           simple_target_specification EQ statement_information_item_name
+           {
+-            $$= new (YYTHD->mem_root) Statement_information_item($3, $1);
++            $$= new (thd->mem_root) Statement_information_item($3, $1);
+             if ($$ == NULL)
+               MYSQL_YYABORT;
+           }
+@@ -3612,7 +3583,6 @@ statement_information_item:
+ simple_target_specification:
+           ident
+           {
+-            THD *thd= YYTHD;
+             LEX *lex= thd->lex;
+             Lex_input_stream *lip= YYLIP;
+             sp_head *sp= lex->sphead;
+@@ -3641,7 +3611,7 @@ simple_target_specification:
+           }
+         | '@' ident_or_text
+           {
+-            $$= new (YYTHD->mem_root) Item_func_get_user_var($2);
++            $$= new (thd->mem_root) Item_func_get_user_var($2);
+             if ($$ == NULL)
+               MYSQL_YYABORT;
+           }
+@@ -3666,7 +3636,7 @@ condition_number:
+ condition_information:
+           condition_information_item
+           {
+-            $$= new (YYTHD->mem_root) List<Condition_information_item>;
++            $$= new (thd->mem_root) List<Condition_information_item>;
+             if ($$ == NULL || $$->push_back($1))
+               MYSQL_YYABORT;
+           }
+@@ -3681,7 +3651,7 @@ condition_information:
+ condition_information_item:
+           simple_target_specification EQ condition_information_item_name
+           {
+-            $$= new (YYTHD->mem_root) Condition_information_item($3, $1);
++            $$= new (thd->mem_root) Condition_information_item($3, $1);
+             if ($$ == NULL)
+               MYSQL_YYABORT;
+           }
+@@ -3720,7 +3690,6 @@ sp_decl_idents:
+           {
+             /* NOTE: field definition is filled in sp_decl section. */
+ 
+-            THD *thd= YYTHD;
+             LEX *lex= thd->lex;
+             sp_pcontext *pctx= lex->get_sp_current_parsing_ctx();
+ 
+@@ -3740,7 +3709,6 @@ sp_decl_idents:
+           {
+             /* NOTE: field definition is filled in sp_decl section. */
+ 
+-            THD *thd= YYTHD;
+             LEX *lex= thd->lex;
+             sp_pcontext *pctx= lex->get_sp_current_parsing_ctx();
+ 
+@@ -3796,7 +3764,6 @@ sp_proc_stmt_if:
          
  sp_proc_stmt_statement:
            {
 -            THD *thd= YYTHD;
              LEX *lex= thd->lex;
              Lex_input_stream *lip= YYLIP;
- 
-@@ -3181,7 +3160,6 @@ sp_proc_stmt_statement:
+             sp_head *sp= lex->sphead;
+@@ -3806,7 +3773,6 @@ sp_proc_stmt_statement:
            }
            statement
            {
 -            THD *thd= YYTHD;
              LEX *lex= thd->lex;
-             Lex_input_stream *lip= YYLIP;
              sp_head *sp= lex->sphead;
-@@ -3228,7 +3206,7 @@ sp_proc_stmt_statement:
  
+@@ -3853,7 +3819,6 @@ sp_proc_stmt_statement:
  sp_proc_stmt_return:
            RETURN_SYM 
--          { Lex->sphead->reset_lex(YYTHD); }
-+          { Lex->sphead->reset_lex(thd); }
+           {
+-            THD *thd= YYTHD;
+             LEX *lex= thd->lex;
+             sp_head *sp= lex->sphead;
+ 
+@@ -3863,7 +3828,6 @@ sp_proc_stmt_return:
+           }
            expr
            {
+-            THD *thd= YYTHD;
+             LEX *lex= thd->lex;
+             sp_head *sp= lex->sphead;
+ 
+@@ -3909,7 +3873,6 @@ sp_proc_stmt_return:
+ 
+ sp_proc_stmt_unlabeled:
+           { /* Unlabeled controls get a secret label. */
+-            THD *thd= YYTHD;
+             LEX *lex= thd->lex;
+             sp_head *sp= lex->sphead;
+             sp_pcontext *pctx= lex->get_sp_current_parsing_ctx();
+@@ -3932,7 +3895,6 @@ sp_proc_stmt_unlabeled:
+ sp_proc_stmt_leave:
+           LEAVE_SYM label_ident
+           {
+-            THD *thd= YYTHD;
              LEX *lex= Lex;
-@@ -3250,7 +3228,7 @@ sp_proc_stmt_return:
-                 MYSQL_YYABORT;
-               sp->m_flags|= sp_head::HAS_RETURN;
-             }
--            if (sp->restore_lex(YYTHD))
-+            if (sp->restore_lex(thd))
-               MYSQL_YYABORT;
-           }
-         ;
-@@ -3477,7 +3455,7 @@ sp_fetch_list:
-         ;
+             sp_head *sp = lex->sphead;
+             sp_pcontext *pctx= lex->get_sp_current_parsing_ctx();
+@@ -3991,7 +3953,6 @@ sp_proc_stmt_leave:
+ sp_proc_stmt_iterate:
+           ITERATE_SYM label_ident
+           {
+-            THD *thd= YYTHD;
+             LEX *lex= Lex;
+             sp_head *sp= lex->sphead;
+             sp_pcontext *pctx= lex->get_sp_current_parsing_ctx();
+@@ -4041,7 +4002,6 @@ sp_proc_stmt_iterate:
+ sp_proc_stmt_open:
+           OPEN_SYM ident
+           {
+-            THD *thd= YYTHD;
+             LEX *lex= Lex;
+             sp_head *sp= lex->sphead;
+             sp_pcontext *pctx= lex->get_sp_current_parsing_ctx();
+@@ -4065,7 +4025,6 @@ sp_proc_stmt_open:
+ sp_proc_stmt_fetch:
+           FETCH_SYM sp_opt_fetch_noise ident INTO
+           {
+-            THD *thd= YYTHD;
+             LEX *lex= Lex;
+             sp_head *sp= lex->sphead;
+             sp_pcontext *pctx= lex->get_sp_current_parsing_ctx();
+@@ -4091,7 +4050,6 @@ sp_proc_stmt_fetch:
+ sp_proc_stmt_close:
+           CLOSE_SYM ident
+           {
+-            THD *thd= YYTHD;
+             LEX *lex= Lex;
+             sp_head *sp= lex->sphead;
+             sp_pcontext *pctx= lex->get_sp_current_parsing_ctx();
+@@ -4159,7 +4117,6 @@ sp_fetch_list:
  
  sp_if:
--          { Lex->sphead->reset_lex(YYTHD); }
-+          { Lex->sphead->reset_lex(thd); }
-           expr THEN_SYM
            {
-             LEX *lex= Lex;
-@@ -3491,7 +3469,7 @@ sp_if:
-                 sp->add_cont_backpatch(i) ||
-                 sp->add_instr(i))
-               MYSQL_YYABORT;
--            if (sp->restore_lex(YYTHD))
-+            if (sp->restore_lex(thd))
-               MYSQL_YYABORT;
+-            THD *thd= YYTHD;
+             LEX *lex= thd->lex;
+             sp_head *sp= lex->sphead;
+ 
+@@ -4168,7 +4125,6 @@ sp_if:
            }
-           sp_proc_stmts1
-@@ -3530,7 +3508,7 @@ simple_case_stmt:
+           expr
            {
+-            THD *thd= YYTHD;
              LEX *lex= Lex;
-             case_stmt_action_case(lex);
--            lex->sphead->reset_lex(YYTHD); /* For expr $3 */
-+            lex->sphead->reset_lex(thd); /* For expr $3 */
+             sp_head *sp= lex->sphead;
+             sp_pcontext *pctx= lex->get_sp_current_parsing_ctx();
+@@ -4204,7 +4160,6 @@ sp_if:
+           }
+           THEN_SYM sp_proc_stmts1
+           {
+-            THD *thd= YYTHD;
+             LEX *lex= thd->lex;
+             sp_head *sp= lex->sphead;
+             sp_pcontext *pctx= lex->get_sp_current_parsing_ctx();
+@@ -4246,7 +4201,6 @@ case_stmt_specification:
+ simple_case_stmt:
+           CASE_SYM
+           {
+-            THD *thd= YYTHD;
+             LEX *lex= thd->lex;
+             sp_head *sp= lex->sphead;
+ 
+@@ -4257,7 +4211,6 @@ simple_case_stmt:
            }
            expr
            {
-@@ -3539,7 +3517,7 @@ simple_case_stmt:
-               MYSQL_YYABORT;
+-            THD *thd= YYTHD;
+             LEX *lex= Lex;
+             sp_head *sp= lex->sphead;
  
-             /* For expr $3 */
--            if (lex->sphead->restore_lex(YYTHD))
-+            if (lex->sphead->restore_lex(thd))
-               MYSQL_YYABORT;
+@@ -4308,7 +4261,7 @@ simple_case_stmt:
+ searched_case_stmt:
+           CASE_SYM
+           {
+-            case_stmt_action_case(YYTHD);
++            case_stmt_action_case(thd);
            }
-           simple_when_clause_list
-@@ -3581,7 +3559,7 @@ searched_when_clause_list:
+           searched_when_clause_list
+           else_clause_opt
+@@ -4332,7 +4285,6 @@ searched_when_clause_list:
  simple_when_clause:
            WHEN_SYM
            {
--            Lex->sphead->reset_lex(YYTHD); /* For expr $3 */
-+            Lex->sphead->reset_lex(thd); /* For expr $3 */
-           }
-           expr
+-            THD *thd= YYTHD;
+             LEX *lex= thd->lex;
+             sp_head *sp= lex->sphead;
+ 
+@@ -4343,7 +4295,6 @@ simple_when_clause:
            {
-@@ -3591,7 +3569,7 @@ simple_when_clause:
-             if (case_stmt_action_when(lex, $3, true))
-               MYSQL_YYABORT;
-             /* For expr $3 */
--            if (lex->sphead->restore_lex(YYTHD))
-+            if (lex->sphead->restore_lex(thd))
+             /* Simple case: <caseval> = <whenval> */
+ 
+-            THD *thd= YYTHD;
+             LEX *lex= thd->lex;
+             sp_head *sp= lex->sphead;
+             sp_pcontext *pctx= lex->get_sp_current_parsing_ctx();
+@@ -4382,7 +4333,7 @@ simple_when_clause:
+           THEN_SYM
+           sp_proc_stmts1
+           {
+-            if (case_stmt_action_then(YYTHD, Lex))
++            if (case_stmt_action_then(thd, Lex))
                MYSQL_YYABORT;
            }
-           THEN_SYM
-@@ -3606,7 +3584,7 @@ simple_when_clause:
+         ;
+@@ -4390,7 +4341,6 @@ simple_when_clause:
  searched_when_clause:
            WHEN_SYM
            {
--            Lex->sphead->reset_lex(YYTHD); /* For expr $3 */
-+            Lex->sphead->reset_lex(thd); /* For expr $3 */
+-            THD *thd= YYTHD;
+             LEX *lex= thd->lex;
+             sp_head *sp= lex->sphead;
+ 
+@@ -4399,7 +4349,6 @@ searched_when_clause:
            }
            expr
            {
-@@ -3614,7 +3592,7 @@ searched_when_clause:
-             if (case_stmt_action_when(lex, $3, false))
-               MYSQL_YYABORT;
-             /* For expr $3 */
--            if (lex->sphead->restore_lex(YYTHD))
-+            if (lex->sphead->restore_lex(thd))
-               MYSQL_YYABORT;
-           }
+-            THD *thd= YYTHD;
+             LEX *lex= thd->lex;
+             sp_head *sp= lex->sphead;
+             sp_pcontext *pctx= lex->get_sp_current_parsing_ctx();
+@@ -4435,7 +4384,7 @@ searched_when_clause:
            THEN_SYM
-@@ -3778,7 +3756,7 @@ sp_unlabeled_control:
+           sp_proc_stmts1
+           {
+-            if (case_stmt_action_then(YYTHD, Lex))
++            if (case_stmt_action_then(thd, Lex))
                MYSQL_YYABORT;
            }
-         | WHILE_SYM 
--          { Lex->sphead->reset_lex(YYTHD); }
-+          { Lex->sphead->reset_lex(thd); }
-           expr DO_SYM
+         ;
+@@ -4443,7 +4392,6 @@ searched_when_clause:
+ else_clause_opt:
+           /* empty */
            {
+-            THD *thd= YYTHD;
              LEX *lex= Lex;
-@@ -3792,7 +3770,7 @@ sp_unlabeled_control:
-                 sp->new_cont_backpatch(i) ||
-                 sp->add_instr(i))
-               MYSQL_YYABORT;
--            if (sp->restore_lex(YYTHD))
-+            if (sp->restore_lex(thd))
+             sp_head *sp= lex->sphead;
+             sp_pcontext *pctx= lex->get_sp_current_parsing_ctx();
+@@ -4473,7 +4421,7 @@ sp_labeled_control:
+             }
+             else
+             {
+-              lab= pctx->push_label(YYTHD, $1, sp->instructions());
++              lab= pctx->push_label(thd, $1, sp->instructions());
+               lab->type= sp_label::ITERATION;
+             }
+           }
+@@ -4515,7 +4463,7 @@ sp_labeled_block:
                MYSQL_YYABORT;
+             }
+ 
+-            lab= pctx->push_label(YYTHD, $1, sp->instructions());
++            lab= pctx->push_label(thd, $1, sp->instructions());
+             lab->type= sp_label::BEGIN;
+           }
+           sp_block_content sp_opt_label
+@@ -4542,7 +4490,7 @@ sp_unlabeled_block:
+             sp_pcontext *pctx= lex->get_sp_current_parsing_ctx();
+ 
+             sp_label *lab=
+-              pctx->push_label(YYTHD, EMPTY_STR, sp->instructions());
++              pctx->push_label(thd, EMPTY_STR, sp->instructions());
+ 
+             lab->type= sp_label::BEGIN;
            }
-           sp_proc_stmts1 END WHILE_SYM
-@@ -3807,7 +3785,7 @@ sp_unlabeled_control:
-             lex->sphead->do_cont_backpatch();
+@@ -4558,7 +4506,6 @@ sp_block_content:
+           { /* QQ This is just a dummy for grouping declarations and statements
+               together. No [[NOT] ATOMIC] yet, and we need to figure out how
+               make it coexist with the existing BEGIN COMMIT/ROLLBACK. */
+-            THD *thd= YYTHD;
+             LEX *lex= thd->lex;
+             sp_pcontext *parent_pctx= lex->get_sp_current_parsing_ctx();
+ 
+@@ -4571,7 +4518,6 @@ sp_block_content:
+           sp_proc_stmts
+           END
+           {
+-            THD *thd= YYTHD;
+             LEX *lex= Lex;
+             sp_head *sp= lex->sphead;
+             sp_pcontext *pctx= lex->get_sp_current_parsing_ctx();
+@@ -4607,7 +4553,6 @@ sp_unlabeled_control:
+           LOOP_SYM
+           sp_proc_stmts1 END LOOP_SYM
+           {
+-            THD *thd= YYTHD;
+             LEX *lex= Lex;
+             sp_head *sp= lex->sphead;
+             sp_pcontext *pctx= lex->get_sp_current_parsing_ctx();
+@@ -4622,7 +4567,6 @@ sp_unlabeled_control:
            }
-         | REPEAT_SYM sp_proc_stmts1 UNTIL_SYM 
--          { Lex->sphead->reset_lex(YYTHD); }
-+          { Lex->sphead->reset_lex(thd); }
-           expr END REPEAT_SYM
+         | WHILE_SYM 
            {
+-            THD *thd= YYTHD;
+             LEX *lex= thd->lex;
+             sp_head *sp= lex->sphead;
+ 
+@@ -4631,7 +4575,6 @@ sp_unlabeled_control:
+           }
+           expr
+           {
+-            THD *thd= YYTHD;
              LEX *lex= Lex;
-@@ -3819,7 +3797,7 @@ sp_unlabeled_control:
-             if (i == NULL ||
-                 lex->sphead->add_instr(i))
-               MYSQL_YYABORT;
--            if (lex->sphead->restore_lex(YYTHD))
-+            if (lex->sphead->restore_lex(thd))
-               MYSQL_YYABORT;
-             /* We can shortcut the cont_backpatch here */
-             i->m_cont_dest= ip+1;
-@@ -4242,7 +4220,6 @@ create2:
+             sp_head *sp= lex->sphead;
+             sp_pcontext *pctx= lex->get_sp_current_parsing_ctx();
+@@ -4669,7 +4612,6 @@ sp_unlabeled_control:
+           sp_proc_stmts1
+           END WHILE_SYM
+           {
+-            THD *thd= YYTHD;
+             LEX *lex= Lex;
+             sp_head *sp= lex->sphead;
+             sp_pcontext *pctx= lex->get_sp_current_parsing_ctx();
+@@ -4685,7 +4627,6 @@ sp_unlabeled_control:
+           }
+         | REPEAT_SYM sp_proc_stmts1 UNTIL_SYM 
+           {
+-            THD *thd= YYTHD;
+             LEX *lex= thd->lex;
+             sp_head *sp= lex->sphead;
+ 
+@@ -4694,7 +4635,6 @@ sp_unlabeled_control:
+           }
+           expr
+           {
+-            THD *thd= YYTHD;
+             LEX *lex= thd->lex;
+             sp_head *sp= lex->sphead;
+             sp_pcontext *pctx= lex->get_sp_current_parsing_ctx();
+@@ -5147,7 +5087,6 @@ create2:
            create3 {}
          | LIKE table_ident
            {
@@ -647,7 +853,7 @@ index 34ae03b..2a6d9aa 100644
              TABLE_LIST *src_table;
              LEX *lex= thd->lex;
  
-@@ -4257,7 +4234,6 @@ create2:
+@@ -5162,7 +5101,6 @@ create2:
            }
          | '(' LIKE table_ident ')'
            {
@@ -655,7 +861,7 @@ index 34ae03b..2a6d9aa 100644
              TABLE_LIST *src_table;
              LEX *lex= thd->lex;
  
-@@ -4858,7 +4834,7 @@ part_value_expr_item:
+@@ -5763,7 +5701,7 @@ part_value_expr_item:
                my_parse_error(ER(ER_WRONG_EXPR_IN_PARTITION_FUNC_ERROR));
                MYSQL_YYABORT;
              }
@@ -664,57 +870,50 @@ index 34ae03b..2a6d9aa 100644
              {
                MYSQL_YYABORT;
              }
-@@ -5252,19 +5228,19 @@ default_collation:
+@@ -6221,7 +6159,6 @@ default_collation:
  storage_engines:
            ident_or_text
            {
--            plugin_ref plugin= ha_resolve_by_name(YYTHD, &$1);
-+            plugin_ref plugin= ha_resolve_by_name(thd, &$1);
- 
-             if (plugin)
-               $$= plugin_data(plugin, handlerton*);
-             else
-             {
--              if (YYTHD->variables.sql_mode & MODE_NO_ENGINE_SUBSTITUTION)
-+              if (thd->variables.sql_mode & MODE_NO_ENGINE_SUBSTITUTION)
-               {
-                 my_error(ER_UNKNOWN_STORAGE_ENGINE, MYF(0), $1.str);
-                 MYSQL_YYABORT;
-               }
-               $$= 0;
--              push_warning_printf(YYTHD, MYSQL_ERROR::WARN_LEVEL_WARN,
-+              push_warning_printf(thd, MYSQL_ERROR::WARN_LEVEL_WARN,
-                                   ER_UNKNOWN_STORAGE_ENGINE,
-                                   ER(ER_UNKNOWN_STORAGE_ENGINE),
-                                   $1.str);
-@@ -5276,7 +5252,7 @@ known_storage_engines:
+-            THD *thd= YYTHD;
+             plugin_ref plugin=
+               ha_resolve_by_name(thd, &$1,
+                 thd->lex->create_info.options & HA_LEX_CREATE_TMP_TABLE);
+@@ -6247,7 +6184,6 @@ storage_engines:
+ known_storage_engines:
            ident_or_text
            {
-             plugin_ref plugin;
--            if ((plugin= ha_resolve_by_name(YYTHD, &$1)))
-+            if ((plugin= ha_resolve_by_name(thd, &$1)))
-               $$= plugin_data(plugin, handlerton*);
-             else
-             {
-@@ -5506,7 +5482,7 @@ type:
+-            THD *thd= YYTHD;
+             LEX *lex= thd->lex;
+             plugin_ref plugin=
+               ha_resolve_by_name(thd, &$1,
+@@ -6483,7 +6419,7 @@ type:
                {
-                 char buff[sizeof("YEAR()") + MY_INT64_NUM_DECIMAL_DIGITS + 1];
-                 my_snprintf(buff, sizeof(buff), "YEAR(%lu)", length);
--                push_warning_printf(YYTHD, MYSQL_ERROR::WARN_LEVEL_NOTE,
-+                push_warning_printf(thd, MYSQL_ERROR::WARN_LEVEL_NOTE,
-                                     ER_WARN_DEPRECATED_SYNTAX,
-                                     ER(ER_WARN_DEPRECATED_SYNTAX),
-                                     buff, "YEAR(4)");
-@@ -5520,7 +5496,7 @@ type:
-           { $$=MYSQL_TYPE_TIME; }
-         | TIMESTAMP
+                 /* Reset unsupported positive column width to default value */
+                 Lex->length= NULL;
+-                push_warning_printf(YYTHD, Sql_condition::WARN_LEVEL_WARN,
++                push_warning_printf(thd, Sql_condition::WARN_LEVEL_WARN,
+                                     ER_INVALID_YEAR_COLUMN_LENGTH,
+                                     ER(ER_INVALID_YEAR_COLUMN_LENGTH),
+                                     length);
+@@ -6497,7 +6433,7 @@ type:
+           { $$= MYSQL_TYPE_TIME2; }
+         | TIMESTAMP type_datetime_precision
            {
 -            if (YYTHD->variables.sql_mode & MODE_MAXDB)
 +            if (thd->variables.sql_mode & MODE_MAXDB)
-               $$=MYSQL_TYPE_DATETIME;
+               $$=MYSQL_TYPE_DATETIME2;
              else
              {
-@@ -5652,7 +5628,7 @@ int_type:
+@@ -6505,7 +6441,7 @@ type:
+                 Unlike other types TIMESTAMP fields are NOT NULL by default.
+                 This behavior is deprecated now.
+               */
+-              if (!YYTHD->variables.explicit_defaults_for_timestamp)
++              if (!thd->variables.explicit_defaults_for_timestamp)
+                 Lex->type|= NOT_NULL_FLAG;
+ 
+               $$=MYSQL_TYPE_TIMESTAMP2;
+@@ -6632,7 +6568,7 @@ int_type:
  real_type:
            REAL
            {
@@ -723,25 +922,16 @@ index 34ae03b..2a6d9aa 100644
                MYSQL_TYPE_FLOAT : MYSQL_TYPE_DOUBLE;
            }
          | DOUBLE_SYM
-@@ -5727,7 +5703,7 @@ attribute:
-         | DEFAULT now_or_signed_literal { Lex->default_value=$2; }
-         | ON UPDATE_SYM NOW_SYM optional_braces
-           {
--            Item *item= new (YYTHD->mem_root) Item_func_now_local();
-+            Item *item= new (thd->mem_root) Item_func_now_local();
-             if (item == NULL)
-               MYSQL_YYABORT;
-             Lex->on_update_value= item;
-@@ -5798,7 +5774,7 @@ type_with_opt_collate:
- now_or_signed_literal:
-           NOW_SYM optional_braces
+@@ -6821,7 +6757,7 @@ type_with_opt_collate:
+ now:
+           NOW_SYM func_datetime_precision
            {
--            $$= new (YYTHD->mem_root) Item_func_now_local();
-+            $$= new (thd->mem_root) Item_func_now_local();
+-            $$= new (YYTHD->mem_root) Item_func_now_local($2);
++            $$= new (thd->mem_root) Item_func_now_local($2);
              if ($$ == NULL)
                MYSQL_YYABORT;
-           }
-@@ -6217,7 +6193,6 @@ string_list:
+           };
+@@ -7301,7 +7237,6 @@ string_list:
  alter:
            ALTER opt_ignore TABLE_SYM table_ident
            {
@@ -749,15 +939,15 @@ index 34ae03b..2a6d9aa 100644
              LEX *lex= thd->lex;
              lex->name.str= 0;
              lex->name.length= 0;
-@@ -6243,7 +6218,6 @@ alter:
+@@ -7327,7 +7262,6 @@ alter:
            }
            alter_commands
            {
 -            THD *thd= YYTHD;
              LEX *lex= thd->lex;
-             if (!lex->m_stmt)
+             if (!lex->m_sql_cmd)
              {
-@@ -6356,7 +6330,7 @@ alter:
+@@ -7440,7 +7374,7 @@ alter:
                Event_parse_data.
              */
  
@@ -766,7 +956,25 @@ index 34ae03b..2a6d9aa 100644
                MYSQL_YYABORT;
              Lex->event_parse_data->identifier= $4;
  
-@@ -6471,7 +6445,6 @@ alter_commands:
+@@ -7543,7 +7477,7 @@ alter_commands:
+           /* empty */
+         | DISCARD TABLESPACE
+           {
+-            Lex->m_sql_cmd= new (YYTHD->mem_root)
++            Lex->m_sql_cmd= new (thd->mem_root)
+               Sql_cmd_discard_import_tablespace(
+                 Sql_cmd_discard_import_tablespace::DISCARD_TABLESPACE);
+             if (Lex->m_sql_cmd == NULL)
+@@ -7551,7 +7485,7 @@ alter_commands:
+           }
+         | IMPORT TABLESPACE
+           {
+-            Lex->m_sql_cmd= new (YYTHD->mem_root)
++            Lex->m_sql_cmd= new (thd->mem_root)
+               Sql_cmd_discard_import_tablespace(
+                 Sql_cmd_discard_import_tablespace::IMPORT_TABLESPACE);
+             if (Lex->m_sql_cmd == NULL)
+@@ -7585,7 +7519,6 @@ alter_commands:
          | OPTIMIZE PARTITION_SYM opt_no_write_to_binlog
            all_or_alt_part_name_list
            {
@@ -774,7 +982,7 @@ index 34ae03b..2a6d9aa 100644
              LEX *lex= thd->lex;
              lex->no_write_to_binlog= $3;
              lex->check_opt.init();
-@@ -6485,7 +6458,6 @@ alter_commands:
+@@ -7599,7 +7532,6 @@ alter_commands:
          | ANALYZE_SYM PARTITION_SYM opt_no_write_to_binlog
            all_or_alt_part_name_list
            {
@@ -782,15 +990,15 @@ index 34ae03b..2a6d9aa 100644
              LEX *lex= thd->lex;
              lex->no_write_to_binlog= $3;
              lex->check_opt.init();
-@@ -6497,7 +6469,6 @@ alter_commands:
+@@ -7611,7 +7543,6 @@ alter_commands:
            }
          | CHECK_SYM PARTITION_SYM all_or_alt_part_name_list
            {
 -            THD *thd= YYTHD;
              LEX *lex= thd->lex;
              lex->check_opt.init();
-             DBUG_ASSERT(!lex->m_stmt);
-@@ -6510,7 +6481,6 @@ alter_commands:
+             DBUG_ASSERT(!lex->m_sql_cmd);
+@@ -7624,7 +7555,6 @@ alter_commands:
          | REPAIR PARTITION_SYM opt_no_write_to_binlog
            all_or_alt_part_name_list
            {
@@ -798,15 +1006,23 @@ index 34ae03b..2a6d9aa 100644
              LEX *lex= thd->lex;
              lex->no_write_to_binlog= $3;
              lex->check_opt.init();
-@@ -6530,7 +6500,6 @@ alter_commands:
+@@ -7644,7 +7574,6 @@ alter_commands:
            }
          | TRUNCATE_SYM PARTITION_SYM all_or_alt_part_name_list
            {
 -            THD *thd= YYTHD;
              LEX *lex= thd->lex;
              lex->check_opt.init();
-             DBUG_ASSERT(!lex->m_stmt);
-@@ -6785,7 +6754,6 @@ alter_list_item:
+             DBUG_ASSERT(!lex->m_sql_cmd);
+@@ -7657,7 +7586,6 @@ alter_commands:
+         | EXCHANGE_SYM PARTITION_SYM alt_part_name_item
+           WITH TABLE_SYM table_ident have_partitioning
+           {
+-            THD *thd= YYTHD;
+             LEX *lex= thd->lex;
+             size_t dummy;
+             lex->select_lex.db=$6->db.str;
+@@ -7939,7 +7867,6 @@ alter_list_item:
            {
              if (!$4)
              {
@@ -814,39 +1030,39 @@ index 34ae03b..2a6d9aa 100644
                $4= thd->variables.collation_database;
              }
              $5= $5 ? $5 : $4;
-@@ -6980,7 +6948,6 @@ repair:
+@@ -8301,7 +8228,6 @@ repair:
            }
            table_list opt_mi_repair_type
            {
 -            THD *thd= YYTHD;
              LEX* lex= thd->lex;
-             DBUG_ASSERT(!lex->m_stmt);
-             lex->m_stmt= new (thd->mem_root) Repair_table_statement(lex);
-@@ -7018,7 +6985,6 @@ analyze:
+             DBUG_ASSERT(!lex->m_sql_cmd);
+             lex->m_sql_cmd= new (thd->mem_root) Sql_cmd_repair_table();
+@@ -8339,7 +8265,6 @@ analyze:
            }
            table_list
            {
 -            THD *thd= YYTHD;
              LEX* lex= thd->lex;
-             DBUG_ASSERT(!lex->m_stmt);
-             lex->m_stmt= new (thd->mem_root) Analyze_table_statement(lex);
-@@ -7053,7 +7019,6 @@ check:
+             DBUG_ASSERT(!lex->m_sql_cmd);
+             lex->m_sql_cmd= new (thd->mem_root) Sql_cmd_analyze_table();
+@@ -8374,7 +8299,6 @@ check:
            }
            table_list opt_mi_check_type
            {
 -            THD *thd= YYTHD;
              LEX* lex= thd->lex;
-             DBUG_ASSERT(!lex->m_stmt);
-             lex->m_stmt= new (thd->mem_root) Check_table_statement(lex);
-@@ -7094,7 +7059,6 @@ optimize:
+             DBUG_ASSERT(!lex->m_sql_cmd);
+             lex->m_sql_cmd= new (thd->mem_root) Sql_cmd_check_table();
+@@ -8415,7 +8339,6 @@ optimize:
            }
            table_list
            {
 -            THD *thd= YYTHD;
              LEX* lex= thd->lex;
-             DBUG_ASSERT(!lex->m_stmt);
-             lex->m_stmt= new (thd->mem_root) Optimize_table_statement(lex);
-@@ -7179,7 +7143,7 @@ keycache_list:
+             DBUG_ASSERT(!lex->m_sql_cmd);
+             lex->m_sql_cmd= new (thd->mem_root) Sql_cmd_optimize_table();
+@@ -8500,7 +8423,7 @@ keycache_list:
  assign_to_keycache:
            table_ident cache_keys_spec
            {
@@ -855,16 +1071,16 @@ index 34ae03b..2a6d9aa 100644
                                             MDL_SHARED_READ,
                                             Select->pop_index_hints()))
                MYSQL_YYABORT;
-@@ -7189,7 +7153,7 @@ assign_to_keycache:
+@@ -8510,7 +8433,7 @@ assign_to_keycache:
  assign_to_keycache_parts:
            table_ident adm_partition cache_keys_spec
            {
 -            if (!Select->add_table_to_list(YYTHD, $1, NULL, 0, TL_READ, 
-+            if (!Select->add_table_to_list(thd, $1, NULL, 0, TL_READ,
++            if (!Select->add_table_to_list(thd, $1, NULL, 0, TL_READ, 
                                             MDL_SHARED_READ,
                                             Select->pop_index_hints()))
                MYSQL_YYABORT;
-@@ -7225,7 +7189,7 @@ preload_list:
+@@ -8546,7 +8469,7 @@ preload_list:
  preload_keys:
            table_ident cache_keys_spec opt_ignore_leaves
            {
@@ -873,7 +1089,7 @@ index 34ae03b..2a6d9aa 100644
                                             MDL_SHARED_READ,
                                             Select->pop_index_hints()))
                MYSQL_YYABORT;
-@@ -7235,7 +7199,7 @@ preload_keys:
+@@ -8556,7 +8479,7 @@ preload_keys:
  preload_keys_parts:
            table_ident adm_partition cache_keys_spec opt_ignore_leaves
            {
@@ -882,7 +1098,7 @@ index 34ae03b..2a6d9aa 100644
                                             MDL_SHARED_READ,
                                             Select->pop_index_hints()))
                MYSQL_YYABORT;
-@@ -7252,7 +7216,7 @@ adm_partition:
+@@ -8573,7 +8496,7 @@ adm_partition:
  
  cache_keys_spec:
            {
@@ -891,7 +1107,7 @@ index 34ae03b..2a6d9aa 100644
              Select->set_index_hint_type(INDEX_HINT_USE, 
                                          old_mode ? 
                                          INDEX_HINT_MASK_JOIN : 
-@@ -7471,7 +7435,6 @@ select_item_list:
+@@ -8788,7 +8711,6 @@ select_item_list:
          | select_item
          | '*'
            {
@@ -899,12 +1115,12 @@ index 34ae03b..2a6d9aa 100644
              Item *item= new (thd->mem_root)
                            Item_field(&thd->lex->current_select->context,
                                       NULL, NULL, "*");
-@@ -7486,14 +7449,12 @@ select_item_list:
+@@ -8803,14 +8725,11 @@ select_item_list:
  select_item:
            remember_name table_wild remember_end
            {
 -            THD *thd= YYTHD;
- 
+-
              if (add_item_to_list(thd, $2))
                MYSQL_YYABORT;
            }
@@ -914,7 +1130,7 @@ index 34ae03b..2a6d9aa 100644
              DBUG_ASSERT($1 < $3);
  
              if (add_item_to_list(thd, $2))
-@@ -7589,7 +7550,7 @@ expr:
+@@ -8905,7 +8824,7 @@ expr:
              else
              {
                /* X OR Y */
@@ -923,16 +1139,16 @@ index 34ae03b..2a6d9aa 100644
                if ($$ == NULL)
                  MYSQL_YYABORT;
              }
-@@ -7597,7 +7558,7 @@ expr:
+@@ -8913,7 +8832,7 @@ expr:
          | expr XOR expr %prec XOR
            {
              /* XOR is a proprietary extension */
--            $$ = new (YYTHD->mem_root) Item_cond_xor($1, $3);
-+            $$ = new (thd->mem_root) Item_cond_xor($1, $3);
+-            $$ = new (YYTHD->mem_root) Item_func_xor($1, $3);
++            $$ = new (thd->mem_root) Item_func_xor($1, $3);
              if ($$ == NULL)
                MYSQL_YYABORT;
            }
-@@ -7639,50 +7600,50 @@ expr:
+@@ -8955,50 +8874,50 @@ expr:
              else
              {
                /* X AND Y */
@@ -991,7 +1207,7 @@ index 34ae03b..2a6d9aa 100644
              if ($$ == NULL)
                MYSQL_YYABORT;
            }
-@@ -7692,19 +7653,19 @@ expr:
+@@ -9008,19 +8927,19 @@ expr:
  bool_pri:
            bool_pri IS NULL_SYM %prec IS
            {
@@ -1014,7 +1230,7 @@ index 34ae03b..2a6d9aa 100644
              if ($$ == NULL)
                MYSQL_YYABORT;
            }
-@@ -7726,13 +7687,12 @@ bool_pri:
+@@ -9042,13 +8961,12 @@ bool_pri:
  predicate:
            bit_expr IN_SYM '(' subselect ')'
            {
@@ -1029,7 +1245,7 @@ index 34ae03b..2a6d9aa 100644
              Item *item= new (thd->mem_root) Item_in_subselect($1, $5);
              if (item == NULL)
                MYSQL_YYABORT;
-@@ -7742,7 +7702,7 @@ predicate:
+@@ -9058,7 +8976,7 @@ predicate:
            }
          | bit_expr IN_SYM '(' expr ')'
            {
@@ -1038,7 +1254,7 @@ index 34ae03b..2a6d9aa 100644
              if ($$ == NULL)
                MYSQL_YYABORT;
            }
-@@ -7750,13 +7710,13 @@ predicate:
+@@ -9066,13 +8984,13 @@ predicate:
            { 
              $6->push_front($4);
              $6->push_front($1);
@@ -1054,7 +1270,7 @@ index 34ae03b..2a6d9aa 100644
              if ($$ == NULL)
                MYSQL_YYABORT;
            }
-@@ -7764,7 +7724,7 @@ predicate:
+@@ -9080,7 +8998,7 @@ predicate:
            {
              $7->push_front($5);
              $7->push_front($1);
@@ -1063,7 +1279,7 @@ index 34ae03b..2a6d9aa 100644
              if (item == NULL)
                MYSQL_YYABORT;
              item->negate();
-@@ -7772,14 +7732,14 @@ predicate:
+@@ -9088,14 +9006,14 @@ predicate:
            }
          | bit_expr BETWEEN_SYM bit_expr AND_SYM predicate
            {
@@ -1080,7 +1296,7 @@ index 34ae03b..2a6d9aa 100644
              if (item == NULL)
                MYSQL_YYABORT;
              item->negate();
-@@ -7787,42 +7747,42 @@ predicate:
+@@ -9103,42 +9021,42 @@ predicate:
            }
          | bit_expr SOUNDS_SYM LIKE bit_expr
            {
@@ -1132,7 +1348,7 @@ index 34ae03b..2a6d9aa 100644
              if ($$ == NULL)
                MYSQL_YYABORT;
            }
-@@ -7832,85 +7792,85 @@ predicate:
+@@ -9148,85 +9066,85 @@ predicate:
  bit_expr:
            bit_expr '|' bit_expr %prec '|'
            {
@@ -1232,7 +1448,7 @@ index 34ae03b..2a6d9aa 100644
              if ($$ == NULL)
                MYSQL_YYABORT;
            }
-@@ -7959,7 +7919,6 @@ simple_expr:
+@@ -9275,7 +9193,6 @@ simple_expr:
          | function_call_conflict
          | simple_expr COLLATE_SYM ident_or_text %prec NEG
            {
@@ -1240,7 +1456,7 @@ index 34ae03b..2a6d9aa 100644
              Item *i1= new (thd->mem_root) Item_string($3.str,
                                                        $3.length,
                                                        thd->charset());
-@@ -7975,7 +7934,7 @@ simple_expr:
+@@ -9291,7 +9208,7 @@ simple_expr:
          | sum_expr
          | simple_expr OR_OR_SYM simple_expr
            {
@@ -1249,7 +1465,7 @@ index 34ae03b..2a6d9aa 100644
              if ($$ == NULL)
                MYSQL_YYABORT;
            }
-@@ -7985,25 +7944,25 @@ simple_expr:
+@@ -9301,25 +9218,25 @@ simple_expr:
            }
          | '-' simple_expr %prec NEG
            {
@@ -1279,7 +1495,7 @@ index 34ae03b..2a6d9aa 100644
              if ($$ == NULL)
                MYSQL_YYABORT;
            }
-@@ -8012,20 +7971,20 @@ simple_expr:
+@@ -9328,20 +9245,20 @@ simple_expr:
          | '(' expr ',' expr_list ')'
            {
              $4->push_front($2);
@@ -1303,7 +1519,16 @@ index 34ae03b..2a6d9aa 100644
              if ($$ == NULL)
                MYSQL_YYABORT;
            }
-@@ -8034,7 +7993,7 @@ simple_expr:
+@@ -9378,7 +9295,7 @@ simple_expr:
+                   type= MYSQL_TYPE_DATETIME;
+               }
+               if (type != MYSQL_TYPE_STRING)
+-                $$= create_temporal_literal(YYTHD,
++                $$= create_temporal_literal(thd,
+                                             str.ptr(), str.length(),
+                                             system_charset_info,
+                                             type, false);
+@@ -9389,7 +9306,7 @@ simple_expr:
          | MATCH ident_list_arg AGAINST '(' bit_expr fulltext_options ')'
            {
              $2->push_front($5);
@@ -1312,7 +1537,7 @@ index 34ae03b..2a6d9aa 100644
              if (i1 == NULL)
                MYSQL_YYABORT;
              Select->add_ftfunc_to_list(i1);
-@@ -8042,7 +8001,7 @@ simple_expr:
+@@ -9397,7 +9314,7 @@ simple_expr:
            }
          | BINARY simple_expr %prec NEG
            {
@@ -1321,7 +1546,7 @@ index 34ae03b..2a6d9aa 100644
                                   &my_charset_bin);
              if ($$ == NULL)
                MYSQL_YYABORT;
-@@ -8050,27 +8009,27 @@ simple_expr:
+@@ -9405,27 +9322,27 @@ simple_expr:
          | CAST_SYM '(' expr AS cast_type ')'
            {
              LEX *lex= Lex;
@@ -1353,8 +1578,8 @@ index 34ae03b..2a6d9aa 100644
              if ($$ == NULL)
                MYSQL_YYABORT;
            }
-@@ -8083,14 +8042,14 @@ simple_expr:
-               my_error(ER_WRONG_COLUMN_NAME, MYF(0), il->my_name()->str);
+@@ -9438,14 +9355,14 @@ simple_expr:
+               my_error(ER_WRONG_COLUMN_NAME, MYF(0), il->m_name.ptr());
                MYSQL_YYABORT;
              }
 -            $$= new (YYTHD->mem_root) Item_default_value(Lex->current_context(),
@@ -1370,7 +1595,7 @@ index 34ae03b..2a6d9aa 100644
                                                          $3);
              if ($$ == NULL)
                MYSQL_YYABORT;
-@@ -8098,7 +8057,7 @@ simple_expr:
+@@ -9453,7 +9370,7 @@ simple_expr:
          | INTERVAL_SYM expr interval '+' expr %prec INTERVAL_SYM
            /* we cannot put interval before - */
            {
@@ -1379,7 +1604,7 @@ index 34ae03b..2a6d9aa 100644
              if ($$ == NULL)
                MYSQL_YYABORT;
            }
-@@ -8113,19 +8072,19 @@ simple_expr:
+@@ -9468,19 +9385,19 @@ simple_expr:
  function_call_keyword:
            CHAR_SYM '(' expr_list ')'
            {
@@ -1402,7 +1627,7 @@ index 34ae03b..2a6d9aa 100644
              if ($$ == NULL)
                MYSQL_YYABORT;
              Lex->set_stmt_unsafe(LEX::BINLOG_STMT_UNSAFE_SYSTEM_FUNCTION);
-@@ -8133,31 +8092,30 @@ function_call_keyword:
+@@ -9488,31 +9405,30 @@ function_call_keyword:
            }
          | DATE_SYM '(' expr ')'
            {
@@ -1438,7 +1663,7 @@ index 34ae03b..2a6d9aa 100644
              List<Item> *list= new (thd->mem_root) List<Item>;
              if (list == NULL)
                MYSQL_YYABORT;
-@@ -8172,7 +8130,6 @@ function_call_keyword:
+@@ -9527,7 +9443,6 @@ function_call_keyword:
            }
          | INTERVAL_SYM '(' expr ',' expr ',' expr_list ')' %prec INTERVAL_SYM
            {
@@ -1446,7 +1671,7 @@ index 34ae03b..2a6d9aa 100644
              $7->push_front($5);
              $7->push_front($3);
              Item_row *item= new (thd->mem_root) Item_row(*$7);
-@@ -8184,103 +8141,103 @@ function_call_keyword:
+@@ -9539,103 +9454,103 @@ function_call_keyword:
            }
          | LEFT '(' expr ',' expr ')'
            {
@@ -1567,7 +1792,7 @@ index 34ae03b..2a6d9aa 100644
              if ($$ == NULL)
                MYSQL_YYABORT;
              Lex->set_stmt_unsafe(LEX::BINLOG_STMT_UNSAFE_SYSTEM_FUNCTION);
-@@ -8288,7 +8245,7 @@ function_call_keyword:
+@@ -9643,7 +9558,7 @@ function_call_keyword:
            }
          | YEAR_SYM '(' expr ')'
            {
@@ -1576,7 +1801,7 @@ index 34ae03b..2a6d9aa 100644
              if ($$ == NULL)
                MYSQL_YYABORT;
            }
-@@ -8309,34 +8266,34 @@ function_call_keyword:
+@@ -9664,27 +9579,27 @@ function_call_keyword:
  function_call_nonkeyword:
            ADDDATE_SYM '(' expr ',' expr ')'
            {
@@ -1601,22 +1826,14 @@ index 34ae03b..2a6d9aa 100644
                MYSQL_YYABORT;
              Lex->safe_to_cache_query=0;
            }
-         | CURTIME optional_braces
-           {
--            $$= new (YYTHD->mem_root) Item_func_curtime_local();
-+            $$= new (thd->mem_root) Item_func_curtime_local();
-             if ($$ == NULL)
-               MYSQL_YYABORT;
-             Lex->safe_to_cache_query=0;
-           }
-         | CURTIME '(' expr ')'
+         | CURTIME func_datetime_precision
            {
--            $$= new (YYTHD->mem_root) Item_func_curtime_local($3);
-+            $$= new (thd->mem_root) Item_func_curtime_local($3);
+-            $$= new (YYTHD->mem_root) Item_func_curtime_local($2);
++            $$= new (thd->mem_root) Item_func_curtime_local($2);
              if ($$ == NULL)
                MYSQL_YYABORT;
              Lex->safe_to_cache_query=0;
-@@ -8344,83 +8301,83 @@ function_call_nonkeyword:
+@@ -9692,26 +9607,26 @@ function_call_nonkeyword:
          | DATE_ADD_INTERVAL '(' expr ',' INTERVAL_SYM expr interval ')'
            %prec INTERVAL_SYM
            {
@@ -1647,21 +1864,7 @@ index 34ae03b..2a6d9aa 100644
              if ($$ == NULL)
                MYSQL_YYABORT;
            }
-         | NOW_SYM optional_braces
-           {
--            $$= new (YYTHD->mem_root) Item_func_now_local();
-+            $$= new (thd->mem_root) Item_func_now_local();
-             if ($$ == NULL)
-               MYSQL_YYABORT;
-             Lex->safe_to_cache_query=0;
-           }
-         | NOW_SYM '(' expr ')'
-           {
--            $$= new (YYTHD->mem_root) Item_func_now_local($3);
-+            $$= new (thd->mem_root) Item_func_now_local($3);
-             if ($$ == NULL)
-               MYSQL_YYABORT;
-             Lex->safe_to_cache_query=0;
+@@ -9722,44 +9637,44 @@ function_call_nonkeyword:
            }
          | POSITION_SYM '(' bit_expr IN_SYM expr ')'
            {
@@ -1713,27 +1916,15 @@ index 34ae03b..2a6d9aa 100644
              if ($$ == NULL)
                MYSQL_YYABORT;
            }
-@@ -8435,9 +8392,9 @@ function_call_nonkeyword:
+@@ -9774,42 +9689,42 @@ function_call_nonkeyword:
              */
              Lex->set_stmt_unsafe(LEX::BINLOG_STMT_UNSAFE_SYSTEM_FUNCTION);
              if (global_system_variables.sysdate_is_now == 0)
--              $$= new (YYTHD->mem_root) Item_func_sysdate_local();
-+              $$= new (thd->mem_root) Item_func_sysdate_local();
+-              $$= new (YYTHD->mem_root) Item_func_sysdate_local($2);
++              $$= new (thd->mem_root) Item_func_sysdate_local($2);
              else
--              $$= new (YYTHD->mem_root) Item_func_now_local();
-+              $$= new (thd->mem_root) Item_func_now_local();
-             if ($$ == NULL)
-               MYSQL_YYABORT;
-             Lex->safe_to_cache_query=0;
-@@ -8445,42 +8402,42 @@ function_call_nonkeyword:
-         | SYSDATE '(' expr ')'
-           {
-             if (global_system_variables.sysdate_is_now == 0)
--              $$= new (YYTHD->mem_root) Item_func_sysdate_local($3);
-+              $$= new (thd->mem_root) Item_func_sysdate_local($3);
-             else
--              $$= new (YYTHD->mem_root) Item_func_now_local($3);
-+              $$= new (thd->mem_root) Item_func_now_local($3);
+-              $$= new (YYTHD->mem_root) Item_func_now_local($2);
++              $$= new (thd->mem_root) Item_func_now_local($2);
              if ($$ == NULL)
                MYSQL_YYABORT;
              Lex->safe_to_cache_query=0;
@@ -1760,22 +1951,22 @@ index 34ae03b..2a6d9aa 100644
                MYSQL_YYABORT;
              Lex->safe_to_cache_query=0;
            }
-         | UTC_TIME_SYM optional_braces
+         | UTC_TIME_SYM func_datetime_precision
            {
--            $$= new (YYTHD->mem_root) Item_func_curtime_utc();
-+            $$= new (thd->mem_root) Item_func_curtime_utc();
+-            $$= new (YYTHD->mem_root) Item_func_curtime_utc($2);
++            $$= new (thd->mem_root) Item_func_curtime_utc($2);
              if ($$ == NULL)
                MYSQL_YYABORT;
              Lex->safe_to_cache_query=0;
            }
-         | UTC_TIMESTAMP_SYM optional_braces
+         | UTC_TIMESTAMP_SYM func_datetime_precision
            {
--            $$= new (YYTHD->mem_root) Item_func_now_utc();
-+            $$= new (thd->mem_root) Item_func_now_utc();
+-            $$= new (YYTHD->mem_root) Item_func_now_utc($2);
++            $$= new (thd->mem_root) Item_func_now_utc($2);
              if ($$ == NULL)
                MYSQL_YYABORT;
              Lex->safe_to_cache_query=0;
-@@ -8495,62 +8452,61 @@ function_call_nonkeyword:
+@@ -9824,75 +9739,74 @@ function_call_nonkeyword:
  function_call_conflict:
            ASCII_SYM '(' expr ')'
            {
@@ -1820,6 +2011,20 @@ index 34ae03b..2a6d9aa 100644
              if ($$ == NULL)
                MYSQL_YYABORT;
            }
+         | FORMAT_SYM '(' expr ',' expr ')'
+           {
+-            $$= new (YYTHD->mem_root) Item_func_format($3, $5);
++            $$= new (thd->mem_root) Item_func_format($3, $5);
+             if ($$ == NULL)
+               MYSQL_YYABORT;
+           }
+         | FORMAT_SYM '(' expr ',' expr ',' expr ')'
+           {
+-            $$= new (YYTHD->mem_root) Item_func_format($3, $5, $7);
++            $$= new (thd->mem_root) Item_func_format($3, $5, $7);
+             if ($$ == NULL)
+               MYSQL_YYABORT;
+           }
          | MICROSECOND_SYM '(' expr ')'
            {
 -            $$= new (YYTHD->mem_root) Item_func_microsecond($3);
@@ -1838,6 +2043,7 @@ index 34ae03b..2a6d9aa 100644
            {
 -            $$=  new (YYTHD->mem_root) Item_func_old_password($3);
 +            $$=  new (thd->mem_root) Item_func_old_password($3);
+             Lex->contains_plaintext_password= true;
              if ($$ == NULL)
                MYSQL_YYABORT;
            }
@@ -1845,9 +2051,9 @@ index 34ae03b..2a6d9aa 100644
            {
 -            THD *thd= YYTHD;
              Item* i1;
-             if (thd->variables.old_passwords)
-               i1= new (thd->mem_root) Item_func_old_password($3);
-@@ -8562,31 +8518,30 @@ function_call_conflict:
+             Lex->contains_plaintext_password= true;
+             if (thd->variables.old_passwords == 1)
+@@ -9905,31 +9819,31 @@ function_call_conflict:
            }
          | QUARTER_SYM '(' expr ')'
            {
@@ -1870,6 +2076,22 @@ index 34ae03b..2a6d9aa 100644
              if ($$ == NULL)
                MYSQL_YYABORT;
            }
+         | REVERSE_SYM '(' expr ')'
+           {
+-            $$= new (YYTHD->mem_root) Item_func_reverse($3);
++            $$= new (thd->mem_root) Item_func_reverse($3);
+             if ($$ == NULL)
+               MYSQL_YYABORT;
+           }
+         | ROW_COUNT_SYM '(' ')'
+           {
+-            $$= new (YYTHD->mem_root) Item_func_row_count();
++            $$= new (thd->mem_root) Item_func_row_count();
+             if ($$ == NULL)
+               MYSQL_YYABORT;
+             Lex->set_stmt_unsafe(LEX::BINLOG_STMT_UNSAFE_SYSTEM_FUNCTION);
+@@ -9937,13 +9851,12 @@ function_call_conflict:
+           }
          | TRUNCATE_SYM '(' expr ',' expr ')'
            {
 -            $$= new (YYTHD->mem_root) Item_func_round($3,$5,1);
@@ -1880,10 +2102,10 @@ index 34ae03b..2a6d9aa 100644
          | WEEK_SYM '(' expr ')'
            {
 -            THD *thd= YYTHD;
-             Item *i1= new (thd->mem_root) Item_int((char*) "0",
+             Item *i1= new (thd->mem_root) Item_int(NAME_STRING("0"),
                                             thd->variables.default_week_format,
                                                     1);
-@@ -8598,7 +8553,7 @@ function_call_conflict:
+@@ -9955,19 +9868,19 @@ function_call_conflict:
            }
          | WEEK_SYM '(' expr ',' expr ')'
            {
@@ -1892,13 +2114,48 @@ index 34ae03b..2a6d9aa 100644
              if ($$ == NULL)
                MYSQL_YYABORT;
            }
-@@ -8620,52 +8575,52 @@ function_call_conflict:
+         | WEIGHT_STRING_SYM '(' expr opt_ws_levels ')'
+           {
+-            $$= new (YYTHD->mem_root) Item_func_weight_string($3, 0, 0, $4);
++            $$= new (thd->mem_root) Item_func_weight_string($3, 0, 0, $4);
+             if ($$ == NULL)
+               MYSQL_YYABORT;
+           }
+         | WEIGHT_STRING_SYM '(' expr AS CHAR_SYM ws_nweights opt_ws_levels ')'
+           {
+-            $$= new (YYTHD->mem_root)
++            $$= new (thd->mem_root)
+                 Item_func_weight_string($3, 0, $6,
+                                         $7 | MY_STRXFRM_PAD_WITH_SPACE);
+             if ($$ == NULL)
+@@ -9975,17 +9888,17 @@ function_call_conflict:
+           }
+         | WEIGHT_STRING_SYM '(' expr AS BINARY ws_nweights ')'
+           {
+-            Item *item= new (YYTHD->mem_root) Item_char_typecast($3, $6, &my_charset_bin);
++            Item *item= new (thd->mem_root) Item_char_typecast($3, $6, &my_charset_bin);
+             if (item == NULL)
+               MYSQL_YYABORT;
+-            $$= new (YYTHD->mem_root)
++            $$= new (thd->mem_root)
+                 Item_func_weight_string(item, 0, $6, MY_STRXFRM_PAD_WITH_SPACE);
+             if ($$ == NULL)
+               MYSQL_YYABORT;
+           }
+         | WEIGHT_STRING_SYM '(' expr ',' ulong_num ',' ulong_num ',' ulong_num ')'
+           {
+-            $$= new (YYTHD->mem_root) Item_func_weight_string($3, $5, $7, $9);
++            $$= new (thd->mem_root) Item_func_weight_string($3, $5, $7, $9);
+             if ($$ == NULL)
+               MYSQL_YYABORT;
+           }
+@@ -10007,52 +9920,52 @@ function_call_conflict:
  geometry_function:
            CONTAINS_SYM '(' expr ',' expr ')'
            {
 -            $$= GEOM_NEW(YYTHD,
 +            $$= GEOM_NEW(thd,
-                          Item_func_spatial_rel($3, $5,
+                          Item_func_spatial_mbr_rel($3, $5,
                                                 Item_func::SP_CONTAINS_FUNC));
            }
          | GEOMETRYCOLLECTION '(' expr_list ')'
@@ -1953,7 +2210,7 @@ index 34ae03b..2a6d9aa 100644
                           Item_func_spatial_collection(* $3,
                             Geometry::wkb_polygon,
                             Geometry::wkb_linestring));
-@@ -8703,7 +8658,6 @@ function_call_generic:
+@@ -10090,7 +10003,6 @@ function_call_generic:
            }
            opt_udf_expr_list ')'
            {
@@ -1961,7 +2218,7 @@ index 34ae03b..2a6d9aa 100644
              Create_func *builder;
              Item *item= NULL;
  
-@@ -8757,7 +8711,6 @@ function_call_generic:
+@@ -10144,7 +10056,6 @@ function_call_generic:
            }
          | ident '.' ident '(' opt_expr_list ')'
            {
@@ -1969,7 +2226,7 @@ index 34ae03b..2a6d9aa 100644
              Create_qfunc *builder;
              Item *item= NULL;
  
-@@ -8821,7 +8774,7 @@ opt_udf_expr_list:
+@@ -10206,7 +10117,7 @@ opt_udf_expr_list:
  udf_expr_list:
            udf_expr
            {
@@ -1978,16 +2235,16 @@ index 34ae03b..2a6d9aa 100644
              if ($$ == NULL)
                MYSQL_YYABORT;
              $$->push_back($1);
-@@ -8854,7 +8807,7 @@ udf_expr:
-                remember_name we may get quoted or escaped names.
+@@ -10239,7 +10150,7 @@ udf_expr:
              */
-             else if ($2->type() != Item::FIELD_ITEM)
--              $2->set_name($1, (uint) ($3 - $1), YYTHD->charset());
-+              $2->set_name($1, (uint) ($3 - $1), thd->charset());
+             else if ($2->type() != Item::FIELD_ITEM &&
+                      $2->type() != Item::REF_ITEM /* For HAVING */ )
+-              $2->item_name.copy($1, (uint) ($3 - $1), YYTHD->charset());
++              $2->item_name.copy($1, (uint) ($3 - $1), thd->charset());
              $$= $2;
            }
          ;
-@@ -8862,46 +8815,46 @@ udf_expr:
+@@ -10247,46 +10158,46 @@ udf_expr:
  sum_expr:
            AVG_SYM '(' in_sum_expr ')'
            {
@@ -2042,7 +2299,7 @@ index 34ae03b..2a6d9aa 100644
              if ($$ == NULL)
                MYSQL_YYABORT;
            }
-@@ -8911,13 +8864,13 @@ sum_expr:
+@@ -10296,13 +10207,13 @@ sum_expr:
            { Select->in_sum_expr--; }
            ')'
            {
@@ -2058,7 +2315,7 @@ index 34ae03b..2a6d9aa 100644
              if ($$ == NULL)
                MYSQL_YYABORT;
            }
-@@ -8928,55 +8881,55 @@ sum_expr:
+@@ -10313,55 +10224,55 @@ sum_expr:
          */
          | MIN_SYM '(' DISTINCT in_sum_expr ')'
            {
@@ -2123,7 +2380,7 @@ index 34ae03b..2a6d9aa 100644
              if ($$ == NULL)
                MYSQL_YYABORT;
            }
-@@ -8988,7 +8941,7 @@ sum_expr:
+@@ -10373,7 +10284,7 @@ sum_expr:
            {
              SELECT_LEX *sel= Select;
              sel->in_sum_expr--;
@@ -2132,16 +2389,16 @@ index 34ae03b..2a6d9aa 100644
                    Item_func_group_concat(Lex->current_context(), $3, $5,
                                           sel->gorder_list, $7);
              if ($$ == NULL)
-@@ -9017,7 +8970,7 @@ variable_aux:
-           ident_or_text SET_VAR expr
+@@ -10403,7 +10314,7 @@ variable_aux:
            {
              Item_func_set_user_var *item;
--            $$= item= new (YYTHD->mem_root) Item_func_set_user_var($1, $3, false);
-+            $$= item= new (thd->mem_root) Item_func_set_user_var($1, $3, false);
+             $$= item=
+-              new (YYTHD->mem_root) Item_func_set_user_var($1, $3, false);
++              new (thd->mem_root) Item_func_set_user_var($1, $3, false);
              if ($$ == NULL)
                MYSQL_YYABORT;
              LEX *lex= Lex;
-@@ -9026,7 +8979,7 @@ variable_aux:
+@@ -10412,7 +10323,7 @@ variable_aux:
            }
          | ident_or_text
            {
@@ -2150,7 +2407,7 @@ index 34ae03b..2a6d9aa 100644
              if ($$ == NULL)
                MYSQL_YYABORT;
              LEX *lex= Lex;
-@@ -9040,7 +8993,7 @@ variable_aux:
+@@ -10426,7 +10337,7 @@ variable_aux:
                my_parse_error(ER(ER_SYNTAX_ERROR));
                MYSQL_YYABORT;
              }
@@ -2159,7 +2416,7 @@ index 34ae03b..2a6d9aa 100644
                MYSQL_YYABORT;
              if (!((Item_func_get_system_var*) $$)->is_written_to_binlog())
                Lex->set_stmt_unsafe(LEX::BINLOG_STMT_UNSAFE_SYSTEM_VARIABLE);
-@@ -9055,7 +9008,7 @@ opt_distinct:
+@@ -10441,7 +10352,7 @@ opt_distinct:
  opt_gconcat_separator:
            /* empty */
            {
@@ -2168,7 +2425,7 @@ index 34ae03b..2a6d9aa 100644
              if ($$ == NULL)
                MYSQL_YYABORT;
            }
-@@ -9082,9 +9035,9 @@ opt_gorder_clause:
+@@ -10468,9 +10379,9 @@ opt_gorder_clause:
  
  gorder_list:
            gorder_list ',' order_ident order_dir
@@ -2180,7 +2437,7 @@ index 34ae03b..2a6d9aa 100644
          ;
  
  in_sum_expr:
-@@ -9137,7 +9090,7 @@ opt_expr_list:
+@@ -10523,7 +10434,7 @@ opt_expr_list:
  expr_list:
            expr
            {
@@ -2189,7 +2446,7 @@ index 34ae03b..2a6d9aa 100644
              if ($$ == NULL)
                MYSQL_YYABORT;
              $$->push_back($1);
-@@ -9157,7 +9110,7 @@ ident_list_arg:
+@@ -10543,7 +10454,7 @@ ident_list_arg:
  ident_list:
            simple_ident
            {
@@ -2198,7 +2455,7 @@ index 34ae03b..2a6d9aa 100644
              if ($$ == NULL)
                MYSQL_YYABORT;
              $$->push_back($1);
-@@ -9257,7 +9210,7 @@ join_table:
+@@ -10643,7 +10554,7 @@ join_table:
            {
              MYSQL_YYABORT_UNLESS($1 && $3);
              /* Change the current name resolution context to a local context. */
@@ -2207,7 +2464,7 @@ index 34ae03b..2a6d9aa 100644
                MYSQL_YYABORT;
              Select->parsing_place= IN_ON;
            }
-@@ -9272,7 +9225,7 @@ join_table:
+@@ -10658,7 +10569,7 @@ join_table:
            {
              MYSQL_YYABORT_UNLESS($1 && $3);
              /* Change the current name resolution context to a local context. */
@@ -2216,7 +2473,7 @@ index 34ae03b..2a6d9aa 100644
                MYSQL_YYABORT;
              Select->parsing_place= IN_ON;
            }
-@@ -9302,7 +9255,7 @@ join_table:
+@@ -10688,7 +10599,7 @@ join_table:
            {
              MYSQL_YYABORT_UNLESS($1 && $5);
              /* Change the current name resolution context to a local context. */
@@ -2225,7 +2482,7 @@ index 34ae03b..2a6d9aa 100644
                MYSQL_YYABORT;
              Select->parsing_place= IN_ON;
            }
-@@ -9338,7 +9291,7 @@ join_table:
+@@ -10724,7 +10635,7 @@ join_table:
            {
              MYSQL_YYABORT_UNLESS($1 && $5);
              /* Change the current name resolution context to a local context. */
@@ -2234,16 +2491,16 @@ index 34ae03b..2a6d9aa 100644
                MYSQL_YYABORT;
              Select->parsing_place= IN_ON;
            }
-@@ -9393,7 +9346,7 @@ table_factor:
+@@ -10795,7 +10706,7 @@ table_factor:
            }
-           table_ident opt_table_alias opt_key_definition
+           table_ident opt_use_partition opt_table_alias opt_key_definition
            {
--            if (!($$= Select->add_table_to_list(YYTHD, $2, $3,
-+            if (!($$= Select->add_table_to_list(thd, $2, $3,
+-            if (!($$= Select->add_table_to_list(YYTHD, $2, $4,
++            if (!($$= Select->add_table_to_list(thd, $2, $4,
                                                  Select->get_table_join_options(),
                                                  YYPS->m_lock_type,
                                                  YYPS->m_mdl_type,
-@@ -9700,7 +9653,7 @@ index_hints_list:
+@@ -11104,7 +11015,7 @@ index_hints_list:
  
  opt_index_hints_list:
            /* empty */
@@ -2252,7 +2509,7 @@ index 34ae03b..2a6d9aa 100644
          ;
  
  opt_key_definition:
-@@ -9709,15 +9662,15 @@ opt_key_definition:
+@@ -11113,15 +11024,15 @@ opt_key_definition:
          ;
  
  opt_key_usage_list:
@@ -2271,7 +2528,7 @@ index 34ae03b..2a6d9aa 100644
          ;
  
  key_usage_list:
-@@ -9730,7 +9683,7 @@ using_list:
+@@ -11134,7 +11045,7 @@ using_list:
            {
              if (!($$= new List<String>))
                MYSQL_YYABORT;
@@ -2280,7 +2537,7 @@ index 34ae03b..2a6d9aa 100644
                                                      $1.length,
                                                      system_charset_info);
              if (s == NULL)
-@@ -9739,7 +9692,7 @@ using_list:
+@@ -11143,7 +11054,7 @@ using_list:
            }
          | using_list ',' ident
            {
@@ -2289,7 +2546,7 @@ index 34ae03b..2a6d9aa 100644
                                                      $3.length,
                                                      system_charset_info);
              if (s == NULL)
-@@ -9844,7 +9797,6 @@ opt_escape:
+@@ -11248,7 +11159,6 @@ opt_escape:
            }
          | /* empty */
            {
@@ -2297,7 +2554,7 @@ index 34ae03b..2a6d9aa 100644
              Lex->escape_used= FALSE;
              $$= ((thd->variables.sql_mode & MODE_NO_BACKSLASH_ESCAPES) ?
                   new (thd->mem_root) Item_string("", 0, &my_charset_latin1) :
-@@ -9865,9 +9817,9 @@ group_clause:
+@@ -11269,9 +11179,9 @@ group_clause:
  
  group_list:
            group_list ',' order_ident order_dir
@@ -2309,7 +2566,7 @@ index 34ae03b..2a6d9aa 100644
          ;
  
  olap_opt:
-@@ -9928,7 +9880,6 @@ alter_order_list:
+@@ -11338,7 +11248,6 @@ alter_order_list:
  alter_order_item:
            simple_ident_nospvar order_dir
            {
@@ -2317,7 +2574,7 @@ index 34ae03b..2a6d9aa 100644
              bool ascending= ($2 == 1) ? true : false;
              if (add_order_to_list(thd, $1, ascending))
                MYSQL_YYABORT;
-@@ -9981,9 +9932,9 @@ order_clause:
+@@ -11391,9 +11300,9 @@ order_clause:
  
  order_list:
            order_list ',' order_ident order_dir
@@ -2329,15 +2586,15 @@ index 34ae03b..2a6d9aa 100644
          ;
  
  order_dir:
-@@ -10047,7 +9998,6 @@ limit_option:
+@@ -11456,7 +11365,6 @@ limit_options:
+ limit_option:
          ident
          {
-           Item_splocal *splocal;
 -          THD *thd= YYTHD;
-           LEX *lex= thd->lex;
-           Lex_input_stream *lip= & thd->m_parser_state->m_lip;
-           sp_variable_t *spv;
-@@ -10084,19 +10034,19 @@ limit_option:
+           LEX *lex= Lex;
+           Lex_input_stream *lip= YYLIP;
+           sp_head *sp= lex->sphead;
+@@ -11487,19 +11395,19 @@ limit_option:
          }
          | ULONGLONG_NUM
            {
@@ -2360,32 +2617,15 @@ index 34ae03b..2a6d9aa 100644
              if ($$ == NULL)
                MYSQL_YYABORT;
            }
-@@ -10183,7 +10133,7 @@ procedure_clause:
-             lex->proc_list.elements=0;
-             lex->proc_list.first=0;
-             lex->proc_list.next= &lex->proc_list.first;
--            Item_field *item= new (YYTHD->mem_root)
-+            Item_field *item= new (thd->mem_root)
-                                 Item_field(&lex->current_select->context,
-                                            NULL, NULL, $2.str);
-             if (item == NULL)
-@@ -10208,7 +10158,6 @@ procedure_list2:
- procedure_item:
-           remember_name expr remember_end
-           {
--            THD *thd= YYTHD;
- 
-             if (add_proc_to_list(thd, $2))
-               MYSQL_YYABORT;
-@@ -10383,7 +10332,6 @@ drop:
+@@ -11801,7 +11709,6 @@ drop:
            }
          | DROP FUNCTION_SYM if_exists ident '.' ident
            {
 -            THD *thd= YYTHD;
              LEX *lex= thd->lex;
              sp_name *spname;
-             if ($4.str && check_db_name(&$4))
-@@ -10406,7 +10354,6 @@ drop:
+             if ($4.str &&
+@@ -11822,7 +11729,6 @@ drop:
            }
          | DROP FUNCTION_SYM if_exists ident
            {
@@ -2393,7 +2633,7 @@ index 34ae03b..2a6d9aa 100644
              LEX *lex= thd->lex;
              LEX_STRING db= {0, 0};
              sp_name *spname;
-@@ -10491,7 +10438,7 @@ table_list:
+@@ -11907,7 +11813,7 @@ table_list:
  table_name:
            table_ident
            {
@@ -2402,7 +2642,16 @@ index 34ae03b..2a6d9aa 100644
                                             TL_OPTION_UPDATING,
                                             YYPS->m_lock_type,
                                             YYPS->m_mdl_type))
-@@ -10507,7 +10454,7 @@ table_alias_ref_list:
+@@ -11918,7 +11824,7 @@ table_name:
+ table_name_with_opt_use_partition:
+           table_ident opt_use_partition
+           {
+-            if (!Select->add_table_to_list(YYTHD, $1, NULL,
++            if (!Select->add_table_to_list(thd, $1, NULL,
+                                            TL_OPTION_UPDATING,
+                                            YYPS->m_lock_type,
+                                            YYPS->m_mdl_type,
+@@ -11936,7 +11842,7 @@ table_alias_ref_list:
  table_alias_ref:
            table_ident_opt_wild
            {
@@ -2411,7 +2660,7 @@ index 34ae03b..2a6d9aa 100644
                                             TL_OPTION_UPDATING | TL_OPTION_ALIAS,
                                             YYPS->m_lock_type,
                                             YYPS->m_mdl_type))
-@@ -10581,7 +10528,7 @@ insert_lock_option:
+@@ -12025,12 +11931,12 @@ insert_lock_option:
          | DELAYED_SYM
          {
            Lex->keyword_delayed_begin_offset= (uint)(YYLIP->get_tok_start() -
@@ -2420,7 +2669,13 @@ index 34ae03b..2a6d9aa 100644
            Lex->keyword_delayed_end_offset= Lex->keyword_delayed_begin_offset +
                                             YYLIP->yyLength() + 1;
            $$= TL_WRITE_DELAYED;
-@@ -10594,7 +10541,7 @@ replace_lock_option:
+ 
+-          push_warning_printf(YYTHD, Sql_condition::WARN_LEVEL_WARN,
++          push_warning_printf(thd, Sql_condition::WARN_LEVEL_WARN,
+                               ER_WARN_DEPRECATED_SYNTAX,
+                               ER(ER_WARN_DEPRECATED_SYNTAX),
+                               "INSERT DELAYED", "INSERT");
+@@ -12043,12 +11949,12 @@ replace_lock_option:
          | DELAYED_SYM
          {
            Lex->keyword_delayed_begin_offset= (uint)(YYLIP->get_tok_start() -
@@ -2429,7 +2684,13 @@ index 34ae03b..2a6d9aa 100644
            Lex->keyword_delayed_end_offset= Lex->keyword_delayed_begin_offset +
                                             YYLIP->yyLength() + 1;
            $$= TL_WRITE_DELAYED;
-@@ -10711,7 +10658,7 @@ expr_or_default:
+ 
+-          push_warning_printf(YYTHD, Sql_condition::WARN_LEVEL_WARN,
++          push_warning_printf(thd, Sql_condition::WARN_LEVEL_WARN,
+                               ER_WARN_DEPRECATED_SYNTAX,
+                               ER(ER_WARN_DEPRECATED_SYNTAX),
+                               "REPLACE DELAYED", "REPLACE");
+@@ -12165,7 +12071,7 @@ expr_or_default:
            expr { $$= $1;}
          | DEFAULT
            {
@@ -2438,7 +2699,7 @@ index 34ae03b..2a6d9aa 100644
              if ($$ == NULL)
                MYSQL_YYABORT;
            }
-@@ -10764,7 +10711,7 @@ update_list:
+@@ -12218,7 +12124,7 @@ update_list:
  update_elem:
            simple_ident_nospvar equal expr_or_default
            {
@@ -2447,16 +2708,16 @@ index 34ae03b..2a6d9aa 100644
                MYSQL_YYABORT;
            }
          ;
-@@ -10809,7 +10756,7 @@ delete:
+@@ -12263,7 +12169,7 @@ delete:
  single_multi:
-           FROM table_ident
+           FROM table_ident opt_use_partition
            {
 -            if (!Select->add_table_to_list(YYTHD, $2, NULL, TL_OPTION_UPDATING,
 +            if (!Select->add_table_to_list(thd, $2, NULL, TL_OPTION_UPDATING,
                                             YYPS->m_lock_type,
-                                            YYPS->m_mdl_type))
-               MYSQL_YYABORT;
-@@ -10853,7 +10800,7 @@ table_wild_one:
+                                            YYPS->m_mdl_type,
+                                            NULL,
+@@ -12309,7 +12215,7 @@ table_wild_one:
              Table_ident *ti= new Table_ident($1);
              if (ti == NULL)
                MYSQL_YYABORT;
@@ -2465,7 +2726,7 @@ index 34ae03b..2a6d9aa 100644
                                             ti,
                                             NULL,
                                             TL_OPTION_UPDATING | TL_OPTION_ALIAS,
-@@ -10863,10 +10810,10 @@ table_wild_one:
+@@ -12319,10 +12225,10 @@ table_wild_one:
            }
          | ident '.' ident opt_wild
            {
@@ -2478,15 +2739,15 @@ index 34ae03b..2a6d9aa 100644
                                             ti,
                                             NULL,
                                             TL_OPTION_UPDATING | TL_OPTION_ALIAS,
-@@ -10906,7 +10853,6 @@ truncate:
+@@ -12362,7 +12268,6 @@ truncate:
            }
            table_name
            {
 -            THD *thd= YYTHD;
              LEX* lex= thd->lex;
-             DBUG_ASSERT(!lex->m_stmt);
-             lex->m_stmt= new (thd->mem_root) Truncate_statement(lex);
-@@ -11000,7 +10946,7 @@ show_param:
+             DBUG_ASSERT(!lex->m_sql_cmd);
+             lex->m_sql_cmd= new (thd->mem_root) Sql_cmd_truncate_table();
+@@ -12456,7 +12361,7 @@ show_param:
             {
               LEX *lex= Lex;
               lex->sql_command= SQLCOM_SHOW_DATABASES;
@@ -2495,7 +2756,7 @@ index 34ae03b..2a6d9aa 100644
                 MYSQL_YYABORT;
             }
           | opt_full TABLES opt_db wild_and_where
-@@ -11008,7 +10954,7 @@ show_param:
+@@ -12464,7 +12369,7 @@ show_param:
               LEX *lex= Lex;
               lex->sql_command= SQLCOM_SHOW_TABLES;
               lex->select_lex.db= $3;
@@ -2503,17 +2764,8 @@ index 34ae03b..2a6d9aa 100644
 +             if (prepare_schema_table(thd, lex, 0, SCH_TABLE_NAMES))
                 MYSQL_YYABORT;
             }
-          | opt_var_type TEMPORARY TABLES opt_db
-@@ -11017,7 +10963,7 @@ show_param:
-              lex->sql_command= SQLCOM_SHOW_TEMPORARY_TABLES;
-              lex->option_type= $1;
-              lex->select_lex.db= $4;
--             if (prepare_schema_table(YYTHD, lex, 0, SCH_TEMPORARY_TABLES))
-+             if (prepare_schema_table(thd, lex, 0, SCH_TEMPORARY_TABLES))
-                MYSQL_YYABORT;
-            }
           | opt_full TRIGGERS_SYM opt_db wild_and_where
-@@ -11025,7 +10971,7 @@ show_param:
+@@ -12472,7 +12377,7 @@ show_param:
               LEX *lex= Lex;
               lex->sql_command= SQLCOM_SHOW_TRIGGERS;
               lex->select_lex.db= $3;
@@ -2522,7 +2774,7 @@ index 34ae03b..2a6d9aa 100644
                 MYSQL_YYABORT;
             }
           | EVENTS_SYM opt_db wild_and_where
-@@ -11033,7 +10979,7 @@ show_param:
+@@ -12480,7 +12385,7 @@ show_param:
               LEX *lex= Lex;
               lex->sql_command= SQLCOM_SHOW_EVENTS;
               lex->select_lex.db= $2;
@@ -2531,7 +2783,7 @@ index 34ae03b..2a6d9aa 100644
                 MYSQL_YYABORT;
             }
           | TABLE_SYM STATUS_SYM opt_db wild_and_where
-@@ -11041,7 +10987,7 @@ show_param:
+@@ -12488,7 +12393,7 @@ show_param:
               LEX *lex= Lex;
               lex->sql_command= SQLCOM_SHOW_TABLE_STATUS;
               lex->select_lex.db= $3;
@@ -2540,7 +2792,7 @@ index 34ae03b..2a6d9aa 100644
                 MYSQL_YYABORT;
             }
          | OPEN_SYM TABLES opt_db wild_and_where
-@@ -11049,14 +10995,14 @@ show_param:
+@@ -12496,14 +12401,14 @@ show_param:
              LEX *lex= Lex;
              lex->sql_command= SQLCOM_SHOW_OPEN_TABLES;
              lex->select_lex.db= $3;
@@ -2557,7 +2809,7 @@ index 34ae03b..2a6d9aa 100644
                MYSQL_YYABORT;
            }
          | ENGINE_SYM known_storage_engines show_engine_param
-@@ -11069,7 +11015,7 @@ show_param:
+@@ -12516,7 +12421,7 @@ show_param:
              lex->sql_command= SQLCOM_SHOW_FIELDS;
              if ($5)
                $4->change_db($5);
@@ -2566,7 +2818,7 @@ index 34ae03b..2a6d9aa 100644
                MYSQL_YYABORT;
            }
          | master_or_binary LOGS_SYM
-@@ -11096,21 +11042,21 @@ show_param:
+@@ -12543,14 +12448,14 @@ show_param:
              lex->sql_command= SQLCOM_SHOW_KEYS;
              if ($4)
                $3->change_db($4);
@@ -2582,26 +2834,25 @@ index 34ae03b..2a6d9aa 100644
 +            if (prepare_schema_table(thd, lex, 0, SCH_ENGINES))
                MYSQL_YYABORT;
            }
-         | AUTHORS_SYM
+         | PRIVILEGES
+@@ -12568,7 +12473,7 @@ show_param:
+           { Lex->sql_command = SQLCOM_SHOW_ERRORS;}
+         | PROFILES_SYM
            {
-             LEX *lex=Lex;
-             lex->sql_command= SQLCOM_SHOW_AUTHORS;
--            push_warning_printf(YYTHD, MYSQL_ERROR::WARN_LEVEL_WARN,
-+            push_warning_printf(thd, MYSQL_ERROR::WARN_LEVEL_WARN,
-                                 ER_WARN_DEPRECATED_SYNTAX_NO_REPLACEMENT,
-                                 ER(ER_WARN_DEPRECATED_SYNTAX_NO_REPLACEMENT),
-                                 "SHOW AUTHORS");
-@@ -11119,7 +11065,7 @@ show_param:
+-            push_warning_printf(YYTHD, Sql_condition::WARN_LEVEL_WARN,
++            push_warning_printf(thd, Sql_condition::WARN_LEVEL_WARN,
+                                 ER_WARN_DEPRECATED_SYNTAX,
+                                 ER(ER_WARN_DEPRECATED_SYNTAX),
+                                 "SHOW PROFILES", "Performance Schema");
+@@ -12576,13 +12481,13 @@ show_param:
+           }
+         | PROFILE_SYM opt_profile_defs opt_profile_args opt_limit_clause_init
            {
-             LEX *lex=Lex;
-             lex->sql_command= SQLCOM_SHOW_CONTRIBUTORS;
--            push_warning_printf(YYTHD, MYSQL_ERROR::WARN_LEVEL_WARN,
-+            push_warning_printf(thd, MYSQL_ERROR::WARN_LEVEL_WARN,
-                                 ER_WARN_DEPRECATED_SYNTAX_NO_REPLACEMENT,
-                                 ER(ER_WARN_DEPRECATED_SYNTAX_NO_REPLACEMENT),
-                                 "SHOW CONTRIBUTORS");
-@@ -11143,7 +11089,7 @@ show_param:
-           { 
+-            push_warning_printf(YYTHD, Sql_condition::WARN_LEVEL_WARN,
++            push_warning_printf(thd, Sql_condition::WARN_LEVEL_WARN,
+                                 ER_WARN_DEPRECATED_SYNTAX,
+                                 ER(ER_WARN_DEPRECATED_SYNTAX),
+                                 "SHOW PROFILE", "Performance Schema");
              LEX *lex= Lex;
              lex->sql_command= SQLCOM_SHOW_PROFILE;
 -            if (prepare_schema_table(YYTHD, lex, NULL, SCH_PROFILES) != 0)
@@ -2609,7 +2860,7 @@ index 34ae03b..2a6d9aa 100644
                YYABORT;
            }
          | opt_var_type STATUS_SYM wild_and_where
-@@ -11151,7 +11097,7 @@ show_param:
+@@ -12590,7 +12495,7 @@ show_param:
              LEX *lex= Lex;
              lex->sql_command= SQLCOM_SHOW_STATUS;
              lex->option_type= $1;
@@ -2618,7 +2869,7 @@ index 34ae03b..2a6d9aa 100644
                MYSQL_YYABORT;
            }
          | opt_full PROCESSLIST_SYM
-@@ -11161,21 +11107,21 @@ show_param:
+@@ -12600,21 +12505,21 @@ show_param:
              LEX *lex= Lex;
              lex->sql_command= SQLCOM_SHOW_VARIABLES;
              lex->option_type= $1;
@@ -2643,7 +2894,7 @@ index 34ae03b..2a6d9aa 100644
                MYSQL_YYABORT;
            }
          | GRANTS
-@@ -11205,7 +11151,7 @@ show_param:
+@@ -12644,7 +12549,7 @@ show_param:
            {
              LEX *lex= Lex;
              lex->sql_command = SQLCOM_SHOW_CREATE;
@@ -2652,7 +2903,7 @@ index 34ae03b..2a6d9aa 100644
                MYSQL_YYABORT;
              lex->only_view= 0;
              lex->create_info.storage_media= HA_SM_DEFAULT;
-@@ -11214,7 +11160,7 @@ show_param:
+@@ -12653,7 +12558,7 @@ show_param:
            {
              LEX *lex= Lex;
              lex->sql_command = SQLCOM_SHOW_CREATE;
@@ -2661,16 +2912,7 @@ index 34ae03b..2a6d9aa 100644
                MYSQL_YYABORT;
              lex->only_view= 1;
            }
-@@ -11236,7 +11182,7 @@ show_param:
- #ifdef HAVE_RESPONSE_TIME_DISTRIBUTION
-            LEX *lex= Lex;
-            lex->sql_command= SQLCOM_SELECT;
--           if (prepare_schema_table(YYTHD, lex, 0, SCH_QUERY_RESPONSE_TIME))
-+           if (prepare_schema_table(thd, lex, 0, SCH_QUERY_RESPONSE_TIME))
-              MYSQL_YYABORT;
- #endif // HAVE_RESPONSE_TIME_DISTRIBUTION
-          }
-@@ -11244,35 +11190,35 @@ show_param:
+@@ -12674,35 +12579,35 @@ show_param:
            {
             LEX *lex= Lex;
             Lex->sql_command= SQLCOM_SELECT;
@@ -2711,7 +2953,7 @@ index 34ae03b..2a6d9aa 100644
               MYSQL_YYABORT;
            }
          | CREATE PROCEDURE_SYM sp_name
-@@ -11299,14 +11245,14 @@ show_param:
+@@ -12729,14 +12634,14 @@ show_param:
            {
              LEX *lex= Lex;
              lex->sql_command= SQLCOM_SHOW_STATUS_PROC;
@@ -2728,7 +2970,7 @@ index 34ae03b..2a6d9aa 100644
                MYSQL_YYABORT;
            }
          | PROCEDURE_SYM CODE_SYM sp_name
-@@ -11374,7 +11320,7 @@ wild_and_where:
+@@ -12804,7 +12709,7 @@ wild_and_where:
            /* empty */
          | LIKE TEXT_STRING_sys
            {
@@ -2737,7 +2979,7 @@ index 34ae03b..2a6d9aa 100644
                                                      system_charset_info);
              if (Lex->wild == NULL)
                MYSQL_YYABORT;
-@@ -11397,7 +11343,7 @@ describe:
+@@ -12827,7 +12732,7 @@ describe:
              lex->sql_command= SQLCOM_SHOW_FIELDS;
              lex->select_lex.db= 0;
              lex->verbose= 0;
@@ -2746,7 +2988,7 @@ index 34ae03b..2a6d9aa 100644
                MYSQL_YYABORT;
            }
            opt_describe_column
-@@ -11429,7 +11375,7 @@ opt_describe_column:
+@@ -12897,7 +12802,7 @@ opt_describe_column:
          | text_string { Lex->wild= $1; }
          | ident
            {
@@ -2755,7 +2997,7 @@ index 34ae03b..2a6d9aa 100644
                                                      $1.length,
                                                      system_charset_info);
              if (Lex->wild == NULL)
-@@ -11647,7 +11593,6 @@ use:
+@@ -13137,7 +13042,6 @@ use:
  load:
            LOAD data_or_xml
            {
@@ -2763,16 +3005,16 @@ index 34ae03b..2a6d9aa 100644
              LEX *lex= thd->lex;
  
              if (lex->sphead)
-@@ -11670,7 +11615,7 @@ load:
-           opt_duplicate INTO TABLE_SYM table_ident
+@@ -13160,7 +13064,7 @@ load:
+           opt_duplicate INTO TABLE_SYM table_ident opt_use_partition
            {
              LEX *lex=Lex;
 -            if (!Select->add_table_to_list(YYTHD, $12, NULL, TL_OPTION_UPDATING,
 +            if (!Select->add_table_to_list(thd, $12, NULL, TL_OPTION_UPDATING,
-                                            $4, MDL_SHARED_WRITE))
+                                            $4, MDL_SHARED_WRITE, NULL, $13))
                MYSQL_YYABORT;
              lex->field_list.empty();
-@@ -11813,7 +11758,7 @@ field_or_var:
+@@ -13303,7 +13207,7 @@ field_or_var:
            simple_ident_nospvar {$$= $1;}
          | '@' ident_or_text
            {
@@ -2781,7 +3023,7 @@ index 34ae03b..2a6d9aa 100644
              if ($$ == NULL)
                MYSQL_YYABORT;
            }
-@@ -11834,16 +11779,16 @@ load_data_set_elem:
+@@ -13324,16 +13228,16 @@ load_data_set_elem:
            {
              LEX *lex= Lex;
              uint length= (uint) ($5 - $3);
@@ -2796,20 +3038,20 @@ index 34ae03b..2a6d9aa 100644
                  lex->value_list.push_back($4) ||
                  lex->load_set_str_list.push_back(val))
                  MYSQL_YYABORT;
--            $4->set_name_no_truncate($3, length, YYTHD->charset());
-+            $4->set_name_no_truncate($3, length, thd->charset());
+-            $4->item_name.copy_no_truncate($3, length, YYTHD->charset());
++            $4->item_name.copy_no_truncate($3, length, thd->charset());
            }
          ;
  
-@@ -11853,7 +11798,6 @@ text_literal:
+@@ -13343,7 +13247,6 @@ text_literal:
            TEXT_STRING
            {
              LEX_STRING tmp;
 -            THD *thd= YYTHD;
-             CHARSET_INFO *cs_con= thd->variables.collation_connection;
-             CHARSET_INFO *cs_cli= thd->variables.character_set_client;
+             const CHARSET_INFO *cs_con= thd->variables.collation_connection;
+             const CHARSET_INFO *cs_cli= thd->variables.character_set_client;
              uint repertoire= thd->lex->text_string_is_7bit &&
-@@ -11879,7 +11823,7 @@ text_literal:
+@@ -13369,7 +13272,7 @@ text_literal:
              uint repertoire= Lex->text_string_is_7bit ?
                               MY_REPERTOIRE_ASCII : MY_REPERTOIRE_UNICODE30;
              DBUG_ASSERT(my_charset_is_ascii_based(national_charset_info));
@@ -2818,7 +3060,7 @@ index 34ae03b..2a6d9aa 100644
                                                    national_charset_info,
                                                    DERIVATION_COERCIBLE,
                                                    repertoire);
-@@ -11888,7 +11832,7 @@ text_literal:
+@@ -13378,7 +13281,7 @@ text_literal:
            }
          | UNDERSCORE_CHARSET TEXT_STRING
            {
@@ -2827,16 +3069,16 @@ index 34ae03b..2a6d9aa 100644
                                                                  $2.length, $1);
              if (str == NULL)
                MYSQL_YYABORT;
-@@ -11907,7 +11851,7 @@ text_literal:
+@@ -13397,7 +13300,7 @@ text_literal:
                   If the string has been pure ASCII so far,
                   check the new part.
                */
--              CHARSET_INFO *cs= YYTHD->variables.collation_connection;
-+              CHARSET_INFO *cs= thd->variables.collation_connection;
+-              const CHARSET_INFO *cs= YYTHD->variables.collation_connection;
++              const CHARSET_INFO *cs= thd->variables.collation_connection;
                item->collation.repertoire|= my_string_repertoire(cs,
                                                                  $2.str,
                                                                  $2.length);
-@@ -11918,15 +11862,15 @@ text_literal:
+@@ -13408,15 +13311,15 @@ text_literal:
  text_string:
            TEXT_STRING_literal
            {
@@ -2855,7 +3097,7 @@ index 34ae03b..2a6d9aa 100644
              if (tmp == NULL)
                MYSQL_YYABORT;
              /*
-@@ -11938,7 +11882,7 @@ text_string:
+@@ -13428,7 +13331,7 @@ text_string:
            }
          | BIN_NUM
            {
@@ -2864,7 +3106,7 @@ index 34ae03b..2a6d9aa 100644
              if (tmp == NULL)
                MYSQL_YYABORT;
              /*
-@@ -11953,7 +11897,6 @@ text_string:
+@@ -13443,7 +13346,6 @@ text_string:
  param_marker:
            PARAM_MARKER
            {
@@ -2872,8 +3114,8 @@ index 34ae03b..2a6d9aa 100644
              LEX *lex= thd->lex;
              Lex_input_stream *lip= YYLIP;
              Item_param *item;
-@@ -11986,38 +11929,38 @@ literal:
-         | NUM_literal { $$ = $1; }
+@@ -13478,38 +13380,38 @@ literal:
+         | temporal_literal { $$= $1; }
          | NULL_SYM
            {
 -            $$ = new (YYTHD->mem_root) Item_null();
@@ -2884,15 +3126,15 @@ index 34ae03b..2a6d9aa 100644
            }
          | FALSE_SYM
            {
--            $$= new (YYTHD->mem_root) Item_int((char*) "FALSE",0,1);
-+            $$= new (thd->mem_root) Item_int((char*) "FALSE",0,1);
+-            $$= new (YYTHD->mem_root) Item_int(NAME_STRING("FALSE"), 0, 1);
++            $$= new (thd->mem_root) Item_int(NAME_STRING("FALSE"), 0, 1);
              if ($$ == NULL)
                MYSQL_YYABORT;
            }
          | TRUE_SYM
            {
--            $$= new (YYTHD->mem_root) Item_int((char*) "TRUE",1,1);
-+            $$= new (thd->mem_root) Item_int((char*) "TRUE",1,1);
+-            $$= new (YYTHD->mem_root) Item_int(NAME_STRING("TRUE"), 1, 1);
++            $$= new (thd->mem_root) Item_int(NAME_STRING("TRUE"), 1, 1);
              if ($$ == NULL)
                MYSQL_YYABORT;
            }
@@ -2917,16 +3159,16 @@ index 34ae03b..2a6d9aa 100644
              if (tmp == NULL)
                MYSQL_YYABORT;
              /*
-@@ -12028,7 +11971,7 @@ literal:
+@@ -13520,7 +13422,7 @@ literal:
              String *str= tmp->val_str((String*) 0);
  
              Item_string *item_str;
 -            item_str= new (YYTHD->mem_root)
 +            item_str= new (thd->mem_root)
-                         Item_string(NULL, /* name will be set in select_item */
+                         Item_string(null_name_string, /* name will be set in select_item */
                                      str ? str->ptr() : "",
                                      str ? str->length() : 0,
-@@ -12046,7 +11989,7 @@ literal:
+@@ -13538,7 +13440,7 @@ literal:
            }
          | UNDERSCORE_CHARSET BIN_NUM
            {
@@ -2935,34 +3177,34 @@ index 34ae03b..2a6d9aa 100644
              if (tmp == NULL)
                MYSQL_YYABORT;
              /*
-@@ -12057,7 +12000,7 @@ literal:
+@@ -13549,7 +13451,7 @@ literal:
              String *str= tmp->val_str((String*) 0);
  
              Item_string *item_str;
 -            item_str= new (YYTHD->mem_root)
 +            item_str= new (thd->mem_root)
-                         Item_string(NULL, /* name will be set in select_item */
+                         Item_string(null_name_string, /* name will be set in select_item */
                                      str ? str->ptr() : "",
                                      str ? str->length() : 0,
-@@ -12081,7 +12024,7 @@ NUM_literal:
+@@ -13570,7 +13472,7 @@ NUM_literal:
            NUM
            {
              int error;
 -            $$= new (YYTHD->mem_root)
 +            $$= new (thd->mem_root)
-                   Item_int($1.str,
+                   Item_int($1,
                             (longlong) my_strtoll10($1.str, NULL, &error),
                             $1.length);
-@@ -12091,7 +12034,7 @@ NUM_literal:
+@@ -13580,7 +13482,7 @@ NUM_literal:
          | LONG_NUM
            {
              int error;
 -            $$= new (YYTHD->mem_root)
 +            $$= new (thd->mem_root)
-                   Item_int($1.str,
+                   Item_int($1,
                             (longlong) my_strtoll10($1.str, NULL, &error),
                             $1.length);
-@@ -12100,23 +12043,23 @@ NUM_literal:
+@@ -13589,23 +13491,23 @@ NUM_literal:
            }
          | ULONGLONG_NUM
            {
@@ -2992,7 +3234,30 @@ index 34ae03b..2a6d9aa 100644
              {
                MYSQL_YYABORT;
              }
-@@ -12136,7 +12079,7 @@ table_wild:
+@@ -13616,19 +13518,19 @@ NUM_literal:
+ temporal_literal:
+         DATE_SYM TEXT_STRING
+           {
+-            if (!($$= create_temporal_literal(YYTHD, $2.str, $2.length, YYCSCL,
++            if (!($$= create_temporal_literal(thd, $2.str, $2.length, YYCSCL,
+                                               MYSQL_TYPE_DATE, true)))
+               MYSQL_YYABORT;
+           }
+         | TIME_SYM TEXT_STRING
+           {
+-            if (!($$= create_temporal_literal(YYTHD, $2.str, $2.length, YYCSCL,
++            if (!($$= create_temporal_literal(thd, $2.str, $2.length, YYCSCL,
+                                               MYSQL_TYPE_TIME, true)))
+               MYSQL_YYABORT;
+           }
+         | TIMESTAMP TEXT_STRING
+           {
+-            if (!($$= create_temporal_literal(YYTHD, $2.str, $2.length, YYCSCL,
++            if (!($$= create_temporal_literal(thd, $2.str, $2.length, YYCSCL,
+                                               MYSQL_TYPE_DATETIME, true)))
+               MYSQL_YYABORT;
+           }
+@@ -13650,7 +13552,7 @@ table_wild:
            ident '.' '*'
            {
              SELECT_LEX *sel= Select;
@@ -3001,7 +3266,7 @@ index 34ae03b..2a6d9aa 100644
                                                   NullS, $1.str, "*");
              if ($$ == NULL)
                MYSQL_YYABORT;
-@@ -12144,7 +12087,6 @@ table_wild:
+@@ -13658,7 +13560,6 @@ table_wild:
            }
          | ident '.' ident '.' '*'
            {
@@ -3009,15 +3274,15 @@ index 34ae03b..2a6d9aa 100644
              SELECT_LEX *sel= Select;
              const char* schema= thd->client_capabilities & CLIENT_NO_SCHEMA ?
                                    NullS : $1.str;
-@@ -12164,7 +12106,6 @@ order_ident:
+@@ -13678,7 +13579,6 @@ order_ident:
  simple_ident:
            ident
            {
 -            THD *thd= YYTHD;
              LEX *lex= thd->lex;
-             Lex_input_stream *lip= YYLIP;
-             sp_variable_t *spv;
-@@ -12215,7 +12156,6 @@ simple_ident:
+             sp_pcontext *pctx = lex->get_sp_current_parsing_ctx();
+             sp_variable *spv;
+@@ -13733,7 +13633,6 @@ simple_ident:
  simple_ident_nospvar:
            ident
            {
@@ -3025,15 +3290,15 @@ index 34ae03b..2a6d9aa 100644
              SELECT_LEX *sel=Select;
              if ((sel->parsing_place != IN_HAVING) ||
                  (sel->get_in_sum_expr() > 0))
-@@ -12237,7 +12177,6 @@ simple_ident_nospvar:
+@@ -13755,7 +13654,6 @@ simple_ident_nospvar:
  simple_ident_q:
            ident '.' ident
            {
 -            THD *thd= YYTHD;
              LEX *lex= thd->lex;
+             sp_head *sp= lex->sphead;
  
-             /*
-@@ -12316,7 +12255,6 @@ simple_ident_q:
+@@ -13835,7 +13733,6 @@ simple_ident_q:
            }
          | '.' ident '.' ident
            {
@@ -3041,7 +3306,7 @@ index 34ae03b..2a6d9aa 100644
              LEX *lex= thd->lex;
              SELECT_LEX *sel= lex->current_select;
              if (sel->no_table_names_allowed)
-@@ -12341,7 +12279,6 @@ simple_ident_q:
+@@ -13860,7 +13757,6 @@ simple_ident_q:
            }
          | ident '.' ident '.' ident
            {
@@ -3049,7 +3314,7 @@ index 34ae03b..2a6d9aa 100644
              LEX *lex= thd->lex;
              SELECT_LEX *sel= lex->current_select;
              const char* schema= (thd->client_capabilities & CLIENT_NO_SCHEMA ?
-@@ -12409,7 +12346,7 @@ table_ident:
+@@ -13928,7 +13824,7 @@ table_ident:
            }
          | ident '.' ident
            {
@@ -3058,7 +3323,7 @@ index 34ae03b..2a6d9aa 100644
              if ($$ == NULL)
                MYSQL_YYABORT;
            }
-@@ -12431,7 +12368,7 @@ table_ident_opt_wild:
+@@ -13950,7 +13846,7 @@ table_ident_opt_wild:
            }
          | ident '.' ident opt_wild
            {
@@ -3067,7 +3332,7 @@ index 34ae03b..2a6d9aa 100644
              if ($$ == NULL)
                MYSQL_YYABORT;
            }
-@@ -12441,7 +12378,7 @@ table_ident_nodb:
+@@ -13960,7 +13856,7 @@ table_ident_nodb:
            ident
            {
              LEX_STRING db={(char*) any_db,3};
@@ -3076,39 +3341,43 @@ index 34ae03b..2a6d9aa 100644
              if ($$ == NULL)
                MYSQL_YYABORT;
            }
-@@ -12451,7 +12388,6 @@ IDENT_sys:
+@@ -13970,8 +13866,6 @@ IDENT_sys:
            IDENT { $$= $1; }
          | IDENT_QUOTED
            {
 -            THD *thd= YYTHD;
- 
+-
              if (thd->charset_is_system_charset)
              {
-@@ -12481,7 +12417,6 @@ IDENT_sys:
+               const CHARSET_INFO *cs= system_charset_info;
+@@ -14013,8 +13907,6 @@ TEXT_STRING_sys_nonewline:
  TEXT_STRING_sys:
            TEXT_STRING
            {
 -            THD *thd= YYTHD;
- 
+-
              if (thd->charset_is_system_charset)
                $$= $1;
-@@ -12497,7 +12432,6 @@ TEXT_STRING_sys:
+             else
+@@ -14029,8 +13921,6 @@ TEXT_STRING_sys:
  TEXT_STRING_literal:
            TEXT_STRING
            {
 -            THD *thd= YYTHD;
- 
+-
              if (thd->charset_is_collation_connection)
                $$= $1;
-@@ -12513,7 +12447,6 @@ TEXT_STRING_literal:
+             else
+@@ -14045,8 +13935,6 @@ TEXT_STRING_literal:
  TEXT_STRING_filesystem:
            TEXT_STRING
            {
 -            THD *thd= YYTHD;
- 
+-
              if (thd->charset_is_character_set_filesystem)
                $$= $1;
-@@ -12531,7 +12464,6 @@ ident:
+             else
+@@ -14063,7 +13951,6 @@ ident:
            IDENT_sys    { $$=$1; }
          | keyword
            {
@@ -3116,7 +3385,7 @@ index 34ae03b..2a6d9aa 100644
              $$.str= thd->strmake($1.str, $1.length);
              if ($$.str == NULL)
                MYSQL_YYABORT;
-@@ -12543,7 +12475,6 @@ label_ident:
+@@ -14075,7 +13962,6 @@ label_ident:
            IDENT_sys    { $$=$1; }
          | keyword_sp
            {
@@ -3124,23 +3393,23 @@ index 34ae03b..2a6d9aa 100644
              $$.str= thd->strmake($1.str, $1.length);
              if ($$.str == NULL)
                MYSQL_YYABORT;
-@@ -12560,7 +12491,6 @@ ident_or_text:
+@@ -14092,7 +13978,6 @@ ident_or_text:
  user:
            ident_or_text
            {
 -            THD *thd= YYTHD;
              if (!($$=(LEX_USER*) thd->alloc(sizeof(st_lex_user))))
                MYSQL_YYABORT;
-             $$->user = $1;
-@@ -12577,7 +12507,6 @@ user:
+             $$->user= $1;
+@@ -14119,7 +14004,6 @@ user:
            }
          | ident_or_text '@' ident_or_text
            {
 -            THD *thd= YYTHD;
              if (!($$=(LEX_USER*) thd->alloc(sizeof(st_lex_user))))
                MYSQL_YYABORT;
-             $$->user = $1; $$->host=$3;
-@@ -12599,7 +12528,7 @@ user:
+             $$->user= $1;
+@@ -14152,7 +14036,7 @@ user:
            }
          | CURRENT_USER optional_braces
            {
@@ -3149,49 +3418,92 @@ index 34ae03b..2a6d9aa 100644
                MYSQL_YYABORT;
              /* 
                empty LEX_USER means current_user and 
-@@ -12987,7 +12916,6 @@ option_value_list:
+@@ -14557,7 +14441,7 @@ set:
+             lex->one_shot_set= 0;
+             lex->autocommit= 0;
  
- option_type_value:
+-            sp_create_assignment_lex(YYTHD, YY_TOKEN_END);
++            sp_create_assignment_lex(thd, YY_TOKEN_END);
+           }
+           start_option_value_list
+           {}
+@@ -14596,7 +14480,7 @@ set_stmt_option_value_following_option_type_list:
+ start_option_value_list:
+           option_value_no_option_type
            {
--            THD *thd= YYTHD;
-             LEX *lex= thd->lex;
-             Lex_input_stream *lip= YYLIP;
- 
-@@ -13018,7 +12946,6 @@ option_type_value:
+-            if (sp_create_assignment_instr(YYTHD, YY_TOKEN_END))
++            if (sp_create_assignment_instr(thd, YY_TOKEN_END))
+               MYSQL_YYABORT;
            }
-           ext_option_value
+           option_value_list_continued
+@@ -14606,7 +14490,7 @@ start_option_value_list:
+           }
+           transaction_characteristics
            {
--            THD *thd= YYTHD;
-             LEX *lex= thd->lex;
-             Lex_input_stream *lip= YYLIP;
- 
-@@ -13101,7 +13028,6 @@ ext_option_value:
- sys_option_value:
-           option_type internal_variable_name equal set_expr_or_default
+-            if (sp_create_assignment_instr(YYTHD, YY_TOKEN_END))
++            if (sp_create_assignment_instr(thd, YY_TOKEN_END))
+               MYSQL_YYABORT;
+           }
+         | option_type
+@@ -14621,13 +14505,13 @@ start_option_value_list:
+ start_option_value_list_following_option_type:
+           option_value_following_option_type
+           {
+-            if (sp_create_assignment_instr(YYTHD, YY_TOKEN_END))
++            if (sp_create_assignment_instr(thd, YY_TOKEN_END))
+               MYSQL_YYABORT; 
+           }
+           option_value_list_continued
+         | TRANSACTION_SYM transaction_characteristics
+           {
+-            if (sp_create_assignment_instr(YYTHD, YY_TOKEN_END))
++            if (sp_create_assignment_instr(thd, YY_TOKEN_END))
+               MYSQL_YYABORT; 
+           }
+         ;
+@@ -14641,20 +14525,20 @@ option_value_list_continued:
+ // Repeating list of option values after first option value.
+ option_value_list:
+           {
+-            sp_create_assignment_lex(YYTHD, YY_TOKEN_START);
++            sp_create_assignment_lex(thd, YY_TOKEN_START);
+           }
+           option_value
+           {
+-            if (sp_create_assignment_instr(YYTHD, YY_TOKEN_END))
++            if (sp_create_assignment_instr(thd, YY_TOKEN_END))
+               MYSQL_YYABORT; 
+           }
+         | option_value_list ','
+           {
+-            sp_create_assignment_lex(YYTHD, YY_TOKEN_START);
++            sp_create_assignment_lex(thd, YY_TOKEN_START);
+           }
+           option_value
+           {
+-            if (sp_create_assignment_instr(YYTHD, YY_TOKEN_END))
++            if (sp_create_assignment_instr(thd, YY_TOKEN_END))
+               MYSQL_YYABORT; 
+           }
+         ;
+@@ -14693,7 +14577,6 @@ opt_var_ident_type:
+ option_value_following_option_type:
+           internal_variable_name equal set_expr_or_default
            {
 -            THD *thd= YYTHD;
              LEX *lex= Lex;
-             LEX_STRING *name= &$2.base_name;
- 
-@@ -13113,7 +13039,7 @@ sys_option_value:
-                 my_parse_error(ER(ER_SYNTAX_ERROR));
-                 MYSQL_YYABORT;
-               }
--              if (set_trigger_new_row(YYTHD, name, $4))
-+              if (set_trigger_new_row(thd, name, $4))
-                 MYSQL_YYABORT;
-             }
-             else if ($2.var)
-@@ -13143,7 +13069,6 @@ sys_option_value:
+             /*
+               Ignore SET STATEMENT variables list on slaves because system
+@@ -14733,7 +14616,6 @@ option_value_no_option_type:
            }
-         | option_type TRANSACTION_SYM ISOLATION LEVEL_SYM isolation_types
+           set_expr_or_default
            {
 -            THD *thd= YYTHD;
-             LEX *lex=Lex;
-             lex->option_type= $1;
-             Item *item= new (thd->mem_root) Item_int((int32) $5);
-@@ -13163,7 +13088,7 @@ option_value:
-           '@' ident_or_text equal expr
+             LEX *lex= Lex;
+             sp_head *sp= lex->sphead;
+             const char *expr_start_ptr= NULL;
+@@ -14827,7 +14709,7 @@ option_value_no_option_type:
+         | '@' ident_or_text equal expr
            {
              Item_func_set_user_var *item;
 -            item= new (YYTHD->mem_root) Item_func_set_user_var($2, $4, false);
@@ -3199,7 +3511,7 @@ index 34ae03b..2a6d9aa 100644
              if (item == NULL)
                MYSQL_YYABORT;
              set_var_user *var= new set_var_user(item);
-@@ -13173,7 +13098,6 @@ option_value:
+@@ -14837,7 +14719,6 @@ option_value_no_option_type:
            }
          | '@' '@' opt_var_ident_type internal_variable_name equal set_expr_or_default
            {
@@ -3207,31 +3519,31 @@ index 34ae03b..2a6d9aa 100644
              struct sys_var_with_base tmp= $4;
              /* Lookup if necessary: must be a system variable. */
              if (tmp.var == NULL)
-@@ -13186,7 +13110,6 @@ option_value:
+@@ -14850,7 +14731,6 @@ option_value_no_option_type:
            }
          | charset old_or_new_charset_name_or_default
            {
 -            THD *thd= YYTHD;
              LEX *lex= thd->lex;
-             CHARSET_INFO *cs2;
-             cs2= $2 ? $2: global_system_variables.character_set_client;
-@@ -13234,7 +13157,6 @@ option_value:
+             int flags= $2 ? 0 : set_var_collation_client::SET_CS_DEFAULT;
+             const CHARSET_INFO *cs2;
+@@ -14901,7 +14781,6 @@ option_value_no_option_type:
            }
          | PASSWORD equal text_or_password
            {
 -            THD *thd= YYTHD;
              LEX *lex= thd->lex;
-             LEX_USER *user;
-             sp_pcontext *spc= lex->spcont;
-@@ -13274,7 +13196,6 @@ option_value:
+             sp_head *sp= lex->sphead;
+             sp_pcontext *pctx= lex->get_sp_current_parsing_ctx();
+@@ -14978,7 +14857,6 @@ option_value_no_option_type:
  internal_variable_name:
            ident
            {
 -            THD *thd= YYTHD;
-             sp_pcontext *spc= thd->lex->spcont;
-             sp_variable_t *spv;
- 
-@@ -13333,7 +13254,7 @@ internal_variable_name:
+             LEX *lex= thd->lex;
+             sp_pcontext *pctx= lex->get_sp_current_parsing_ctx();
+             sp_variable *spv;
+@@ -15041,7 +14919,7 @@ internal_variable_name:
              }
              else
              {
@@ -3240,7 +3552,7 @@ index 34ae03b..2a6d9aa 100644
                if (!tmp)
                  MYSQL_YYABORT;
                if (!tmp->is_struct())
-@@ -13344,7 +13265,7 @@ internal_variable_name:
+@@ -15052,7 +14930,7 @@ internal_variable_name:
            }
          | DEFAULT '.' ident
            {
@@ -3249,28 +3561,49 @@ index 34ae03b..2a6d9aa 100644
              if (!tmp)
                MYSQL_YYABORT;
              if (!tmp->is_struct())
-@@ -13366,16 +13287,16 @@ text_or_password:
-           TEXT_STRING { $$=$1.str;}
-         | PASSWORD '(' TEXT_STRING ')'
-           {
--            $$= $3.length ? YYTHD->variables.old_passwords ?
--              Item_func_old_password::alloc(YYTHD, $3.str, $3.length) :
--              Item_func_password::alloc(YYTHD, $3.str, $3.length) :
-+            $$= $3.length ? thd->variables.old_passwords ?
-+              Item_func_old_password::alloc(thd, $3.str, $3.length) :
-+              Item_func_password::alloc(thd, $3.str, $3.length) :
-               $3.str;
+@@ -15073,7 +14951,6 @@ transaction_characteristics:
+ transaction_access_mode:
+           transaction_access_mode_types
+           {
+-            THD *thd= YYTHD;
+             LEX *lex=Lex;
+             Item *item= new (thd->mem_root) Item_int((int32) $1);
+             if (item == NULL)
+@@ -15091,7 +14968,6 @@ transaction_access_mode:
+ isolation_level:
+           ISOLATION LEVEL_SYM isolation_types
+           {
+-            THD *thd= YYTHD;
+             LEX *lex=Lex;
+             Item *item= new (thd->mem_root) Item_int((int32) $3);
+             if (item == NULL)
+@@ -15125,13 +15001,13 @@ text_or_password:
+             if ($3.length == 0)
+              $$= $3.str;
+             else
+-            switch (YYTHD->variables.old_passwords) {
++            switch (thd->variables.old_passwords) {
+               case 1: $$= Item_func_old_password::
+-                alloc(YYTHD, $3.str, $3.length);
++                alloc(thd, $3.str, $3.length);
+                 break;
+               case 0:
+               case 2: $$= Item_func_password::
+-                create_password_hash_buffer(YYTHD, $3.str, $3.length);
++                create_password_hash_buffer(thd, $3.str, $3.length);
+                 break;
+             }
              if ($$ == NULL)
-               MYSQL_YYABORT;
-           }
+@@ -15141,7 +15017,7 @@ text_or_password:
          | OLD_PASSWORD '(' TEXT_STRING ')'
            {
--            $$= $3.length ? Item_func_old_password::alloc(YYTHD, $3.str,
-+            $$= $3.length ? Item_func_old_password::alloc(thd, $3.str,
-                                                           $3.length) :
+             $$= $3.length ? Item_func_old_password::
+-              alloc(YYTHD, $3.str, $3.length) :
++              alloc(thd, $3.str, $3.length) :
                $3.str;
              if ($$ == NULL)
-@@ -13389,19 +13310,19 @@ set_expr_or_default:
+               MYSQL_YYABORT;
+@@ -15155,19 +15031,19 @@ set_expr_or_default:
          | DEFAULT { $$=0; }
          | ON
            {
@@ -3293,7 +3626,7 @@ index 34ae03b..2a6d9aa 100644
              if ($$ == NULL)
                MYSQL_YYABORT;
            }
-@@ -13440,7 +13361,7 @@ table_lock:
+@@ -15206,7 +15082,7 @@ table_lock:
            {
              thr_lock_type lock_type= (thr_lock_type) $3;
              bool lock_for_write= (lock_type >= TL_WRITE_ALLOW_WRITE);
@@ -3302,38 +3635,80 @@ index 34ae03b..2a6d9aa 100644
                                             (lock_for_write ?
                                              MDL_SHARED_NO_READ_WRITE :
                                              MDL_SHARED_READ)))
-@@ -13511,7 +13432,7 @@ handler:
+@@ -15220,7 +15096,7 @@ lock_option:
+         | LOW_PRIORITY WRITE_SYM 
+           { 
+             $$= TL_WRITE_LOW_PRIORITY; 
+-            WARN_DEPRECATED(YYTHD, "LOW_PRIORITY WRITE", "WRITE");
++            WARN_DEPRECATED(thd, "LOW_PRIORITY WRITE", "WRITE");
+           }
+         | READ_SYM LOCAL_SYM     { $$= TL_READ; }
+         ;
+@@ -15248,7 +15124,6 @@ unlock:
+ handler:
+           HANDLER_SYM table_ident OPEN_SYM opt_table_alias
+           {
+-            THD *thd= YYTHD;
+             LEX *lex= Lex;
+             if (lex->sphead)
+             {
+@@ -15264,7 +15139,6 @@ handler:
+           }
+         | HANDLER_SYM table_ident_nodb CLOSE_SYM
+           {
+-            THD *thd= YYTHD;
+             LEX *lex= Lex;
+             if (lex->sphead)
+             {
+@@ -15288,7 +15162,7 @@ handler:
+             }
              lex->expr_allows_subselect= FALSE;
              lex->sql_command = SQLCOM_HA_READ;
-             lex->ha_rkey_mode= HA_READ_KEY_EXACT; /* Avoid purify warnings */
 -            Item *one= new (YYTHD->mem_root) Item_int((int32) 1);
 +            Item *one= new (thd->mem_root) Item_int((int32) 1);
              if (one == NULL)
                MYSQL_YYABORT;
              lex->current_select->select_limit= one;
-@@ -13857,10 +13778,10 @@ grant_user:
+@@ -15298,7 +15172,6 @@ handler:
+           }
+           handler_read_or_scan where_clause opt_limit_clause
+           {
+-            THD *thd= YYTHD;
+             LEX *lex= Lex;
+             Lex->expr_allows_subselect= TRUE;
+             /* Stored functions are not supported for HANDLER READ. */
+@@ -15333,7 +15206,7 @@ handler_rkey_function:
+         | LAST_SYM  { $$= RLAST;  }
+         | handler_rkey_mode
+           {
+-            YYTHD->m_parser_state->m_yacc.m_ha_rkey_mode= $1;
++            thd->m_parser_state->m_yacc.m_ha_rkey_mode= $1;
+             Lex->insert_list= new List_item;
+             if (! Lex->insert_list)
+               MYSQL_YYABORT;
+@@ -15641,8 +15514,8 @@ grant_user:
+               my_parse_error(ER(ER_SYNTAX_ERROR));
                MYSQL_YYABORT;
-             if ($4.length)
+             }
+-            String *password = new (YYTHD->mem_root) String((const char*)$4.str,
+-                                    YYTHD->variables.character_set_client);
++            String *password = new (thd->mem_root) String((const char*)$4.str,
++                                    thd->variables.character_set_client);
+             check_password_policy(password);
+             /*
+               1. Plugin must be resolved
+@@ -15662,8 +15535,8 @@ grant_user:
+             $1->password= $5; 
+             if (!strcmp($5.str, ""))
              {
--              if (YYTHD->variables.old_passwords)
-+              if (thd->variables.old_passwords)
-               {
-                 char *buff= 
--                  (char *) YYTHD->alloc(SCRAMBLED_PASSWORD_CHAR_LENGTH_323+1);
-+                  (char *) thd->alloc(SCRAMBLED_PASSWORD_CHAR_LENGTH_323+1);
-                 if (buff == NULL)
-                   MYSQL_YYABORT;
-                 my_make_scrambled_password_323(buff, $4.str, $4.length);
-@@ -13870,7 +13791,7 @@ grant_user:
-               else
-               {
-                 char *buff= 
--                  (char *) YYTHD->alloc(SCRAMBLED_PASSWORD_CHAR_LENGTH+1);
-+                  (char *) thd->alloc(SCRAMBLED_PASSWORD_CHAR_LENGTH+1);
-                 if (buff == NULL)
-                   MYSQL_YYABORT;
-                 my_make_scrambled_password(buff, $4.str, $4.length);
-@@ -13923,7 +13844,7 @@ column_list:
+-              String *password= new (YYTHD->mem_root) String ((const char *)"",
+-                                     YYTHD->variables.character_set_client);
++              String *password= new (thd->mem_root) String ((const char *)"",
++                                     thd->variables.character_set_client);
+               check_password_policy(password);
+             }
+             /*
+@@ -15721,7 +15594,7 @@ column_list:
  column_list_id:
            ident
            {
@@ -3342,7 +3717,7 @@ index 34ae03b..2a6d9aa 100644
              if (new_str == NULL)
                MYSQL_YYABORT;
              List_iterator <LEX_COLUMN> iter(Lex->columns);
-@@ -14133,7 +14054,6 @@ opt_union_order_or_limit:
+@@ -15931,7 +15804,6 @@ opt_union_order_or_limit:
  
  union_order_or_limit:
            {
@@ -3350,7 +3725,7 @@ index 34ae03b..2a6d9aa 100644
              LEX *lex= thd->lex;
              DBUG_ASSERT(lex->current_select->linkage != GLOBAL_OPTIONS_TYPE);
              SELECT_LEX *sel= lex->current_select;
-@@ -14149,7 +14069,6 @@ union_order_or_limit:
+@@ -15947,7 +15819,6 @@ union_order_or_limit:
            }
            order_or_limit
            {
@@ -3358,7 +3733,7 @@ index 34ae03b..2a6d9aa 100644
              thd->lex->current_select->no_table_names_allowed= 0;
              thd->where= "";
            }
-@@ -14331,14 +14250,14 @@ no_definer:
+@@ -16129,14 +16000,14 @@ no_definer:
                from older master servers (i.e. to create non-suid trigger in this
                case).
              */
@@ -3375,7 +3750,7 @@ index 34ae03b..2a6d9aa 100644
            }
          ;
  
-@@ -14383,7 +14302,6 @@ view_suid:
+@@ -16181,7 +16052,6 @@ view_suid:
  view_tail:
            view_suid VIEW_SYM table_ident
            {
@@ -3383,7 +3758,7 @@ index 34ae03b..2a6d9aa 100644
              LEX *lex= thd->lex;
              lex->sql_command= SQLCOM_CREATE_VIEW;
              /* first table in list is target VIEW name */
-@@ -14427,7 +14345,6 @@ view_select:
+@@ -16225,7 +16095,6 @@ view_select:
            }
            view_select_aux view_check_option
            {
@@ -3391,35 +3766,23 @@ index 34ae03b..2a6d9aa 100644
              LEX *lex= Lex;
              uint len= YYLIP->get_cpp_ptr() - lex->create_view_select.str;
              void *create_view_select= thd->memdup(lex->create_view_select.str, len);
-@@ -14483,7 +14400,6 @@ trigger_tail:
-           EACH_SYM
-           ROW_SYM
-           { /* $15 */
+@@ -16317,7 +16186,6 @@ trigger_tail:
+           EACH_SYM          /* $13 */
+           ROW_SYM           /* $14 */
+           {                 /* $15 */
 -            THD *thd= YYTHD;
              LEX *lex= thd->lex;
              Lex_input_stream *lip= YYLIP;
-             sp_head *sp;
-@@ -14517,8 +14433,8 @@ trigger_tail:
-             sp_head *sp= lex->sphead;
  
-             lex->sql_command= SQLCOM_CREATE_TRIGGER;
--            sp->set_stmt_end(YYTHD);
--            sp->restore_thd_mem_root(YYTHD);
-+            sp->set_stmt_end(thd);
-+            sp->restore_thd_mem_root(thd);
+@@ -16347,7 +16215,6 @@ trigger_tail:
+           }
+           sp_proc_stmt /* $16 */
+           { /* $17 */
+-            THD *thd= YYTHD;
+             LEX *lex= Lex;
+             sp_head *sp= lex->sphead;
  
-             if (sp->is_not_allowed_in_function("trigger"))
-               MYSQL_YYABORT;
-@@ -14528,7 +14444,7 @@ trigger_tail:
-               sp_proc_stmt alternatives are not saving/restoring LEX, so
-               lex->query_tables can be wiped out.
-             */
--            if (!lex->select_lex.add_table_to_list(YYTHD, $9,
-+            if (!lex->select_lex.add_table_to_list(thd, $9,
-                                                    (LEX_STRING*) 0,
-                                                    TL_OPTION_UPDATING,
-                                                    TL_READ_NO_INSERT,
-@@ -14547,7 +14463,6 @@ udf_tail:
+@@ -16382,7 +16249,6 @@ udf_tail:
            AGGREGATE_SYM remember_name FUNCTION_SYM ident
            RETURNS_SYM udf_type SONAME_SYM TEXT_STRING_sys
            {
@@ -3427,7 +3790,7 @@ index 34ae03b..2a6d9aa 100644
              LEX *lex= thd->lex;
              if (is_native_function(thd, & $4))
              {
-@@ -14565,7 +14480,6 @@ udf_tail:
+@@ -16400,7 +16266,6 @@ udf_tail:
          | remember_name FUNCTION_SYM ident
            RETURNS_SYM udf_type SONAME_SYM TEXT_STRING_sys
            {
@@ -3435,32 +3798,32 @@ index 34ae03b..2a6d9aa 100644
              LEX *lex= thd->lex;
              if (is_native_function(thd, & $3))
              {
-@@ -14588,7 +14502,6 @@ sf_tail:
+@@ -16423,7 +16288,6 @@ sf_tail:
            sp_name /* $3 */
            '(' /* $4 */
            { /* $5 */
 -            THD *thd= YYTHD;
              LEX *lex= thd->lex;
-             Lex_input_stream *lip= YYLIP;
-             sp_head *sp;
-@@ -14646,7 +14559,7 @@ sf_tail:
+ 
+             lex->stmt_definition_begin= $1;
+@@ -16482,7 +16346,7 @@ sf_tail:
                MYSQL_YYABORT;
              }
  
--            if (sp->fill_field_definition(YYTHD, lex,
-+            if (sp->fill_field_definition(thd, lex,
-                                           (enum enum_field_types) $11,
-                                           &sp->m_return_field_def))
+-            if (fill_field_definition(YYTHD, sp,
++            if (fill_field_definition(thd, sp,
+                                       (enum enum_field_types) $11,
+                                       &sp->m_return_field_def))
                MYSQL_YYABORT;
-@@ -14655,7 +14568,6 @@ sf_tail:
+@@ -16491,7 +16355,6 @@ sf_tail:
            }
            sp_c_chistics /* $13 */
            { /* $14 */
 -            THD *thd= YYTHD;
              LEX *lex= thd->lex;
-             Lex_input_stream *lip= YYLIP;
  
-@@ -14664,7 +14576,6 @@ sf_tail:
+             lex->sphead->m_chistics= &lex->sp_chistics;
+@@ -16499,7 +16362,6 @@ sf_tail:
            }
            sp_proc_stmt /* $15 */
            {
@@ -3468,28 +3831,23 @@ index 34ae03b..2a6d9aa 100644
              LEX *lex= thd->lex;
              sp_head *sp= lex->sphead;
  
-@@ -14735,10 +14646,10 @@ sp_tail:
-             sp= new sp_head();
-             if (sp == NULL)
-               MYSQL_YYABORT;
--            sp->reset_thd_mem_root(YYTHD);
-+            sp->reset_thd_mem_root(thd);
-             sp->init(lex);
-             sp->m_type= TYPE_ENUM_PROCEDURE;
--            sp->init_sp_name(YYTHD, $3);
-+            sp->init_sp_name(thd, $3);
+@@ -16557,7 +16419,6 @@ sf_tail:
+ sp_tail:
+           PROCEDURE_SYM remember_name sp_name
+           {
+-            THD *thd= YYTHD;
+             LEX *lex= Lex;
  
-             lex->sphead= sp;
-           }
-@@ -14753,7 +14664,6 @@ sp_tail:
+             if (lex->sphead)
+@@ -16590,7 +16451,6 @@ sp_tail:
            sp_pdparam_list
            ')'
            {
 -            THD *thd= YYTHD;
              LEX *lex= thd->lex;
  
-             lex->sphead->m_param_end= YYLIP->get_cpp_tok_start();
-@@ -14761,7 +14671,6 @@ sp_tail:
+             Lex->sphead->m_parser_data.set_parameter_end_ptr(
+@@ -16600,7 +16460,6 @@ sp_tail:
            }
            sp_c_chistics
            {
@@ -3497,19 +3855,15 @@ index 34ae03b..2a6d9aa 100644
              LEX *lex= thd->lex;
  
              lex->sphead->m_chistics= &lex->sp_chistics;
-@@ -14772,9 +14681,9 @@ sp_tail:
-             LEX *lex= Lex;
-             sp_head *sp= lex->sphead;
- 
--            sp->set_stmt_end(YYTHD);
-+            sp->set_stmt_end(thd);
-             lex->sql_command= SQLCOM_CREATE_PROCEDURE;
--            sp->restore_thd_mem_root(YYTHD);
-+            sp->restore_thd_mem_root(thd);
+@@ -16608,7 +16467,6 @@ sp_tail:
            }
-         ;
+           sp_proc_stmt
+           {
+-            THD *thd= YYTHD;
+             LEX *lex= Lex;
  
-@@ -14811,21 +14720,21 @@ xid:
+             sp_finish_parsing(thd);
+@@ -16650,21 +16508,21 @@ xid:
            text_string
            {
              MYSQL_YYABORT_UNLESS($1->length() <= MAXGTRIDSIZE);
@@ -3534,6 +3888,15 @@ index 34ae03b..2a6d9aa 100644
                MYSQL_YYABORT;
              Lex->xid->set($5, $1->ptr(), $1->length(), $3->ptr(), $3->length());
            }
--- 
-1.8.4
-
+diff --git a/storage/perfschema/gen_pfs_lex_token.cc b/storage/perfschema/gen_pfs_lex_token.cc
+index 7581255..2eee5d1 100644
+--- a/storage/perfschema/gen_pfs_lex_token.cc
++++ b/storage/perfschema/gen_pfs_lex_token.cc
+@@ -21,6 +21,7 @@
+ 
+ /* We only need the tokens here */
+ #define YYSTYPE_IS_DECLARED
++class THD;
+ #include <../sql/sql_yacc.h>
+ #include <lex.h>
+ 
diff --git a/community/percona-server/mysql56-bufsize.patch b/community/percona-server/mysql56-bufsize.patch
new file mode 100644
index 000000000..1d5b7dc63
--- /dev/null
+++ b/community/percona-server/mysql56-bufsize.patch
@@ -0,0 +1,20 @@
+--- storage/innobase/row/row0log.cc.orig	2013-10-14 09:44:46.060172260 +0200
++++ storage/innobase/row/row0log.cc	2013-10-14 10:05:51.822170509 +0200
+@@ -2364,7 +2364,7 @@
+ 		and be ignored when the operation is unsupported. */
+ 		fallocate(index->online_log->fd,
+ 			  FALLOC_FL_PUNCH_HOLE | FALLOC_FL_KEEP_SIZE,
+-			  ofs, srv_buf_size);
++			  ofs, srv_sort_buf_size);
+ #endif /* FALLOC_FL_PUNCH_HOLE */
+ 
+ 		next_mrec = index->online_log->head.block;
+@@ -3153,7 +3153,7 @@
+ 		and be ignored when the operation is unsupported. */
+ 		fallocate(index->online_log->fd,
+ 			  FALLOC_FL_PUNCH_HOLE | FALLOC_FL_KEEP_SIZE,
+-			  ofs, srv_buf_size);
++			  ofs, srv_sort_buf_size);
+ #endif /* FALLOC_FL_PUNCH_HOLE */
+ 
+ 		next_mrec = index->online_log->head.block;
diff --git a/community/percona-server/percona.install b/community/percona-server/percona.install
index c3b337ae1..2659c7558 100644
--- a/community/percona-server/percona.install
+++ b/community/percona-server/percona.install
@@ -6,7 +6,7 @@ fi
 post_install(){
   groupadd -g 89 mysql &>/dev/null
   useradd -u 89 -g mysql -d $datadir -s /bin/false mysql &>/dev/null
-  
+
   if [[ ! -e $datadir ]]; then
     install -dm700 $datadir
     usr/bin/mysql_install_db --user=mysql --basedir=/usr --datadir=$datadir
@@ -20,7 +20,7 @@ post_upgrade(){
   getent group mysql >/dev/null 2>&1 || groupadd -g 89 mysql &>/dev/null
   getent passwd mysql >/dev/null 2>&1 || useradd -u 89 -g mysql -d $datadir -s /bin/false mysql &>/dev/null
 
-  if [ "$(vercmp $2 5.5)" -lt 0 ]; then
+  if [ "$(vercmp $2 5.6)" -lt 0 ]; then
     echo " >> "
     echo " >> Major version update. Consider restart the service, and then running mysql_upgrade after it."
     echo " >> "
diff --git a/community/perl-berkeleydb/PKGBUILD b/community/perl-berkeleydb/PKGBUILD
index b6405d193..29f3319ca 100644
--- a/community/perl-berkeleydb/PKGBUILD
+++ b/community/perl-berkeleydb/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 93668 2013-07-08 11:19:35Z spupykin $
+# $Id: PKGBUILD 99506 2013-10-29 10:25:03Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: Charles Mauch <cmauch@gmail.com>
 # Contributor: Francois Charette <firmicus@gmx.net>
 
 pkgname=perl-berkeleydb
-pkgver=0.52
-pkgrel=1
+pkgver=0.53
+pkgrel=2
 pkgdesc="Interface to Berkeley DB version 2, 3 or 4"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://search.cpan.org/dist/BerkeleyDB/"
@@ -13,7 +13,7 @@ license=('GPL' 'PerlArtistic')
 depends=('perl' 'db')
 options=('!emptydirs')
 source=(http://search.cpan.org/CPAN/authors/id/P/PM/PMQS/BerkeleyDB-$pkgver.tar.gz)
-md5sums=('e1031f4cd3062fdb1597af4373789d79')
+md5sums=('899c6967316c7a36b1d5b6a4c7ffbb02')
 
 build() {
   cd  $srcdir/BerkeleyDB-$pkgver
@@ -22,8 +22,9 @@ build() {
 }
 
 package() {
-  _dbver=`pacman -Q db | cut -d\  -f2 | cut -d- -f1`
-  depends=('perl' "db=$_dbver")
+  _dbver1=`pacman -Q db | cut -d\  -f2 | cut -d- -f1 | cut -f1 -d.`
+  _dbver2=`pacman -Q db | cut -d\  -f2 | cut -d- -f1 | cut -f2 -d.`
+  depends=('perl' "db>=${_dbver1}.${_dbver2}" "db<${_dbver1}.$(expr $_dbver2 + 1)")
 
   cd  $srcdir/BerkeleyDB-$pkgver
   make pure_install doc_install DESTDIR=$pkgdir
diff --git a/community/perl-dbd-odbc/PKGBUILD b/community/perl-dbd-odbc/PKGBUILD
index 186632e86..3d9b695e2 100644
--- a/community/perl-dbd-odbc/PKGBUILD
+++ b/community/perl-dbd-odbc/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 91664 2013-05-26 09:24:58Z bluewind $
+# $Id: PKGBUILD 100316 2013-11-02 09:13:58Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: François Charette <firmicus ατ gmx δοτ net>
 
 pkgname=perl-dbd-odbc
-pkgver=1.43
-pkgrel=2
+pkgver=1.45
+pkgrel=1
 pkgdesc="ODBC Driver for DBI"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://search.cpan.org/dist/DBD-ODBC/"
@@ -12,7 +12,7 @@ license=('GPL' 'PerlArtistic')
 depends=('perl-dbi' 'perl' 'unixodbc')
 options=('!emptydirs')
 source=("http://search.cpan.org/CPAN/authors/id/M/MJ/MJEVANS/DBD-ODBC-${pkgver}.tar.gz")
-md5sums=('35e37488170b5111f826226c4d466961')
+md5sums=('3c750cde8e39fbba804043485f18ba68')
 
 build() {
   cd  DBD-ODBC-${pkgver}
diff --git a/community/perl-fuse/PKGBUILD b/community/perl-fuse/PKGBUILD
index 9476203a7..a87c9620a 100644
--- a/community/perl-fuse/PKGBUILD
+++ b/community/perl-fuse/PKGBUILD
@@ -1,17 +1,24 @@
-# $Id: PKGBUILD 95164 2013-08-06 11:52:21Z spupykin $
+# $Id: PKGBUILD 99530 2013-10-29 10:58:33Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: Tom K <tomk@runbox.com>
 
 pkgname=perl-fuse
-pkgver=0.15
+pkgver=0.16
 pkgrel=1
 pkgdesc="write filesystems in Perl using FUSE"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://search.cpan.org/dist/Fuse"
 depends=('perl' 'fuse')
 license=('GPL')
-source=(http://www.cpan.org/authors/id/D/DP/DPAVLIN/Fuse-$pkgver.tar.gz)
-md5sums=('5c521508bea036fed946d43b44d56056')
+source=(http://search.cpan.org/CPAN/authors/id/D/DP/DPATES/Fuse-$pkgver.tar.gz
+	build-fix.patch)
+md5sums=('d7f36eb55392270d2c6b2f05737b553f'
+         '16d985400e620286efdf4610d78cb5d6')
+
+prepare() {
+  cd  $srcdir/Fuse-$pkgver
+  patch -p1 <$srcdir/build-fix.patch
+}
 
 build() {
   cd  $srcdir/Fuse-$pkgver
diff --git a/community/perl-fuse/build-fix.patch b/community/perl-fuse/build-fix.patch
new file mode 100644
index 000000000..51cb5ebce
--- /dev/null
+++ b/community/perl-fuse/build-fix.patch
@@ -0,0 +1,13 @@
+diff -wbBur Fuse-0.16/Fuse.xs Fuse-0.16.q/Fuse.xs
+--- Fuse-0.16/Fuse.xs	2013-09-13 06:16:35.000000000 +0400
++++ Fuse-0.16.q/Fuse.xs	2013-10-29 14:38:44.000000000 +0400
+@@ -754,6 +754,9 @@
+ 
+ int _PLfuse_release (const char *file, struct fuse_file_info *fi) {
+ 	int rv;
++#ifndef PERL_HAS_64BITINT
++	char *temp;
++#endif
+ 	int flags = fi->flags;
+ 	FUSE_CONTEXT_PRE;
+ 	DEBUGf("release begin\n");
diff --git a/community/perl-gstreamer/PKGBUILD b/community/perl-gstreamer/PKGBUILD
index 744cbac3e..97385d294 100644
--- a/community/perl-gstreamer/PKGBUILD
+++ b/community/perl-gstreamer/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 91674 2013-05-26 09:25:14Z bluewind $
+# $Id: PKGBUILD 99484 2013-10-29 10:21:54Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Corrado Primier <bardo@aur.archlinux.org>
 
 pkgname=perl-gstreamer
-pkgver=0.18
-pkgrel=2
+pkgver=0.19
+pkgrel=1
 pkgdesc="Interface to the GStreamer library"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://search.cpan.org/dist/GStreamer"
@@ -12,7 +12,7 @@ license=('GPL' 'PerlArtistic')
 depends=('glib-perl>=1.180' 'gstreamer0.10' 'perl-extutils-pkgconfig>=1.07' 'perl-extutils-depends>=0.205')
 options=('!emptydirs')
 source=(http://search.cpan.org/CPAN/authors/id/X/XA/XAOC/GStreamer-$pkgver.tar.gz)
-md5sums=('7ac748677f00d1fd966b09e10448cff6')
+md5sums=('886bc1f553fa288ca86842332ddadd8e')
 
 build() {
   cd  GStreamer-${pkgver}
diff --git a/community/perl-json-xs/PKGBUILD b/community/perl-json-xs/PKGBUILD
index 941337a8b..2a84a3280 100644
--- a/community/perl-json-xs/PKGBUILD
+++ b/community/perl-json-xs/PKGBUILD
@@ -1,22 +1,21 @@
-# $Id: PKGBUILD 92759 2013-06-14 17:40:33Z spupykin $
+# $Id: PKGBUILD 100497 2013-11-05 10:05:37Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Tor Krill <tor@krill.nu>
 
 pkgname=perl-json-xs
-pkgver=2.34
-pkgrel=1
+pkgver=3.01
+pkgrel=2
 pkgdesc="JSON::XS - JSON serialising/deserialising, done correctly and fast"
 url="http://search.cpan.org/dist/JSON-XS/"
 license=("GPL")
 arch=('i686' 'x86_64' 'mips64el')
-depends=('perl' 'perl-common-sense')
+depends=('perl' 'perl-common-sense' 'perl-types-serialiser')
 options=('!emptydirs')
 source=(http://search.cpan.org/CPAN/authors/id/M/ML/MLEHMANN/JSON-XS-$pkgver.tar.gz)
-md5sums=('dda3c03335665cdeff91c37a269b833b')
+md5sums=('b7be65295baf6dd9233c6494782c1153')
 
 build() {
   cd  $srcdir/JSON-XS-$pkgver
-# eval `perl -V:archname`
   perl Makefile.PL INSTALLDIRS=vendor
   make
 }
diff --git a/community/perl-libapreq2/PKGBUILD b/community/perl-libapreq2/PKGBUILD
index 3bf8a000b..1bddbecd9 100644
--- a/community/perl-libapreq2/PKGBUILD
+++ b/community/perl-libapreq2/PKGBUILD
@@ -1,17 +1,17 @@
-# $Id: PKGBUILD 93091 2013-06-24 09:55:33Z spupykin $
+# $Id: PKGBUILD 100273 2013-11-02 08:47:16Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: Tom K <tomk@runbox.com>
 
 pkgname=perl-libapreq2
 pkgver=2.13
-pkgrel=4
+pkgrel=5
 pkgdesc="A safe, standards-compliant, high-performance library used for parsing HTTP cookies, query-strings and POST data."
 arch=('i686' 'x86_64' 'mips64el')
 url="http://search.cpan.org/dist/libapreq2"
 depends=('mod_perl' 'apr-util')
 makedepends=('perl-extutils-xsbuilder')
 license=("GPL")
-options=('!libtool' '!makeflags')
+options=('!makeflags')
 source=(http://search.cpan.org/CPAN/authors/id/I/IS/ISAAC/libapreq2-$pkgver.tar.gz)
 md5sums=('c11fb0861aa84dcc6cd0f0798b045eee')
 
diff --git a/community/perl-xml-libxml/PKGBUILD b/community/perl-xml-libxml/PKGBUILD
index c7e3231a6..e1f6f5035 100644
--- a/community/perl-xml-libxml/PKGBUILD
+++ b/community/perl-xml-libxml/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 97592 2013-09-24 21:06:57Z jsteel $
+# $Id: PKGBUILD 100412 2013-11-03 17:59:19Z jsteel $
 # Maintainer: Jonathan Steel <jsteel@aur.archlinux.org>
 # Contributor: Justin "juster" Davis <jrcd83@gmail.com>
 # Contributor: François Charette <francois.archlinux.org>
 
 pkgname=perl-xml-libxml
-pkgver=2.0106
+pkgver=2.0107
 pkgrel=1
 pkgdesc="Interface to the libxml library"
 arch=('i686' 'x86_64' 'mips64el')
@@ -13,24 +13,26 @@ license=('GPL')
 depends=('libxml2' 'perl-xml-sax' 'perl-xml-namespacesupport')
 provides=('perl-libxml' 'perl-xml-libxml-common')
 replaces=('perl-libxml' 'perl-xml-libxml-common')
-conflicts=('perl-libxml' 'perl-xml-libxml-common')
 options=('!emptydirs')
 install=$pkgname.install
 source=(http://www.cpan.org/authors/id/S/SH/SHLOMIF/XML-LibXML-$pkgver.tar.gz)
-md5sums=('5da8ecfdedccca81fe0821e9935fe11c')
+md5sums=('4caedd8fb64167e1caf0443f18ec47a2')
 
 build() {
-  cd XML-LibXML-$pkgver
+  cd "$srcdir"/XML-LibXML-$pkgver
+
   PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor
   make
 }
 
 check() {
-  cd XML-LibXML-$pkgver
+  cd "$srcdir"/XML-LibXML-$pkgver
+
   make test
 }
 
 package() {
-  cd XML-LibXML-$pkgver
+  cd "$srcdir"/XML-LibXML-$pkgver
+
   make pure_install doc_install DESTDIR="$pkgdir"/
 }
diff --git a/community/pgadmin3/PKGBUILD b/community/pgadmin3/PKGBUILD
index 2d3065ab3..9c4ee420d 100644
--- a/community/pgadmin3/PKGBUILD
+++ b/community/pgadmin3/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 98468 2013-10-11 10:07:30Z spupykin $
+# $Id: PKGBUILD 99091 2013-10-24 10:41:34Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: Douglas Soares de Andrade <dsa@aur.archlinux.org>
 # Contributor: Benjamin Andresen <benny@klapmuetz.org>
@@ -6,21 +6,20 @@
 
 pkgname=pgadmin3
 pkgver=1.18.1
-pkgrel=1
+pkgrel=3
 pkgdesc="Comprehensive design and management interface for PostgreSQL"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.pgadmin.org"
 license=('custom')
 depends=('wxgtk' 'postgresql-libs' 'libxslt')
 makedepends=('libpqxx' 'krb5' 'postgresql' 'imagemagick')
-_categories="Development;Application"
+install=pgadmin3.install
 source=(http://ftp.postgresql.org/pub/pgadmin3/release/v${pkgver}/src/pgadmin3-${pkgver}.tar.gz)
 md5sums=('7dde96680407c900af72d0839a377de4')
 
 build() {
   cd "$srcdir"
   convert pgadmin3-${pkgver}/pgadmin/include/images/pgAdmin3.ico pgadmin3.png
-  cp pgadmin3-3.png pgadmin3.png
 
   cd "pgadmin3-${pkgver}"
   [ -f Makefile ] || ./configure --prefix=/usr
@@ -33,7 +32,7 @@ package() {
   make DESTDIR=$pkgdir/ install
   install -Dm644 i18n/$pkgname.lng $pkgdir/usr/share/pgadmin3/i18n
   install -Dm644 LICENSE $pkgdir/usr/share/licenses/$pkgname/LICENSE
-  install -Dm644 pgadmin/include/images/pgAdmin3.ico $pkgdir/usr/share/pgadmin3/pixmaps/pgAdmin3.ico
-  install -Dm644 "$srcdir/pgadmin3.png" "$pkgdir/usr/share/pixmaps/pgadmin3.png"
+  install -Dm644 pgadmin/include/images/pgAdmin3.ico $pkgdir/usr/share/pgadmin3/pgAdmin3.ico
+  install -Dm644 "$srcdir/pgadmin3-3.png" "$pkgdir/usr/share/pgadmin3/pgAdmin3.png"
   install -Dm644 "pkg/pgadmin3.desktop" "$pkgdir/usr/share/applications/pgadmin3.desktop"
 }
diff --git a/community/pgadmin3/pgadmin3.install b/community/pgadmin3/pgadmin3.install
new file mode 100644
index 000000000..56e20c736
--- /dev/null
+++ b/community/pgadmin3/pgadmin3.install
@@ -0,0 +1,11 @@
+post_install() {
+  [ -x usr/bin/update-desktop-database ] && update-desktop-database -q || true
+}
+
+post_upgrade() {
+  [ -x usr/bin/update-desktop-database ] && update-desktop-database -q || true
+}
+
+post_remove() {
+  [ -x usr/bin/update-desktop-database ] && update-desktop-database -q || true
+}
diff --git a/community/picocom/PKGBUILD b/community/picocom/PKGBUILD
index be3edddc5..0e5f1137e 100644
--- a/community/picocom/PKGBUILD
+++ b/community/picocom/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 75039 2012-08-12 14:06:03Z seblu $
-# Maintainer: Sébastien Luttringer <seblu@aur.archlinux.org>
+# $Id: PKGBUILD 98869 2013-10-20 22:35:11Z seblu $
+# Maintainer: Sébastien Luttringer
 # Contributor: Jens Adam (byte/jra) <j_adam@web.de>
 
 pkgname=picocom
 pkgver=1.7
-pkgrel=2
+pkgrel=3
 pkgdesc='Minimal dumb-terminal emulation program, very much like minicom'
 url='http://code.google.com/p/picocom/'
 license=('GPL2')
@@ -16,7 +16,7 @@ sha1sums=('bde6e36af71db845913f9d61f28dee1b485218fa')
 
 build() {
   cd $pkgname-$pkgver
-  make --environment-overrides UUCP_LOCK_DIR=/run/lock/picocom
+  make UUCP_LOCK_DIR=/run/lock/picocom
 }
 
 package() {
@@ -30,4 +30,4 @@ package() {
     > "$pkgdir/usr/lib/tmpfiles.d/$pkgname.conf"
 }
 
-# vim:set ts=2 sw=2 ft=sh et:
+# vim:set ts=2 sw=2 et:
diff --git a/community/picocom/picocom.install b/community/picocom/picocom.install
index 4d2f2ed48..aab48bdc7 100644
--- a/community/picocom/picocom.install
+++ b/community/picocom/picocom.install
@@ -1,8 +1,8 @@
-#!/bin/sh
+# vim:set ts=2 sw=2 ft=sh et:
 
 ## arg 1:  the new package version
 post_install() {
-  type systemd-tmpfiles >/dev/null && systemd-tmpfiles --create picocom.conf
+  type -P systemd-tmpfiles >/dev/null && systemd-tmpfiles --create picocom.conf
 }
 
 # arg 1:  the new package version
@@ -13,7 +13,5 @@ post_upgrade() {
 
 ## arg 1:  the old package version
 post_remove() {
- type systemd-tmpfiles >/dev/null && systemd-tmpfiles --clean --remove picocom.conf
+ type -P systemd-tmpfiles >/dev/null && systemd-tmpfiles --clean --remove picocom.conf
 }
-
-# vim:set ts=2 sw=2 ft=sh et:
diff --git a/community/pidgin-encryption/PKGBUILD b/community/pidgin-encryption/PKGBUILD
index 178d7d344..5e0e1a7c3 100644
--- a/community/pidgin-encryption/PKGBUILD
+++ b/community/pidgin-encryption/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 83172 2013-01-27 16:23:51Z pierre $
+# $Id: PKGBUILD 99953 2013-10-31 02:39:54Z allan $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Dan McGee <dan@archlinux.org>
 # Contributor: Dale Blount <dale@archlinux.org>
@@ -11,7 +11,6 @@ arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 url="http://pidgin-encrypt.sourceforge.net/"
 depends=('pidgin' 'nss')
-options=('!libtool')
 source=(http://downloads.sourceforge.net/pidgin-encrypt/$pkgname-$pkgver.tar.gz)
 md5sums=('d839eec602c21f913b32b742dc512f4b')
 
diff --git a/community/pidgin-gfire/PKGBUILD b/community/pidgin-gfire/PKGBUILD
index 04b0adcc9..eccb41d29 100644
--- a/community/pidgin-gfire/PKGBUILD
+++ b/community/pidgin-gfire/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 73926 2012-07-17 06:00:57Z svenstaro $
+# $Id: PKGBUILD 99954 2013-10-31 02:40:14Z allan $
 # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
 # Contributor: Slash <demodevil5[at]yahoo[dot]com>
 # Contributor: LookTJ <jesus[dot]christ[dot]i[dot]love[at]gmail[dot]com>
@@ -15,7 +15,6 @@ makedepends=('pkgconfig' 'intltool' 'libtool')
 source=("http://downloads.sourceforge.net/gfire/pidgin-gfire-$pkgver.tar.bz2" "gfire-libnotify.patch")
 md5sums=('7167828fd77200603a318afdd4d9ebd2'
          '5d6fc2b98837fbebba6bef2648699d5e')
-options=(!libtool)
 
 build() {
     cd "$srcdir/pidgin-gfire-$pkgver"
diff --git a/community/pidgin-hotkeys/PKGBUILD b/community/pidgin-hotkeys/PKGBUILD
index c62910921..19440dd17 100644
--- a/community/pidgin-hotkeys/PKGBUILD
+++ b/community/pidgin-hotkeys/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 80723 2012-12-01 13:56:24Z fyan $
+# $Id: PKGBUILD 99153 2013-10-25 05:05:18Z fyan $
 # Maintainer: Felix Yan <felixonmars@gmail.com>
 # Contributor: Lukas Fleischer <archlinux at cryptocrack dot de>
 # Contributor: detto <detto-brumm@freenet.de>
 
 pkgname=pidgin-hotkeys
 pkgver=0.2.4
-pkgrel=2
+pkgrel=3
 pkgdesc="A Pidgin plugin that allows you to define global hotkeys."
 arch=('i686' 'x86_64' 'mips64el')
 url="http://pidgin-hotkeys.sourceforge.net"
diff --git a/community/pidgin-kwallet/PKGBUILD b/community/pidgin-kwallet/PKGBUILD
index 0f504f145..a1c79ea3b 100644
--- a/community/pidgin-kwallet/PKGBUILD
+++ b/community/pidgin-kwallet/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 82219 2013-01-12 09:18:51Z fyan $
+# $Id: PKGBUILD 99955 2013-10-31 02:40:34Z allan $
 # Maintainer: Felix Yan <felixonmars@gmail.com>
 # Contributor: Mateusz Slazynski <ceceron@gmail.com>
 
@@ -11,7 +11,6 @@ url="http://kde-apps.org/content/show.php/Pidgin+KWallet+Plugin?content=127136"
 license=('GPL')
 depends=('pidgin' 'kdelibs')
 makedepends=('cmake')
-options=(!libtool)
 source=("http://kde-apps.org/CONTENT/content-files/127136-PidginKWallet-$pkgver.tar.bz2")
 md5sums=('c8fde518d8058de8302124791d0d15c6')
 
diff --git a/community/pidgin-libnotify/PKGBUILD b/community/pidgin-libnotify/PKGBUILD
index 884b9e373..f44a5eec0 100644
--- a/community/pidgin-libnotify/PKGBUILD
+++ b/community/pidgin-libnotify/PKGBUILD
@@ -12,7 +12,6 @@ license=('GPL')
 depends=('pidgin' 'libnotify')
 makedepends=('intltool')
 optdepends=('notification-daemon')
-options=(!libtool)
 source=(http://downloads.sourceforge.net/sourceforge/gaim-libnotify/$pkgname-$pkgver.tar.gz language_fixes.patch
         pidgin-libnotify-0.14-libnotify-0.7.patch pidgin-libnotify-showbutton.patch pidgin-libnotify-getfocus.patch)
 md5sums=('bfb5368b69c02d429b2b17c00a6673c0'
diff --git a/community/pidgin-talkfilters/PKGBUILD b/community/pidgin-talkfilters/PKGBUILD
index 5ac864306..66849640d 100644
--- a/community/pidgin-talkfilters/PKGBUILD
+++ b/community/pidgin-talkfilters/PKGBUILD
@@ -9,7 +9,6 @@ url="http://www.guifications.org/projects/purple-plugin-pack"
 license=('GPL')
 depends=('pidgin' 'talkfilters')
 makedepends=('intltool' 'gettext' 'python2')
-options=(!libtool)
 source=(https://www.guifications.org/attachments/download/201/purple-plugin-pack-${pkgver}.tar.bz2)
 
 build() {
diff --git a/community/pidgin-toobars/PKGBUILD b/community/pidgin-toobars/PKGBUILD
index 1b31da37f..4187952c2 100644
--- a/community/pidgin-toobars/PKGBUILD
+++ b/community/pidgin-toobars/PKGBUILD
@@ -10,7 +10,6 @@ url="http://vayurik.ru/wordpress/en/toobars/"
 license=('GPL')
 depends=('pidgin')
 makedepends=('intltool')
-options=('!libtool')
 source=("http://vayurik.ru/wordpress/wp-content/uploads/toobars/${pkgver}/${pkgname}-${pkgver}.tar.gz")
 md5sums=('0b9255902c10ec1b171329474bd69e82')
 
diff --git a/community/pion/PKGBUILD b/community/pion/PKGBUILD
index c8ce2666e..f628a7e73 100644
--- a/community/pion/PKGBUILD
+++ b/community/pion/PKGBUILD
@@ -1,7 +1,7 @@
-# $Id: PKGBUILD 94042 2013-07-13 12:35:54Z svenstaro $
+# $Id: PKGBUILD 99025 2013-10-22 18:18:59Z stativ $
 # Maintainer: Lukas Jirkovsky <l.jirkovsky@gmail.com>
 pkgname=pion
-pkgver=5.0.2
+pkgver=5.0.4
 pkgrel=1
 pkgdesc="A C++ development library for implementing lightweight HTTP interfaces"
 url="https://github.com/cloudmeter/pion"
@@ -13,7 +13,7 @@ provides=('pion-net')
 conflicts=('pion-net')
 replaces=('pion-net')
 source=(https://github.com/cloudmeter/pion/archive/$pkgver.zip)
-md5sums=('1f6a9f69114235ca98756cbcab16d162')
+md5sums=('5807d39beb0c80fdef5b8ad5cee71c1c')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
@@ -25,7 +25,7 @@ build() {
   # override Makefile bug
   sed -i "/docs:/ s/doxygen-doc//" Makefile.in
 
-  ./configure --prefix=/usr --disable-doxygen-doc
+  ./configure --prefix=/usr --with-plugins=/usr/lib/pion/plugins --disable-doxygen-doc
 
   make
 }
diff --git a/community/pitivi/PKGBUILD b/community/pitivi/PKGBUILD
index 0a7c76d9f..8849804ba 100644
--- a/community/pitivi/PKGBUILD
+++ b/community/pitivi/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 98281 2013-10-07 22:50:21Z bgyorgy $
+# $Id: PKGBUILD 100501 2013-11-05 10:06:09Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: Abhishek Dasgupta <abhidg@gmail.com>
 # Contributor: Gabor Nyekhelyi (n0gabor) <n0gabor@vipmail.hu>
 
 pkgname=pitivi
-pkgver=0.91
-pkgrel=3
+pkgver=0.92
+pkgrel=1
 pkgdesc="Editor for audio/video projects using the GStreamer framework"
 arch=('i686' 'x86_64')
 url="http://www.pitivi.org/"
@@ -18,10 +18,9 @@ optdepends=('frei0r-plugins: additional video effects, clip transformation featu
             'gst-libav: additional multimedia codecs'
             'gst-plugins-bad: additional multimedia codecs'
             'gst-plugins-ugly: additional multimedia codecs')
-options=('!libtool')
 install=$pkgname.install
-source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/0.91/$pkgname-$pkgver.tar.xz)
-md5sums=('30f520587885d231aeb9a7ddb2585e45')
+source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/$pkgver/$pkgname-$pkgver.tar.xz)
+md5sums=('6c84db8a647c9151c3890e9cd15a8fc1')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
diff --git a/community/plan9port/PKGBUILD b/community/plan9port/PKGBUILD
index fc2519b76..517b59b24 100644
--- a/community/plan9port/PKGBUILD
+++ b/community/plan9port/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 98017 2013-10-03 19:11:32Z arodseth $
+# $Id: PKGBUILD 99408 2013-10-28 11:45:43Z arodseth $
 # Maintainer: Alexander Rødseth <rodseth@gmail.com>
 # Contributor: phrakture <aaronmgriffin--gmail--com>
 # Contributor: Fazlul Shahriar
@@ -6,16 +6,16 @@
 
 pkgname=plan9port
 pkgver=20130927
-pkgrel=2
+pkgrel=3
 pkgdesc='Port of many programs from Plan 9 to Unix-like operating systems'
 arch=('x86_64' 'i686' 'mips64el')
 url='http://swtch.com/plan9port/'
 license=('custom')
-depends=('xorg-server' 'libxt' 'libxext' 'sh' 'fuse')
+depends=('xorg-server' 'libxt' 'libxext' 'fuse')
 optdepends=('python2: for the codereview script')
 provides=('plan9')
 install='plan9.install'
-options=('!zipman')
+options=('!zipman' 'staticlibs')
 source=("http://swtch.com/$pkgname/$pkgname-$pkgver.tgz"
         'plan9.sh')
 sha256sums=('580927688ae2df295bf7f78d0ba19588104c6b0403558ffa3cd9ed0b7b110542'
diff --git a/community/plank/PKGBUILD b/community/plank/PKGBUILD
new file mode 100644
index 000000000..94521202e
--- /dev/null
+++ b/community/plank/PKGBUILD
@@ -0,0 +1,39 @@
+# $Id: PKGBUILD 99552 2013-10-29 14:43:20Z alucryd $
+# Maintainer: Maxime Gauduin <alucryd at gmail dot com> 
+# Contributor: Ner0 <darkelfdarkelf666 at yahoo dot co dot uk>
+# Contributor: dcelasun <dcelasun at gmaild dot com>
+
+pkgname=plank
+pkgver=0.4.0
+pkgrel=2
+pkgdesc="Elegant, simple, clean dock"
+arch=('i686' 'x86_64')
+url="https://launchpad.net/plank"
+license=('GPL3')
+depends=('bamf' 'libdbusmenu-gtk3' 'libgee06' 'python2')
+makedepends=('gnome-common' 'intltool' 'vala')
+install="${pkgname}.install"
+source=("https://launchpad.net/${pkgname}/1.0/${pkgver}/+download/${pkgname}-${pkgver}.tar.xz")
+sha256sums=('b8417bce7d88ac1f339e948c964822049a9261f9d9dedc0d0e636c73442856fe')
+
+prepare() {
+  cd ${pkgname}-${pkgver}
+
+  sed -i 's|^#!.*python$|#!/usr/bin/python2|' $(grep -rl '^#!.*python')
+}
+
+build() {
+  cd ${pkgname}-${pkgver}
+
+  ./configure --prefix='/usr' --sysconfdir='/etc' --localstatedir='/var' --disable-gee-0.8
+  make
+}
+
+package() {
+  cd ${pkgname}-${pkgver}
+
+  make DESTDIR="${pkgdir}" install
+  rm -rf "${pkgdir}"/{etc,usr/share/apport}
+}
+
+# vim: ts=2 sw=2 et:
diff --git a/community/plank/plank.install b/community/plank/plank.install
new file mode 100644
index 000000000..197190dd8
--- /dev/null
+++ b/community/plank/plank.install
@@ -0,0 +1,15 @@
+post_install() {
+  gtk-update-icon-cache -ftq usr/share/icons/hicolor
+}
+
+post_upgrade()
+{
+  post_install
+}
+
+post_remove()
+{
+  post_install
+}
+
+# vim: ts=2 sw=2 et:
diff --git a/community/polkit-gnome/PKGBUILD b/community/polkit-gnome/PKGBUILD
index 520a893c5..d5e4b2abc 100644
--- a/community/polkit-gnome/PKGBUILD
+++ b/community/polkit-gnome/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 96622 2013-09-02 13:20:27Z bgyorgy $
+# $Id: PKGBUILD 99960 2013-10-31 02:42:16Z allan $
 # Maintainer: Balló György <ballogyor+arch at gmail dot com>
 # Contributor: Jan de Groot <jgc@archlinux.org>
 # Contributor: onestep_ua <onestep@ukr.net>
@@ -12,7 +12,6 @@ url="http://www.freedesktop.org/wiki/Software/polkit/"
 license=('LGPL')
 depends=('polkit' 'gtk3')
 makedepends=('intltool')
-options=(!libtool)
 install=$pkgname.install
 source=(http://download.gnome.org/sources/$pkgname/$pkgver/$pkgname-$pkgver.tar.xz
         polkit-gnome-authentication-agent-1.desktop)
diff --git a/community/portaudio/PKGBUILD b/community/portaudio/PKGBUILD
index fac6fb857..82291a2e5 100644
--- a/community/portaudio/PKGBUILD
+++ b/community/portaudio/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 96889 2013-09-07 11:45:00Z bgyorgy $
+# $Id: PKGBUILD 99961 2013-10-31 02:42:36Z allan $
 # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de>
 # Contributor: Eric Belanger <eric@archlinux.org>
 # Contributor: Darwin Bautista <djclue917@gmail.com>
@@ -6,7 +6,7 @@
 
 pkgname=portaudio
 pkgver=19_20111121
-pkgrel=2
+pkgrel=3
 pkgdesc='A free, cross-platform, open source, audio I/O library.'
 arch=('i686' 'x86_64' 'mips64el')
 url='http://www.portaudio.com/'
@@ -15,7 +15,6 @@ depends=('gcc-libs' 'jack')
 conflicts=('portaudio_cpp')
 provides=('portaudio_cpp')
 replaces=('portaudio_cpp')
-options=('!libtool')
 source=("http://www.portaudio.com/archives/pa_stable_v$pkgver.tgz")
 md5sums=('25c85c1cc5e9e657486cbc299c6c035a')
 
diff --git a/community/postgis/PKGBUILD b/community/postgis/PKGBUILD
index dcda1022d..e15f900e7 100644
--- a/community/postgis/PKGBUILD
+++ b/community/postgis/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 98497 2013-10-12 06:26:10Z jlichtblau $
+# $Id: PKGBUILD 99962 2013-10-31 02:42:56Z allan $
 # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
 # Contributor: dibblethewrecker dibblethewrecker.at.jiwe.dot.org
 # Contributor: William Rea <sillywilly@gmail.com>
@@ -12,7 +12,6 @@ url="http://postgis.net/"
 license=('GPL')
 depends=('postgresql' 'gdal' 'json-c')
 changelog=$pkgname.changelog
-options=('!libtool')
 source=(http://download.osgeo.org/postgis/source/${pkgname}-${pkgver}.tar.gz)
 sha256sums=('fc00481aec904661f3eb11da4305b1666f2040c28b0651de7eac6c22f217b26c')
 
diff --git a/community/primus/PKGBUILD b/community/primus/PKGBUILD
index c900b626d..e7f024443 100644
--- a/community/primus/PKGBUILD
+++ b/community/primus/PKGBUILD
@@ -2,7 +2,7 @@
 # Contributor: Alexander Monakov <amonakov@gmail.com>
 
 pkgname=primus
-pkgver=20130815
+pkgver=20131027
 pkgrel=1
 pkgdesc="Faster OpenGL offloading for Bumblebee"
 arch=('i686' 'x86_64')
diff --git a/community/processing/PKGBUILD b/community/processing/PKGBUILD
index aac018b62..c2557b7d1 100644
--- a/community/processing/PKGBUILD
+++ b/community/processing/PKGBUILD
@@ -1,37 +1,38 @@
-# $Id: PKGBUILD 96894 2013-09-07 11:57:50Z arodseth $
+# $Id: PKGBUILD 99410 2013-10-28 11:54:28Z arodseth $
 # Maintainer: Alexander Rødseth <rodseth@gmail.com>
 
 pkgname=processing
-pkgver=2.0.3
+pkgver=2.1
 pkgrel=1
 arch=('x86_64' 'i686')
 pkgdesc='Programming environment for creating images, animations and interactions'
 url='http://www.processing.org/'
 license=('GPL' 'LGPL')
-depends=('libgl' 'sh' 'libxxf86vm')
+depends=('libgl' 'libxxf86vm')
 makedepends=('gendesk')
-options=(!strip)
+options=('!strip') # 'staticlibs')
 
-if [ "$CARCH" == "x86_64" ]; then
+if [[ $CARCH == "x86_64" ]]; then
   source=("http://download.$pkgname.org/$pkgname-$pkgver-linux64.tgz"
           "$pkgname.png::http://wiki.$pkgname.org/skins/${pkgname}skin/${pkgname}_wiki_logo.png")
-  sha256sums=('8d36995fb1ea0390fe6c3110372316c4b3f86e81af6a34d4e0227f4bb109f707'
-            '019ae700333409acbc628779747ab8f153f6647de25e4de3a9bd4a42d0d8056a')
+  sha256sums=('68a5fd3befeb951c57f3cfcf55e755fc2b8fbd22ad23deae01bd10d8460ce84a'
+              '019ae700333409acbc628779747ab8f153f6647de25e4de3a9bd4a42d0d8056a')
 else
   source=("http://download.$pkgname.org/$pkgname-$pkgver-linux32.tgz"
           "$pkgname.png::http://wiki.$pkgname.org/skins/${pkgname}skin/${pkgname}_wiki_logo.png")
-  sha256sums=('4dc0700fabce04465f1183c87939076655b9b055263cd0c5900d41bb4fa284e3'
-            '019ae700333409acbc628779747ab8f153f6647de25e4de3a9bd4a42d0d8056a')
+  sha256sums=('ccb026d685ddb7f28c3292c27ccffa6033a459d0d2dcaa703781736a26dde62f'
+             '019ae700333409acbc628779747ab8f153f6647de25e4de3a9bd4a42d0d8056a')
 fi
 
 prepare() {
-  gendesk --pkgname="$pkgname" --pkgdesc="$pkgdesc"
+  gendesk -f -n --pkgname="$pkgname" --pkgdesc="$pkgdesc"
 }
 
 package() {
   cd "$pkgname-$pkgver"
   
-  install -d "$pkgdir/usr/share/$pkgname/" "$pkgdir/usr/bin/"
+  install -d "$pkgdir/usr/share/$pkgname/"
+  install -d "$pkgdir/usr/bin/"
   cp -r * "$pkgdir/usr/share/$pkgname/"
   ln -s "/usr/share/$pkgname/$pkgname" "$pkgdir/usr/bin/$pkgname"
   ln -s "/usr/share/$pkgname/$pkgname-java" "$pkgdir/usr/bin/$pkgname-java"
diff --git a/community/proj/PKGBUILD b/community/proj/PKGBUILD
index 3e1a63225..8cc235515 100644
--- a/community/proj/PKGBUILD
+++ b/community/proj/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 84824 2013-02-24 20:23:27Z jlichtblau $
+# $Id: PKGBUILD 99963 2013-10-31 02:43:16Z allan $
 # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
 # Contributor: Mateusz Herych <heniekk@gmail.com>
 # Contributor: dibblethewrecker dibblethewrecker.at.jiwe.dot.org
@@ -11,7 +11,6 @@ pkgdesc='Cartographic Projections library.'
 arch=('i686' 'x86_64' 'mips64el')
 url="http://trac.osgeo.org/proj/"
 license=('MIT')
-options=('!libtool')
 changelog=$pkgname.changelog
 source=("http://download.osgeo.org/proj/$pkgname-$pkgver.tar.gz"
         "http://download.osgeo.org/proj/$pkgname-datumgrid-1.5.zip"
diff --git a/community/protobuf/PKGBUILD b/community/protobuf/PKGBUILD
index 3baff71f1..70f6977d9 100644
--- a/community/protobuf/PKGBUILD
+++ b/community/protobuf/PKGBUILD
@@ -13,7 +13,6 @@ url="http://code.google.com/p/protobuf/"
 license=('APACHE')
 depends=('gcc-libs' 'zlib')
 makedepends=('python2' 'setuptools')
-options=(!libtool)
 source=(http://$pkgname.googlecode.com/files/$pkgname-$pkgver.tar.bz2)
 md5sums=('a72001a9067a4c2c4e0e836d0f92ece4')
 
diff --git a/community/proxychains/PKGBUILD b/community/proxychains/PKGBUILD
index 4237a830b..5b120adc2 100644
--- a/community/proxychains/PKGBUILD
+++ b/community/proxychains/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 95519 2013-08-13 06:25:46Z fyan $
+# $Id: PKGBUILD 99154 2013-10-25 05:05:19Z fyan $
 # Maintainer: Felix Yan <felixonmars@gmail.com>
 # Contributor: Michael Düll <mail@akurei.me> PGP-Key: AAAEE882
 # Contributor: Dan Serban
@@ -6,20 +6,19 @@
 
 pkgname=proxychains
 pkgver=3.1
-pkgrel=6
+pkgrel=7
 pkgdesc='A program proxifier: Runs programs from behind a proxy server, similar to tsocks. TCP & DNS tunneling. HTTP, SOCKS4 & SOCKS5.'
 url='http://proxychains.sourceforge.net/'
 arch=('i686' 'x86_64')
 license=('GPL')
 depends=('dnsutils')
-options=('!libtool')
 backup=('etc/proxychains.conf')
 source=("http://downloads.sourceforge.net/sourceforge/proxychains/proxychains-${pkgver}.tar.gz")
 
 build() {
   cd proxychains-${pkgver}
   sed -i 's/servlen, unsigned int/servlen, int/' proxychains/libproxychains.c
-#  sed -i 's#export LD_PRELOAD=libproxychains.so#export LD_PRELOAD=/usr/lib/libproxychains.so#' proxychains/proxychains
+  #sed -i 's#export LD_PRELOAD=libproxychains.so#export LD_PRELOAD=/usr/lib/libproxychains.so#' proxychains/proxychains
   ./configure --prefix=/usr
   make
 }
diff --git a/community/psqlodbc/PKGBUILD b/community/psqlodbc/PKGBUILD
index 34cb4bc18..7aaef730d 100644
--- a/community/psqlodbc/PKGBUILD
+++ b/community/psqlodbc/PKGBUILD
@@ -1,20 +1,19 @@
-# $Id: PKGBUILD 79084 2012-10-30 09:55:07Z spupykin $
+# $Id: PKGBUILD 100038 2013-10-31 13:15:52Z spupykin $
 # Maintainer:
 # Contributor: Douglas Soares de Andrade <dsa@aur.archlinux-br.org>
 # Contributor: Rick Rein <jeebusroxors@gmail.com>
 
 pkgname=psqlodbc
-pkgver=09.01.0200
-pkgrel=2
+pkgver=09.02.0100
+pkgrel=1
 pkgdesc="PostgreSQL ODBC driver"
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 url="http://www.postgresql.org"
 depends=('unixodbc' 'postgresql-libs')
 makedepends=('postgresql')
-options=('!libtool')
 source=(ftp://ftp2.it.postgresql.org/mirrors/postgres//odbc/versions/src/$pkgname-$pkgver.tar.gz)
-md5sums=('0f4ac0e6b0755af2452764db4cfe4e8f')
+md5sums=('0d591c8f7233c863fd93f6c36316451a')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
diff --git a/community/pwmanager/PKGBUILD b/community/pwmanager/PKGBUILD
index c13ce266a..2ac895469 100644
--- a/community/pwmanager/PKGBUILD
+++ b/community/pwmanager/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 58627 2011-11-16 15:52:59Z spupykin $
+# $Id: PKGBUILD 99966 2013-10-31 02:44:17Z allan $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: Vesa Kaihlavirta <vegai@iki.fi>
 # Contributors: Pointer <pointer@linux-blog.de>, tmaynard <arch@toddmaynard.com>
@@ -11,7 +11,6 @@ arch=('i686' 'x86_64')
 url="http://passwordmanager.sourceforge.net/"
 license=('GPL')
 depends=('kdelibs3')
-options=('!libtool')
 source=(http://downloads.sourceforge.net/sourceforge/passwordmanager/$pkgname-$pkgver.tar.bz2
 	build-fix.patch)
 md5sums=('e6f720af9b325bc0e7ea20c9c5e6039f'
diff --git a/community/pygoocanvas/PKGBUILD b/community/pygoocanvas/PKGBUILD
index bd04e147a..831658afd 100644
--- a/community/pygoocanvas/PKGBUILD
+++ b/community/pygoocanvas/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 65296 2012-02-20 19:48:25Z jelle $
+# $Id: PKGBUILD 99967 2013-10-31 02:44:37Z allan $
 # Maintainer: Douglas Soares de Andrade <dsandrade@gmail.com>
 # Contributor: William Rea <sillywilly@gmail.com>
 
@@ -11,7 +11,7 @@ url="http://developer.berlios.de/projects/pygoocanvas"
 license=('LGPL')
 depends=('python2' 'goocanvas1' 'pygtk')
 makedepends=('pkgconfig')
-options=('!libtool' 'docs')
+options=('docs')
 source=(http://ftp.gnome.org/pub/GNOME/sources/pygoocanvas/0.14/pygoocanvas-$pkgver.tar.bz2)
 md5sums=('e0e7b694af2f81a78b0838555d150252')
 
diff --git a/community/pyqt3/PKGBUILD b/community/pyqt3/PKGBUILD
deleted file mode 100644
index 957276a32..000000000
--- a/community/pyqt3/PKGBUILD
+++ /dev/null
@@ -1,32 +0,0 @@
-# $Id: PKGBUILD 90081 2013-05-06 19:39:12Z foutrelis $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Contributor: Tobias Powalowski <tpowa@archlinux.org>
-# Contributor: riai <riai@bigfoot.com> Ben <ben@benmazer.net>
-
-pkgname=pyqt3
-pkgver=3.18.1
-pkgrel=13
-pkgdesc="A set of Python bindings for the Qt3 toolkit"
-arch=('i686' 'x86_64' 'mips64el')
-url="http://www.riverbankcomputing.com/software/pyqt/intro"
-depends=('python2-sip' 'qscintilla-qt3')
-makedepends=('glu')
-license=('GPL')
-source=("http://downloads.sourceforge.net/project/pyqt/PyQt3/PyQt-x11-gpl-${pkgver}.tar.gz")
-md5sums=('f1d120495d1aaf393819e988c0a7bb7e')
-
-build() {
-  cd ${srcdir}/PyQt-x11-gpl-${pkgver}
-  export QTDIR=/usr
-  export QMAKESPEC=/usr/share/qt3/mkspecs/linux-g++
-  echo yes | python2 configure.py -b /usr/bin \
-    -d /usr/lib/python2.7/site-packages \
-    -v /usr/share/sip \
-    INCDIR_QT=/usr/include/qt3
-  make CXX="g++ -DANY=void"
-}
-
-package() {
-  cd ${srcdir}/PyQt-x11-gpl-${pkgver}
-  make DESTDIR=${pkgdir} install
-}
diff --git a/community/python-openbabel/PKGBUILD b/community/python-openbabel/PKGBUILD
index b986d80c2..53b156bac 100644
--- a/community/python-openbabel/PKGBUILD
+++ b/community/python-openbabel/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 96310 2013-08-24 20:06:01Z arodseth $
+# $Id: PKGBUILD 99971 2013-10-31 02:45:56Z allan $
 # Maintainer: Alexander Rødseth <rodseth@gmail.com>
 # Contributor: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Michal Bozon <bozonm@vscht.cz>
@@ -12,7 +12,6 @@ url='http://openbabel.org/wiki/Python'
 license=('GPL')
 depends=('gcc-libs' "openbabel=${pkgver}" 'eigen2')
 makedepends=('swig' 'cmake' 'python-setuptools' 'python2-setuptools')
-options=('!libtool')
 source=("http://downloads.sourceforge.net/openbabel/openbabel-$pkgver.tar.gz")
 sha256sums=('4eaca26679aa6cc85ebf96af19191472ac63ca442c36b0427b369c3a25705188')
 
diff --git a/community/python-pillow/PKGBUILD b/community/python-pillow/PKGBUILD
index 6ef3cd700..9f2704036 100644
--- a/community/python-pillow/PKGBUILD
+++ b/community/python-pillow/PKGBUILD
@@ -1,12 +1,14 @@
-# $Id: PKGBUILD 98021 2013-10-04 01:35:36Z kkeen $
+# $Id: PKGBUILD 98694 2013-10-17 06:08:29Z kkeen $
 # Maintainer: Kyle Keen <keenerd@gmail.com>
 # Contributor: minder
 
 pkgbase=python-pillow
 pkgname=(python-pillow python2-pillow)
-_appname=Pillow
 pkgver=2.2.1
-pkgrel=1
+pkgrel=2
+_appname=Pillow
+_py2basever=2.7
+_py3basever=3.3m
 pkgdesc="Python Imaging Library (PIL) fork. Python3 version."
 arch=('i686' 'x86_64')
 url="http://python-imaging.github.io/"
@@ -32,6 +34,9 @@ package_python-pillow() {
   popd
   install -Dm644 docs/LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
 
+  install -dm755 "$pkgdir/usr/include/python$_py3basever/"
+  install -m644 -t "$pkgdir/usr/include/python$_py3basever/" libImaging/*.h
+
   # clean up bins
   cd "$pkgdir/usr/bin"
   for f in *.py; do
@@ -55,6 +60,9 @@ package_python2-pillow() {
   popd
   install -Dm644 docs/LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
 
+  install -dm755 "$pkgdir/usr/include/python$_py2basever/"
+  install -m644 -t "$pkgdir/usr/include/python$_py2basever/" libImaging/*.h
+
   # clean up bins
   cd "$pkgdir/usr/bin"
   for f in *.py; do
diff --git a/community/python-psutil/PKGBUILD b/community/python-psutil/PKGBUILD
index 6e9a92d5c..680c12271 100644
--- a/community/python-psutil/PKGBUILD
+++ b/community/python-psutil/PKGBUILD
@@ -1,16 +1,16 @@
-# $Id: PKGBUILD 98418 2013-10-09 22:50:40Z seblu $
+# $Id: PKGBUILD 99570 2013-10-29 21:24:23Z seblu $
 # Maintainer: Sébastien Luttringer
 
 pkgbase=python-psutil
 pkgname=('python-psutil' 'python2-psutil')
-pkgver=1.1.1
+pkgver=1.1.2
 pkgrel=1
 arch=('i686' 'x86_64' 'mips64el')
 url='http://code.google.com/p/psutil/'
 license=('custom: BSD')
 makedepends=('python' 'python-setuptools' 'python2' 'python2-setuptools')
 source=("https://pypi.python.org/packages/source/p/psutil/psutil-$pkgver.tar.gz")
-md5sums=('24430ee6486be2f1a960d9ce4dc87ad0')
+md5sums=('fe9c9a3ed95fe6564acf8b4500c7b5da')
 
 build() {
   cd psutil-$pkgver
diff --git a/community/python-pygit2/PKGBUILD b/community/python-pygit2/PKGBUILD
index 0960e79ae..748012d7b 100644
--- a/community/python-pygit2/PKGBUILD
+++ b/community/python-pygit2/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 94332 2013-07-20 22:37:34Z thestinger $
+# $Id: PKGBUILD 98636 2013-10-15 23:04:31Z thestinger $
 # Maintainer: Daniel Micay <danielmicay@gmail.com>
 
 pkgbase=python-pygit2
 pkgname=(python-pygit2 python2-pygit2)
-pkgver=0.19.0
+pkgver=0.19.1
 pkgrel=1
 pkgdesc='Python bindings for libgit2'
 url="https://github.com/libgit2/pygit2"
@@ -12,7 +12,7 @@ makedepends=(python python2)
 arch=(i686 x86_64 mips64el)
 license=('GPL2')
 source=(https://github.com/libgit2/pygit2/archive/v${pkgver}.tar.gz)
-md5sums=('a197304b3788ad051c39d7f2eeae4745')
+md5sums=('98a98d8052a4066ab48b74ebd05c90e1')
 
 package_python-pygit2() {
   cd "$srcdir/pygit2-$pkgver"
diff --git a/community/python-pymongo/PKGBUILD b/community/python-pymongo/PKGBUILD
index f3481c83d..d22d0a3df 100644
--- a/community/python-pymongo/PKGBUILD
+++ b/community/python-pymongo/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 96885 2013-09-07 02:44:43Z fyan $
+# $Id: PKGBUILD 98824 2013-10-19 20:51:12Z arodseth $
 # Maintainer: Alexander Rødseth <rodseth@gmail.com>
 # Maintainer: Felix Yan <felixonmars@gmail.com>
 # Contributor: Thomas S Hatch <thatch45@gmail.com>
@@ -6,33 +6,32 @@
 
 pkgbase=python-pymongo
 pkgname=('python-pymongo' 'python2-pymongo')
-pkgver=2.6.2
-pkgrel=1
-pkgdesc='Python driver for MongoDB'
+pkgver=2.6.3
+pkgrel=2
+pkgdesc='Python module for using MongoDB'
 arch=('x86_64' 'i686' 'mips64el')
 license=('APACHE')
 url='http://pypi.python.org/pypi/pymongo/'
 makedepends=('python-setuptools' 'python2-setuptools')
+optdepends=('mongodb: High-performance schema-free document-oriented database')
 source=("http://pypi.python.org/packages/source/p/pymongo/pymongo-$pkgver.tar.gz")
-sha256sums=('091d584f7b5d8de60bf6152d9269ec9a29ae7fa34415862b2f092af393233c4e')
+sha256sums=('cabe1d785ad5db6ed8ff70dcb9c987958fc75400f066ec78911ca3f37184a4e2')
 
 build() {
-  cd "$srcdir"
-
   cp -a "pymongo-$pkgver" "pymongo2-$pkgver"
 }
 
 package_python2-pymongo() {
   depends=('python2')
 
-  cd "$srcdir/pymongo2-$pkgver"
+  cd "pymongo2-$pkgver"
   python2 setup.py install --root="$pkgdir" --optimize=1
 }
 
 package_python-pymongo() {
   depends=('python')
 
-  cd "$srcdir/pymongo-$pkgver"
+  cd "pymongo-$pkgver"
   python setup.py install --root="$pkgdir" --optimize=1
 }
 
diff --git a/community/python-pyopencl/PKGBUILD b/community/python-pyopencl/PKGBUILD
index 4a1126de9..14865460f 100644
--- a/community/python-pyopencl/PKGBUILD
+++ b/community/python-pyopencl/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 96123 2013-08-20 06:32:57Z lcarlier $
+# $Id: PKGBUILD 100072 2013-11-01 09:31:30Z jelle $
 # Maintainer: Stéphane Gaudreault <stephane@archlinux.org>
 
 pkgbase=python-pyopencl
 pkgname=('python2-pyopencl' 'python-pyopencl' 'pyopencl-headers')
-pkgver=2013.1
-pkgrel=2
+pkgver=2013.2
+pkgrel=1
 pkgdesc="A complete, object-oriented language binding of OpenCL to Python"
 arch=('i686' 'x86_64')
 url="http://mathema.tician.de/software/pyopencl"
@@ -13,7 +13,7 @@ epoch=1
 makedepends=('boost-libs' 'ctags' 'python2-setuptools' 'python-setuptools' 'libcl' 'opencl-headers' 'mesa' 'boost' 'python2-mako' 'python-mako' 'python-numpy' 'python2-numpy')
 source=("http://pypi.python.org/packages/source/p/pyopencl/pyopencl-${pkgver}.tar.gz"
         'LICENSE.txt')
-sha1sums=('76331c9042d0286c7c722407dec0fb975a6b340c'
+sha1sums=('805b1c5c44647182dcc7aedb00caf8ca47bc6e84'
           '2e6966b3d9b15603ce2c3ff79eeadd63c5d066b7')
 
 build() {
@@ -30,6 +30,14 @@ build() {
    python2 setup.py build
 }
 
+check(){
+   cd "${srcdir}/pyopencl-${pkgver}"
+   python3 setup.py test
+
+   cd "$srcdir/pyopencl-$pkgver-python2"
+   python2 setup.py test
+}
+
 package_python-pyopencl() {
    depends=('libcl' 'opencl-headers' 'mesa' 'boost-libs' 'python' 'python-numpy' 'python-mako' 'python-pytools' 'pyopencl-headers')
 
diff --git a/community/python-pytables/PKGBUILD b/community/python-pytables/PKGBUILD
index acd014876..9831e3438 100644
--- a/community/python-pytables/PKGBUILD
+++ b/community/python-pytables/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 93702 2013-07-08 14:16:08Z aginiewicz $
+# $Id: PKGBUILD 98817 2013-10-19 13:44:44Z bpiotrowski $
 # Maintainer: Andrzej Giniewicz <gginiu@gmail.com>
 # Contributor: Sebastien Binet <binet@cern.ch>
 
 pkgbase=python-pytables
 pkgname=('python2-pytables' 'python-pytables')
 pkgver=3.0.0
-pkgrel=3
+pkgrel=4
 arch=("i686" "x86_64" "mips64el")
 pkgdesc="A package for managing hierarchical datasets and designed to efficiently and easily cope with extremely large amounts of data"
 url="http://www.pytables.org"
diff --git a/community/python-pyzmq/PKGBUILD b/community/python-pyzmq/PKGBUILD
index dfd1f9181..fa13b0e48 100644
--- a/community/python-pyzmq/PKGBUILD
+++ b/community/python-pyzmq/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 92654 2013-06-10 15:28:34Z bpiotrowski $
+# $Id: PKGBUILD 100379 2013-11-03 07:15:10Z kkeen $
 # Maintainer: Kyle Keen <keenerd at gmail dot com>
 pkgbase=python-pyzmq
 pkgname=(python2-pyzmq python-pyzmq)
-pkgver=13.1.0
+pkgver=14.0.0
 pkgrel=1
 pkgdesc="Python bindings for zeromq, written in Cython"
 arch=(i686 x86_64 mips64el)
@@ -12,7 +12,7 @@ depends=(zeromq python)
 makedepends=(python python2 zeromq)
 #source=(https://github.com/zeromq/pyzmq/downloads/pyzmq-$pkgver.tar.gz)
 source=(https://pypi.python.org/packages/source/p/pyzmq/pyzmq-$pkgver.tar.gz)
-md5sums=('b54a2209a4efed93ed00282d949db8d9')
+md5sums=('ce62ce9807b0b5da0076eaa9cf6cc24e')
 
 build() {
   cd "$srcdir"
diff --git a/community/python-scipy/PKGBUILD b/community/python-scipy/PKGBUILD
index e850f3867..a65d5ae6d 100644
--- a/community/python-scipy/PKGBUILD
+++ b/community/python-scipy/PKGBUILD
@@ -6,31 +6,28 @@
 # Contributor: Andrzej Giniewicz <gginiu@gmail.com>
 
 pkgname=('python-scipy' 'python2-scipy')
-pkgver=0.12.0
+pkgver=0.13.0
 pkgrel=1
 pkgdesc="SciPy is open-source software for mathematics, science, and engineering."
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.scipy.org/"
 license=('BSD')
-makedepends=('gcc-fortran' 'python-numpy' 'python2-numpy')
+makedepends=('gcc-fortran' 'python-numpy' 'python2-numpy' 'python-setuptools' 'python2-setuptools')
 checkdepends=('python-nose' 'python2-nose')
-source=("http://downloads.sourceforge.net/scipy/scipy-${pkgver}.tar.gz" )
-# "http://pkgbuild.com/~jelle/0001-GEN-regenerate-C-sources-with-Cython-0.17.1.patch.xz")
+source=("https://pypi.python.org/packages/source/s/scipy/scipy-${pkgver}.tar.gz")
+md5sums=('ffa1e9bfd2bbdf3f17f4cf8139084098')
 
 build() {
-  unset LDFLAGS
-  unset FFLAGS
-
   # Changing the arithmetic parameter (Thanks to Fabrizio Castellano)
-  sed -i "s/\#define\ UNK\ 1/\#define\ IBMPC\ 1/" \
-    scipy-${pkgver}/scipy/special/cephes/mconf.h
+#  sed -i "s/\#define\ UNK\ 1/\#define\ IBMPC\ 1/" \
+#    scipy-${pkgver}/scipy/special/cephes/mconf.h
+  export LDFLAGS="-Wall -shared"
 
   # 2 builds
   cp -r scipy-${pkgver} scipy-${pkgver}-py2
 
   # build for python3
   cd scipy-${pkgver}
-#patch -Np1   -i $srcdir/0001-GEN-regenerate-C-sources-with-Cython-0.17.1.patch
   python3 setup.py config_fc --fcompiler=gnu95 build
 
   # build for python2
@@ -48,6 +45,7 @@ check() {
   cd scipy-${pkgver}
 # figure out how to run tests in the source tree easily
 #  python -c "from scipy import test; test('full')"
+#  python setup.py test
 
   cd ../scipy-${pkgver}-py2
 # figure out how to run tests in the source tree easily
@@ -59,6 +57,7 @@ package_python-scipy() {
   provides=('python3-scipy' 'scipy')
 
   cd scipy-${pkgver}
+  export LDFLAGS="-Wall -shared"
 
   python3 setup.py config_fc --fcompiler=gnu95 install \
     --prefix=/usr --root=${pkgdir} --optimize=1
@@ -72,6 +71,7 @@ package_python2-scipy() {
   conflicts=('python-scipy<0.9.0')
 
   cd scipy-${pkgver}-py2
+  export LDFLAGS="-Wall -shared"
 
   python2 setup.py config_fc --fcompiler=gnu95 install \
     --prefix=/usr --root=${pkgdir} --optimize=1
@@ -81,4 +81,3 @@ package_python2-scipy() {
 }
 
 # vim:set ts=2 sw=2 et:
-md5sums=('8fb4da324649f655e8557ea92b998786')
diff --git a/community/python2-lcms/PKGBUILD b/community/python2-lcms/PKGBUILD
index 47c6d4ad4..f8c320775 100644
--- a/community/python2-lcms/PKGBUILD
+++ b/community/python2-lcms/PKGBUILD
@@ -5,13 +5,12 @@
 pkgname=python2-lcms
 pkgver=1.19
 _mver=1.19
-pkgrel=4
+pkgrel=5
 pkgdesc="LittleCMS Python bindings"
 arch=(i686 x86_64 mips64el)
 license=('CUSTOM')
 depends=('libtiff' 'python2' 'lcms')
 url="http://www.littlecms.com"
-options=('!libtool')
 source=(http://downloads.sourceforge.net/project/lcms/lcms/${_mver}/lcms-$pkgver.tar.gz)
 md5sums=('8af94611baf20d9646c7c2c285859818')
 
diff --git a/community/python2-nautilus/PKGBUILD b/community/python2-nautilus/PKGBUILD
index b359926cd..bf36dd40c 100644
--- a/community/python2-nautilus/PKGBUILD
+++ b/community/python2-nautilus/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 72850 2012-06-24 00:37:15Z bgyorgy $
+# $Id: PKGBUILD 99969 2013-10-31 02:45:16Z allan $
 # Maintainer: Balló György <ballogyor+arch at gmail dot com>
 # Contributor: Giorgio Gilestro <giorgio@gilest.ro>
 
@@ -13,7 +13,6 @@ license=('GPL')
 depends=('nautilus' 'python2-gobject')
 replaces=('python-nautilus')
 provides=('python-nautilus')
-options=('!libtool')
 source=(http://ftp.gnome.org/pub/GNOME/sources/$_pkgname/$pkgver/$_pkgname-$pkgver.tar.xz)
 sha256sums=('7825e08ada8e131f829d0e7d4144dcfac9fad7bfd7c0600bf3985349c20c496b')
 
diff --git a/community/python2-poppler/PKGBUILD b/community/python2-poppler/PKGBUILD
index 5a7e907d7..b262c2381 100644
--- a/community/python2-poppler/PKGBUILD
+++ b/community/python2-poppler/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 58362 2011-11-12 10:53:03Z ibiru $
+# $Id: PKGBUILD 99970 2013-10-31 02:45:36Z allan $
 # Maintainer: Ray Rashif <schiv@archlinux.org
 # Contributor: György Balló <ballogy@freestart.hu>
 
@@ -14,7 +14,6 @@ depends=('pygtk' 'poppler-glib' 'glib2' 'freetype2')
 provides=('pypoppler' 'python-poppler')
 conflicts=('python-poppler')
 replaces=('python-poppler')
-options=(!libtool)
 source=("http://launchpad.net/poppler-python/trunk/development/+download/$_realname-$pkgver.tar.gz"
         'pypoppler-0.12.1-poppler-0.16.0.patch')
 md5sums=('1a89e5ed3042afc81bbd4d02e0cf640a'
diff --git a/community/python2-xapian/PKGBUILD b/community/python2-xapian/PKGBUILD
index cb50d1c38..668f7c797 100644
--- a/community/python2-xapian/PKGBUILD
+++ b/community/python2-xapian/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 89984 2013-05-06 17:28:48Z fyan $
+# $Id: PKGBUILD 99157 2013-10-25 05:16:11Z fyan $
 # Maintainer: Felix Yan <felixonmars@gmail.com>
 # Contributor: DonVla <donvla/users.sourceforge/net>
 # Contributor: Hervé Cauwelier <herve/oursours/net>
@@ -6,29 +6,30 @@
 pkgname=python2-xapian
 _realname=xapian-bindings
 pkgver=1.2.15
-pkgrel=1
+epoch=1
+pkgrel=2
 pkgdesc="Python bindings for Xapian"
 arch=(i686 x86_64 mips64el)
 url="http://xapian.org/docs/bindings/python/"
 license=('GPL')
-depends=('python2' 'xapian-core')
+depends=('python2' "xapian-core=$epoch:$pkgver")
 source=("http://oligarchy.co.uk/xapian/${pkgver}/${_realname}-$pkgver.tar.gz")
 
 build() {
   cd "$srcdir/${_realname}-$pkgver"
     
-  ./configure XAPIAN_CONFIG=/usr/bin/xapian-config \
+  LDFLAGS=-lpython2.7 ./configure XAPIAN_CONFIG=/usr/bin/xapian-config \
          --prefix=/usr --with-python \
          PYTHON=/usr/bin/python2
 
   make
 }
 
-
 package() {
   cd "$srcdir/${_realname}-$pkgver"
 
   make DESTDIR="$pkgdir" install
 }
+
 # vim:set ts=2 sw=2 et:
 sha512sums=('b3733308f0446fa041dcae677b3d3316bd8e775fcd1a1770ca2fab5b60e40463bbbce210cb1161161f6e9f1ff5e5473d38c2dab922b7f4f2705ac165d991c0ec')
diff --git a/community/pyzy/PKGBUILD b/community/pyzy/PKGBUILD
index 30ffc644d..090fc75fb 100644
--- a/community/pyzy/PKGBUILD
+++ b/community/pyzy/PKGBUILD
@@ -11,7 +11,6 @@ url='https://github.com/pyzy/pyzy'
 license=('LGPL')
 depends=('glib2' 'sqlite' 'util-linux')
 makedepends=('git' 'doxygen' 'gnome-common' 'python2')
-options=('!libtool')
 
 __gitroot=git://github.com/pyzy/pyzy.git
 __gitname=$pkgname
diff --git a/community/qcad/PKGBUILD b/community/qcad/PKGBUILD
index 916069472..5c6cec38f 100644
--- a/community/qcad/PKGBUILD
+++ b/community/qcad/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 97523 2013-09-23 16:15:04Z spupykin $
+# $Id: PKGBUILD 99094 2013-10-24 11:49:04Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Stefan Husmann <stefan-husmann@t-online.de>
 # Contributor: Giovanni Scafora <linuxmania@gmail.com>
 # Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
 
 pkgname=qcad
-pkgver=3.3.1.0
+pkgver=3.4.0.0
 pkgrel=1
 pkgdesc="A 2D CAD package based upon Qt"
 arch=('i686' 'x86_64' 'mips64el')
@@ -16,17 +16,13 @@ makedepends=('glu')
 options=(libtool)
 source=($pkgname-$pkgver.tar.gz::https://github.com/qcad/qcad/archive/v${pkgver}.tar.gz
         QCad.desktop)
-md5sums=('e6e469482b40515980c416e61482abc2'
+md5sums=('b781fb8dcf8ba2725bbccf315a1da44f'
          '35100eaedbdf6625f6e6a09b177854cd')
 
 prepare() {
   cd ${srcdir}/qcad-$pkgver
-  sed -i '1,1i#include <unistd.h>' src/core/{RLocalPeer,RS}.cpp
-  sed -i '1,1i#include <sys/sysinfo.h>' src/core/{RScriptHandler,RS}.cpp
-  (cd src/3rdparty &&
-    cp -a qt-labs-qtscriptgenerator-4.8.4 qt-labs-qtscriptgenerator-4.8.5)
-  (cd src/3rdparty/qt-labs-qtscriptgenerator-4.8.5 &&
-    mv qt-labs-qtscriptgenerator-4.8.4.pro qt-labs-qtscriptgenerator-4.8.5.pro)
+#  sed -i '1,1i#include <unistd.h>' src/core/{RLocalPeer,RS}.cpp
+#  sed -i '1,1i#include <sys/sysinfo.h>' src/core/{RScriptHandler,RS}.cpp
 }
 
 build() {
diff --git a/community/qingy/PKGBUILD b/community/qingy/PKGBUILD
index c2470df3c..a5a12bf08 100644
--- a/community/qingy/PKGBUILD
+++ b/community/qingy/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 96483 2013-08-30 15:29:41Z spupykin $
+# $Id: PKGBUILD 99973 2013-10-31 02:46:37Z allan $
 # Maintainer: Eric Bélanger <eric@archlinux.org>
 # Contributor: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
 
@@ -12,7 +12,6 @@ license=('GPL')
 depends=('directfb' 'openssl' 'libxss')
 makedepends=('emacs')
 backup=('etc/pam.d/qingy' 'etc/logrotate.d/qingy' 'etc/qingy/settings' 'etc/qingy/welcomes')
-options=('!libtool')
 install=qingy.install
 source=(http://downloads.sourceforge.net/sourceforge/qingy/${pkgname}-${pkgver}.tar.bz2 \
         qingy.logrotate qingy@.service)
diff --git a/community/qlandkartegt/PKGBUILD b/community/qlandkartegt/PKGBUILD
index 39b925f01..b82fe34ab 100644
--- a/community/qlandkartegt/PKGBUILD
+++ b/community/qlandkartegt/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 97737 2013-09-28 07:46:07Z jlichtblau $
+# $Id: PKGBUILD 98683 2013-10-16 20:04:00Z jlichtblau $
 # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
 # Contributor: Matthias Maennich <arch@maennich.net>
 # Contributor: <boenki@gmx.de>
 
 pkgname=qlandkartegt
-pkgver=1.7.4
+pkgver=1.7.5
 pkgrel=1
 pkgdesc="Use your GPS with Linux"
 arch=('i686' 'x86_64' 'mips64el')
@@ -18,7 +18,7 @@ install=$pkgname.install
 changelog=$pkgname.changelog
 source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz
         $pkgname-mimetypes.xml)
-sha256sums=('d6412ae6b34c2ec8a5f929f7aa8b4d1a660f913f16ea52096f93b42d4f271daf'
+sha256sums=('a8b571ba838568ed258c61fa0ab18b370c7d22d2539a632a0028b78f4a22aa2c'
             'e8d33948831f8a66edd752c71c653085d6c4d9f1969e70dd8c40b9c7ca37fba0')
 
 build() {
diff --git a/community/qlandkartegt/qlandkartegt.changelog b/community/qlandkartegt/qlandkartegt.changelog
index 4630d2591..04136b721 100644
--- a/community/qlandkartegt/qlandkartegt.changelog
+++ b/community/qlandkartegt/qlandkartegt.changelog
@@ -1,3 +1,6 @@
+2013-10-16 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
+	* qlandkartegt 1.7.5-1
+
 2013-09-28 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
 	* qlandkartegt 1.7.4-1
 
diff --git a/community/qscintilla-qt3/PKGBUILD b/community/qscintilla-qt3/PKGBUILD
deleted file mode 100644
index 403a4d100..000000000
--- a/community/qscintilla-qt3/PKGBUILD
+++ /dev/null
@@ -1,32 +0,0 @@
-# $Id: PKGBUILD 88009 2013-04-09 21:48:46Z eric $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Contributor: Tobias Powalowski <tpowa@archlinux.org>
-# Contributor: red_over_blue,Ben <ben@benmazer.net>,Kritoke <kritoke@gamebox.net>
-
-pkgname=qscintilla-qt3
-pkgver=1.7.1
-pkgrel=4
-pkgdesc="A port to Qt3 of Neil Hodgson's Scintilla C++ editor class"
-arch=('i686' 'x86_64' 'mips64el')
-url="http://www.riverbankcomputing.co.uk/software/qscintilla/intro/"
-license=('GPL2')
-depends=('qt3')
-source=("http://downloads.sourceforge.net/pyqt/QScintilla-1.71-gpl-$pkgver.tar.gz")
-md5sums=('dfa047b45d4f09ae8d4a8a431ba88a5a')
-
-build() {
-  cd "${srcdir}"/QScintilla-1.71-gpl-$pkgver
-  cd qt
-  sed -i "s%DESTDIR.*%DESTDIR=$pkgdir/usr/lib%g" qscintilla.pro
-  qmake-qt3 qscintilla.pro
-  sed -i 's|$(QTDIR)/include|/usr/include/qt3|' Makefile
-  make MOC=/usr/bin/moc-qt3
-}
-
-package() {
-  cd "${srcdir}"/QScintilla-1.71-gpl-$pkgver/qt
-  # installind includes
-  for i in qextscintilla*.h; do
-    install -m 644 -D $i "${pkgdir}"/usr/include/qt3/$i
-  done
-}
diff --git a/community/qtcurve-gtk2/PKGBUILD b/community/qtcurve-gtk2/PKGBUILD
deleted file mode 100644
index 43814f1bf..000000000
--- a/community/qtcurve-gtk2/PKGBUILD
+++ /dev/null
@@ -1,34 +0,0 @@
-# $Id: PKGBUILD 82497 2013-01-19 15:53:37Z svenstaro $
-# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
-# Contributor: Andrea Scarpino <andrea@archlinux.org>
-# Contributor: Pierre Schmitz <pierre@archlinux.de>
-
-pkgname=qtcurve-gtk2
-pkgver=1.8.16
-pkgrel=1
-pkgdesc="A configurable set of widget styles for KDE and Gtk"
-arch=('i686' 'x86_64' 'mips64el')
-url="http://www.kde-look.org/content/show.php?content=40492"
-license=('GPL')
-depends=('gtk2')
-makedepends=('cmake')
-groups=('qtcurve')
-options=('!libtool')
-source=("http://craigd.wikispaces.com/file/view/QtCurve-Gtk2-${pkgver}.tar.bz2")
-md5sums=('8923caaa0704f6a30252a5eadb015d76')
-
-build() {
-  cd "${srcdir}"
-
-  mkdir -p build
-  cd build/
-  cmake ../QtCurve-Gtk2-${pkgver} \
-      -DCMAKE_BUILD_TYPE=Release \
-      -DCMAKE_INSTALL_PREFIX=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}"/build
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/community/qtcurve-kde4/PKGBUILD b/community/qtcurve-kde4/PKGBUILD
deleted file mode 100644
index 2291fe95e..000000000
--- a/community/qtcurve-kde4/PKGBUILD
+++ /dev/null
@@ -1,42 +0,0 @@
-# $Id: PKGBUILD 74971 2012-08-10 22:17:48Z svenstaro $
-# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
-# Contributor: Andrea Scarpino <andrea@archlinux.org>
-# Contributor: Pierre Schmitz <pierre@archlinux.de>
-
-pkgname=qtcurve-kde4
-pkgver=1.8.14
-pkgrel=1
-arch=('i686' 'x86_64' 'mips64el')
-groups=('qtcurve')
-license=('GPL')
-pkgdesc='A configurable set of widget styles for KDE and Gtk'
-url='http://www.kde-look.org/content/show.php?content=40492'
-depends=('kdebase-workspace')
-makedepends=('cmake' 'automoc4')
-source=("http://craigd.wikispaces.com/file/view/QtCurve-KDE4-${pkgver}.tar.bz2"
-        'bypass-kde-config.patch'
-        'fix-kwin_decoration-macro.patch')
-md5sums=('b4d7924806058f39e842ce7ffe47a4f8'
-         '3f6681147cc361bd2bfd4d7477f2a8d0'
-         '7366e45ef9f24f53a36f87a539a937d6')
-
-build() {
-	cd "${srcdir}"/QtCurve-KDE4-${pkgver}
-	# Bypass KDE prefix detection by kde4-config, see:
-	# http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=541667
-	patch -p1 -i "${srcdir}"/bypass-kde-config.patch
-	patch -p1 -i "${srcdir}"/fix-kwin_decoration-macro.patch
-
-	cd "${srcdir}"
-	mkdir build
-	cd build
-	cmake ../QtCurve-KDE4-${pkgver} \
-		-DCMAKE_BUILD_TYPE=Release \
-		-DCMAKE_INSTALL_PREFIX=/usr
-	make
-}
-
-package() {
-	cd "${srcdir}"/build
-	make DESTDIR="${pkgdir}" install
-}
diff --git a/community/qtcurve-kde4/bypass-kde-config.patch b/community/qtcurve-kde4/bypass-kde-config.patch
deleted file mode 100644
index d09e5ead5..000000000
--- a/community/qtcurve-kde4/bypass-kde-config.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From: Pino Toscano <pino@kde.org>
-Description: Disable braindead KDE3/4 prefix detection
- The current detection of the KDE 3 and KDE 4 prefixes is done running
- kde-config and kde4-config, resp.
- This can be problematic, as these two could create files in ~/.kde,
- thus breaking when the home of the current user (eg in buildds) is read-only.
- Given the build system sets anyway "/usr" as prefix of KDE 3 and KDE 4
- if they were not detected, then just let it to.
-Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=541667
-
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -16,6 +16,11 @@ set(CPACK_SOURCE_PACKAGE_FILE_NAME "${CM
- set(CPACK_PACKAGE_FILE_NAME "${CMAKE_PROJECT_NAME}-${QTCURVE_VERSION_FULL}")
- include(CPack)
- 
-+# Comment the kde3/kde4 prefix detection as a whole as it wants to run
-+# kde-config and kde4-config, which in turn can create stuff in ~/.kde.
-+# This cannot work on read-only homes.
-+# So, the "fallback" prefixes ("/usr" for both) will be used.
-+if (BRAINDEAD_DETECTION)
- set(OLD_CMAKE_INSTALL_PREFIX ${CMAKE_INSTALL_PREFIX})
- 
- # Try to find kde4-config...
-@@ -48,6 +53,7 @@ if (KDE4_KDECONFIG_EXECUTABLE)
-                     ARGS --prefix
-                     OUTPUT_VARIABLE KDE4PREFIX)
- endif (KDE4_KDECONFIG_EXECUTABLE)
-+endif (BRAINDEAD_DETECTION)
- 
- if(NOT KDE3PREFIX)
-     if(KDE4PREFIX)
diff --git a/community/qtcurve-kde4/fix-kwin_decoration-macro.patch b/community/qtcurve-kde4/fix-kwin_decoration-macro.patch
deleted file mode 100644
index 6202e7b87..000000000
--- a/community/qtcurve-kde4/fix-kwin_decoration-macro.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff -Naur a/kwin/qtcurvehandler.cpp b/kwin/qtcurvehandler.cpp
---- a/kwin/qtcurvehandler.cpp	2012-08-02 13:36:58.811347708 +0000
-+++ b/kwin/qtcurvehandler.cpp	2012-08-02 13:38:03.240996792 +0000
-@@ -489,6 +489,11 @@
- 
- extern "C"
- {
-+    KWIN_EXPORT int decoration_version()
-+    {
-+        return KWIN_DECORATION_API_VERSION;
-+    }
-+
-     KDE_EXPORT KDecorationFactory *create_factory()
-     {
-         KWinQtCurve::handler = new KWinQtCurve::QtCurveHandler();
diff --git a/community/qtcurve/PKGBUILD b/community/qtcurve/PKGBUILD
index 815c9d945..d85ed86d5 100644
--- a/community/qtcurve/PKGBUILD
+++ b/community/qtcurve/PKGBUILD
@@ -1,29 +1,27 @@
-# $Id$
-# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
+# $Id: PKGBUILD 98877 2013-10-21 00:42:02Z speps $
+# Maintainer : speps <speps at aur dot archlinux dot org>
+# Contributor: Sven-Hendrik Haase <sh@lutzhaase.com>
 # Contributor: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 
 pkgbase=qtcurve
-pkgname=('qtcurve-qt4' 'qtcurve-kde4')
-pkgver=1.8.15
-pkgrel=2
+pkgname=('qtcurve-utils' 'qtcurve-gtk2' 'qtcurve-qt4' 'qtcurve-qt5' 'qtcurve-kde4')
+pkgver=1.8.17
+pkgrel=1
+pkgdesc='A configurable set of widget styles for KDE and Gtk'
 arch=('i686' 'x86_64')
-groups=('qtcurve')
+url='https://github.com/QtCurve/qtcurve'
 license=('GPL')
-pkgdesc='A configurable set of widget styles for KDE and Gtk'
-url='https://github.com/QtCurve/qtcurve-qt4'
-makedepends=('cmake' 'automoc4' 'kdebase-workspace')
+groups=('qtcurve')
+makedepends=('cmake' 'automoc4' 'gtk2' 'qt4' 'qt5-svg' 'qt5-x11extras' 'kdebase-workspace')
 source=("$pkgbase-$pkgver.tar.gz::$url/archive/$pkgver.tar.gz")
-md5sums=('ee0b35fe428807b0dc2b0c57e5eb4f38')
+md5sums=('c4f2e9bc296398b42bfc132b88a3b989')
 
 build() {
-  cd "qtcurve-qt4-$pkgver"
-
-  sed -i "s/QApplication/QCoreApplication/g" tools/gen_image_header_qt4.cpp
+  cd $pkgbase-$pkgver
 
-  mkdir build-{qt,kde}4
-
-  cd build-qt4
+  mkdir build{,-kde4}
+  cd build
   cmake .. -DCMAKE_BUILD_TYPE=Release \
            -DCMAKE_INSTALL_PREFIX=/usr \
            -DQTC_QT4_ENABLE_KDE=false
@@ -31,18 +29,40 @@ build() {
 
   cd ../build-kde4
   cmake .. -DCMAKE_BUILD_TYPE=Release \
-           -DCMAKE_INSTALL_PREFIX=/usr
+           -DCMAKE_INSTALL_PREFIX=/usr \
+           -DENABLE_GTK2=false \
+           -DENABLE_QT5=false
   make
 }
 
+package_qtcurve-utils() {
+  depends=('libx11')
+  cd $pkgbase-$pkgver/build/qtcurve-utils
+  make DESTDIR="$pkgdir" install
+}
+
+package_qtcurve-gtk2() {
+  depends=('qtcurve-utils' 'gtk2')
+  cd $pkgbase-$pkgver/build/gtk2
+  make DESTDIR="$pkgdir" install
+}
+
 package_qtcurve-qt4() {
-  depends=('qt4')
-  cd "qtcurve-qt4-$pkgver/build-qt4/qt4/style"
+  depends=('qtcurve-utils' 'qt4')
+  cd $pkgbase-$pkgver/build/qt4
+  make DESTDIR="$pkgdir" install
+}
+
+package_qtcurve-qt5() {
+  depends=('qtcurve-utils' 'qt5-svg' 'qt5-x11extras')
+  cd $pkgbase-$pkgver/build/qt5
   make DESTDIR="$pkgdir" install
 }
 
 package_qtcurve-kde4() {
-  depends=('kdebase-workspace')
-  cd "qtcurve-qt4-$pkgver/build-kde4"
+  depends=('qtcurve-utils' 'kdebase-workspace')
+  cd $pkgbase-$pkgver/build-kde4/qt4
+  make DESTDIR="$pkgdir" install
+  cd ../po
   make DESTDIR="$pkgdir" install
 }
diff --git a/community/quagga/PKGBUILD b/community/quagga/PKGBUILD
index f1ec54acd..a110b8b7e 100644
--- a/community/quagga/PKGBUILD
+++ b/community/quagga/PKGBUILD
@@ -1,15 +1,15 @@
-# $Id: PKGBUILD 96712 2013-09-03 08:11:01Z seblu $
+# $Id: PKGBUILD 99121 2013-10-24 20:42:11Z seblu $
 # Maintainer: Sébastien Luttringer
 
 pkgname=quagga
 pkgver=0.99.22.4
-pkgrel=1
+pkgrel=3
 pkgdesc='BGP/OSPF/ISIS/RIP/RIPNG routing daemon suite'
 arch=('i686' 'x86_64' 'mips64el')
 url='http://www.quagga.net'
 license=('GPL2')
 depends=('libcap' 'libnl' 'net-snmp' 'readline' 'ncurses')
-options=('!libtool' '!buildflags')
+options=('!buildflags')
 install=quagga.install
 source=("http://download.savannah.gnu.org/releases/$pkgname/$pkgname-$pkgver.tar.gz"
         'babeld.service'
@@ -20,7 +20,7 @@ source=("http://download.savannah.gnu.org/releases/$pkgname/$pkgname-$pkgver.tar
         'ripd.service'
         'ripngd.service'
         'zebra.service')
-md5sums=('1b68aa52d403b6b4ea877e005610a6b4'
+md5sums=('27ef98abb1820bae19eb71f631a10853'
          '20a8e36ad851d4e06467aeb56a84b245'
          'cc90c234aac9098c5132d653037d5269'
          '67d0ada0f3000b9a86351798786c5256'
diff --git a/community/quesoglc/PKGBUILD b/community/quesoglc/PKGBUILD
index 50397c44e..44d7f817c 100644
--- a/community/quesoglc/PKGBUILD
+++ b/community/quesoglc/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 68088 2012-03-17 19:29:26Z giovanni $
+# $Id: PKGBUILD 99975 2013-10-31 02:47:18Z allan $
 # Maintainer: Vesa Kaihlavirta <vegai@iki.fi>
 # Contributor: Markus Pargmann
 
@@ -11,7 +11,6 @@ url="http://quesoglc.sourceforge.net/"
 license=('LGPL2.1')
 depends=('fontconfig' 'freeglut' 'fribidi' 'glew')
 makedepends=('pkg-config')
-options=('!libtool')
 source=("http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.gz")
 md5sums=('c2697a92e2cc00c537626020e4108a4e')
 
diff --git a/community/quvi/PKGBUILD b/community/quvi/PKGBUILD
index e45e1a451..99f841783 100644
--- a/community/quvi/PKGBUILD
+++ b/community/quvi/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 98182 2013-10-07 12:06:30Z jgc $
+# $Id: PKGBUILD 99976 2013-10-31 02:47:38Z allan $
 # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de>
 # Contributor: joyfulgirl@archlinux.us
 
@@ -10,7 +10,6 @@ arch=('i686' 'x86_64' 'mips64el')
 url='http://quvi.sourceforge.net/'
 license=('AGPL3')
 depends=('libquvi')
-options=('!libtool')
 source=("http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.xz"{,.sig})
 md5sums=('24b3173f8662a6bb33d9a8a58662764f'
          'SKIP')
diff --git a/community/rapidsvn/PKGBUILD b/community/rapidsvn/PKGBUILD
index 7ff71322c..767d945d5 100644
--- a/community/rapidsvn/PKGBUILD
+++ b/community/rapidsvn/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 79429 2012-11-04 20:20:48Z spupykin $
+# $Id: PKGBUILD 100277 2013-11-02 08:47:54Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: Angel 'angvp' Velasquez <angvp[at]archlinux.com.ve>
 # Contributor: AqD <aquila.deus@gmail.com>
@@ -6,12 +6,11 @@
 
 pkgname=rapidsvn
 pkgver=0.12.1
-pkgrel=1
+pkgrel=2
 pkgdesc="A cross-platform GUI front-end for the Subversion revision system written in C++ using the wxWidgets framework."
 url='http://rapidsvn.tigris.org/'
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
-options=('!libtool')
 depends=('subversion' 'wxgtk')
 makedepends=('python2' 'automake' 'libtool')
 source=(http://www.rapidsvn.org/download/release/$pkgver/rapidsvn-$pkgver.tar.gz
@@ -31,6 +30,11 @@ build() {
   sed -i 's|python|python2|' src/locale/Makefile
 
   make -k
+}
+
+package() {
+  cd $srcdir/$pkgname-$pkgver
+
   make DESTDIR=$pkgdir install
 
   install -Dm644 src/res/bitmaps/rapidsvn_32x32.xpm $pkgdir/usr/share/pixmaps/rapidsvn_32x32.xpm
diff --git a/community/rawstudio/PKGBUILD b/community/rawstudio/PKGBUILD
index 6a5e9b989..ea5f6ba0f 100644
--- a/community/rawstudio/PKGBUILD
+++ b/community/rawstudio/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 98046 2013-10-04 15:27:57Z bgyorgy $
+# $Id: PKGBUILD 100450 2013-11-04 12:12:48Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: Daniel J Griffiths <ghost1227@archlinux.us>
 # Contributor: Roman Kyrylych <roman@archlinux.org>
@@ -6,15 +6,14 @@
 
 pkgname=rawstudio
 pkgver=2.0
-pkgrel=9
+pkgrel=10
 pkgdesc="An open source raw-image converter written in GTK+"
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 url="http://rawstudio.org/"
 depends=('gconf' 'lcms' 'exiv2' 'fftw' 'lensfun' 'flickcurl' 'sqlite'
-	 'libgphoto2' 'gtk-engines' 'desktop-file-utils')
+	 'libgphoto2' 'gtk-engines' 'desktop-file-utils' 'icu')
 install=${pkgname}.install
-options=('!libtool')
 source=(http://rawstudio.org/files/release/${pkgname}-${pkgver}.tar.gz
 	libpng15.patch)
 md5sums=('b2f86b8ca6b83ad954e3104c4cb89e9b'
diff --git a/community/rlog/PKGBUILD b/community/rlog/PKGBUILD
index 1ba965fe5..259168a6f 100644
--- a/community/rlog/PKGBUILD
+++ b/community/rlog/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 55453 2011-09-12 23:51:53Z ebelanger $
+# $Id: PKGBUILD 99979 2013-10-31 02:48:38Z allan $
 # Contributor: Jaroslaw Swierczynski <swiergot@aur.archlinux.org>
 # Contributor: Sven Kauber <celeon@gmail.com>
 # Maintainer: Daniel J Griffiths <ghost1227@archlinux.us>
@@ -11,7 +11,6 @@ arch=('i686' 'x86_64' 'mips64el')
 url="http://www.arg0.net/rlog"
 license=('LGPL')
 depends=('gcc-libs')
-options=('!libtool')
 source=(http://rlog.googlecode.com/files/${pkgname}-${pkgver}.tar.gz \
 	${pkgname}-section.patch)
 md5sums=('c29f74e0f50d66b20312d049b683ff82'
diff --git a/community/rpc2/PKGBUILD b/community/rpc2/PKGBUILD
index 9014cd617..c595e6c81 100644
--- a/community/rpc2/PKGBUILD
+++ b/community/rpc2/PKGBUILD
@@ -1,14 +1,13 @@
-# $Id: PKGBUILD 65509 2012-02-21 06:46:03Z spupykin $
+# $Id: PKGBUILD 100279 2013-11-02 08:48:14Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: William Rea <sillywilly@gmail.com>
 
 pkgname=rpc2
 pkgver=2.10
-pkgrel=3
+pkgrel=4
 pkgdesc="Remote procedure call package for IP/UDP"
 arch=(i686 x86_64 'mips64el')
 url="http://www.coda.cs.cmu.edu"
-options=('!libtool')
 license=("LGPL")
 depends=('lwp' 'readline')
 source=(http://www.coda.cs.cmu.edu/pub/rpc2/src/rpc2-$pkgver.tar.gz)
@@ -18,5 +17,9 @@ build() {
   cd $srcdir/rpc2-$pkgver
   ./configure --prefix=/usr
   make
+}
+
+package() {
+  cd $srcdir/rpc2-$pkgver
   make DESTDIR=$pkgdir install
 }
diff --git a/community/rss-glx/PKGBUILD b/community/rss-glx/PKGBUILD
index ca0b61d95..4ae5984c1 100644
--- a/community/rss-glx/PKGBUILD
+++ b/community/rss-glx/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 95473 2013-08-12 20:28:13Z eric $
+# $Id: PKGBUILD 99981 2013-10-31 02:49:18Z allan $
 # Maintainer : Ionut Biru <ibiru@archlinux.org>
 # Contributor: Corrado 'bardo' Primier <corrado.primier@mail.polimi.it>
 # Contributor: Tate "Tatey" Johnson <tatey86@tpg.com.au>
@@ -14,7 +14,6 @@ depends=('desktop-file-utils' 'freealut' 'glew' 'imagemagick' 'glu')
 makedepends=('mesa')
 optdepends=('xscreensaver: xscreensaver integration')
 install=rss-glx.install
-options=('!libtool')
 source=(http://downloads.sourceforge.net/rss-glx/${pkgname}_${pkgver}.tar.bz2
         rss-glx-desktops.tar.bz2)
 md5sums=('a772bd143cd8d141edf4d9eff9860ab3'
diff --git a/community/rsyslog/PKGBUILD b/community/rsyslog/PKGBUILD
index 5348ccc9f..9f67b70bd 100644
--- a/community/rsyslog/PKGBUILD
+++ b/community/rsyslog/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 97525 2013-09-23 16:15:36Z spupykin $
+# $Id: PKGBUILD 99982 2013-10-31 02:49:38Z allan $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 
 pkgname=rsyslog
@@ -18,7 +18,7 @@ optdepends=('postgresql-libs: PostgreSQL Database Support'
 backup=('etc/rsyslog.conf'
 	'etc/logrotate.d/rsyslog'
 	'etc/conf.d/rsyslog')
-options=('strip' 'zipman' '!libtool')
+options=('strip' 'zipman')
 source=("http://www.rsyslog.com/files/download/rsyslog/rsyslog-$pkgver.tar.gz"
 	'rsyslog.logrotate'
 	'rsyslog.conf')
diff --git a/community/rtl-sdr/PKGBUILD b/community/rtl-sdr/PKGBUILD
index 04c8afa7f..76f5a20ec 100644
--- a/community/rtl-sdr/PKGBUILD
+++ b/community/rtl-sdr/PKGBUILD
@@ -1,12 +1,12 @@
-# $Id: PKGBUILD 98280 2013-10-07 22:50:19Z kkeen $
+# $Id: PKGBUILD 100562 2013-11-05 21:31:17Z kkeen $
 # Maintainer: Kyle Keen <keenerd@gmail.com>
 # Contributor: Michael Düll <mail@akurei.me>
 
 pkgname=rtl-sdr
 # they are just starting to play with tags
 # consider using tags for the pkgver in the future
-pkgver=20130913
-_commit=4914b5d4314b752
+pkgver=20131105
+_commit=c5b8a2130007
 pkgrel=1
 pkgdesc="Driver for Realtek RTL2832U, allowing general purpose software defined radio (SDR)."
 arch=('i686' 'x86_64')
@@ -15,6 +15,7 @@ license=('GPL')
 depends=('libusb>=1.0')
 makedepends=('git' 'cmake')
 conflicts=('rtl-sdr-git')
+options=('staticlibs') 
 install=rtl-sdr.install
 source=("git://git.osmocom.org/rtl-sdr.git#commit=$_commit"
         'rtlsdr.conf')
@@ -23,19 +24,25 @@ md5sums=('SKIP'
 
 _gitname="rtl-sdr"
 
+pkgver() {
+  cd "$srcdir/$_gitname"
+  git show -s --format="%ci" HEAD | sed -e 's/-//g' -e 's/ .*//'
+}
+
 build() {
   cd "$srcdir/$_gitname"
   mkdir build
   cd build
-  cmake -DCMAKE_INSTALL_PREFIX:PATH=/usr -Wno-dev ../
+  cmake -DCMAKE_INSTALL_PREFIX:PATH=/usr \
+        -DINSTALL_UDEV_RULES=ON -Wno-dev ../
   make
 }
 
 package() {
   cd "$srcdir/$_gitname/build"
   make DESTDIR="$pkgdir" install
-  install -D -m644 "$srcdir/$_gitname/rtl-sdr.rules" "$pkgdir/usr/lib/udev/rules.d/10-rtl-sdr.rules"
-  install -D -m644 "$srcdir/rtlsdr.conf" "$pkgdir/etc/modprobe.d/rtlsdr.conf"
+  install -Dm644 "$srcdir/$_gitname/rtl-sdr.rules" "$pkgdir/usr/lib/udev/rules.d/10-rtl-sdr.rules"
+  install -Dm644 "$srcdir/rtlsdr.conf" "$pkgdir/etc/modprobe.d/rtlsdr.conf"
 }
 
 # vim:set ts=2 sw=2 et:
diff --git a/community/rubinius/PKGBUILD b/community/rubinius/PKGBUILD
new file mode 100644
index 000000000..a2494068f
--- /dev/null
+++ b/community/rubinius/PKGBUILD
@@ -0,0 +1,89 @@
+# $Id: PKGBUILD 98826 2013-10-19 20:58:03Z heftig $
+# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
+
+pkgbase=rubinius
+pkgname=(rubinius rubinius-ruby)
+pkgver=2.1.1
+pkgrel=1
+pkgdesc="Ruby runtime written in Ruby, designed for concurrency"
+arch=(i686 x86_64)
+url="http://rubini.us"
+license=(custom)
+depends=(llvm-libs libffi openssl libyaml)
+makedepends=(llvm ruby chrpath)
+options=(!emptydirs)
+source=(http://releases.rubini.us/${pkgbase}-${pkgver}.tar.bz2
+        http://rubygems.org/downloads/bundler-1.3.5.gem
+        gemrc)
+sha256sums=('e142c3f201e4ae9f3a6e6671298baabbd9bd906509c663adcf080bff4181ee96'
+            '08b89047f7b829f3e197a28fb1bde74c3f5cfea1552f99dfba237fee30eaffe4'
+            '4bb7eb2fe66e396ed16b589cdb656831407b39ad4e138d88536754c0448ac614')
+
+prepare() {
+  export GEM_HOME="$srcdir/gemdir"
+  cd $pkgbase-$pkgver
+
+  mkdir -p "$GEM_HOME"
+  gem install --no-user-install -N ../bundler-1.3.5.gem
+
+  "$GEM_HOME/bin/bundle" install --local
+}
+
+build() {
+  export GEM_HOME="$srcdir/gemdir"
+  cd $pkgbase-$pkgver
+
+  ./configure --prefix=/usr \
+    --mandir=/usr/share/man \
+    --includedir=/usr/include/rubinius \
+    --appdir=/usr/lib/rubinius \
+    --gemsdir=/usr/lib/rubinius/gems \
+    --preserve-prefix \
+    --llvm-shared
+  rake build
+}
+
+check() {
+  export GEM_HOME="$srcdir/gemdir"
+  cd $pkgbase-$pkgver
+
+  rake vm:test || :
+}
+
+package_rubinius() {
+  optdepends=('rubinius-docs: Rubinius documentation'
+              'ruby-docs: Ruby documentation')
+
+  export GEM_HOME="$srcdir/gemdir"
+  cd $pkgbase-$pkgver
+
+  DESTDIR="$pkgdir" rake install
+
+  find "$pkgdir" -name "*.so" -exec chrpath -d {} +
+  chrpath -d "$pkgdir/usr/bin/rbx"
+
+  mkdir -p "$pkgdir/usr/share/ri"
+  ln -s 2.0.0 "$pkgdir/usr/share/ri/2.1"
+
+  install -Dm644 LICENSE "$pkgdir/usr/share/licenses/rubinius/LICENSE"
+
+### Split rubinius-ruby
+  mkdir -p "$srcdir/ruby/usr/bin"
+  for _f in "$pkgdir"/usr/bin/*; do
+    [[ $_f == */rbx ]] && continue
+    mv $_f "$srcdir/ruby/usr/bin"
+  done
+}
+
+package_rubinius-ruby() {
+  pkgdesc="Ruby compat for Rubinius"
+  depends=(rubinius)
+  provides=(ruby)
+  conflicts=(ruby)
+  backup=(etc/gemrc)
+
+  mv ruby/* "$pkgdir"
+  install -Dm644 gemrc "$pkgdir/etc/gemrc"
+  install -d "$pkgdir/usr/share/licenses/rubinius-ruby"
+  ln -s ../rubinius/LICENSE "$pkgdir/usr/share/licenses/rubinius-ruby/LICENSE"
+}
diff --git a/community/rubinius/gemrc b/community/rubinius/gemrc
new file mode 100644
index 000000000..3d11de1ec
--- /dev/null
+++ b/community/rubinius/gemrc
@@ -0,0 +1,5 @@
+# Read about the gemrc format at http://docs.rubygems.org/read/chapter/11
+
+# --user-install is used to install to $HOME/.gem/ by default since we want to separate
+#                pacman installed gems and gem installed gems
+gem: --user-install
diff --git a/community/ruby-iconv/PKGBUILD b/community/ruby-iconv/PKGBUILD
index 0f43dd6ab..8a6e207f9 100755
--- a/community/ruby-iconv/PKGBUILD
+++ b/community/ruby-iconv/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 97686 2013-09-27 08:51:25Z alucryd $
+# $Id: PKGBUILD 100391 2013-11-03 11:24:29Z alucryd $
 # Maintainer: Maxime Gauduin <alucryd@gmail.com>
 
 pkgname=ruby-iconv
 pkgver=1.0.3
-pkgrel=4
+pkgrel=6
 pkgdesc="Wrapper library for iconv"
 arch=('i686' 'x86_64' 'mips64el')
 url="https://github.com/nurse/iconv"
@@ -15,6 +15,7 @@ sha256sums=('94a9b62a56c96226b62b787cd45fdc48c03f4517f1e36e64db113b010fb012da')
 
 prepare() {
   gem install --no-{document,user-install} --ignore-dependencies -i . ${pkgname#*-}-${pkgver}.gem
+  sed "s|iconv/iconv.so|$CARCH-linux/iconv.so|" -i gems/${pkgname#*-}-${pkgver}/lib/iconv.rb
 }
 
 package() {
diff --git a/community/rxvt-unicode/01-fix-tabber-perl-ext.patch b/community/rxvt-unicode/01-fix-tabber-perl-ext.patch
deleted file mode 100644
index adb140bcc..000000000
--- a/community/rxvt-unicode/01-fix-tabber-perl-ext.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-# https://bugs.archlinux.org/task/35420
---- a/src/perl/tabbed	2012-09-12 17:32:04.000000000 +0900
-+++ b/src/perl/tabbed	2013-05-24 13:04:37.000000000 +0900
-@@ -402,7 +402,7 @@
- # simply proxies all interesting calls back to the tabbed class.
- 
- {
--   for my $hook qw(start destroy key_press property_notify) {
-+   for my $hook (qw(start destroy key_press property_notify)) {
-       eval qq{
-          sub on_$hook {
-             my \$parent = \$_[0]{term}{parent}
diff --git a/community/rxvt-unicode/PKGBUILD b/community/rxvt-unicode/PKGBUILD
index 7a0285a84..0e46d17ca 100644
--- a/community/rxvt-unicode/PKGBUILD
+++ b/community/rxvt-unicode/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 93568 2013-07-05 17:54:59Z seblu $
+# $Id: PKGBUILD 99594 2013-10-30 11:27:15Z seblu $
 # Maintainer: Sébastien Luttringer
 # Contributor: Angel Velasquez <angvp@archlinux.org>
 # Contributor: tobias <tobias@archlinux.org>
@@ -6,8 +6,8 @@
 
 pkgbase=rxvt-unicode
 pkgname=('rxvt-unicode' 'rxvt-unicode-terminfo')
-pkgver=9.18
-pkgrel=7
+pkgver=9.19
+pkgrel=1
 arch=('i686' 'x86_64' 'mips64el')
 url='http://software.schmorp.de/pkg/rxvt-unicode.html'
 license=('GPL')
@@ -17,17 +17,11 @@ source=(
   'urxvt.desktop'
   'urxvtc.desktop'
   'urxvt-tabbed.desktop'
-  '01-fix-tabber-perl-ext.patch'
 )
-md5sums=('963ccc748fe5bca925e7b92c0404d68b'
+md5sums=('45ad197eb9b5a840c0f65e3a8131921c'
          'fec94dc986fa37ec380079d81de3e0b2'
          'fac55f0a8404c86dad3e702146762332'
-         '8a5599197568c63720e282b9722a7990'
-         '0c26ae7022a128e68981577785358b63')
-
-prepare() {
-  patch -p1 -d $pkgname-$pkgver < 01-fix-tabber-perl-ext.patch
-}
+         '8a5599197568c63720e282b9722a7990')
 
 build() {
   cd $pkgname-$pkgver
diff --git a/community/schroot/PKGBUILD b/community/schroot/PKGBUILD
index aa6dbbf67..464f92aec 100644
--- a/community/schroot/PKGBUILD
+++ b/community/schroot/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 94048 2013-07-13 12:36:56Z svenstaro $
+# $Id: PKGBUILD 100281 2013-11-02 08:48:53Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Andreas Wagner <Andreas dot Wagner at em dot uni-frankfurt dot de>
 
 pkgname=schroot
 pkgver=1.6.5
-pkgrel=3
+pkgrel=4
 pkgdesc="Allows users to execute shell commands under different root filesystems. (Successor to dchroot)."
 url="http://packages.qa.debian.org/s/schroot.html"
 license=('GPL3')
@@ -19,7 +19,6 @@ backup=('etc/schroot/schroot.conf'
 	'etc/schroot/arch32/copyfiles'
 	'etc/schroot/arch32/mount'
 	'etc/schroot/arch32/nssdatabases')
-options=(!libtool)
 source=("http://ftp.debian.org/debian/pool/main/s/$pkgname/${pkgname}_${pkgver}.orig.tar.xz"
 	'arch32-example'
 	'arch32-config'
diff --git a/community/scite/PKGBUILD b/community/scite/PKGBUILD
index 1f28af024..5dc9cac9b 100644
--- a/community/scite/PKGBUILD
+++ b/community/scite/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 96605 2013-09-02 09:39:10Z arodseth $
+# $Id: PKGBUILD 99178 2013-10-25 10:00:48Z arodseth $
 # Maintainer: Alexander Rødseth <rodseth@gmail.com>
 # Contributor: Thomas S Hatch <thatch45@gmail.com>
 # Contributor: Corrado 'bardo' Primier <corrado.primier@mail.polimi.it>
@@ -6,7 +6,7 @@
 # Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
 
 pkgname=scite
-pkgver=3.3.5
+pkgver=3.3.6
 pkgrel=1
 pkgdesc='Editor with facilities for building and running programs'
 arch=('i686' 'x86_64' 'mips64el')
@@ -17,7 +17,7 @@ makedepends=('setconf')
 backup=('usr/share/scite/SciTEGlobal.properties')
 install="$pkgname.install"
 source=("http://downloads.sourceforge.net/sourceforge/scintilla/${pkgname}${pkgver//./}.tgz")
-sha256sums=('5acd167046afe7dfa280c034ab9c7dc5d1be1d548e4999c2456fb2a61468fa89')
+sha256sums=('9f3f9c9867e93af37af7a59e962aad76897c9e816c683c03e922baed6be506a5')
 
 prepare() {
   if [ $?CXXBASEFLAGS == 1 ]; then 
diff --git a/community/scribus/PKGBUILD b/community/scribus/PKGBUILD
index f9def3500..66ea57706 100644
--- a/community/scribus/PKGBUILD
+++ b/community/scribus/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 95954 2013-08-19 05:30:25Z bisson $
+# $Id: PKGBUILD 99984 2013-10-31 02:50:20Z allan $
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
 # Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
 # Contributor: Ronald van Haren <ronald.archlinux.org>
@@ -19,7 +19,6 @@ depends=('qt4' 'cairo' 'lcms2' 'libcups' 'libxml2' 'hyphen'
 source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.xz")
 sha1sums=('30c111762790e4407c13236bbb4b06f04e907f71')
 
-options=('!libtool')
 install=install
 
 prepare() {
diff --git a/community/shapelib/PKGBUILD b/community/shapelib/PKGBUILD
index ad4ccf6ec..778cefa38 100644
--- a/community/shapelib/PKGBUILD
+++ b/community/shapelib/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 97796 2013-09-29 19:27:30Z jlichtblau $
+# $Id: PKGBUILD 99985 2013-10-31 02:50:40Z allan $
 # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
 # Contributor: Federico Cinelli <cinelli@aur.archlinux.org>
 # Contributor: Bob Finch <w9ya@arrl.net>
@@ -10,7 +10,6 @@ pkgdesc='simple C API for reading and writing ESRI Shapefiles'
 arch=('i686' 'x86_64' 'mips64el')
 url='http://shapelib.maptools.org/'
 license=('LGPL' 'MIT')
-options=('!libtool')
 source=(http://download.osgeo.org/$pkgname/$pkgname-$pkgver.tar.gz
         LICENSE)
 sha256sums=('23d474016158ab5077db2f599527631706ba5c0dc7c4178a6a1d685bb014f68f'
diff --git a/community/siege/PKGBUILD b/community/siege/PKGBUILD
index 5f42d1094..153621645 100644
--- a/community/siege/PKGBUILD
+++ b/community/siege/PKGBUILD
@@ -1,16 +1,15 @@
-# $Id: PKGBUILD 97337 2013-09-18 09:31:58Z bluewind $
+# $Id: PKGBUILD 99986 2013-10-31 02:51:00Z allan $
 # Maintainer: Florian Pritz <flo@xinu.at>
 # Contributor: Sven Kauber <celeon@gmail.com>
 
 pkgname=siege
-pkgver=3.0.4
+pkgver=3.0.5
 pkgrel=1
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 pkgdesc="An http regression testing and benchmarking utility"
 url="http://www.joedog.org/JoeDog/Siege"
 depends=('openssl')
-options=(!libtool)
 source=("http://www.joedog.org/pub/siege/siege-${pkgver}.tar.gz")
 backup=(etc/siegerc etc/urls.txt)
 
@@ -29,4 +28,4 @@ package() {
   sed -i 's/^# file =$/file = \/etc\/urls.txt/' "$pkgdir/etc/siegerc"
 }
 
-md5sums=('ea4180f0b02b99d0f43cf676a697c999')
+md5sums=('822cc4750a6162945ee91af98773bda4')
diff --git a/community/sigil/PKGBUILD b/community/sigil/PKGBUILD
index ecdfdff9e..d516b78a1 100644
--- a/community/sigil/PKGBUILD
+++ b/community/sigil/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 97088 2013-09-12 10:47:29Z giovanni $
+# $Id: PKGBUILD 99361 2013-10-27 16:02:30Z giovanni $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Larry Hajali <larryhaja [at] gmail [dot] com>
 
 pkgname=sigil
-pkgver=0.7.3
+pkgver=0.7.4
 pkgrel=1
 pkgdesc="WYSIWYG ebook editor"
 arch=('i686' 'x86_64') 
@@ -13,7 +13,7 @@ depends=('qt5-webkit' 'boost-libs')
 makedepends=('qt5-tools' 'qt5-svg' 'cmake' 'gendesk' 'boost')
 install=sigil.install
 source=("http://sigil.googlecode.com/files/Sigil-${pkgver}-Code.zip")
-md5sums=('13630c59bd85e91b96e312b4d39e5087')
+md5sums=('dde8f3b8daa0ccd37589ea2aa454e1bc')
 
 build() {
   cd "${srcdir}"
diff --git a/community/silly/PKGBUILD b/community/silly/PKGBUILD
index 3cea28a3c..70a4406ef 100644
--- a/community/silly/PKGBUILD
+++ b/community/silly/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 90090 2013-05-06 19:39:34Z foutrelis $
+# $Id: PKGBUILD 99987 2013-10-31 02:51:21Z allan $
 # Maintainer: Eric Belanger <eric@archlinux.org>
 # Contributor: G_Syme <demichan(at)mail(dot)upb(dot)de>
 
@@ -10,7 +10,6 @@ arch=('i686' 'x86_64' 'mips64el')
 url="http://www.cegui.org.uk/wiki/index.php/SILLY"
 license=('MIT')
 depends=('libjpeg' 'libpng' 'gcc-libs')
-options=('!libtool')
 source=(http://downloads.sourceforge.net/crayzedsgui/SILLY-${pkgver}.tar.gz
         silly-libpng1.5.patch)
 md5sums=('c3721547fced7792a36ffc9ce6ec23fd'
diff --git a/community/simavr/PKGBUILD b/community/simavr/PKGBUILD
index aa2e8370f..4f9a5a82a 100644
--- a/community/simavr/PKGBUILD
+++ b/community/simavr/PKGBUILD
@@ -1,31 +1,28 @@
 # Maintainer: schuay <jakob.gruber@gmail.com>
 
 pkgname=simavr
-pkgver=1.0
-pkgrel=2
+pkgver=1.1
+pkgrel=1
 pkgdesc='A lean, mean and hackable AVR simulator'
 arch=('i686' 'x86_64')
 url="https://github.com/buserror-uk/simavr"
 license=('GPL3')
 depends=('elfutils')
-makedepends=('avr-libc')
-source=("https://github.com/downloads/buserror-uk/simavr/$pkgname-$pkgver.tar.bz2")
+makedepends=('avr-libc' 'git')
+source=("${pkgname}::git+https://github.com/buserror-uk/simavr.git#tag=v${pkgver}")
 options=(!strip)
+md5sums=('SKIP')
 
 build() {
-  cd "$srcdir/$pkgname-$pkgver"
+  cd "$srcdir/$pkgname"
 
-  # The original Makefile depends on git, hardcode the version until it's fixed upstream.
-  sed -i "s/^\(SIMAVR_VERSION\).*/\1 = ${pkgver}/" simavr/Makefile
-
-  make AVR_ROOT=/usr/avr SIMAVR_VERSION=1.0 \
-      CFLAGS="-Wall -Wextra -fPIC -std=gnu99 -Wno-sign-compare -Wno-unused-parameter" \
+  make AVR_ROOT=/usr/avr RELEASE=1 \
+      CFLAGS="-Wall -Wextra -fPIC -O2 -std=gnu99 -Wno-sign-compare -Wno-unused-parameter" \
       build-simavr
 }
 
 package() {
-  cd "$srcdir/$pkgname-$pkgver"
+  cd "$srcdir/$pkgname"
   make PREFIX="/usr" DESTDIR="$pkgdir/usr" install
 }
 
-md5sums=('82c9704a4e8569548f01931e32ebfe0c')
diff --git a/community/simgear/PKGBUILD b/community/simgear/PKGBUILD
index 00b0628cf..369c7daaf 100644
--- a/community/simgear/PKGBUILD
+++ b/community/simgear/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 97539 2013-09-23 17:39:01Z spupykin $
+# $Id: PKGBUILD 100283 2013-11-02 08:49:11Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: William Rea <sillywilly@gmail.com>
 # Contributor: Hans Janssen <hans@janserv.xs4all.nl>
 
 pkgname=simgear
 pkgver=2.12.0
-pkgrel=1
+pkgrel=2
 pkgdesc="A set of open-source libraries designed to be used as building blocks for quickly assembling 3d simulations, games, and visualization applications."
 arch=(i686 x86_64)
 depends=('glut' 'freealut' 'plib' 'openscenegraph')
diff --git a/community/sk1/PKGBUILD b/community/sk1/PKGBUILD
index bff38847f..7aee64b74 100644
--- a/community/sk1/PKGBUILD
+++ b/community/sk1/PKGBUILD
@@ -1,51 +1,27 @@
-# $Id: PKGBUILD 98434 2013-10-10 11:32:25Z spupykin $
+# $Id: PKGBUILD 99085 2013-10-24 10:25:28Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: ConnorBehan <connor.behan@gmail.com>
 
 pkgname=sk1
 pkgver=0.9.1
-pkgrel=12
+pkgrel=13
 pkgdesc="Fork of skencil with improved CMYK support"
 arch=(i686 x86_64 'mips64el')
 url="http://sk1project.org/modules.php?name=Products&product=sk1"
-depends=('tcl' 'tk' 'python2-lcms' 'python2-pillow' 'zenity' 'sk1libs')
+depends=('tcl' 'tk' 'python2-lcms' 'python2-pillow' 'zenity' 'sk1libs' 'sk1sdk')
 license=('GPL' 'LGPL')
-source=(http://sk1project.org/downloads/sk1/${pkgver}pre_rev905/sK1-${pkgver}pre_rev905.tar.gz
-	sk1.desktop
-        fix_pillow_import.patch
+source=(https://sk1.googlecode.com/files/sk1-${pkgver}pre2_rev1383.tar.gz
 	build-fix.patch)
+md5sums=('ce8a98e99e133b215b7ed67d6b0e0113'
+         'b22c3c7b6a979c0a4e59ecaa2bd2182b')
 
-package() {
-  local _tclver=`pacman -Q tcl`
-  local _tclnum=${tclver:4:3}
-  local _tcldir='tcl'${tclnum}
-
-  cd $srcdir/sK1-${pkgver}pre
-
-  # pillow import fix
-  patch -Np1 -i $srcdir/fix_pillow_import.patch
-
-  # python2 fix
-  sed -i 's_#! /usr/bin/python_#! /usr/bin/python2_' src/__init__.py
-
+prepare() {
+  cd $srcdir/sk1-${pkgver}pre2
+  sed -i 's_#! /usr/bin/python_#! /usr/bin/python2_' src/{__init__.py,sk1}
   patch -p1 <$srcdir/build-fix.patch
-  python2 setup.py install --prefix=/usr --root=$pkgdir
-
-  mkdir -p $pkgdir/usr/share/pixmaps
-  mkdir -p $pkgdir/usr/share/applications
-
-  cp $pkgdir/usr/lib/python2.7/site-packages/sk1/share/icons/CrystalSVG/icon_sk1_32.png \
-   $pkgdir/usr/share/pixmaps/sk1.png
-
-  cp $srcdir/sk1.desktop $pkgdir/usr/share/applications
-
-  mkdir $pkgdir/usr/lib/${_tcldir}
-  cp -r $pkgdir/usr/lib/python2.7/site-packages/sk1/share/ttk-themes/Plastik \
-    $pkgdir/usr/lib/${_tcldir}/Plastik
+}
 
-  sed -i 's#^python#python2#' $pkgdir/usr/bin/sk1
+package() {
+  cd $srcdir/sk1-${pkgver}pre2
+  python2 setup.py install --prefix=/usr --root=$pkgdir
 }
-md5sums=('43b82fd85049b078dcf98e9dd81fdc6a'
-         'bbf6f10b8155838eede93b5abed724f5'
-         '4a44dd89707b19fe58f4c124ed321236'
-         'b22c3c7b6a979c0a4e59ecaa2bd2182b')
diff --git a/community/sk1/fix_pillow_import.patch b/community/sk1/fix_pillow_import.patch
deleted file mode 100644
index 7306dd3b6..000000000
--- a/community/sk1/fix_pillow_import.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-diff -aur sK1-0.9.1pre/src/app/UI/pluginpanels/properties/gradient_fill.py sK1-0.9.1pre.new/src/app/UI/pluginpanels/properties/gradient_fill.py
---- sK1-0.9.1pre/src/app/UI/pluginpanels/properties/gradient_fill.py	2009-07-16 23:26:15.000000000 +0000
-+++ sK1-0.9.1pre.new/src/app/UI/pluginpanels/properties/gradient_fill.py	2013-09-22 09:52:26.543457833 +0000
-@@ -24,7 +24,7 @@
- 
- import tooltips
- 
--import Image, ImageTk, ImageDraw
-+from PIL import Image, ImageTk, ImageDraw
- 
- DEFAULT_WIDTH=0.283286
- DEFAULT_CORNER=const.JoinMiter
-diff -aur sK1-0.9.1pre/src/app/UI/pluginpanels/properties/outlineprop.py sK1-0.9.1pre.new/src/app/UI/pluginpanels/properties/outlineprop.py
---- sK1-0.9.1pre/src/app/UI/pluginpanels/properties/outlineprop.py	2009-05-15 22:11:39.000000000 +0000
-+++ sK1-0.9.1pre.new/src/app/UI/pluginpanels/properties/outlineprop.py	2013-09-22 09:52:13.216885815 +0000
-@@ -24,7 +24,7 @@
- 
- import tooltips
- 
--import Image, ImageTk, ImageDraw
-+from PIL import Image, ImageTk, ImageDraw
- 
- DEFAULT_WIDTH=0.283286
- DEFAULT_CORNER=const.JoinMiter
-diff -aur sK1-0.9.1pre/src/app/UI/widgets/colorbutton.py sK1-0.9.1pre.new/src/app/UI/widgets/colorbutton.py
---- sK1-0.9.1pre/src/app/UI/widgets/colorbutton.py	2009-04-30 02:58:41.000000000 +0000
-+++ sK1-0.9.1pre.new/src/app/UI/widgets/colorbutton.py	2013-09-22 09:52:38.150044124 +0000
-@@ -8,7 +8,7 @@
- # The color sample size is 31x20 px
- 
- from Ttk import TButton
--import Image, ImageTk
-+from PIL import Image, ImageTk
- 
- class TColorButton(TButton):
diff --git a/community/sk1/sk1.desktop b/community/sk1/sk1.desktop
deleted file mode 100644
index 6e1878e6e..000000000
--- a/community/sk1/sk1.desktop
+++ /dev/null
@@ -1,59 +0,0 @@
-
-[Desktop Entry]
-Encoding=UTF-8
-Name=sk1
-GenericName=Vector-based Drawing Program
-GenericName[af]=Vector-based Teken Program
-GenericName[bg]=�ек�оѬна гѬа�и�!на пѬогѬама за Ѭи��ђване
-GenericName[bs]=Program za vektorsko crtanje
-GenericName[ca]=Programa de dibuix basat en els vectors
-GenericName[cs]=Vektorový kresl�program
-GenericName[da]=Vektorbaseret tegneprogram
-GenericName[de]=Vektorbasiertes Zeichenprogramm
-GenericName[el]=� ���Rγ��αμμα ��0γ��α� ική� �αϒιϒμνη� ϒε �ιαν��ϒμα�α
-GenericName[eo]=Vektor-desegnilo
-GenericName[es]=Programa de dibujo vectorial
-GenericName[et]=Vektorgraafika joonistamine
-GenericName[eu]=Marazteko Programa Bektoriala
-GenericName[fa]=بر� ا�&�!�R�R رس�& بردار�R
-GenericName[fi]=Vektoripohjainen piirto-ohjelma
-GenericName[fr]=Logiciel de dessin vectoriel
-GenericName[he]=ת�"�:� �"ת צ�"�"ר �~��"ססת �"ק���"ר�"��
-GenericName[hr]=Vektorski program za crtanje
-GenericName[hu]=vektoros rajzolóprogram
-GenericName[is]=Vigrað teikniforrit
-GenericName[it]=Programma di disegno vettoriale
-GenericName[ja]=�"����㒫�0㒼��㒳�����㒩� 
-GenericName[lo]=��:ຣ����ຣມວາ��~າ�a���a�a໬ວັ��໬�"ີ
-GenericName[lt]=Vektorinio paišymo programa
-GenericName[lv]=Uz Vektoriem b��z�tas Zīm�šanas Programma
-GenericName[mk]=�ек�оѬ��ки базиѬан пѬогѬам за � Ѭ�а�aе
-GenericName[mn]=�ек�оѬв �ђлгђђла��ан зђѬгийн пѬогѬам
-GenericName[mt]=Programm biex tpinġi b'vektori
-GenericName[nb]=Vektorbasert tegneprogram
-GenericName[nl]=vector-gebaseerd tekenprogramma
-GenericName[nn]=Vektorbasert teikneprogram
-GenericName[nso]=Lenaneo lago Taka leo le Lebisitswego ka Vector
-GenericName[pl]=Wektorowy program do rysowania
-GenericName[pt]=Programa de Desenho Vectorial
-GenericName[pt_BR]=Programa de Desenho baseado em Vetor
-GenericName[ro]=Program de desenare vectorialĒ
-GenericName[ru]=�xѬогѬамма век�оѬной гѬа�ики
-GenericName[se]=Vektorvuo��oduvvon sárgonprográmma
-GenericName[sk]=Vektorový kresliaci program
-GenericName[sl]=Program za vektorsko risanje
-GenericName[sv]=Vektorbaserat ritprogram
-GenericName[th]=��:ร����รมวา�� า�~���a�a๬ว��๬�"ุ��R
-GenericName[tr]=Vektor Tabanlı �!izim Programı
-GenericName[uk]=�xѬогѬама ���воѬенн�� век�оѬни�& зобѬажен�R
-GenericName[ven]=Mbekanyamushumo yo olwaho sa Vekitha
-GenericName[vi]=Trình vẽ kiỒu Vector
-GenericName[xh]=Inkqubo Yomzobo Osekwe-Kwimitha Yovavanyo
-GenericName[zh_CN]=�x��!����:��9��
-GenericName[zh_TW]=���!�繪�S�9��
-GenericName[zu]=Uhlelo lwemisebenzi olusekelwe kwi-Vector
-Exec=/usr/bin/sk1
-Categories=Application;Graphics;
-Terminal=false
-Type=Application
-Icon=/usr/share/pixmaps/sk1.png
diff --git a/community/sk1libs/PKGBUILD b/community/sk1libs/PKGBUILD
index e3a9f52d7..f539e254e 100644
--- a/community/sk1libs/PKGBUILD
+++ b/community/sk1libs/PKGBUILD
@@ -1,24 +1,24 @@
-# $Id: PKGBUILD 65445 2012-02-21 05:49:25Z spupykin $
+# $Id: PKGBUILD 99087 2013-10-24 10:25:54Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 
 pkgname=sk1libs
-pkgver=0.9.1
-pkgrel=3
+pkgver=0.9.2
+pkgrel=1
 pkgdesc='A set of python non-GUI extensions for sK1 Project.'
 arch=('i686' 'x86_64' 'mips64el')
 url='http://sk1project.org/'
 license=('custom:LGPL2')
 depends=('python2' 'freetype2' 'lcms')
-source=("${pkgname}-${pkgver}.tar.gz::http://sk1project.org/dc.php?target=${pkgname}-${pkgver}.tar.gz")
-md5sums=('e18088bbc8a105e7535a96f40b80f284')
+source=("${pkgname}-${pkgver}.tar.gz::https://sk1.googlecode.com/files/sk1libs-${pkgver}pre_rev1383.tar.gz")
+md5sums=('fdbb198779ff9941a8912438802fc05a')
 
 build() {
-  cd ${pkgname}-${pkgver}
+  cd ${pkgname}-${pkgver}pre
   python2 setup.py build
 }
 
 package() {
-  cd ${pkgname}-${pkgver}
+  cd ${pkgname}-${pkgver}pre
   python2 setup.py install --root ${pkgdir}
   install -D -m644 GNU_LGPL_v2 ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
 }
diff --git a/community/sk1sdk/PKGBUILD b/community/sk1sdk/PKGBUILD
new file mode 100644
index 000000000..92dad15bf
--- /dev/null
+++ b/community/sk1sdk/PKGBUILD
@@ -0,0 +1,29 @@
+# $Id: PKGBUILD 78820 2012-10-25 06:47:28Z foutrelis $
+# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
+
+pkgname=sk1sdk
+pkgver=0.9.1
+pkgrel=1
+pkgdesc='A set of python non-GUI extensions for sK1 Project.'
+arch=('i686' 'x86_64')
+url='http://sk1project.org/'
+license=('custom:LGPL2')
+depends=('python2' 'freetype2' 'lcms' 'tk' 'libxcursor')
+source=("${pkgname}-${pkgver}.tar.gz::https://sk1.googlecode.com/files/sk1sdk-${pkgver}pre2_rev1383.tar.gz")
+md5sums=('b6db1a14ed9d39251851a3d78b63bb15')
+
+prepare() {
+  cd ${pkgname}-${pkgver}pre2
+  sed -i 's|python -c|python2 -c|g' src/tkstyle/{fonts,colors}.py
+}
+
+build() {
+  cd ${pkgname}-${pkgver}pre2
+  python2 setup.py build
+}
+
+package() {
+  cd ${pkgname}-${pkgver}pre2
+  python2 setup.py install --root ${pkgdir}
+  install -D -m644 GNU_LGPL_v2 ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
+}
diff --git a/community/skrooge/PKGBUILD b/community/skrooge/PKGBUILD
index 82dc1baf5..7e453adde 100644
--- a/community/skrooge/PKGBUILD
+++ b/community/skrooge/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 98131 2013-10-06 15:36:48Z jlichtblau $
+# $Id: PKGBUILD 100087 2013-11-01 13:55:59Z eric $
 # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
 # Contributor: Ray Rashif <schiv@archlinux.org>
 # Contributor: Andrea Scarpino <andrea@archlinux.org>
@@ -6,7 +6,7 @@
 
 pkgname=skrooge
 pkgver=1.8.0
-pkgrel=1
+pkgrel=2
 pkgdesc="A personal finances manager for KDE"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://skrooge.org/"
diff --git a/community/sleuthkit/PKGBUILD b/community/sleuthkit/PKGBUILD
index a90220805..66baac429 100644
--- a/community/sleuthkit/PKGBUILD
+++ b/community/sleuthkit/PKGBUILD
@@ -1,19 +1,18 @@
-# $Id: PKGBUILD 86192 2013-03-12 21:51:33Z jlichtblau $
+# $Id: PKGBUILD 99988 2013-10-31 02:51:42Z allan $
 # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
 # Contributor: Geoffroy Carrier <geoffroy.carrier@koon.fr>
 
 pkgname=sleuthkit
-pkgver=4.0.2
+pkgver=4.1.2
 pkgrel=1
 pkgdesc='File system and media management forensic analysis tools'
 arch=('i686' 'x86_64' 'mips64el')
 url='http://www.sleuthkit.org/sleuthkit'
 license=('GPL2' 'CPL' 'custom:"IBM Public Licence"')
 depends=('perl')
-options=('!libtool')
 changelog=$pkgname.changelog
 source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz)
-sha256sums=('112f80fbc6a868c18c7a924f756b35c79eed9d0cc8923a4f973646f00e546e62')
+sha256sums=('58253b35c016083558fb581308f4a3baf884229de89eb84ddbfb977ed56600d3')
 
 build() {
   cd ${pkgname}-${pkgver}
diff --git a/community/sleuthkit/sleuthkit.changelog b/community/sleuthkit/sleuthkit.changelog
index 6ab1ba102..7c9c63ae0 100644
--- a/community/sleuthkit/sleuthkit.changelog
+++ b/community/sleuthkit/sleuthkit.changelog
@@ -1,3 +1,6 @@
+2013-10-13 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
+	* sleuthkit 4.1.2-1
+
 2013-03-12 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
 	* sleuthkit 4.0.2-1
 
diff --git a/community/smalltalk/PKGBUILD b/community/smalltalk/PKGBUILD
index 9473d4a0b..3a838ca95 100644
--- a/community/smalltalk/PKGBUILD
+++ b/community/smalltalk/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 88644 2013-04-20 23:03:17Z arodseth $
+# $Id: PKGBUILD 99989 2013-10-31 02:52:02Z allan $
 # Maintainer: Alexander Rødseth <rodseth@gmail.com>
 # Contributor: Kaiting Chen <kaitocracy@gmail.com>
 # Contributor: mrshpot <mrshpot at gmail dot com>
@@ -6,14 +6,14 @@
 
 pkgname=smalltalk
 pkgver=3.2.5
-pkgrel=1
+pkgrel=2
 pkgdesc='Implementation of Smalltalk-80'
 url='http://smalltalk.gnu.org/'
 license=('GPL' 'LGPL')
 arch=('i686' 'x86_64' 'mips64el')
-options=('!libtool' '!emptydirs')
+options=('!emptydirs' 'staticlibs')
 depends=('gmp' 'libffi' 'libsigsegv' 'readline' 'libltdl')
-makedepends=('gdbm' 'gtk2' 'sqlite' 'tk>=8.6' 'zip')
+makedepends=('gdbm' 'gtk2' 'sqlite' 'tk' 'zip')
 install="$pkgname.install"
 source=("ftp://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.gz")
 sha256sums=('06e574e818ec49f0555d948ae53b1453d8c1df59ef597dad911a4fd1ffba1cce')
@@ -23,7 +23,7 @@ optdepends=('tk: for gst-blox'
             'gtk2: GUI toolkit')
 
 build() {
-  cd "$srcdir/$pkgname-$pkgver"
+  cd "$pkgname-$pkgver"
 
   ./configure \
     --prefix=/usr \
@@ -42,13 +42,13 @@ build() {
 }
 
 check() {
-  cd "$srcdir/$pkgname-$pkgver"
+  cd "$pkgname-$pkgver"
 
-  #make check
+  make check || return 1
 }
 
 package() {
-  cd "$srcdir/$pkgname-$pkgver"
+  cd "$pkgname-$pkgver"
 
   make DESTDIR="$pkgdir" install
 
diff --git a/community/snapper/PKGBUILD b/community/snapper/PKGBUILD
new file mode 100644
index 000000000..35f66933d
--- /dev/null
+++ b/community/snapper/PKGBUILD
@@ -0,0 +1,61 @@
+# Maintainer: Massimiliano Torromeo <massimiliano.torromeo@gmail.com>
+# Contributor: Tom Kuther <gimpel@sonnenkinder.org>
+
+pkgname=snapper
+pkgver=0.1.7
+pkgrel=1
+pkgdesc="A tool for managing BTRFS and LVM snapshots. It can create, diff and restore snapshots and provides timelined auto-snapping."
+arch=('i686' 'x86_64')
+url="http://snapper.io"
+license=('GPL2')
+depends=('btrfs-progs' 'libxml2' 'dbus' 'boost-libs')
+makedepends=('boost' 'lvm2' 'libxslt' 'docbook-xsl' 'pam' 'git')
+backup=('etc/conf.d/snapper')
+source=("ftp://ftp.suse.com/pub/projects/$pkgname/$pkgname-$pkgver.tar.bz2"
+        'libbtrfs.patch')
+options=(!libtool)
+
+prepare() {
+  cd "$srcdir/$pkgname-$pkgver"
+  patch -p1 -i "$srcdir"/libbtrfs.patch
+}
+
+build() {
+  cd "$srcdir/$pkgname-$pkgver"
+
+  # rename cron scripts
+  sed -i -e 's@suse.de-@@g' scripts/Makefile.am
+  # fix config location in cron scripts
+  sed -i -e 's@/etc/sysconfig/@/etc/conf.d/@g' scripts/snapper-{daily,hourly}
+
+  # boost fixlets - Arch doesn't use -mt suffix
+  sed -i -e 's@lboost_thread-mt@lboost_thread@g' snapper/Makefile.am
+  sed -i -e 's@lboost_system-mt@lboost_system@g' snapper/Makefile.am
+
+  # fix pam plugin install location
+  sed -i -e 's@shell echo /@shell echo /usr/@g' pam/Makefile.am
+  # Arch all in /usr/bin
+  sed -i -e 's@/usr/sbin@/usr/bin@g' data/org.opensuse.Snapper.service
+
+  aclocal
+  libtoolize --force --automake --copy
+  autoheader
+  automake --add-missing --copy
+  autoconf
+  ./configure --prefix=/usr \
+              --sbindir=/usr/bin \
+              --with-conf=/etc/conf.d \
+              --disable-zypp \
+              --disable-silent-rules
+  make
+}
+
+package() {
+  cd "$srcdir/$pkgname-$pkgver"
+
+  make DESTDIR="$pkgdir" install
+  install -Dm644 data/sysconfig.snapper "$pkgdir"/etc/conf.d/snapper
+}
+
+sha256sums=('fcb8d98aa36021970b214a2b6ea85f86aa29e107559bf677226e2e4ade2c6ed0'
+            '0d0289e7448a357c78450f6690d684fef0e889921be152038a73401d37294317')
diff --git a/community/snapper/libbtrfs.patch b/community/snapper/libbtrfs.patch
new file mode 100644
index 000000000..805c36b44
--- /dev/null
+++ b/community/snapper/libbtrfs.patch
@@ -0,0 +1,13 @@
+diff --git a/snapper/Btrfs.cc b/snapper/Btrfs.cc
+index 2c110c3..be9e974 100644
+--- a/snapper/Btrfs.cc
++++ b/snapper/Btrfs.cc
+@@ -982,7 +982,7 @@ namespace snapper
+ 	{
+ 	    boost::this_thread::interruption_point();
+ 
+-	    int r = btrfs_read_and_process_send_stream(fd, &send_ops, &*this);
++	    int r = btrfs_read_and_process_send_stream(fd, &send_ops, &*this, 0);
+ 
+ 	    if (r < 0)
+ 	    {
diff --git a/community/spacefm/PKGBUILD b/community/spacefm/PKGBUILD
index 50a3db338..c0b4f49b5 100644
--- a/community/spacefm/PKGBUILD
+++ b/community/spacefm/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 86533 2013-03-18 17:58:18Z bpiotrowski $
+# $Id: PKGBUILD 99024 2013-10-22 17:56:30Z bpiotrowski $
 # Maintainer:  Bartłomiej Piotrowski <nospam@bpiotrowski.pl>
 # Contributor: IgnorantGuru http://igurublog.wordpress.com/contact-ignorantguru/
 # Contributor: ridikulus_rat <the.ridikulus.rat@gmail.com>
 
 pkgname=spacefm
-pkgver=0.8.7
+pkgver=0.9.0
 pkgrel=1
 pkgdesc='Multi-panel tabbed file manager'
 arch=('i686' 'x86_64')
@@ -20,8 +20,8 @@ optdepends=('lsof: device processes'
             'udevil: mount as non-root user and mount networks'
             'udisks: mount as non-root user'
             'udisks2: mount as non-root user')
-source=(https://raw.github.com/IgnorantGuru/$pkgname/master/packages/$pkgver/$pkgname-$pkgver.tar.xz)
-sha256sums=('3e48f276df4505b69d24fbeb4b5a869cf316503e2395bef467a29a5207b23947')
+source=(https://github.com/IgnorantGuru/spacefm/archive/$pkgver.tar.gz)
+sha256sums=('cca3fcfecd148dca165a71bb14c66c8b29ae7a488a98b9e9662ae4b686b2c01b')
 
 build() {
 	cd $srcdir/$pkgname-$pkgver
diff --git a/community/spacefm/spacefm.install b/community/spacefm/spacefm.install
index f2954aa73..76a5d56b9 100644
--- a/community/spacefm/spacefm.install
+++ b/community/spacefm/spacefm.install
@@ -1,8 +1,8 @@
 post_install() {
-  update-mime-database usr/share/mime > /dev/null
+  update-mime-database /usr/share/mime > /dev/null
   update-desktop-database -q
   gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor
-  [ -d /usr/share/icons/Faenza ] && gtk-update-icon-cache -q -t -f /usr/share/icons/Faenza
+  [[ -d /usr/share/icons/Faenza ]] && gtk-update-icon-cache -q -t -f /usr/share/icons/Faenza
 }
 
 post_upgrade() {
diff --git a/community/spice-gtk3/PKGBUILD b/community/spice-gtk3/PKGBUILD
index 840b6a390..9053dbabf 100644
--- a/community/spice-gtk3/PKGBUILD
+++ b/community/spice-gtk3/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 98296 2013-10-08 04:33:16Z bgyorgy $
+# $Id: PKGBUILD 99990 2013-10-31 02:52:22Z allan $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Stefano Facchini <stefano.facchini@gmail.com>
 # Contributor: Jonathan Lestrelin <zanko@daemontux.org>
@@ -6,20 +6,23 @@
 
 pkgname=spice-gtk3
 pkgver=0.21
-pkgrel=2
+pkgrel=3
 pkgdesc="Gtk client and libraries for SPICE remote desktop servers (gtk3 version)"
 arch=('i686' 'x86_64')
 url="http://spice-space.org"
 license=('LGPL2.1')
 depends=('celt0.5.1' 'gtk3' 'libcacard' 'libpulse' 'usbredir')
 makedepends=('gobject-introspection' 'intltool' 'python2-pyparsing' 'qemu' 'spice-protocol' 'usbutils' 'vala')
-options=('!libtool')
-source=("http://www.spice-space.org/download/gtk/spice-gtk-$pkgver.tar.bz2")
+source=("http://www.spice-space.org/download/gtk/spice-gtk-$pkgver.tar.bz2"
+	"usb-fix.patch::https://bugs.freedesktop.org/attachment.cgi?id=86818")
 sha256sums=('73d418ffa97d6cf5edb1920d46f1d51fc40d14a8d4edfab3be6041e25062c564')
+sha256sums=('73d418ffa97d6cf5edb1920d46f1d51fc40d14a8d4edfab3be6041e25062c564'
+            '1b3c7d20ebd3644faf95e387f7d2696fcd773539db8ffdda2e316a7c516ce6d2')
 
 prepare() {
   cd "$srcdir/spice-gtk-$pkgver"
   sed -i 's,/usr/bin/env python,/usr/bin/python2,' spice-common/spice_codegen.py
+  patch -p1 <$srcdir/usb-fix.patch
 }
 
 build() {
diff --git a/community/sqlheavy/PKGBUILD b/community/sqlheavy/PKGBUILD
index fc6a0a3f1..7a571f3ec 100755
--- a/community/sqlheavy/PKGBUILD
+++ b/community/sqlheavy/PKGBUILD
@@ -1,38 +1,37 @@
-# $Id: PKGBUILD 96517 2013-08-30 22:52:46Z alucryd $
+# $Id: PKGBUILD 99102 2013-10-24 12:51:25Z alucryd $
 # Maintainer: Maxime Gauduin <alucryd at gmail dot com>
 # Contributor : sebikul <sebikul@gmail.com>
 
 pkgname=sqlheavy
-pkgver=0.1.1
-pkgrel=7
+pkgver=0.2.0.7ae6112
+pkgrel=1
 pkgdesc="GObject SQLite wrapper"
 arch=('i686' 'x86_64' 'mips64el')
 url="https://code.google.com/p/sqlheavy/"
 license=('LGPL')
 depends=('gtk2' 'sqlite3')
-makedepends=('gobject-introspection' 'vala')
-options=('!libtool')
-source=("https://sqlheavy.googlecode.com/files/${pkgname}-${pkgver}.tar.xz")
-sha256sums=('e8689f5fd4e0baf98eada2b3811262bb99877c2e8586fd21ad2a7ad3acc59031')
+makedepends=('git' 'gobject-introspection' 'vala')
+source=('git://gitorious.org/sqlheavy/sqlheavy.git')
+sha256sums=('SKIP')
 
-prepare() {
-  cd ${pkgname}-${pkgver}
+pkgver() {
+  cd ${pkgname}
 
-  sed 's/libvala-0.16/libvala-0.20/' -i configure
-  sed '/examples/d; /utils/d' -i Makefile.in
+  printf "0.2.0.%s" "$(git rev-parse --short HEAD)"
 }
 
 build() {
-  cd ${pkgname}-${pkgver}
+  cd ${pkgname}
 
-  ./configure --prefix='/usr' --disable-static
+  ./autogen.sh --prefix='/usr' --disable-static
   make
 }
 
 package() {
-  cd ${pkgname}-${pkgver}
+  cd ${pkgname}
 
   make DESTDIR="${pkgdir}" install
+  rm -rf "${pkgdir}"/usr/share/man
 }
 
 # vim: ts=2 sw=2 et:
diff --git a/community/sqlite2/PKGBUILD b/community/sqlite2/PKGBUILD
index 77bcf44b4..95e66e8b8 100644
--- a/community/sqlite2/PKGBUILD
+++ b/community/sqlite2/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 68015 2012-03-17 00:56:03Z giovanni $
+# $Id: PKGBUILD 99991 2013-10-31 02:52:44Z allan $
 # Maintainer: Ronald van Haren <ronald.archlinux.org>
 # Contributor: Judd <jvinet@zeroflux.org>
 
@@ -12,7 +12,6 @@ depends=('readline>=6.0.00')
 source=("http://www.sqlite.org/sqlite-$pkgver.tar.gz" 
         'LICENSE')
 license=('custom')
-options=('!libtool')
 md5sums=('838dbac20b56d2c4292e98848505a05b'
          '5d3b333e59a37747284f66081660f8a1')
 
diff --git a/community/squid/PKGBUILD b/community/squid/PKGBUILD
index d520a8094..35d2409e4 100644
--- a/community/squid/PKGBUILD
+++ b/community/squid/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 97531 2013-09-23 16:17:02Z spupykin $
+# $Id: PKGBUILD 100452 2013-11-04 12:13:15Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Mark Coolen <mark.coolen@gmail.com>
 # Contributor: Tom Newsom <Jeepster@gmx.co.uk>
 # Contributor: Kevin Piche <kevin@archlinux.org>
 
 pkgname=squid
-pkgver=3.3.9
+pkgver=3.3.10
 pkgrel=1
 pkgdesc='Full-featured Web proxy cache server'
 arch=('x86_64' 'i686' 'mips64el')
@@ -21,7 +21,7 @@ source=("http://www.squid-cache.org/Versions/v3/3.3/$pkgname-$pkgver.tar.bz2"
         'squid.pam'
         'squid.cron'
         'squid.service')
-md5sums=('f08bffe795260cecca828331c579e0c4'
+md5sums=('ff69d08818ee008f66666f79bb27b9ee'
          '270977cdd9b47ef44c0c427ab9034777'
          'a71425c4951f2e5b640d19e6a5048531'
          'ceeb57c69ebb165676219222f109a24e')
@@ -87,7 +87,8 @@ build() {
     --with-default-user=proxy \
     --enable-async-io \
     --enable-truncate \
-    --enable-icap-client
+    --enable-icap-client \
+    --enable-ssl-crtd
   make
 }
 
diff --git a/community/sshguard/PKGBUILD b/community/sshguard/PKGBUILD
index 0e81c4e9a..63c7ba59b 100644
--- a/community/sshguard/PKGBUILD
+++ b/community/sshguard/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 96970 2013-09-09 14:29:18Z mtorromeo $
+# $Id: PKGBUILD 99653 2013-10-30 18:22:33Z mtorromeo $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: Massimiliano Torromeo <massimiliano.torromeo@gmail.com>
 
 pkgname=sshguard
 pkgver=1.5
-pkgrel=15
+pkgrel=16
 pkgdesc="Brute force detector for SSH, Exim, VSFTPD and more. Blocks by ip with iptables"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.sshguard.net/"
@@ -15,9 +15,6 @@ install=sshguard.install
 source=("http://downloads.sourceforge.net/sourceforge/sshguard/sshguard-$pkgver.tar.bz2"
 	sshguard.service
 	sshguard-journalctl)
-sha256sums=('b537f8765455fdf8424f87d4bd695e5b675b88e5d164865452137947093e7e19'
-            '3185cd3ceeee0bbb1f1df54baf025857200f39bd1eb747a59d6f46c562be4a51'
-            'f7b307fe9dbbe8c18fe91ca751679d62b2a3ade03cfe164e76ca411cfafffca6')
 
 prepare() {
   cd "$srcdir/$pkgname-$pkgver"
@@ -41,3 +38,7 @@ package() {
   install -Dm0644 "$srcdir/sshguard.service" "$pkgdir/usr/lib/systemd/system/sshguard.service"
   install -Dm0755 "$srcdir/sshguard-journalctl" "$pkgdir/usr/lib/systemd/scripts/sshguard-journalctl"
 }
+
+sha256sums=('b537f8765455fdf8424f87d4bd695e5b675b88e5d164865452137947093e7e19'
+            '24be7918dcba37805dea2fd1d9e4c1c139e3ea840773aea49574d4c6a7056507'
+            'a8f315d163128d4e8458c1d50c90082581092476937921cba2afb167f51cbe3f')
diff --git a/community/sshguard/sshguard-journalctl b/community/sshguard/sshguard-journalctl
index e9bb14c5f..8a800ff26 100644
--- a/community/sshguard/sshguard-journalctl
+++ b/community/sshguard/sshguard-journalctl
@@ -1,4 +1,4 @@
 #!/bin/sh
-DBFILE=$1
+SSHGUARD_OPTS=$1
 shift
-/usr/bin/journalctl -afb -p info -n1 "$@" | /usr/bin/sshguard -l- -b $DBFILE
+LANG=C /usr/bin/journalctl -afb -p info -n1 -o cat "$@" | /usr/bin/sshguard -l- $SSHGUARD_OPTS
diff --git a/community/sshguard/sshguard.service b/community/sshguard/sshguard.service
index 11115727b..1c019fde2 100644
--- a/community/sshguard/sshguard.service
+++ b/community/sshguard/sshguard.service
@@ -4,7 +4,7 @@ After=iptables.service ip6tables.service network.target
 Wants=iptables.service ip6tables.service
 
 [Service]
-ExecStart=/usr/lib/systemd/scripts/sshguard-journalctl /var/db/sshguard/blacklist.db SYSLOG_FACILITY=4 SYSLOG_FACILITY=10
+ExecStart=/usr/lib/systemd/scripts/sshguard-journalctl "-b /var/db/sshguard/blacklist.db" SYSLOG_FACILITY=4 SYSLOG_FACILITY=10
 
 [Install]
 WantedBy=multi-user.target
diff --git a/community/stardict/PKGBUILD b/community/stardict/PKGBUILD
index 5b58f5a77..845dca043 100644
--- a/community/stardict/PKGBUILD
+++ b/community/stardict/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 87021 2013-03-25 19:17:03Z bpiotrowski $
+# $Id: PKGBUILD 99992 2013-10-31 02:53:04Z allan $
 # Maintainer: Felix Yan <felixonmars@gmail.com>
 # Contributor: Gaetan Bisson <bisson@archlinux.org>
 # Contributor: Aaron Griffin <aaron@archlinux.org>
@@ -13,7 +13,7 @@ arch=('i686' 'x86_64' 'mips64el')
 url='http://www.stardict.org/'
 license=('GPL')
 makedepends=('intltool' 'popt' 'gnome-doc-utils' 'gnome-common' 'libmariadbclient' 'enchant' 'gtk2' 'libsigc++' 'libsm' 'espeak' 'libgnome')
-options=('!libtool' '!emptydirs')
+options=('!emptydirs')
 source=("http://stardict-3.googlecode.com/files/${pkgbase}-${pkgver}.tar.bz2"
         'gcc46.patch'
         'glib2.patch'
diff --git a/community/stfl/PKGBUILD b/community/stfl/PKGBUILD
index 5deb338e0..ffcf1257e 100644
--- a/community/stfl/PKGBUILD
+++ b/community/stfl/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 66465 2012-02-25 04:40:20Z jlichtblau $
+# $Id: PKGBUILD 99993 2013-10-31 02:53:24Z allan $
 # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
 # Contributor: Sven Pfleiderer <pfleidi@roothausen.de>
 
@@ -11,7 +11,6 @@ url="http://clifford.at/stfl/"
 license=('GPL3')
 depends=('ncurses')
 makedepends=('patch' 'swig')
-options=('!libtool')
 changelog=$pkgname.changelog
 source=(http://clifford.at/stfl/$pkgname-$pkgver.tar.gz \
         $pkgname-archlinux.patch)
diff --git a/community/stunnel/PKGBUILD b/community/stunnel/PKGBUILD
index 4b7bdf2ca..3b994e1a6 100644
--- a/community/stunnel/PKGBUILD
+++ b/community/stunnel/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 92897 2013-06-18 09:22:57Z lfleischer $
+# $Id: PKGBUILD 99994 2013-10-31 02:53:44Z allan $
 # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de>
 # Contributor: Kaiting Chen <kaitocracy@gmail.com>
 # Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
@@ -13,7 +13,6 @@ url="http://www.stunnel.org"
 license=('GPL')
 depends=('openssl')
 install=$pkgname.install
-options=('!libtool')
 source=("ftp://ftp.stunnel.org/stunnel/$pkgname-$pkgver.tar.gz"{,.asc}
         'Makefile.patch'
         'stunnel.tmpfiles.conf')
diff --git a/community/subtitleeditor/PKGBUILD b/community/subtitleeditor/PKGBUILD
index 78db7eab4..2a2e1154d 100644
--- a/community/subtitleeditor/PKGBUILD
+++ b/community/subtitleeditor/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 95280 2013-08-08 19:16:53Z jlichtblau $
+# $Id: PKGBUILD 99995 2013-10-31 02:54:04Z allan $
 # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
 
 pkgname=subtitleeditor
@@ -13,7 +13,6 @@ depends=('desktop-file-utils' 'enchant' 'gstreamer0.10-base-plugins' 'gstreamer0
 makedepends=('intltool')
 optdepends=('gstreamer0.10-ffmpeg: to be able to view movies inside the subtitleeditor'
             'gstreamer0.10-ugly-plugins: to be able to view movies inside the subtitleeditor')
-options=('!libtool')
 install=$pkgname.install
 changelog=$pkgname.changelog
 source=(http://download.gna.org/$pkgname/0.41/$pkgname-$pkgver.tar.gz)
diff --git a/community/supertuxkart/PKGBUILD b/community/supertuxkart/PKGBUILD
index a31909eef..ce9b35417 100644
--- a/community/supertuxkart/PKGBUILD
+++ b/community/supertuxkart/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 81785 2012-12-29 16:57:50Z arodseth $
+# $Id: PKGBUILD 98716 2013-10-17 11:38:17Z svenstaro $
 # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
 # Contributor: Daenyth <Daenyth+Arch [AT] gmail [DOT] com>
 # Contributor: Allan McRae <allan@archlinux.org>
@@ -6,7 +6,7 @@
 
 pkgname=supertuxkart
 pkgver=0.8
-pkgrel=3
+pkgrel=4
 pkgdesc='Kart racing game featuring Tux and his friends'
 arch=('i686' 'x86_64')
 url='http://supertuxkart.sourceforge.net/'
@@ -14,16 +14,16 @@ license=('GPL2')
 depends=('openal' 'libvorbis' 'libgl' 'fribidi' 'curl')
 makedepends=('cmake' 'subversion' 'mesa' 'imagemagick' 'setconf')
 source=("http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver-src.tar.bz2")
+install=supertuxkart.install
 md5sums=('0b939ce601374758938119e0b0dd1fec')
 
 build() {
   cd ${srcdir}/SuperTuxKart-${pkgver}
 
-  convert "data/${pkgname}_64.xpm" "data/$pkgname.png"
   _fn="data/${pkgname}_desktop.template"
   setconf "$_fn" Exec "$pkgname --log=file"
   setconf "$_fn" TryExec "$pkgname"
-  setconf "$_fn" Icon "$pkgname"
+  setconf "$_fn" Icon "$pkgname"_64
 
   cd lib/irrlicht/source/Irrlicht
   NDEBUG=1 make
@@ -48,9 +48,6 @@ package() {
 
   cd build
   make DESTDIR=${pkgdir} install
-
-  cd ../data
-  install -Dm644 "$pkgname.png" "$pkgdir/usr/share/pixmaps/$pkgname.png"
 }
 
 # vim:set ts=2 sw=2 et:
diff --git a/community/google-gadgets/google-gadgets.install b/community/supertuxkart/supertuxkart.install
index fd88688fc..41f09f887 100644
--- a/community/google-gadgets/google-gadgets.install
+++ b/community/supertuxkart/supertuxkart.install
@@ -1,15 +1,12 @@
 post_install() {
-  echo "==> Updating desktop database..."
-  update-mime-database usr/share/mime &> /dev/null
   update-desktop-database -q
+  update-mime-database usr/share/mime &> /dev/null
 }
 
 post_upgrade() {
-  post_install
+  post_install $1
 }
 
 post_remove() {
-  post_install
+  post_install $1
 }
-
-# vim:set ts=2 sw=2 et:
diff --git a/community/sylpheed/PKGBUILD b/community/sylpheed/PKGBUILD
index c834ce3df..3bd364a1a 100644
--- a/community/sylpheed/PKGBUILD
+++ b/community/sylpheed/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 79631 2012-11-09 11:59:26Z speps $
+# $Id: PKGBUILD 99996 2013-10-31 02:54:24Z allan $
 # Maintainer: speps <speps at aur dot archlinux dot org>
 # Contributor: Alexander Fehr <pizzapunk gmail com>
 # Contributor: dorphell <dorphell@archlinux.org>
@@ -12,7 +12,6 @@ url="http://sylpheed.sraoss.jp/en/"
 license=('GPL')
 depends=('gpgme' 'gtkspell' 'desktop-file-utils')
 makedepends=('compface' 'openssl')
-options=('!libtool')
 install="$pkgname.install"
 source=("http://sylpheed.sraoss.jp/$pkgname/v3.3/$pkgname-$pkgver.tar.bz2")
 md5sums=('20442f81dbb4e7c59462360ad0bb1afb')
diff --git a/community/synce-core/PKGBUILD b/community/synce-core/PKGBUILD
index 77b484699..4ed45b1af 100644
--- a/community/synce-core/PKGBUILD
+++ b/community/synce-core/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 95579 2013-08-14 14:20:51Z spupykin $
+# $Id: PKGBUILD 100285 2013-11-02 08:49:32Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: Jan Was <janek.jan@gmail.com>
 
 pkgname=synce-core
 pkgver=0.17
-pkgrel=1
+pkgrel=2
 pkgdesc="provide a means of communication with a Windows CE device - libraries"
 arch=('i686' 'x86_64')
 url="http://synce.sourceforge.net/"
@@ -14,7 +14,6 @@ makedepends=('dhclient')
 provides=('synce-libsynce' 'synce-librapi')
 replaces=('synce-libsynce' 'synce-librapi')
 conflicts=('synce-libsynce' 'synce-librapi')
-options=('!libtool')
 source=(http://downloads.sourceforge.net/sourceforge/synce/SynCE/synce-core/synce-core-$pkgver.tar.gz)
 md5sums=('ee0b9369b6fea5e2d1b970503dd7cb0e')
 
diff --git a/community/synce-libmimedir/PKGBUILD b/community/synce-libmimedir/PKGBUILD
index c06851fe3..d6efb8930 100644
--- a/community/synce-libmimedir/PKGBUILD
+++ b/community/synce-libmimedir/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 65473 2012-02-21 05:58:56Z spupykin $
+# $Id: PKGBUILD 100287 2013-11-02 08:49:51Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Zhukov Pavel <gelios@gmail.com>
 
 pkgname=synce-libmimedir
 pkgver=0.4
-pkgrel=4
+pkgrel=5
 pkgdesc="provide a means of communication with a Windows CE device - library that parses MIME Directory Profile."
 arch=('i686' 'x86_64' 'mips64el')
 url="http://synce.sourceforge.net/"
@@ -20,6 +20,10 @@ build() {
     else  ./configure --prefix=/usr --disable-shared
   fi
   make
+}
+
+package() {
+  cd $srcdir/libmimedir-$pkgver
   mkdir -p $pkgdir/usr/{include,lib}
   make prefix=$pkgdir/usr install
 }
diff --git a/community/synce-rra/PKGBUILD b/community/synce-rra/PKGBUILD
index f67c56912..da128a03b 100644
--- a/community/synce-rra/PKGBUILD
+++ b/community/synce-rra/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 96045 2013-08-19 12:13:09Z spupykin $
+# $Id: PKGBUILD 100120 2013-11-01 17:17:46Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Zhukov Pavel <gelios@gmail.com>
 
 pkgname=synce-rra
 pkgver=0.17
-pkgrel=1
+pkgrel=2
 pkgdesc="provide a means of communication with a Windows CE device - rra libraries for synce"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://synce.sourceforge.net/"
diff --git a/community/synergy/PKGBUILD b/community/synergy/PKGBUILD
index 55df83ac8..9a82255e8 100644
--- a/community/synergy/PKGBUILD
+++ b/community/synergy/PKGBUILD
@@ -5,7 +5,7 @@
 # Contributor: Michael Düll <mail@akurei.me>
 
 pkgname=synergy
-pkgver=1.4.12
+pkgver=1.4.15
 pkgrel=1
 pkgdesc="Share a single mouse and keyboard between multiple computers"
 url="http://synergy-foss.org"
@@ -16,9 +16,10 @@ optdepends=('qt4: gui support')
 license=('GPL2')
 source=("http://synergy.googlecode.com/files/$pkgname-$pkgver-Source.tar.gz"
         "synergys.socket"
-        "synergys.service"
-        "synergy.png"
-        "synergy.desktop")
+        "synergys.service")
+sha512sums=('857e8cbfb0b32c7dc325de5765f182f4e4fb198443b4a3e26d38c2d3dec3819e57057b91a202b53c86d4fad18154d1d58b401812dd8fabc384255e44d4b4b01a'
+            'f7d918faf4a25654786f270fc48b6e4089ecd1b2f504bb90de543b47a862733f7be067e06fd613d621bba48d20dc63214966e2cfbd2cb3fcbfe623d6d41f10ad'
+            'a10dfe5b24ac6f4a2ef3a3a9f8a6a3c432b91d5e59d1fae2258d37c5be00ac8f172656fa0d213012c7dc94ab8c04c3945ae33acfcd5db5fad8b37ccc9f5e980f')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}-Source"
@@ -51,12 +52,7 @@ package() {
   install -Dm644 "$srcdir/synergys.socket" "$pkgdir/usr/lib/systemd/system/"
 
   # install desktop/icon stuff
-  install -Dm644 "$srcdir/synergy.png" "$pkgdir/usr/share/pixmaps/synergy.png"
-  install -Dm644 "$srcdir/synergy.desktop" "$pkgdir/usr/share/applications/synergy.desktop"
+  cd ../res
+  install -Dm644 "synergy.ico" "$pkgdir/usr/share/pixmaps/synergy.ico"
+  install -Dm644 "synergy.desktop" "$pkgdir/usr/share/applications/synergy.desktop"
 }
-
-sha512sums=('5305e03d871e5408640ece55364067418f9b8b160dda31f994ebafe807b31291bdaa688a901f2e81710acb0857952c37f0c1823a50c927573feaec0c8659be9d'
-            'f7d918faf4a25654786f270fc48b6e4089ecd1b2f504bb90de543b47a862733f7be067e06fd613d621bba48d20dc63214966e2cfbd2cb3fcbfe623d6d41f10ad'
-            'a10dfe5b24ac6f4a2ef3a3a9f8a6a3c432b91d5e59d1fae2258d37c5be00ac8f172656fa0d213012c7dc94ab8c04c3945ae33acfcd5db5fad8b37ccc9f5e980f'
-            'cb3db9593c943bce11ce5ae962e120feb70e6afa9206887a6971c77491711afcebc78653e7413e87e33d031c43a507f4a9a6e8747d10b60c6642106ae1690f18'
-            'c1c76ecfbed5c22f1a2a7562dce20971a784ff6b0edbf5c9b5f7c796f9ead882b82f970bb24f35533b928c341f87f66b0b10d9d96e122d14d74102cac8997445')
diff --git a/community/synergy/synergy.desktop b/community/synergy/synergy.desktop
deleted file mode 100644
index e7bf87b9e..000000000
--- a/community/synergy/synergy.desktop
+++ /dev/null
@@ -1,9 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Name=Synergy
-Comment=The Synergy GUI is based on QSynergy by Volker Lanz.
-Exec=synergy
-Icon=synergy
-Terminal=false
-Type=Application
-Categories=Utility;DesktopUtility;Qt
diff --git a/community/synergy/synergy.png b/community/synergy/synergy.png
deleted file mode 100644
index 5534f0fdf..000000000
--- a/community/synergy/synergy.png
+++ /dev/null
diff --git a/community/synfig/PKGBUILD b/community/synfig/PKGBUILD
index 587b920d5..39b3127cf 100644
--- a/community/synfig/PKGBUILD
+++ b/community/synfig/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 96407 2013-08-28 00:08:39Z eric $
+# $Id: PKGBUILD 99998 2013-10-31 02:55:04Z allan $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Franco Iacomella <yaco@gnu.org>
 
@@ -15,7 +15,6 @@ makedepends=('boost')
 optdepends=('openexr' 'libsigc++')
 conflicts=('synfig-core')
 replaces=('synfig-core')
-options=(!libtool)
 source=(http://downloads.sourceforge.net/project/synfig/synfig/$pkgver/synfig-$pkgver.tar.gz
 	build-fix.patch
 	ffmpeg-0.8.patch
diff --git a/community/synfigstudio/PKGBUILD b/community/synfigstudio/PKGBUILD
index 11cffef70..490903f01 100644
--- a/community/synfigstudio/PKGBUILD
+++ b/community/synfigstudio/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 90608 2013-05-13 10:38:34Z spupykin $
+# $Id: PKGBUILD 99999 2013-10-31 02:55:24Z allan $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Franco Iacomella <yaco@gnu.org>
 
@@ -13,7 +13,6 @@ depends=('gtkmm' 'synfig')
 makedepends=('openexr' 'imagemagick' 'xorg-fonts-100dpi' 'xorg-fonts-75dpi'
 	     'xorg-fonts-misc' 'xorg-fonts-type1' 'intltool')
 install=synfigstudio.install
-options=('!libtool')
 source=(http://downloads.sourceforge.net/project/synfig/synfigstudio/$pkgver/synfigstudio-$pkgver.tar.gz)
 md5sums=('bbda14359a07254b8efe5e706de192df')
 
diff --git a/community/sysstat/PKGBUILD b/community/sysstat/PKGBUILD
index cc704560c..e45ac8dda 100644
--- a/community/sysstat/PKGBUILD
+++ b/community/sysstat/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 97533 2013-09-23 16:17:24Z spupykin $
+# $Id: PKGBUILD 100454 2013-11-04 12:13:37Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Martin Devera <devik@cdi.cz>
 
 pkgname=sysstat
-pkgver=10.1.7
+pkgver=10.2.0
 pkgrel=1
 pkgdesc="a collection of performance monitoring tools (iostat,isag,mpstat,pidstat,sadf,sar)"
 arch=('i686' 'x86_64' 'mips64el')
@@ -18,7 +18,7 @@ backup=('etc/conf.d/sysstat'
 source=(http://pagesperso-orange.fr/sebastien.godard/$pkgname-$pkgver.tar.gz
 	sysstat.service
 	lib64-fix.patch)
-md5sums=('112c8cc92114c961709d09f6afa537bd'
+md5sums=('7a6e3df08590385113a27a76ce64a6ff'
          '12ba479c606620193e8b7c6e982d5088'
          '7ffa6bf990609d85367070f71b40a34b')
 
diff --git a/community/talkfilters/PKGBUILD b/community/talkfilters/PKGBUILD
index 3ff55d919..a5a1a7463 100644
--- a/community/talkfilters/PKGBUILD
+++ b/community/talkfilters/PKGBUILD
@@ -6,7 +6,6 @@ pkgrel=2
 pkgdesc="Filters to translate text into dialects that GNU finds funny"
 arch=(i686 x86_64 mips64el)
 url="http://www.hyperrealm.com/main.php?s=talkfilters"
-options=('!libtool')
 depends=('glibc')
 license=('custom:Public Domain')
 install=$pkgname.install
diff --git a/community/tcc/PKGBUILD b/community/tcc/PKGBUILD
index ebb5f21b3..352c80b5b 100644
--- a/community/tcc/PKGBUILD
+++ b/community/tcc/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 86525 2013-03-18 16:24:05Z spupykin $
+# $Id: PKGBUILD 99550 2013-10-29 14:08:21Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer : Gergely Imreh <imrehgATgmailDOTcom>
 # Contributor : dschauer <dschauerATgmailDOTcom>
@@ -7,13 +7,13 @@
 
 pkgname=tcc
 pkgver=0.9.26
-pkgrel=1
+pkgrel=2
 pkgdesc="Tiny C Compiler"
 arch=('i686' 'x86_64')
 url="http://bellard.org/tcc/"
 license=('LGPL')
 makedepends=('gcc')
-options=('docs')
+options=('docs' 'staticlibs')
 source=(http://download.savannah.nongnu.org/releases/tinycc/${pkgname}-${pkgver}.tar.bz2)
 md5sums=('5fb28e4abc830c46a7f54c1f637fb25d')
 
@@ -44,7 +44,7 @@ package() {
     install
 
   make clean
-  make CFLAGS="-fPIC" libtcc.o
-  ld -shared -soname libtcc.so -o libtcc.so libtcc.o
+  make CFLAGS="-fPIC"
+  ld -shared -soname libtcc.so -o libtcc.so *.o
   install -D -m 755 libtcc.so "${pkgdir}/usr/lib/libtcc.so"
 }
diff --git a/community/tea/PKGBUILD b/community/tea/PKGBUILD
index dc4597f9f..bfb90b1a4 100644
--- a/community/tea/PKGBUILD
+++ b/community/tea/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 97073 2013-09-12 10:15:01Z spupykin $
+# $Id: PKGBUILD 98727 2013-10-17 12:44:12Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Roman Kyrylych <roman@archlinux.org>
@@ -6,7 +6,7 @@
 # Contributor: Zsolt Varadi <sysop_xxl@fibermail.hu>
 
 pkgname=tea
-pkgver=36.0.3
+pkgver=37.0.0
 pkgrel=1
 pkgdesc="A Qt-based text editor for Linux and *BSD. With an ultimate small size TEA provides you hundreds of functions."
 arch=('i686' 'x86_64' 'mips64el')
@@ -16,7 +16,7 @@ depends=('qt4' 'aspell' 'hunspell')
 install=tea.install
 source=(http://semiletov.org/tea/dloads/tea-$pkgver.tar.bz2
         tea.desktop)
-md5sums=('2e33f9a150f17eea62d9a805033fe16b'
+md5sums=('2f1113cf5771ba504ae1964aedb0acf2'
          '377ace3363124f4c086de0babb820761')
 
 build() {
diff --git a/community/tellico/PKGBUILD b/community/tellico/PKGBUILD
index 65b0e76db..f0ef4d5cc 100644
--- a/community/tellico/PKGBUILD
+++ b/community/tellico/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 94089 2013-07-14 11:11:38Z jlichtblau $
+# $Id: PKGBUILD 98964 2013-10-21 20:10:32Z jlichtblau $
 # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
 # Contributor: Ray Rashif <schiv@archlinux.org
 # Contributor: Andrea Scarpino <andrea@archlinux.org>
@@ -6,7 +6,7 @@
 
 pkgname=tellico
 pkgver=2.3.8
-pkgrel=1
+pkgrel=2
 pkgdesc="A collection manager for KDE"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://tellico-project.org/"
diff --git a/community/tesseract/PKGBUILD b/community/tesseract/PKGBUILD
index c433678b1..58352ffc6 100644
--- a/community/tesseract/PKGBUILD
+++ b/community/tesseract/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 82232 2013-01-12 17:31:36Z spupykin $
+# $Id: PKGBUILD 100338 2013-11-02 11:39:11Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Andreas Hauser <andy-aur@splashground.de>
 
@@ -12,7 +12,7 @@ pkgbase=tesseract
 pkgname=(tesseract $(for l in ${_langs[@]}; do echo tesseract-data-${l}; done))
 pkgver=3.02.02
 _pkgver=3.02
-pkgrel=2
+pkgrel=3
 pkgdesc="An OCR programm"
 arch=(x86_64 i686 'mips64el')
 url="http://code.google.com/p/tesseract-ocr"
@@ -49,7 +49,7 @@ md5sums=('3d57ee5777fa998632ad0693c13a0e9e'
          'dd734ac212a98a02945760891b657e70'
          'e0ca24ca45de83e67057f0e208233ffc'
          'ef7b8e13891e08f29b02011a5dd6b630'
-         'f14aac95ab2f4a5f919da82dbc1fcd3c'
+         'ac493e5a49e456f2dd354f5b6449573e'
          '7ae7f3384083c66f06d63b6c0f0a66c3'
          '186f17b326a58313344c2ea987ea7785'
          '0396a267d894f485b6b534476f3322dc'
diff --git a/community/texmaker/PKGBUILD b/community/texmaker/PKGBUILD
index 1b18beed2..7e5ff0973 100644
--- a/community/texmaker/PKGBUILD
+++ b/community/texmaker/PKGBUILD
@@ -1,24 +1,24 @@
-# $Id: PKGBUILD 94994 2013-08-02 22:19:28Z cinelli $
-#Maintainer: Federico Cinelli <cinelli@aur.archlinux.org>
+# $Id: PKGBUILD 100064 2013-11-01 05:49:38Z cinelli $
+# Maintainer: Federico Cinelli <cinelli@aur.archlinux.org>
 
 pkgname=texmaker
-pkgver=4.0.3
+pkgver=4.1
 pkgrel=1
 pkgdesc='Free cross-platform LaTeX editor'
 arch=('i686' 'x86_64')
 url="http://www.xm1math.net/texmaker/index.html"
 license=('GPL')
-depends=('poppler-qt' 'qtwebkit')
+depends=('poppler-qt5' 'qt5-webkit' 'desktop-file-utils')
 optdepends=('ghostscript: LaTeX to HTML conversion command'
-	    'ibus-qt: accented characters support'bu  
+	    'ibus-qt5: accented characters support'
 	    'poppler: PDF rendering support')
 install="$pkgname.install"
 source=("http://www.xm1math.net/$pkgname/$pkgname-$pkgver.tar.bz2")
-md5sums=('fe33120eef6d6ae6dcbf949d5d5c7a4f')
+md5sums=('97ef7f97e73d69283391e467e5758275')
 
 build() {
   cd "$pkgname-$pkgver"
-  qmake-qt4 PREFIX=/usr texmaker.pro
+  qmake-qt5 PREFIX=/usr texmaker.pro
   make
 }
 package() {
diff --git a/community/the_silver_searcher/PKGBUILD b/community/the_silver_searcher/PKGBUILD
index 0d1663b0f..b693e1d55 100644
--- a/community/the_silver_searcher/PKGBUILD
+++ b/community/the_silver_searcher/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 96848 2013-09-06 14:29:02Z arodseth $
+# $Id: PKGBUILD 99585 2013-10-30 09:27:44Z arodseth $
 # Maintainer: Alexander Rødseth <rodseth@gmail.com>
 # Contributor: Jeff Horelick <jdhore1@gmail.com>
 # Contributor: skydrome <skydrome@i2pmail.org>
 
 pkgname=the_silver_searcher
-pkgver=0.16
+pkgver=0.18
 pkgrel=1
 pkgdesc='Code searching tool similar to Ack, but faster'
 url='https://github.com/ggreer/the_silver_searcher'
@@ -12,7 +12,7 @@ license=('Apache')
 depends=('pcre' 'zlib' 'xz')
 arch=('x86_64' 'i686' 'mips64el')
 source=("$pkgname-$pkgver.tar.gz::https://github.com/ggreer/$pkgname/archive/$pkgver.tar.gz")
-sha256sums=('2be261b18a74adf4354515544a7e7bfdb970005ce1f0fc78f56a6801e629ada7')
+sha256sums=('9d3cdb7ab42308351f951adf1d149241b25f27d676322d96cdb215e4a0d90ea2')
 
 prepare() {
   cd "$pkgname-$pkgver"
diff --git a/community/tigervnc/PKGBUILD b/community/tigervnc/PKGBUILD
index ef059484d..843288f8c 100644
--- a/community/tigervnc/PKGBUILD
+++ b/community/tigervnc/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 97561 2013-09-24 10:31:09Z spupykin $
+# $Id: PKGBUILD 100001 2013-10-31 02:56:06Z allan $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: Uroš Vampl <mobile.leecher at gmail dot com>
 
@@ -17,7 +17,6 @@ makedepends=('cmake' 'nasm' 'xorg-font-util' 'xorg-util-macros' 'bigreqsproto'
 	     'compositeproto' 'damageproto' 'randrproto' 'resourceproto'
 	     'scrnsaverproto' 'videoproto' 'xcmiscproto' 'xf86vidmodeproto'
 	     'xtrans' 'mesa' 'glproto' 'dri2proto' 'imagemagick')
-options=(!libtool)
 conflicts=('tightvnc')
 source=(http://downloads.sourceforge.net/project/tigervnc/tigervnc/$pkgver/tigervnc-$pkgver.tar.bz2
 	ftp://ftp.freedesktop.org/pub/xorg/individual/xserver/xorg-server-${_xorgver}.tar.bz2
diff --git a/community/tinc/PKGBUILD b/community/tinc/PKGBUILD
index 2b64cfeac..10c7312f6 100644
--- a/community/tinc/PKGBUILD
+++ b/community/tinc/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 96041 2013-08-19 11:44:18Z tredaelli $
+# $Id: PKGBUILD 99008 2013-10-22 08:58:32Z tredaelli $
 # Maintainer: Timothy Redaelli <timothy.redaelli@gmail.com>
 # Contributor: helios
 # Contributor: Lothar Gesslein
 # Contributor: Dominik George <nik@naturalnet.de>
 
 pkgname=tinc
-pkgver=1.0.22
+pkgver=1.0.23
 pkgrel=1
 pkgdesc="VPN (Virtual Private Network) daemon"
 arch=('i686' 'x86_64' 'mips64el')
@@ -15,7 +15,7 @@ depends=('lzo2' 'openssl')
 install=tinc.install
 source=(http://www.tinc-vpn.org/packages/tinc-$pkgver.tar.gz{,.sig}
         tincd@.service)
-md5sums=('cc1346150715bd56070695af85ab39f4'
+md5sums=('762c0d47bdf1b33a40b19165d9c2761f'
          'SKIP'
          '112327da32fdb56ab779fe004712235f')
 
diff --git a/community/torch/PKGBUILD b/community/torch/PKGBUILD
index cc4fffb13..88f9c11f8 100644
--- a/community/torch/PKGBUILD
+++ b/community/torch/PKGBUILD
@@ -1,26 +1,30 @@
-# $Id: PKGBUILD 65413 2012-02-21 03:29:54Z spupykin $
+# $Id: PKGBUILD 100522 2013-11-05 11:47:05Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 
 pkgname=torch
 pkgver=3.1
-pkgrel=3
+pkgrel=4
 pkgdesc="State of the art machine learning library"
 arch=(i686 x86_64 'mips64el')
 url="http://packages.debian.org/source/lenny/torch3"
 license=('GPL')
 depends=(gcc-libs)
 source=(http://ftp.de.debian.org/debian/pool/main/t/torch3/torch3_$pkgver.orig.tar.gz
-	http://ftp.de.debian.org/debian/pool/main/t/torch3/torch3_$pkgver-2.diff.gz)
+	http://ftp.de.debian.org/debian/pool/main/t/torch3/torch3_$pkgver-2.1.diff.gz)
 md5sums=('04f7dc72a1e875a12ddf8ac77ec2dcc7'
-         'b928c4206abb3209435dca27ad3e3c22')
+         '4f6c8e743e7a0aa9688f1e20b14797e4')
 
 build() {
   cd "$srcdir/torch3-$pkgver.orig"
 
-  [ $NOEXTRACT -eq 1 ] || cat $srcdir/torch3_$pkgver-2.diff | patch -p1
+  [ $NOEXTRACT -eq 1 ] || cat $srcdir/torch3_$pkgver-2.1.diff | patch -p1
   [ $NOEXTRACT -eq 1 ] || make depend
 
   make
+}
+
+package() {
+  cd "$srcdir/torch3-$pkgver.orig"
 
   mkdir -p $pkgdir/usr/{include/torch,lib}
 
diff --git a/community/torsocks/PKGBUILD b/community/torsocks/PKGBUILD
index 0497dd696..2d27d3504 100644
--- a/community/torsocks/PKGBUILD
+++ b/community/torsocks/PKGBUILD
@@ -4,14 +4,13 @@
 
 pkgname=torsocks
 pkgver=1.3
-pkgrel=4
+pkgrel=5
 pkgdesc='Wrapper to safely torify applications'
 arch=('i686' 'x86_64' 'mips64el')
 url='http://code.google.com/p/torsocks'
 license=('GPL2')
 depends=('tor')
 makedepends=('git')
-options=(!libtool)
 backup=("etc/${pkgname}.conf")
 source=("git://git.torproject.org/torsocks.git#tag=1.3")
 md5sums=(SKIP)
diff --git a/community/tre/PKGBUILD b/community/tre/PKGBUILD
index c12f89522..c8f669b9d 100644
--- a/community/tre/PKGBUILD
+++ b/community/tre/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 56023 2011-09-29 06:45:36Z andrea $
+# $Id: PKGBUILD 100003 2013-10-31 02:56:45Z allan $
 # Maintainer: Stefan Husmann <stefan-husmann@t-online.de
 # Contributor: Igor Galic<i.galic@gmail.com>
 
@@ -12,7 +12,6 @@ depends=('glibc')
 license=('custom:BSD')
 source=("http://laurikari.net/tre/$pkgname-$pkgver.tar.bz2")
 md5sums=('b4d3232593dadf6746f4727bdda20b41')
-options=('!libtool')
 
 build() {
   cd ${srcdir}/$pkgname-$pkgver
diff --git a/community/tvision/PKGBUILD b/community/tvision/PKGBUILD
index 0b89dcc1d..f56d78bef 100644
--- a/community/tvision/PKGBUILD
+++ b/community/tvision/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 57007 2011-10-18 03:49:00Z ebelanger $
+# $Id: PKGBUILD 100289 2013-11-02 08:50:10Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com>
 
 pkgname=tvision
 pkgver=2.2.1_r1
-pkgrel=2
+pkgrel=3
 pkgdesc="turbo vision library port (console interface)"
 arch=(i686 x86_64 'mips64el')
 url="http://tvision.sourceforge.net"
@@ -21,5 +21,9 @@ build() {
   patch -p1 <$srcdir/tvision-build-fix.patch
   ./configure --prefix=/usr --include=/usr/include
   make
+}
+
+package() {
+  cd $srcdir/$pkgname
   make prefix=$pkgdir/usr install
 }
diff --git a/community/twin/PKGBUILD b/community/twin/PKGBUILD
index fdcea7796..81201adbf 100644
--- a/community/twin/PKGBUILD
+++ b/community/twin/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 91844 2013-05-28 17:06:13Z spupykin $
+# $Id: PKGBUILD 100291 2013-11-02 08:50:30Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: G_Syme <demichan(at)mail(dot)upb(dot)de>
 
 pkgname=twin
 pkgver=0.6.2
-pkgrel=4
+pkgrel=5
 pkgdesc="A text-mode window environment"
 arch=('i686' 'x86_64' 'mips64el')
 url='http://sourceforge.net/projects/twin/'
diff --git a/community/twolame/PKGBUILD b/community/twolame/PKGBUILD
index 33ceeedd7..c01af7c09 100644
--- a/community/twolame/PKGBUILD
+++ b/community/twolame/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 65632 2012-02-21 15:35:13Z giovanni $
+# $Id: PKGBUILD 100004 2013-10-31 02:57:06Z allan $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: farid abdelnour <farid at atelier-labs.org>
 # Contributor: Gustavo Alvarez <sl1pkn07 at gmail.org>
@@ -11,7 +11,6 @@ arch=('i686' 'x86_64' 'mips64el')
 url="http://www.twolame.org/"
 license=('LGPL')
 depends=('libsndfile')
-options=('!libtool')
 source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz")
 md5sums=('4113d8aa80194459b45b83d4dbde8ddb')
 
diff --git a/community/ubuntuone-client-gnome/PKGBUILD b/community/ubuntuone-client-gnome/PKGBUILD
index d0e01b090..3f0af0c98 100644
--- a/community/ubuntuone-client-gnome/PKGBUILD
+++ b/community/ubuntuone-client-gnome/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 88682 2013-04-21 22:16:52Z heftig $
+# $Id: PKGBUILD 100006 2013-10-31 02:57:45Z allan $
 # Maintainer: Balló György <ballogyor+arch at gmail dot com>
 
 pkgname=ubuntuone-client-gnome
@@ -10,7 +10,6 @@ url="https://launchpad.net/ubuntuone-client-gnome"
 license=('GPL')
 depends=('nautilus' 'gconf' 'ubuntuone-client')
 makedepends=('intltool' 'gnome-settings-daemon')
-options=('!libtool')
 install=$pkgname.install
 source=(https://launchpad.net/ubuntuone-client-gnome/stable-4-2/$pkgver/+download/$pkgname-$pkgver.tar.gz
         disable-gsd-plugin.patch)
diff --git a/community/ubuntuone-client/PKGBUILD b/community/ubuntuone-client/PKGBUILD
index f7631850a..87090bad6 100644
--- a/community/ubuntuone-client/PKGBUILD
+++ b/community/ubuntuone-client/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 96135 2013-08-20 06:33:12Z lcarlier $
+# $Id: PKGBUILD 100005 2013-10-31 02:57:26Z allan $
 # Maintainer: Balló György <ballogyor+arch at gmail dot com>
 
 pkgname=ubuntuone-client
@@ -10,7 +10,6 @@ url="https://launchpad.net/ubuntuone-client"
 license=('GPL' 'CCPL:cc-by-sa')
 depends=('dbus-glib' 'python2-configglue' 'python2-setuptools' 'python2-gobject' 'libnotify' 'python2-pyinotify' 'ubuntu-sso-client' 'python2-ubuntuone-storageprotocol' 'hicolor-icon-theme' 'xdg-utils')
 makedepends=('intltool' 'imake' 'python2-distutils-extra')
-options=('!libtool')
 install=$pkgname.install
 source=(https://launchpad.net/ubuntuone-client/stable-4-2/$pkgver/+download/$pkgname-$pkgver.tar.gz
         https://launchpad.net/ubuntuone-client-data/stable-4-2/$pkgver/+download/$pkgname-data-$pkgver.tar.gz
diff --git a/community/ucl/PKGBUILD b/community/ucl/PKGBUILD
index 8ea619f4a..107f1fad5 100644
--- a/community/ucl/PKGBUILD
+++ b/community/ucl/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 66541 2012-02-26 00:11:59Z lfleischer $
+# $Id: PKGBUILD 100007 2013-10-31 02:58:06Z allan $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Geoffroy Carrier <geoffroy.carrier@koon.fr>
 # Previous Contributor: arjan <arjan@archlinux.org>
@@ -11,7 +11,6 @@ pkgdesc="Portable lossless data compression library written in ANSI C"
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 url="http://www.oberhumer.com/opensource/ucl/"
-options=(!libtool)
 source=("http://www.oberhumer.com/opensource/$pkgname/download/$pkgname-$pkgver.tar.gz")
 md5sums=('852bd691d8abc75b52053465846fba34')
 
diff --git a/community/ulogd/PKGBUILD b/community/ulogd/PKGBUILD
index 8d3798210..11c831fe0 100644
--- a/community/ulogd/PKGBUILD
+++ b/community/ulogd/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 98179 2013-10-07 10:07:11Z spupykin $
+# $Id: PKGBUILD 100008 2013-10-31 02:58:26Z allan $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: Sébastien Luttringer
 # Contributor: Dale Blount <dale@archlinux.org>
@@ -6,7 +6,7 @@
 
 pkgname=ulogd
 pkgver=2.0.2
-pkgrel=3
+pkgrel=4
 pkgdesc='Userspace Packet Logging for netfilter'
 arch=('i686' 'x86_64' 'mips64el')
 url='http://www.netfilter.org/projects/ulogd/index.html'
@@ -23,14 +23,13 @@ makedepends=('libmariadbclient'
              'postgresql-libs'
              'sqlite')
 optdepends=("${makedepends[@]}")
-options=('!libtool')
 source=("ftp://ftp.netfilter.org/pub/$pkgname/$pkgname-$pkgver.tar.bz2"
         "$pkgname.logrotate"
         "$pkgname.conf"
         "$pkgname.service")
 md5sums=('660516de4b5b1e110c12dae414619e0f'
          '95f05af0a0c8f5fdea5bd92ccb2fd465'
-         '7ccdb48cd152ff502334d3f6b2a4daab'
+         '2c8cbedb2fb455cba220ca35186ad846'
          '092d72209e30c132e0a08112e4062772')
 
 build() {
diff --git a/community/ulogd/ulogd.conf b/community/ulogd/ulogd.conf
index f96bd1d2c..643892e88 100644
--- a/community/ulogd/ulogd.conf
+++ b/community/ulogd/ulogd.conf
@@ -9,8 +9,9 @@ plugin="/usr/lib/ulogd/ulogd_raw2packet_BASE.so"
 plugin="/usr/lib/ulogd/ulogd_filter_IP2STR.so"
 plugin="/usr/lib/ulogd/ulogd_filter_PRINTPKT.so"
 plugin="/usr/lib/ulogd/ulogd_output_LOGEMU.so"
+plugin="/usr/lib/ulogd/ulogd_filter_IFINDEX.so"
 
-stack=log1:NFLOG,base1:BASE,ip2str1:IP2STR,print1:PRINTPKT,emu1:LOGEMU
+stack=log1:NFLOG,base1:BASE,ifi1:IFINDEX,ip2str1:IP2STR,print1:PRINTPKT,emu1:LOGEMU
 
 [log1]
 group=1
diff --git a/community/unbound/PKGBUILD b/community/unbound/PKGBUILD
index 3eb3da923..49e1010b4 100644
--- a/community/unbound/PKGBUILD
+++ b/community/unbound/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 97464 2013-09-20 18:55:05Z bisson $
+# $Id: PKGBUILD 100009 2013-10-31 02:58:46Z allan $
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
 # Contributor: Hisato Tatekura <hisato_tatekura@excentrics.net>
 # Contributor: Massimiliano Torromeo <massimiliano DOT torromeo AT google mail service>
@@ -21,7 +21,6 @@ sha1sums=('3ef4ea626e5284368d48ab618fe2207d43f2cee1'
           'b543ae6f8b87423bec095fca6b335a9ee43739a8'
           '5d473ec2943fd85367cdb653fcd58e186f07383f')
 
-options=('!libtool')
 install=install
 
 build() {
diff --git a/community/unshield/PKGBUILD b/community/unshield/PKGBUILD
index 5e95a493b..a4b0460b0 100644
--- a/community/unshield/PKGBUILD
+++ b/community/unshield/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 65351 2012-02-21 02:17:14Z spupykin $
+# $Id: PKGBUILD 100010 2013-10-31 02:59:06Z allan $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 
 pkgname=unshield
@@ -9,7 +9,6 @@ arch=('i686' 'x86_64' 'mips64el')
 url="http://sourceforge.net/projects/synce/files/"
 license=('custom')
 depends=('zlib')
-options=('!libtool')
 source=(http://downloads.sourceforge.net/sourceforge/synce/${pkgname}-${pkgver}.tar.gz
         libunshield.c.patch)
 md5sums=('31a829192a255160d1f71cda4c865c9c'
diff --git a/community/uptimed/PKGBUILD b/community/uptimed/PKGBUILD
index e3dbdc641..5ade5d63d 100644
--- a/community/uptimed/PKGBUILD
+++ b/community/uptimed/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 91504 2013-05-23 10:15:34Z spupykin $
+# $Id: PKGBUILD 100011 2013-10-31 02:59:26Z allan $
 # Maintainer:  Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer:  Bartłomiej Piotrowski <nospam@bpiotrowski.pl>
 # Contributor: Tom Killian <tomk@runbox.com>
@@ -6,14 +6,13 @@
 
 pkgname=uptimed
 pkgver=0.3.17
-pkgrel=4
+pkgrel=5
 pkgdesc="A system uptime record daemon"
 arch=(i686 x86_64 'mips64el')
 url="http://podgorny.cz/uptimed/"
 license=('GPL')
 depends=('glibc' 'bash')
 backup=(etc/uptimed.conf)
-options=('!libtool')
 install=$pkgname.install
 source=(http://podgorny.cz/$pkgname/releases/$pkgname-$pkgver.tar.bz2
         service)
@@ -30,7 +29,7 @@ build() {
   sed -i 's|spool|log|' libuptimed/urec.h
   sed -i 's|AM_CONFIG_HEADER|AC_CONFIG_HEADER|g' configure.ac
 
-  autoreconf
+  autoreconf -i
   libtoolize --force
 
   ./configure --prefix=/usr --sysconfdir=/etc --sbindir=/usr/bin
diff --git a/community/uriparser/PKGBUILD b/community/uriparser/PKGBUILD
index a9b6b7e44..ec2e2de0c 100644
--- a/community/uriparser/PKGBUILD
+++ b/community/uriparser/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 91154 2013-05-20 09:57:23Z spupykin $
+# $Id: PKGBUILD 100078 2013-11-01 09:49:54Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Juan Pablo Gonzalez Tognarelli <lord_jotape@yahoo.com.ar>
 
 pkgname=uriparser
 pkgver=0.7.8
-pkgrel=1
+pkgrel=2
 pkgdesc="uriparser is a strictly RFC 3986 compliant URI parsing library. uriparser is cross-platform, fast, supports Unicode"
 url="http://sourceforge.net/projects/uriparser/"
 depends=()
diff --git a/community/usbredir/PKGBUILD b/community/usbredir/PKGBUILD
index 7a413742d..c6501f4a4 100644
--- a/community/usbredir/PKGBUILD
+++ b/community/usbredir/PKGBUILD
@@ -1,16 +1,15 @@
-# $Id: PKGBUILD 93438 2013-07-03 12:56:12Z spupykin $
+# $Id: PKGBUILD 100293 2013-11-02 08:50:50Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: Stefano Facchini <stefano.facchini@gmail.com>
 
 pkgname=usbredir
 pkgver=0.6
-pkgrel=3
+pkgrel=4
 pkgdesc="USB traffic redirection protocol"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://spice-space.org/page/UsbRedir"
 license=('GPL2' 'LGPL2.1')
 depends=('libusb')
-options=(!libtool)
 source=(http://spice-space.org/download/usbredir/$pkgname-$pkgver.tar.bz2)
 sha256sums=('028184960044ea4124030000b3c55a35c3238835116e3a0fbcaff449df2c8edf')
 
diff --git a/community/ustr/PKGBUILD b/community/ustr/PKGBUILD
index 100685dd8..761b8b945 100644
--- a/community/ustr/PKGBUILD
+++ b/community/ustr/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 65359 2012-02-21 02:20:19Z spupykin $
+# $Id: PKGBUILD 100295 2013-11-02 08:51:09Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 
 pkgname=ustr
 pkgver=1.0.4
-pkgrel=3
+pkgrel=4
 pkgdesc="micro string API for C"
 arch=(i686 x86_64 'mips64el')
 url="http://www.and.org/ustr/"
@@ -15,6 +15,10 @@ md5sums=('93147d9f0c9765d4cd0f04f7e44bdfce')
 build() {
   cd "$srcdir/$pkgname-$pkgver"
   make
+}
+
+package() {
+  cd "$srcdir/$pkgname-$pkgver"
   make DESTDIR="$pkgdir" install
   mv $pkgdir/usr/share/doc/man $pkgdir/usr/share/
 }
diff --git a/community/uudeview/PKGBUILD b/community/uudeview/PKGBUILD
index 6e3ef0d5b..4ae65cd56 100644
--- a/community/uudeview/PKGBUILD
+++ b/community/uudeview/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 67722 2012-03-14 09:04:31Z spupykin $
+# $Id: PKGBUILD 100326 2013-11-02 09:31:41Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: kmaster <kmaster12@sasktel.net>
 
 pkgname=uudeview
 pkgver=0.5.20
-pkgrel=10
+pkgrel=11
 pkgdesc="UUDeview helps transmitting & receiving binary files using mail or newsgroups. Includes library files."
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.fpx.de/fp/Software/UUDeview/"
@@ -14,9 +14,16 @@ source=(http://www.fpx.de/fp/Software/UUDeview/download/$pkgname-$pkgver.tar.gz)
 md5sums=('0161abaec3658095044601eae82bbc5b')
 
 build() {
+  cd $srcdir/uudeview-$pkgver/uulib
+  autoreconf
   cd $srcdir/$pkgname-$pkgver
+  autoreconf
   ./configure --prefix=/usr --mandir=/usr/share/man
   make
+}
+
+package() {
+  cd $srcdir/$pkgname-$pkgver
   make prefix=$pkgdir/usr MANDIR=$pkgdir/usr/share/man install
   install -d $pkgdir/usr/lib/uudeview
   install -d $pkgdir/usr/include/uudeview
diff --git a/community/uwsgi/PKGBUILD b/community/uwsgi/PKGBUILD
index a785dc9bb..447d415b4 100644
--- a/community/uwsgi/PKGBUILD
+++ b/community/uwsgi/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 98108 2013-10-06 00:44:23Z dwallace $
+# $Id: PKGBUILD 98834 2013-10-20 05:56:09Z dwallace $
 # Maintainer: Daniel Wallace <danielwallace at gtmanfred dot com>
 # Contributor: Valentin Hăloiu <vially.ichb+aur@gmail.com>
 # Contributor: Angel Velasquez <angvp@archlinux.org>  
@@ -23,7 +23,7 @@ pkgname=(uwsgi
         uwsgi-plugin-pam
         uwsgi-plugin-zergpool
         )
-pkgver=1.9.17.1
+pkgver=1.9.18.1
 pkgrel=1
 arch=(i686 x86_64)
 url="http://projects.unbit.it/$pkgbase"
@@ -41,7 +41,7 @@ source=(http://projects.unbit.it/downloads/$pkgbase-$pkgver.tar.gz
         uwsgi_ruby20_compatibility.patch
         uwsgi_trick_chroot.patch)
 
-md5sums=('501f29ad4538193c0ef585b4cef46bcf'
+md5sums=('9925e4c189cb0fcd26d4b2efd732b6ca'
          'fcd57c37372e6afe5b1fae151dd43bc9'
          'b05ba1d796e1ea608a40635bc4f3ec67'
          '740a7718bd341b03d916a13ddbbbe694'
diff --git a/community/vdrift/PKGBUILD b/community/vdrift/PKGBUILD
index 0225b12f9..7ea03206f 100644
--- a/community/vdrift/PKGBUILD
+++ b/community/vdrift/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 94910 2013-08-01 06:55:43Z bpiotrowski $
+# $Id: PKGBUILD 99451 2013-10-29 09:00:10Z svenstaro $
 # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
 # Contributor: Anton Bazhenov <anton.bazhenov at gmail>
 # Contributor: Lone_Wolf lonewolf@xs4all.nl
 
 pkgname=vdrift
 pkgver=2012.07.22
-pkgrel=5
+pkgrel=6
 pkgdesc="Open source driving simulation made with drift racing in mind"
 arch=('i686' 'x86_64')
 url="http://vdrift.net/"
diff --git a/community/vile/PKGBUILD b/community/vile/PKGBUILD
index d3af5c033..9e32ec227 100644
--- a/community/vile/PKGBUILD
+++ b/community/vile/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 76743 2012-09-28 19:43:00Z spupykin $
+# $Id: PKGBUILD 100013 2013-10-31 03:00:12Z allan $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 
 pkgname=vile
@@ -10,7 +10,6 @@ arch=('i686' 'x86_64' 'mips64el')
 url="http://invisible-island.net/vile/vile.html"
 depends=('ncurses')
 license=('custom')
-options=(!libtool)
 source=("ftp://invisible-island.net/vile/vile-${_basever}.tgz"
 	"ftp://invisible-island.net/vile/patches/vile-${_basever}a.patch.gz"
 	"ftp://invisible-island.net/vile/patches/vile-${_basever}b.patch.gz"
diff --git a/community/virtualbox-modules-lts/PKGBUILD b/community/virtualbox-modules-lts/PKGBUILD
index eae92f3b6..364dc97ba 100644
--- a/community/virtualbox-modules-lts/PKGBUILD
+++ b/community/virtualbox-modules-lts/PKGBUILD
@@ -1,12 +1,12 @@
-# $Id: PKGBUILD 98211 2013-10-07 14:38:11Z andyrtr $
+# $Id: PKGBUILD 100234 2013-11-02 01:49:57Z seblu $
 # Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl>
 # Contributor: Ionut Biru <ibiru@archlinux.org>
 # Contributor: Sébastien Luttringer
 
 pkgbase=virtualbox-modules-lts
 pkgname=('virtualbox-host-modules-lts' 'virtualbox-guest-modules-lts')
-pkgver=4.2.18
-pkgrel=8
+pkgver=4.3.2
+pkgrel=1
 arch=('i686' 'x86_64')
 url='http://virtualbox.org'
 license=('GPL')
diff --git a/community/virtualbox-modules/PKGBUILD b/community/virtualbox-modules/PKGBUILD
index f3670841a..18d8dd712 100644
--- a/community/virtualbox-modules/PKGBUILD
+++ b/community/virtualbox-modules/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 98153 2013-10-06 16:52:44Z tpowa $
+# $Id: PKGBUILD 100230 2013-11-02 00:53:56Z seblu $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 # Maintainer: Sébastien Luttringer
 
 pkgbase=virtualbox-modules
 pkgname=('virtualbox-host-modules' 'virtualbox-guest-modules')
-pkgver=4.2.18
-pkgrel=6
+pkgver=4.3.2
+pkgrel=1
 arch=('i686' 'x86_64')
 url='http://virtualbox.org'
 license=('GPL')
diff --git a/community/vmoviedb/PKGBUILD b/community/vmoviedb/PKGBUILD
index 5aeccb3db..6591b4fb4 100644
--- a/community/vmoviedb/PKGBUILD
+++ b/community/vmoviedb/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 65371 2012-02-21 02:25:52Z spupykin $
+# $Id: PKGBUILD 100297 2013-11-02 08:51:28Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: Roman Kyrylych <Roman.Kyrylych@gmail.com>
 # Contributor: William Rea <sillywilly@gmail.com>
 
 pkgname=vmoviedb
 pkgver=0.1.5
-pkgrel=5
+pkgrel=6
 pkgdesc="A movie collection manager for the Gnome desktop"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://vmoviedb.sourceforge.net"
@@ -13,7 +13,7 @@ license=('GPL')
 depends=('libgnomeui' 'gconf>=2.18.0.1-4' 'desktop-file-utils')
 makedepends=('gnome-doc-utils>=0.11.2' 'intltool')
 install=$pkgname.install
-options=('!libtool' '!emptydirs')
+options=('!emptydirs')
 source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz)
 md5sums=('7bfc10573bb890f3924755f2446dd3b6')
 
@@ -21,6 +21,10 @@ build() {
   cd $srcdir/vmoviedb-$pkgver
   ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var
   make
+}
+
+package() {
+  cd $srcdir/vmoviedb-$pkgver
   make -j1 GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR=$pkgdir install
 
   mkdir -p $pkgdir/usr/share/gconf/schemas
diff --git a/community/vorbissimple/PKGBUILD b/community/vorbissimple/PKGBUILD
index c07291a36..edc211242 100644
--- a/community/vorbissimple/PKGBUILD
+++ b/community/vorbissimple/PKGBUILD
@@ -1,15 +1,14 @@
-# $Id: PKGBUILD 65375 2012-02-21 02:27:15Z spupykin $
+# $Id: PKGBUILD 100299 2013-11-02 08:51:47Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: William Rea <sillywilly@gmail.com>
 
 pkgname=vorbissimple
 pkgver=0.0.2
-pkgrel=3
+pkgrel=4
 pkgdesc="A Vorbis decoder"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://kamaelia.sourceforge.net"
 license=('GPL')
-options=('!libtool')
 depends=('libvorbis')
 source=(http://downloads.sourceforge.net/kamaelia/$pkgname-$pkgver.tar.gz)
 md5sums=('332077b25a4c9547947ab0922361ffda')
@@ -18,5 +17,9 @@ build() {
   cd $srcdir/$pkgname-$pkgver/libvorbissimple
   ./configure --prefix=/usr
   make
+}
+
+package() {
+  cd $srcdir/$pkgname-$pkgver/libvorbissimple
   make DESTDIR=$pkgdir install
 }
diff --git a/community/vtk/PKGBUILD b/community/vtk/PKGBUILD
index bcfecb3e8..5db9de80b 100644
--- a/community/vtk/PKGBUILD
+++ b/community/vtk/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 94911 2013-08-01 06:55:45Z bpiotrowski $
+# $Id: PKGBUILD 98818 2013-10-19 13:44:45Z bpiotrowski $
 # Maintainer: Andrzej Giniewicz <gginiu@gmail.com>
 # Contributor: Thomas Dziedzic < gostrc at gmail >
 # Contributor: Christofer Bertonha <christoferbertonha at gmail dot com>
@@ -12,7 +12,7 @@
 
 pkgname=vtk
 pkgver=5.10.1
-pkgrel=9
+pkgrel=10
 pkgdesc='A software system for 3D computer graphics, image processing, and visualization.'
 arch=('i686' 'x86_64')
 url='http://www.vtk.org/'
diff --git a/community/weston/PKGBUILD b/community/weston/PKGBUILD
index 3fca66d3b..946d60874 100644
--- a/community/weston/PKGBUILD
+++ b/community/weston/PKGBUILD
@@ -1,18 +1,17 @@
-# $Id: PKGBUILD 98516 2013-10-12 14:35:58Z seblu $
+# $Id: PKGBUILD 100093 2013-11-01 14:31:04Z seblu $
 # Maintainer: Sébastien Luttringer
 # Contributor: Joel Teichroeb <joel@teichroeb.net>
 
 pkgname=weston
-pkgver=1.3.0
+pkgver=1.3.1
 pkgrel=1
 pkgdesc='Reference implementation of a Wayland compositor'
 arch=('i686' 'x86_64' 'mips64el')
 url='http://wayland.freedesktop.org'
 license=('MIT')
-options=(!libtool)
 depends=('libxkbcommon' 'libunwind' 'poppler-glib' 'mtdev' 'libxcursor' 'glu' 'pango' 'colord')
 source=("http://wayland.freedesktop.org/releases/$pkgname-$pkgver.tar.xz")
-sha1sums=('670f95844d20dc87da579b6ac566388edc0bfa0c')
+sha1sums=('56acdfde4d1a3871d6e54f0cdbcf2736e73e979a')
 
 build() {
 	cd $pkgname-$pkgver
diff --git a/extra/wireshark/PKGBUILD b/community/wireshark/PKGBUILD
index 552c2d015..5fcafcf1b 100644
--- a/extra/wireshark/PKGBUILD
+++ b/community/wireshark/PKGBUILD
@@ -1,18 +1,25 @@
-# $Id: PKGBUILD 194226 2013-09-11 02:06:50Z eric $
-# Maintainer: Guillaume ALAUX <guillaume@archlinux.org>
+# $Id: PKGBUILD 100436 2013-11-04 11:50:09Z tredaelli $
+# Maintainer: Timothy Redaelli <timothy.redaelli@gmail.com>
+# Contributor: Guillaume ALAUX <guillaume@archlinux.org>
 # Contributor: Florian Pritz <bluewind at jabber dot ccc dot de>
 pkgname=('wireshark-cli' 'wireshark-gtk')
 pkgbase=wireshark
-pkgver=1.10.2
+pkgver=1.10.3
 pkgrel=1
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL2')
 makedepends=('gtk3' 'krb5' 'libpcap' 'bash' 'gnutls'
              'lua' 'python' 'desktop-file-utils' 'hicolor-icon-theme')
 url='http://www.wireshark.org/'
-options=(!libtool)
-source=(http://www.wireshark.org/download/src/${pkgbase}-${pkgver}.tar.bz2)
-sha256sums=('b7a83314424e13639c591de924aa240bc5f3d9cae01dde69bf858fa04b22a33d')
+source=(http://www.wireshark.org/download/src/${pkgbase}-${pkgver}.tar.bz2
+        wireshark-1.10.3-gtk3.10-compile.patch)
+sha256sums=('c1641b36aeb0ca2c1a95fb01d2c647888b65e00a215c9a6464b5fc61e0fd498c'
+            '45274cca58f0abdd3a560beb79a6f0bc8f35736426a1855ed048c9ad8e94f3c0')
+
+prepare() {
+  cd ${pkgbase}-${pkgver}
+  patch -p1 -i ${srcdir}/wireshark-1.10.3-gtk3.10-compile.patch
+}
 
 build() {
   cd ${pkgbase}-${pkgver}
diff --git a/community/wireshark/wireshark-1.10.3-gtk3.10-compile.patch b/community/wireshark/wireshark-1.10.3-gtk3.10-compile.patch
new file mode 100644
index 000000000..6dc50646f
--- /dev/null
+++ b/community/wireshark/wireshark-1.10.3-gtk3.10-compile.patch
@@ -0,0 +1,12 @@
+--- wireshark-1.10.3/configure.ac.orig	2013-11-04 10:39:14.101045626 +0000
++++ wireshark-1.10.3/configure.ac	2013-11-04 10:39:26.884300664 +0000
+@@ -1388,9 +1388,6 @@
+ 	# Don't use GLIB_CFLAGS
+ 	AM_PATH_GLIB_2_0($GLIB_MIN_VERSION, , AC_MSG_ERROR(GLib $GLIB_MIN_VERSION or later distribution not found.), gthread gmodule)
+ 
+-	CPPFLAGS="-DGDK_PIXBUF_DISABLE_DEPRECATED $CPPFLAGS"
+-	CPPFLAGS="-DGDK_DISABLE_DEPRECATED $CPPFLAGS"
+-	CPPFLAGS="-DGTK_DISABLE_DEPRECATED $CPPFLAGS"
+ 	CPPFLAGS="-DGTK_DISABLE_SINGLE_INCLUDES $CPPFLAGS"
+ 	if test ! \( $gtk_config_major_version -eq 2 -a $gtk_config_minor_version -lt 20 \) ; then
+ 		# Enable GSEAL when building with GTK > 2.20
diff --git a/extra/wireshark/wireshark-gtk.install b/community/wireshark/wireshark-gtk.install
index 771e497ca..771e497ca 100644
--- a/extra/wireshark/wireshark-gtk.install
+++ b/community/wireshark/wireshark-gtk.install
diff --git a/extra/wireshark/wireshark.install b/community/wireshark/wireshark.install
index 719171d9e..719171d9e 100644
--- a/extra/wireshark/wireshark.install
+++ b/community/wireshark/wireshark.install
diff --git a/community/wiznote/PKGBUILD b/community/wiznote/PKGBUILD
new file mode 100644
index 000000000..da1e90b64
--- /dev/null
+++ b/community/wiznote/PKGBUILD
@@ -0,0 +1,28 @@
+# $Id: PKGBUILD 100396 2013-11-03 12:29:00Z fyan $
+# Maintainer: Felix Yan <felixonmars@gmail.com>
+# Contributor: Albert.Zhou <albert.zhou@wiz.cn>
+
+pkgname=wiznote
+pkgver=2.0.62
+pkgrel=1
+pkgdesc="Opensource cross-platform cloud based note-taking client"
+arch=('i686' 'x86_64')
+url="http://www.wiznote.com"
+license=('GPL3' 'custom')
+depends=('desktop-file-utils' 'hicolor-icon-theme' 'xdg-utils' 'qt5-base' 'qt5-webkit') # indirect: qt5-declarative qt5-sensors zlib glic gcc-libs
+makedepends=('cmake' 'qt5-tools' 'git')
+install=wiznote.install
+_wiznote_project_name="WizQTClient"
+source=("git+https://github.com/WizTeam/${_wiznote_project_name}.git#tag=v$pkgver")
+md5sums=('SKIP')
+
+build() {
+    cd $_wiznote_project_name
+    cmake -DWIZNOTE_USE_QT5=YES -DCMAKE_INSTALL_PREFIX=/usr/ .
+	make
+}
+
+package() {
+	cd $_wiznote_project_name
+	make DESTDIR="$pkgdir/" install
+}
diff --git a/community/wiznote/wiznote.install b/community/wiznote/wiznote.install
new file mode 100644
index 000000000..d43ea7c35
--- /dev/null
+++ b/community/wiznote/wiznote.install
@@ -0,0 +1,12 @@
+post_install() {
+    xdg-icon-resource forceupdate --theme hicolor &>/dev/null
+    update-desktop-database -q
+}
+
+post_upgrade() {
+    post_install
+}
+
+post_remove() {
+    post_install
+}
diff --git a/community/workrave/PKGBUILD b/community/workrave/PKGBUILD
index bc9808beb..dfcd69dba 100644
--- a/community/workrave/PKGBUILD
+++ b/community/workrave/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 83401 2013-01-31 11:27:26Z spupykin $
+# $Id: PKGBUILD 100122 2013-11-01 17:18:06Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: William Rea <sillywilly@gmail.com>
 
 pkgname=workrave
 pkgver=1.10
-pkgrel=2
+pkgrel=3
 pkgdesc="a tool to help RSI"
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL2')
diff --git a/community/wt/PKGBUILD b/community/wt/PKGBUILD
index 1e68f7a95..1f660bf2f 100644
--- a/community/wt/PKGBUILD
+++ b/community/wt/PKGBUILD
@@ -1,12 +1,12 @@
-# $Id: PKGBUILD 93696 2013-07-08 13:32:56Z spupykin $
+# $Id: PKGBUILD 98707 2013-10-17 10:43:21Z svenstaro $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
 # Contributor: Denis Martinez <deuns.martinez@gmail.com>
 
 pkgname=wt
-pkgver=3.3.0
-_pkgver=3.3.0
-pkgrel=2
+pkgver=3.3.1
+_pkgver=3.3.1
+pkgrel=1
 pkgdesc="a C++ library and application server for developing and deploying web applications"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.webtoolkit.eu/"
@@ -24,7 +24,7 @@ optdepends=('openssl: for SSL support in built-in webserver'
 	    'qt4: for the Wt/Qt interopability example (wtwithqt)')
 backup=('etc/wt/wt_config.xml')
 source=(http://downloads.sourceforge.net/witty/$pkgname-${_pkgver}.tar.gz)
-md5sums=('b2331942ad01c4fda376abf30c6a503a')
+md5sums=('3e93152c0ba3feb4ee687e7370b27552')
 
 build() {
   cd ${srcdir}/${pkgname}-${_pkgver}
diff --git a/community/wvstreams/PKGBUILD b/community/wvstreams/PKGBUILD
index e81d55fad..e114812c4 100644
--- a/community/wvstreams/PKGBUILD
+++ b/community/wvstreams/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 92257 2013-06-03 11:15:30Z allan $
-# Maintainer:
+# $Id: PKGBUILD 100398 2013-11-03 12:30:25Z fyan $
+# Maintainer: Felix Yan <felixonmars@gmail.com>
 # Contributor: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: dorphell <dorphell@archlinux.org>
 
 pkgname=wvstreams
 pkgver=4.6.1
-pkgrel=6
+pkgrel=7
 pkgdesc="A network programming library written in C++"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://alumnit.ca/wiki/?page=WvStreams"
diff --git a/community/xapian-core/PKGBUILD b/community/xapian-core/PKGBUILD
index 8694bac37..662d590dc 100644
--- a/community/xapian-core/PKGBUILD
+++ b/community/xapian-core/PKGBUILD
@@ -1,12 +1,13 @@
-# $Id: PKGBUILD 89923 2013-05-05 14:51:22Z spupykin $
+# $Id: PKGBUILD 100301 2013-11-02 08:52:08Z spupykin $
 # Contributor: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Alexander Fehr <pizzapunk gmail com>
 # Contributor: William Rea <sillywilly@gmail.com>
 # Maintainer: Daniel J Griffiths <ghost1227@archlinux.us>
 
 pkgname=xapian-core
+epoch=1
 pkgver=1.2.15
-pkgrel=1
+pkgrel=2
 pkgdesc='Open source search engine library.'
 arch=('i686' 'x86_64' 'mips64el')
 url='http://www.xapian.org/'
diff --git a/community/xbmc-pvr-addons/PKGBUILD b/community/xbmc-pvr-addons/PKGBUILD
index 0e867b56c..3ac9a67bb 100644
--- a/community/xbmc-pvr-addons/PKGBUILD
+++ b/community/xbmc-pvr-addons/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 86252 2013-03-14 11:10:40Z spupykin $
+# $Id: PKGBUILD 100503 2013-11-05 10:06:30Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 
 pkgname=xbmc-pvr-addons
-pkgver=12.0_Frodo
+pkgver=20131105git
 pkgrel=1
 pkgdesc="XBMC PVR add-ons for current stable xbmc"
 arch=('i686' 'x86_64')
@@ -12,17 +12,19 @@ depends=('xbmc' 'libmysqlclient')
 makedepends=('git' 'libmysqlclient' 'boost')
 optdepends=('tvheadend-git: tvheadend backend' 'mythtv: mythtv backend')
 conflicts=('xbmc-pvr-addons-git')
-source=("$pkgname-$pkgver.tar.gz::https://github.com/opdenkamp/xbmc-pvr-addons/archive/${pkgver/_/-}.tar.gz")
-md5sums=('4411848a648597037daf97562dd0fcd2')
+#source=("$pkgname-$pkgver.tar.gz::https://github.com/opdenkamp/xbmc-pvr-addons/archive/${pkgver/_/-}.tar.gz")
+#source=("git://github.com/opdenkamp/xbmc-pvr-addons.git")
+source=("git://github.com/fetzerch/xbmc-pvr-addons.git")
+md5sums=('SKIP')
 
 build() {
-  cd "$srcdir/$pkgname-${pkgver/_/-}"
+  cd "$srcdir/$pkgname"
   ./bootstrap
   ./configure --prefix=/usr --enable-addons-with-dependencies
   make
 }
 
 package() {
-  cd "$srcdir/$pkgname-${pkgver/_/-}"
+  cd "$srcdir/$pkgname"
   make DESTDIR="$pkgdir/" install
 }
diff --git a/community/xcb-util-cursor/PKGBUILD b/community/xcb-util-cursor/PKGBUILD
new file mode 100644
index 000000000..cc94347a8
--- /dev/null
+++ b/community/xcb-util-cursor/PKGBUILD
@@ -0,0 +1,28 @@
+# $Id: PKGBUILD 98879 2013-10-21 00:54:20Z seblu $
+# Maintainer: Sébastien Luttringer <seblu at seblu dot net>
+# Contributor: Bastien Dejean <nihilhill@gmail.com>
+
+pkgname=xcb-util-cursor
+pkgver=0.1.0
+pkgrel=4
+pkgdesc='XCB cursor library'
+arch=('i686' 'x86_64')
+url='http://cgit.freedesktop.org/xcb/util-cursor'
+license=('custom:MIT')
+depends=('libxcb' 'xcb-util-renderutil' 'xcb-util-image')
+source=("http://xcb.freedesktop.org/dist/xcb-util-cursor-$pkgver.tar.bz2")
+md5sums=('40e913aae6fb30a72d423e6bae9a93e9')
+
+build() {
+  cd $pkgname-$pkgver
+  ./configure --prefix=/usr
+  make
+}
+
+package() {
+  cd $pkgname-$pkgver
+  make DESTDIR="$pkgdir" install
+  install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+}
+
+# vim:set ts=2 sw=2 et:
diff --git a/community/xcircuit/PKGBUILD b/community/xcircuit/PKGBUILD
index 35e51165d..4ec956890 100644
--- a/community/xcircuit/PKGBUILD
+++ b/community/xcircuit/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 97641 2013-09-26 10:52:31Z spupykin $
+# $Id: PKGBUILD 99387 2013-10-28 09:51:20Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: Giovanni Scafora <linuxmania@gmail.com>
 # Contributor: simo <simo@archlinux.org>
 
 pkgname=xcircuit
-pkgver=3.7.52
+pkgver=3.7.54
 pkgrel=1
 pkgdesc="A program for drawing publishable-quality electrical circuit schematic diagrams"
 arch=('i686' 'x86_64' 'mips64el')
@@ -13,7 +13,7 @@ license=('GPL2')
 depends=('tk' 'libxpm' 'zlib')
 makedepends=('chrpath')
 source=(http://opencircuitdesign.com/xcircuit/archive/$pkgname-$pkgver.tgz)
-md5sums=('b39a2dcce9c3844ee2e6f9b477c501f5')
+md5sums=('25e60837e5db6b4ff71615505493a481')
 
 build() {
   cd $srcdir/$pkgname-$pkgver
diff --git a/community/xkbsel/PKGBUILD b/community/xkbsel/PKGBUILD
index c292de3d6..897db49a8 100644
--- a/community/xkbsel/PKGBUILD
+++ b/community/xkbsel/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 59722 2011-11-29 13:35:50Z stephane $
+# $Id: PKGBUILD 100458 2013-11-04 12:14:04Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com>
 
 pkgname=xkbsel
 pkgver=0.13
-pkgrel=5
+pkgrel=6
 pkgdesc="framework for defining, selecting and indicating XKB keyboard mappings"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.meduna.org/sw_xkbsel_en.html"
@@ -19,6 +19,8 @@ md5sums=('c82196344ef920a072f413df85b9dc00'
 build() {
   cd $srcdir/$pkgname-$pkgver
 
+  autoreconf
+
   patch -Np1 <../build-fix.patch
   export CFLAGS="$CFLAGS -I/usr/include/gdbm -DHAVE_NDBM_H"
   export LDFLAGS="-lgdbm -lgdbm_compat"
@@ -27,5 +29,9 @@ build() {
 		--build=`uname -m` --host=`uname -m` --target=`uname -m` \
 		--mandir=/usr/share/man
   make
+}
+
+package() {
+  cd $srcdir/$pkgname-$pkgver
   make DESTDIR=$pkgdir install
 }
diff --git a/community/xmind/PKGBUILD b/community/xmind/PKGBUILD
new file mode 100644
index 000000000..c49b9a5c0
--- /dev/null
+++ b/community/xmind/PKGBUILD
@@ -0,0 +1,56 @@
+# $Id$
+# Maintainer: Felix Yan <felixonmars@gmail.com>
+# Contributor: Christoph Drexler <chrdr at gmx dot at>
+# Contributor: Jelle van der Waa <jellevdwaa@gmail.com>
+
+pkgname=xmind
+pkgver=3.3.1
+_pkgdate=201212250029
+pkgrel=2
+pkgdesc="Brainstorming and Mind Mapping Software"
+arch=('i686' 'x86_64')
+[ "${CARCH}" = "i686" ] && _arch="i386"
+[ "${CARCH}" = "x86_64" ] && _arch="amd64"
+url="http://www.xmind.net"
+license=('EPL' 'LGPL')
+depends=('desktop-file-utils' 'fontconfig' 'libxrender' 'java-runtime' 'shared-mime-info')
+optdepends=('lame: needed for the feature audio notes')
+install=xmind.install
+source=(http://dl2.xmind.net/xmind-downloads/${pkgname}-linux-${pkgver}.${_pkgdate}_${_arch}.deb)
+[ "${CARCH}" = "i686" ] && md5sums=('53d55f189879b4d2f27eb214456c754b')
+[ "${CARCH}" = "x86_64" ] && md5sums=('a31c55dab417a8281ec4211f4ac111d7')
+
+build() {
+  cd "${srcdir}"
+  ar x "${pkgname}-linux-${pkgver}.${_pkgdate}_${_arch}.deb"
+  bsdtar -xf data.tar.gz
+}
+
+package() {
+  install -d "${pkgdir}"/usr/share/xmind/
+  cp -a "${srcdir}"/usr/local/xmind/* "${pkgdir}"/usr/share/xmind/
+  cp -a "${srcdir}"/usr/share/* "${pkgdir}"/usr/share/
+  install -d "${pkgdir}"/usr/bin/
+  cd "${pkgdir}"/usr/bin/
+  ln -s ../../usr/share/xmind/XMind .
+
+  # getting the config files to the right place...
+  install -d "${pkgdir}"/etc/xmind/
+  mv "${pkgdir}"/usr/share/xmind/configuration/* \
+    "${pkgdir}"/etc/xmind/
+  cd "${pkgdir}"/usr/share/xmind/configuration/
+  ln -s ../../../../etc/xmind/* .
+  mv "${pkgdir}"/usr/share/xmind/XMind.ini \
+    "${pkgdir}"/etc/xmind/
+  cd ../
+  ln -s ../../../etc/xmind/XMind.ini .
+
+  # putting the png file where it belongs to
+  install -d "${pkgdir}"/usr/share/pixmaps/
+  mv "${pkgdir}"/usr/share/xmind/xmind-logo-36.png \
+    "${pkgdir}"/usr/share/pixmaps/xmind.png
+  sed -i s!Exec=.*!Exec=/usr/share/xmind/XMind! \
+    "${pkgdir}"/usr/share/applications/xmind.desktop
+  sed -i s!/usr/local/xmind/xmind-logo-36.png!xmind.png! \
+    "${pkgdir}"/usr/share/applications/xmind.desktop
+}
diff --git a/community/xmind/xmind.install b/community/xmind/xmind.install
new file mode 100644
index 000000000..7be8023f9
--- /dev/null
+++ b/community/xmind/xmind.install
@@ -0,0 +1,16 @@
+post_install() {
+	echo "Updating MIME database"
+	update-mime-database /usr/share/mime
+	update-desktop-database
+}
+
+post_remove() {
+	echo "Updating MIME database"
+	update-mime-database /usr/share/mime
+	update-desktop-database
+}
+
+op=$1
+shift
+
+$op $*
diff --git a/community/xmlrpc-c/PKGBUILD b/community/xmlrpc-c/PKGBUILD
index fd394728b..f0fd475e4 100644
--- a/community/xmlrpc-c/PKGBUILD
+++ b/community/xmlrpc-c/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 87246 2013-03-29 00:18:37Z arodseth $
+# $Id: PKGBUILD 100018 2013-10-31 03:01:57Z allan $
 # Maintainer: Alexander Rødseth <rodseth@gmail.com>
 # Contributor: Daenyth <Daenyth+Arch [at] gmail [dot] com>
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 # Contributor: Vitaliy Berdinskikh <skipper13@root.ua>
 
 pkgname=xmlrpc-c
-pkgver=1.33.03
+pkgver=1.36.00
 pkgrel=1
 epoch=1
 pkgdesc='XML-RPC for C and C++'
@@ -14,9 +14,9 @@ url='http://xmlrpc-c.sourceforge.net/'
 license=('custom')
 depends=('curl' 'libxml2')
 makedepends=('libtool' 'setconf')
-options=('!makeflags' '!libtool' '!emptydirs')
-source=("$pkgname-advanced-$pkgver.tar.gz::http://xmlrpc-c.svn.sourceforge.net/viewvc/xmlrpc-c/advanced/?view=tar")
-sha256sums=('89ee1a2cd7319fbb0940cb1e87c8592d17379659f05da231aec603d70bd1233a')
+options=('!makeflags' '!emptydirs')
+source=('svn://svn.code.sf.net/p/xmlrpc-c/code/advanced#revision=2545')
+sha1sums=('SKIP')
 
 build() {
   cd "$srcdir/advanced"
diff --git a/community/xmlstarlet/PKGBUILD b/community/xmlstarlet/PKGBUILD
index 8793c80e5..4a0ffad20 100644
--- a/community/xmlstarlet/PKGBUILD
+++ b/community/xmlstarlet/PKGBUILD
@@ -1,34 +1,29 @@
-# $Id: PKGBUILD 83360 2013-01-30 09:39:18Z spupykin $
+# $Id: PKGBUILD 99079 2013-10-24 09:22:03Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: PyroPeter <abi1789@googlemail.com>
 # Contributor: BlackEagle <ike.devolder@scarlet.be>
 # Contributor: chochem <chochem@gmail.com>
 
 pkgname=xmlstarlet
-pkgver=1.4.2
+pkgver=1.5.0
 pkgrel=1
 pkgdesc="A set of tools to transform, query, validate, and edit XML documents"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://xmlstar.sourceforge.net/"
 license=('MIT')
-depends=('libxslt>=1.1.9')
+depends=('libxslt')
 source=("xmlstarlet-$pkgver.tar.gz::http://sourceforge.net/projects/xmlstar/files/xmlstarlet/$pkgver/xmlstarlet-$pkgver.tar.gz/download")
-md5sums=('ee8df42efd2417f74a1f5e3b7fe9e023')
+md5sums=('0c6db295d0cf9ff0d439edb755b7e8f6')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
-
-  local xsltlibs=$(pkg-config --libs libxslt libexslt)
-  local xmllibs=$(pkg-config --libs libxml-2.0)
-
-  LIBXSLT_PREFIX=/usr \
-	LIBXML_PREFIX=/usr \
-	LIBXSLT_LIBS="${xsltlibs}" \
-	LIBXML_LIBS="${xmllibs}" \
-	./configure --prefix=/usr
+  LIBXSLT_PREFIX=/usr LIBXML_PREFIX=/usr ./configure --prefix=/usr
   make
-  make DESTDIR="${pkgdir}" install
+}
 
+package() {
+  cd "$srcdir/$pkgname-$pkgver"
+  make DESTDIR="${pkgdir}" install
   install -Dm0644 Copyright $pkgdir/usr/share/licenses/$pkgname/COPYING
   ln -s xml ${pkgdir}/usr/bin/xmlstarlet
 }
diff --git a/community/xmms-pulse/PKGBUILD b/community/xmms-pulse/PKGBUILD
index 89fbad382..039f55122 100644
--- a/community/xmms-pulse/PKGBUILD
+++ b/community/xmms-pulse/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 68002 2012-03-17 00:12:40Z giovanni $
+# $Id: PKGBUILD 100019 2013-10-31 03:02:17Z allan $
 # Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com>
 # Contributor: Corrado Primier <bardo@aur.archlinux.org>
 # Contributor: William Rea <sillywilly@gmail.com>
@@ -6,14 +6,13 @@
 
 pkgname=xmms-pulse
 pkgver=0.9.4
-pkgrel=3
+pkgrel=4
 pkgdesc="An XMMS output plugin for the PulseAudio sound server"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://0pointer.de/lennart/projects/xmms-pulse"
 license=('GPL')
 depends=('xmms' 'pulseaudio')
 groups=('xmms-plugins' 'xmms-io-plugins')
-options=('!libtool')
 source=("http://0pointer.de/lennart/projects/xmms-pulse/${pkgname}-${pkgver}.tar.gz")
 md5sums=('c879939a6242f07b69298b30bcdeb6c5')
 
diff --git a/community/xmms-volnorm/PKGBUILD b/community/xmms-volnorm/PKGBUILD
index 8251d3eab..75aa3a075 100644
--- a/community/xmms-volnorm/PKGBUILD
+++ b/community/xmms-volnorm/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 67715 2012-03-14 08:23:40Z ebelanger $
+# $Id: PKGBUILD 100020 2013-10-31 03:02:37Z allan $
 # Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgname=xmms-volnorm
@@ -10,7 +10,6 @@ url="http://volnorm.sourceforge.net/"
 license=('GPL')
 depends=('xmms')
 groups=('xmms-plugins')
-options=('!libtool')
 source=(http://downloads.sourceforge.net/volnorm/volnorm-${pkgver}.tar.gz)
 sha1sums=('6c5ba86aed257514c6f94febeea1668f1b18a04d')
 
diff --git a/community/xmobar/PKGBUILD b/community/xmobar/PKGBUILD
index 35164bee3..a6abea19e 100644
--- a/community/xmobar/PKGBUILD
+++ b/community/xmobar/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 92482 2013-06-06 20:06:10Z jelle $
+# $Id: PKGBUILD 99437 2013-10-28 20:54:44Z jelle $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Arch Haskell Team <arch-haskell@haskell.org>
 
 pkgname=xmobar
-pkgver=0.18
+pkgver=0.19
 pkgrel=1
 pkgdesc="A Minimalistic Text Based Status Bar"
 url="http://hackage.haskell.org/package/xmobar"
@@ -11,7 +11,7 @@ license=('custom:BSD3')
 arch=('i686' 'x86_64' 'mips64el')
 depends=('gmp' 'libxft' 'libxinerama' 'wireless_tools' 'libxrandr')
 makedepends=('ghc=7.6.3-1' 'haskell-x11=1.6.1.1-3' 'haskell-x11-xft=0.3.1-9' 'haskell-utf8-string=0.3.7-5'
-	     'haskell-stm=2.4.2-2' 'haskell-parsec=3.1.3-3' 'haskell-mtl=2.1.2-3' 'haskell-regex-compat')
+	     'haskell-stm=2.4.2-2' 'haskell-parsec=3.1.3-3' 'haskell-mtl=2.1.2-3' 'haskell-regex-base' 'haskell-regex-compat')
 options=('strip')
 source=(http://hackage.haskell.org/packages/archive/xmobar/$pkgver/xmobar-$pkgver.tar.gz)
 
@@ -28,4 +28,4 @@ package() {
     install -D -m644 license ${pkgdir}/usr/share/licenses/$pkgname/LICENSE
 }
 
-md5sums=('4d0502fa75cd51ff23e41e1711f25adb')
+md5sums=('1c5b6ac7e7afe837b79c10ae4e8b8e4d')
diff --git a/community/xnee/PKGBUILD b/community/xnee/PKGBUILD
index 1962a7854..44f82123d 100644
--- a/community/xnee/PKGBUILD
+++ b/community/xnee/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 94092 2013-07-14 11:19:44Z jlichtblau $
+# $Id: PKGBUILD 100021 2013-10-31 03:03:11Z allan $
 # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
 # Contributor: Jaroslaw Swierczynski <swiergot@aur.archlinux.org>
 
@@ -12,7 +12,7 @@ license=('GPL3')
 depends=('gtk2' 'libxtst')
 makedepends=('texinfo')
 optdepends=('xosd: feedback support')
-options=('!libtool' '!emptydirs')
+options=('!emptydirs')
 source=(ftp://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.gz
         gnee.desktop)
 sha256sums=('07393d84d7abfab607b5ba078a0c32411815b7c883317356f6b92f7bbf3176fe'
diff --git a/community/xnoise/PKGBUILD b/community/xnoise/PKGBUILD
index 7328b31d2..41d0512da 100755
--- a/community/xnoise/PKGBUILD
+++ b/community/xnoise/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 97326 2013-09-18 04:04:28Z fyan $
+# $Id: PKGBUILD 100022 2013-10-31 03:03:33Z allan $
 # Maintainer: Felix Yan <felixonmars@gmail.com>
 # Contributor: archtux <antonio dot arias99999 at gmail dot com>
 
@@ -16,7 +16,6 @@ optdepends=('gst-plugins-base: Basic media codecs'
 	    'gst-libav: Extra media codecs'
 	    'gvfs: Needed for fetching album art')
 makedepends=('gettext' 'intltool')
-options=('!libtool')
 install=$pkgname.install
 source=("https://bitbucket.org/shuerhaaken/xnoise/downloads/$pkgname-$pkgver.tar.gz")
 
diff --git a/community/xosd/PKGBUILD b/community/xosd/PKGBUILD
index a9de83583..c154bde89 100644
--- a/community/xosd/PKGBUILD
+++ b/community/xosd/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 97848 2013-09-30 10:05:25Z spupykin $
+# $Id: PKGBUILD 100303 2013-11-02 08:52:28Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Damir Perisa <damir.perisa@bluewin.ch>
 
 pkgname=xosd
 pkgver=2.2.14
-pkgrel=6
+pkgrel=7
 pkgdesc="Displays text on your screen. On-Screen-Display-libs for some tools"
 arch=("i686" "x86_64" 'mips64el')
 license=('GPL2')
@@ -12,7 +12,6 @@ url="http://www.ignavus.net/software.html"
 depends=('libxt' 'libxinerama' 'sh')
 makedepends=('xmms' 'gdk-pixbuf')
 optdepends=('gdk-pixbuf: for using the xmms plugin')
-options=('!libtool')
 source=("http://downloads.sourceforge.net/libxosd/${pkgname}-${pkgver}.tar.gz"
 	"http://ftp.de.debian.org/debian/pool/main/x/xosd/xosd_$pkgver-2.debian.tar.gz")
 md5sums=('4b349fe930e4eee2f504d6c02673e24d'
diff --git a/community/xpad/PKGBUILD b/community/xpad/PKGBUILD
index 300054866..ae0459e64 100644
--- a/community/xpad/PKGBUILD
+++ b/community/xpad/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 60101 2011-12-05 05:18:09Z spupykin $
+# $Id: PKGBUILD 100460 2013-11-04 12:14:25Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: Kevin Piche <kevin@archlinux.org>
 # Contributor: Ben <contrasutra@myrealbox.com>
 
 pkgname=xpad
-pkgver=4.1
+pkgver=4.2
 pkgrel=1
 pkgdesc="Stickies-like notes program"
 arch=(i686 x86_64 'mips64el')
@@ -16,15 +16,19 @@ install=xpad.install
 source=(http://launchpad.net/xpad/trunk/$pkgver/+download/xpad-$pkgver.tar.bz2
 	xpad-gtk-2.20.patch
 	xpad-4.1-glib.patch)
-md5sums=('e37bfbe2331d810124c28150fdf30b3f'
+md5sums=('85583f8f68ad61ec282ea1332fe76480'
          '6a3d2952b469d65ec333714991ba8284'
-	 '69a2792b9cf4791aa733d1034a28c84b')
+         '69a2792b9cf4791aa733d1034a28c84b')
 
 build() {
   cd $srcdir/$pkgname-$pkgver
 #  patch -p1 <$srcdir/xpad-gtk-2.20.patch
-   patch -Np1 -i ${srcdir}/xpad-4.1-glib.patch
+  patch -Np1 -i ${srcdir}/xpad-4.1-glib.patch
   ./configure --prefix=/usr
-  /usr/bin/make
-  /usr/bin/make DESTDIR=$pkgdir install
+  make
+}
+
+package() {
+  cd $srcdir/$pkgname-$pkgver
+  make DESTDIR=$pkgdir install
 }
diff --git a/community/xplc/PKGBUILD b/community/xplc/PKGBUILD
index f31efdc52..7d1c364e7 100644
--- a/community/xplc/PKGBUILD
+++ b/community/xplc/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 64687 2012-02-17 18:35:47Z bluewind $
+# $Id: PKGBUILD 98918 2013-10-21 12:15:57Z bluewind $
 # Maintainer:
 # Contributor: dorphell <dorphell@archlinux.org>
 
 pkgname=xplc
 pkgver=0.3.13
-pkgrel=4
+pkgrel=5
 pkgdesc="Cross-Platform Lightweight Components"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://xplc.sourceforge.net"
diff --git a/community/xsettings-client/PKGBUILD b/community/xsettings-client/PKGBUILD
index f9ead9d39..7ebec39e2 100644
--- a/community/xsettings-client/PKGBUILD
+++ b/community/xsettings-client/PKGBUILD
@@ -1,16 +1,15 @@
-# $Id: PKGBUILD 88791 2013-04-22 10:19:12Z spupykin $
+# $Id: PKGBUILD 100305 2013-11-02 08:52:48Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Alois Belaska <lloyd@centrum.cz>
 
 pkgname=xsettings-client
 pkgver=0.10
-pkgrel=6.1
+pkgrel=7
 pkgdesc="Provides cross toolkit configuration settings such as theme parameters"
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 url="http://matchbox-project.org"
 depends=('libx11')
-options=('!libtool')
 source=(http://downloads.yoctoproject.org/releases/matchbox/optional-dependencies/Xsettings-client-$pkgver.tar.gz)
 md5sums=('c14aa9db6c097e0306dac97fb7da1add')
 
diff --git a/community/yaws/PKGBUILD b/community/yaws/PKGBUILD
index 412bca218..ce581444f 100644
--- a/community/yaws/PKGBUILD
+++ b/community/yaws/PKGBUILD
@@ -1,23 +1,23 @@
-# $Id: PKGBUILD 94952 2013-08-01 13:32:19Z arodseth $
+# $Id: PKGBUILD 100429 2013-11-04 09:06:17Z arodseth $
 # Maintainer: Alexander Rødseth <rodseth@gmail.com>
 # Maintainer: Vesa Kaihlavirta <vegai@iki.fi>
 # Contributor: Patrick Smits <mail@patricksmits.net>
 
 pkgname=yaws
-pkgver=1.96
-pkgrel=2
-pkgdesc='Yet Another Web Server, pure Erlang HTTP server/framework'
+pkgver=1.97
+pkgrel=1
+pkgdesc='Pure Erlang HTTP web server/framework'
 arch=('x86_64' 'i686' 'mips64el')
 url='http://yaws.hyber.org/'
 license=('BSD')
-depends=('pam' 'erlang') # segfaults with erlang-nox
+depends=('pam' 'erlang-nox')
 backup=('etc/yaws/yaws.conf')
 options=('!emptydirs')
-install=$pkgname.install
+install="$pkgname.install"
 source=("http://yaws.hyber.org/download/$pkgname-$pkgver.tar.gz"
         "$pkgname.service")
-sha256sums=('8d4f16d18937335ac021ca4c65c8ee81dc4d71f133718c7148856cc6bf1f55e2'
-            '3f8347add6e3741e77f7bb9ba6b31feb1c878e2e58ecf19063891e801fa24698')
+sha256sums=('a792478564866393f3e901bf4ec33272c22d7c01a8c5493b33856729d25b026e'
+            '09bd1f9f17833c83b4d82d3ac9dc2bf539c8e20ef92d438fced6e70b2aea61bc')
 
 prepare() {
   cd "$pkgname-$pkgver"
@@ -38,14 +38,13 @@ build() {
 }
 
 package() {
-  cd "$pkgname-$pkgver"
-
-  make DESTDIR="$pkgdir" install
+  make -C "$pkgname-$pkgver" 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"
-  install -Dm644 "$srcdir/$pkgname.service" \
+  install -Dm644 "$pkgname.service" \
     "$pkgdir/usr/lib/systemd/system/$pkgname.service"
+  install -Dm644 "$pkgname-$pkgver/LICENSE" \
+    "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
 }
 
 # vim:set ts=2 sw=2 et:
diff --git a/community/yaws/yaws.service b/community/yaws/yaws.service
index 7e2ced32d..b0f1ee144 100644
--- a/community/yaws/yaws.service
+++ b/community/yaws/yaws.service
@@ -1,5 +1,5 @@
 [Unit]
-Description=A fast lightweight webserver.
+Description=Fast lightweight webserver
 After=syslog.target network.target
 
 [Service]
diff --git a/community/yaz/PKGBUILD b/community/yaz/PKGBUILD
index 1527540d1..3af26cb5e 100644
--- a/community/yaz/PKGBUILD
+++ b/community/yaz/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 88599 2013-04-20 16:23:14Z jlichtblau $
+# $Id: PKGBUILD 100025 2013-10-31 03:04:33Z allan $
 # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
 # Contributor: Ray Rashif <schiv@archlinux.org>
 # Contributor: Andrea Scarpino <andrea@archlinux.org>
@@ -7,17 +7,16 @@
 # Contributor: Robert Emil Berge <filoktetes@linuxophic.org>
 
 pkgname=yaz
-pkgver=4.2.54
+pkgver=5.0.1
 pkgrel=1
 pkgdesc="A toolkit supporting the development of Z39.50/SRW/SRU clients and servers"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.indexdata.dk/yaz"
 license=('BSD')
 depends=('openssl' 'libxslt' 'icu')
-options=('!libtool')
 changelog=$pkgname.changelog
 source=(http://ftp.indexdata.dk/pub/$pkgname/$pkgname-$pkgver.tar.gz)
-sha256sums=('a11fb3b7129bec80311f8e27a0717b9bf6d7c56049674bb5477b91e7e98d2087')
+sha256sums=('4792096db2175b8e3553dec5f3762efab9b1b9d0f84acceec0690ddcf7954a11')
 
 build() {
   cd ${srcdir}/$pkgname-$pkgver
diff --git a/community/yaz/yaz.changelog b/community/yaz/yaz.changelog
index 27f48a9c4..7198259b5 100644
--- a/community/yaz/yaz.changelog
+++ b/community/yaz/yaz.changelog
@@ -1,3 +1,6 @@
+2013-10-12 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
+	* yaz 5.0.1-1
+
 2013-04-20 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
 	* yaz 4.2.54-1
 
diff --git a/community/zathura-pdf-mupdf/PKGBUILD b/community/zathura-pdf-mupdf/PKGBUILD
index 3a19e8af9..a21073ee3 100644
--- a/community/zathura-pdf-mupdf/PKGBUILD
+++ b/community/zathura-pdf-mupdf/PKGBUILD
@@ -4,16 +4,17 @@
 # Contributor: Moritz Lipp <mlq@pwmt.org>
 
 pkgname=zathura-pdf-mupdf
-pkgver=0.2.4
-pkgrel=1
+pkgver=0.2.5
+pkgrel=2
 pkgdesc="Adds pdf support to zathura by using the mupdf library"
 arch=('i686' 'x86_64' 'mips64el')
 url="https://pwmt.org/projects/zathura/plugins/zathura-pdf-mupdf/"
 license=('custom')
-depends=('mupdf>=1.1' 'zathura')
+depends=('mupdf>=1.3' 'zathura'
+	 'jbig2dec' 'openjpeg2')
 conflicts=('zathura-pdf-poppler')
 source=("https://pwmt.org/projects/zathura/plugins/download/$pkgname-$pkgver.tar.gz")
-md5sums=('aa9667425dab93147dd8605eda020e59')
+md5sums=('42dcdf2511ffc8f87ca6baba6c566f91')
 
 build() {
   make -C "${srcdir}/$pkgname-$pkgver"
diff --git a/community/zeromq/LIBZMQ-569.patch b/community/zeromq/LIBZMQ-569.patch
new file mode 100644
index 000000000..a1e27f622
--- /dev/null
+++ b/community/zeromq/LIBZMQ-569.patch
@@ -0,0 +1,30 @@
+From 7ecab54ac3b7a6103c46892990217acafb039eed Mon Sep 17 00:00:00 2001
+From: Martin Hurton <hurtonm@gmail.com>
+Date: Fri, 21 Jun 2013 16:23:38 +0200
+Subject: [PATCH] Load identity message to decoder at start
+
+---
+ src/stream_engine.cpp | 7 +++++++
+ 1 file changed, 7 insertions(+)
+
+diff --git a/src/stream_engine.cpp b/src/stream_engine.cpp
+index 0d87581..2c07889 100644
+--- a/src/stream_engine.cpp
++++ b/src/stream_engine.cpp
+@@ -480,6 +480,13 @@ bool zmq::stream_engine_t::handshake ()
+         //  header data away.
+         const size_t header_size = options.identity_size + 1 >= 255 ? 10 : 2;
+         unsigned char tmp [10], *bufferp = tmp;
++
++        //  Prepare the identity message and load it into encoder.
++        //  Then consume bytes we have already sent to the peer.
++        const int rc = tx_msg.init_size (options.identity_size);
++        zmq_assert (rc == 0);
++        memcpy (tx_msg.data (), options.identity, options.identity_size);
++        encoder->load_msg (&tx_msg);
+         size_t buffer_size = encoder->encode (&bufferp, header_size);
+         zmq_assert (buffer_size == header_size);
+ 
+-- 
+1.8.4
+
diff --git a/community/zeromq/PKGBUILD b/community/zeromq/PKGBUILD
index 3da8ea28b..6c4913bae 100644
--- a/community/zeromq/PKGBUILD
+++ b/community/zeromq/PKGBUILD
@@ -1,22 +1,30 @@
-# $Id: PKGBUILD 92652 2013-06-10 15:20:40Z bpiotrowski $
+# $Id: PKGBUILD 99117 2013-10-24 16:13:47Z mtorromeo $
 # Maintainer: Kyle Keen <keenerd@gmail.com>
 pkgname=zeromq
-pkgver=3.2.3
-pkgrel=1
+pkgver=4.0.1
+pkgrel=5
 pkgdesc="Fast messaging system built on sockets, C and C++ bindings.  aka 0MQ, ZMQ."
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.zeromq.org"
 license=('LGPL')
-depends=('gcc-libs' 'util-linux')
+depends=('gcc-libs' 'util-linux' 'libsodium')
 makedepends=('python2')
+options=('staticlibs')
 source=(http://download.zeromq.org/$pkgname-$pkgver.tar.gz
-        https://raw.github.com/zeromq/cppzmq/master/zmq.hpp)
-md5sums=('1abf8246363249baf5931a065ee38203'
-         '37805e6859ce1900041c9a2613936ec7')
+        https://raw.github.com/zeromq/cppzmq/master/zmq.hpp
+        LIBZMQ-569.patch)
+md5sums=('e738c310d135e20fa48c5b348da18e22'
+         '388ddb07fdd88b040769e8f4c9b397fa'
+         '2ef4f92027ec2b88e8eec86b2cccf2e4')
+
+prepare() {
+  cd "$srcdir/$pkgname-$pkgver"
+  patch -p1 -i "$srcdir/LIBZMQ-569.patch"
+}
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
-  ./configure prefix=/usr --with-pgm
+  ./configure prefix=/usr --with-pgm --with-libsodium
   sed -i 's/python$/&2/' foreign/openpgm/build-staging/openpgm/pgm/{Makefile,version_generator.py}
   make
 }
diff --git a/community/zh-autoconvert/PKGBUILD b/community/zh-autoconvert/PKGBUILD
index db33931df..1206f8c8c 100644
--- a/community/zh-autoconvert/PKGBUILD
+++ b/community/zh-autoconvert/PKGBUILD
@@ -4,13 +4,12 @@
 
 pkgname=zh-autoconvert
 pkgver=0.3.16
-pkgrel=2
+pkgrel=3
 pkgdesc="An intelligent Chinese Encoding converter"
 url="http://libhz.googlecode.com/"
 license=('LGPL')
 arch=('i686' 'x86_64' 'mips64el')
 depends=('glibc')
-makedepends=('pkgconfig')
 source=(${url}/files/${pkgname}-${pkgver}.tar.gz
 	autoconvert.patch)
 md5sums=('1f4aa2332afc076910b5d510b8c81966'
diff --git a/community/zinnia/PKGBUILD b/community/zinnia/PKGBUILD
index 8318e4eff..0ed9f82b1 100644
--- a/community/zinnia/PKGBUILD
+++ b/community/zinnia/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 81446 2012-12-21 04:42:33Z fyan $
+# $Id: PKGBUILD 99156 2013-10-25 05:05:21Z fyan $
 # Maintainer: Felix Yan <felixonmars@gmail.com>
 # Contributor: Humbert Julien <julroy67 [AT] gmail.com>
 
 pkgname=zinnia
 pkgver=0.06
-pkgrel=2
+pkgrel=3
 pkgdesc="Simple, customizable and portable online hand recognition system based on Support Vector Machines"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://zinnia.sourceforge.net/"
diff --git a/community/znc/PKGBUILD b/community/znc/PKGBUILD
index b82957a75..559b1d1ac 100644
--- a/community/znc/PKGBUILD
+++ b/community/znc/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 91707 2013-05-26 09:26:32Z bluewind $
+# $Id: PKGBUILD 100560 2013-11-05 20:58:10Z seblu $
 # Maintainer: Sébastien Luttringer
 # Contributor: Kaiting Chen <kaitocracy@gmail.com>
 # Contributor: mickael9 <mickael9 at gmail dot com>
 
 pkgname=znc
-pkgver=1.0
-pkgrel=7
+pkgver=1.2
+pkgrel=1
 pkgdesc='An IRC bouncer with modules & scripts support'
 url='http://en.znc.in/wiki/index.php/ZNC'
 license=('GPL2')
@@ -18,7 +18,7 @@ optdepends=('tcl: modtcl module'
             'cyrus-sasl: saslauth module')
 install=$pkgname.install
 source=("http://znc.in/releases/$pkgname-$pkgver.tar.gz")
-md5sums=('23807ca830c27392cccb6774f542df6e')
+md5sums=('ef18e5402a82cc3fcab5c2ac5c2e6f3b')
 
 build() {
   cd $pkgname-$pkgver
diff --git a/core/acl/PKGBUILD b/core/acl/PKGBUILD
index 0b68f0d2a..f3b4c1d5b 100644
--- a/core/acl/PKGBUILD
+++ b/core/acl/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 188195 2013-06-12 15:53:07Z thomas $
+# $Id: PKGBUILD 197385 2013-10-25 08:24:54Z thomas $
 # Maintainer: Thomas Bächler <thomas@archlinux.org>
 
 pkgname=acl
 pkgver=2.2.52
-pkgrel=1
+pkgrel=2
 pkgdesc="Access control list utilities, libraries and headers"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://savannah.nongnu.org/projects/acl"
@@ -12,7 +12,6 @@ depends=('attr>=2.4.46')
 replaces=('xfsacl')
 provides=('xfsacl')
 conflicts=('xfsacl')
-options=('!libtool')
 source=("http://download.savannah.gnu.org/releases/$pkgname/$pkgname-$pkgver.src.tar.gz"{,.sig})
 sha256sums=('179074bb0580c06c4b4137be4c5a92a701583277967acdb5546043c7874e0d23'
             'SKIP')
diff --git a/core/attr/PKGBUILD b/core/attr/PKGBUILD
index 7d0615c97..16065788d 100644
--- a/core/attr/PKGBUILD
+++ b/core/attr/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 188196 2013-06-12 15:53:08Z thomas $
+# $Id: PKGBUILD 197803 2013-10-30 11:02:33Z allan $
 # Maintainer: Thomas Bächler <thomas@archlinux.org>
 
 pkgname=attr
@@ -13,7 +13,6 @@ makedepends=('gettext')
 replaces=('xfsattr')
 provides=('xfsattr')
 conflicts=('xfsattr')
-options=('!libtool')
 source=("http://download.savannah.gnu.org/releases/$pkgname/$pkgname-$pkgver.src.tar.gz"{,.sig})
 sha256sums=('25772f653ac5b2e3ceeb89df50e4688891e21f723c460636548971652af0a859'
             'SKIP')
diff --git a/core/binutils/PKGBUILD b/core/binutils/PKGBUILD
index 9ca57f86e..cc83e065e 100644
--- a/core/binutils/PKGBUILD
+++ b/core/binutils/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 193064 2013-08-15 12:08:13Z allan $
+# $Id: PKGBUILD 196835 2013-10-20 12:06:12Z allan $
 # Maintainer: Allan McRae <allan@archlinux.org>
 
 # toolchain build order: linux-api-headers->glibc->binutils->gcc->binutils->glibc
@@ -13,7 +13,7 @@ license=('GPL')
 groups=('base-devel')
 depends=('glibc>=2.18' 'zlib')
 checkdepends=('dejagnu' 'bc')
-options=('!libtool' '!distcc' '!ccache')
+options=('staticlibs' '!distcc' '!ccache')
 install=binutils.install
 source=(ftp://ftp.gnu.org/gnu/binutils/binutils-${pkgver}.tar.bz2{,.sig}
         binutils-2.23.2-texinfo-5.0.patch)
diff --git a/core/bison/PKGBUILD b/core/bison/PKGBUILD
index f4a47d19b..7e601b013 100644
--- a/core/bison/PKGBUILD
+++ b/core/bison/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 191960 2013-08-02 00:55:04Z allan $
+# $Id: PKGBUILD 196831 2013-10-20 11:52:24Z allan $
 # Maintainer: Allan McRae <allan@archlinux.org>
 # Contributor: Eric Belanger <eric@archlinux.org>
 
@@ -11,6 +11,7 @@ license=('GPL3')
 url="http://www.gnu.org/software/bison/bison.html"
 depends=('glibc' 'm4' 'sh')
 groups=('base-devel')
+options=('staticlibs')
 install=bison.install
 source=(ftp://ftp.gnu.org/gnu/bison/${pkgname}-${pkgver}.tar.xz{,.sig})
 md5sums=('a2624994561aa69f056c904c1ccb2880'
diff --git a/core/bzip2/PKGBUILD b/core/bzip2/PKGBUILD
index 7ef4a7c49..8601505b5 100644
--- a/core/bzip2/PKGBUILD
+++ b/core/bzip2/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 158054 2012-05-02 01:12:57Z allan $
+# $Id: PKGBUILD 197160 2013-10-23 13:04:57Z allan $
 # Maintainer: Ronald van Haren <ronald.archlinux.org>
 # Contributor: Judd <jvinet@zeroflux.org> 
 
 pkgname=bzip2
 pkgver=1.0.6
-pkgrel=4.1
+pkgrel=5
 pkgdesc="A high-quality data compression program"
 arch=('i686' 'x86_64' 'mips64el')
 license=('custom')
@@ -29,7 +29,7 @@ build() {
   patch -Np1 < ../bzip2-1.0.4-bzip2recover.patch
 
   make -f Makefile-libbz2_so
-  make bzip2 bzip2recover libbz2.a
+  make bzip2 bzip2recover
 }
 
 check() {
@@ -51,7 +51,6 @@ package() {
   ln -s libbz2.so.1.0.6 $pkgdir/usr/lib/libbz2.so
   ln -s libbz2.so.1.0.6 $pkgdir/usr/lib/libbz2.so.1
   ln -s libbz2.so.1.0.6 $pkgdir/usr/lib/libbz2.so.1.0
-  install -m644 libbz2.a ${pkgdir}/usr/lib/libbz2.a
 
   install -m644 bzlib.h $pkgdir/usr/include/
 
diff --git a/core/cloog/PKGBUILD b/core/cloog/PKGBUILD
index d5a38a163..780e8e0d4 100644
--- a/core/cloog/PKGBUILD
+++ b/core/cloog/PKGBUILD
@@ -1,26 +1,16 @@
-# $Id: PKGBUILD 188781 2013-06-20 06:35:09Z allan $
+# $Id: PKGBUILD 197161 2013-10-23 13:04:58Z allan $
 # Maintainer: Allan McRae <allan@archlinux.org>
 
 pkgname=cloog
-pkgver=0.18.0
+pkgver=0.18.1
 pkgrel=2
 pkgdesc="Library that generates loops for scanning polyhedra"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.bastoul.net/cloog/"
 license=('GPL')
-depends=('isl' 'gmp')
-options=('!libtool')
-source=(http://www.bastoul.net/cloog/pages/download/$pkgname-$pkgver.tar.gz
-        cloog-0.18.0-isl-0.11.2.patch)
-md5sums=('be78a47bd82523250eb3e91646db5b3d'
-         '1bec9a7f1c3e9e0f3f10f23898f7148d')
-
-prepare() {
-  cd $srcdir/$pkgname-$pkgver
-  
-  # test-suite fix - commit fc8b0627
-  patch -p1 -i $srcdir/cloog-0.18.0-isl-0.11.2.patch
-}
+depends=('isl')
+source=(http://www.bastoul.net/cloog/pages/download/$pkgname-$pkgver.tar.gz)
+md5sums=('e34fca0540d840e5d0f6427e98c92252')
 
 build() {
   cd $srcdir/$pkgname-$pkgver
diff --git a/core/cloog/cloog-0.18.0-isl-0.11.2.patch b/core/cloog/cloog-0.18.0-isl-0.11.2.patch
deleted file mode 100644
index ca4290b68..000000000
--- a/core/cloog/cloog-0.18.0-isl-0.11.2.patch
+++ /dev/null
@@ -1,95 +0,0 @@
-diff --git a/test/darte.c b/test/darte.c
-index e185b7a..2a4a1b8 100644
---- a/test/darte.c
-+++ b/test/darte.c
-@@ -6,14 +6,14 @@ if (n >= 1) {
-     }
-   }
-   for (t1=-n+2;t1<=n-1;t1++) {
--    if (t1 >= 2) {
-+    if (t1 >= 0) {
-       for (t3=t1+4;t3<=t1+2*n+2;t3++) {
-         if ((t1+t3)%2 == 0) {
-           S1(t1+1,1,(-t1+t3-2)/2);
-         }
-       }
-     }
--    for (t2=max(-t1+2,t1+2);t2<=-t1+4;t2++) {
-+    for (t2=max(-t1+2,t1+3);t2<=-t1+4;t2++) {
-       for (t3=t2+2;t3<=t2+2*n;t3++) {
-         if ((t1+t2)%2 == 0) {
-           if ((t1+t3)%2 == 0) {
-diff --git a/test/dartef.f b/test/dartef.f
-index 50e1073..3b5e3e2 100644
---- a/test/dartef.f
-+++ b/test/dartef.f
-@@ -6,14 +6,14 @@ IF (n >= 1) THEN
-     END IF
-   END DO
-   DO t1=-n+2, n-1
--    IF (t1 >= 2) THEN
-+    IF (t1 >= 0) THEN
-       DO t3=t1+4, t1+2*n+2
-         IF (MOD(t1+t3, 2) == 0) THEN
-           S1(t1+1,1,(-t1+t3-2)/2)
-         END IF
-       END DO
-     END IF
--    DO t2=MAX(-t1+2,t1+2), -t1+4
-+    DO t2=MAX(-t1+2,t1+3), -t1+4
-       DO t3=t2+2, t2+2*n
-         IF (MOD(t1+t2, 2) == 0) THEN
-           IF (MOD(t1+t3, 2) == 0) THEN
-diff --git a/test/dealII.c b/test/dealII.c
-index 200b257..5d28c4a 100644
---- a/test/dealII.c
-+++ b/test/dealII.c
-@@ -3,10 +3,13 @@ for (scat_0=0;scat_0<=min(T_66,T_2-1);scat_0++) {
-   S1(scat_0);
-   S2(scat_0);
- }
--if ((T_2 == 0) && (T_67 == 0)) {
-+if ((T_2 == 0) && (T_66 >= 0) && (T_67 == 0)) {
-   S1(0);
- }
--for (scat_0=max(0,T_66+1);scat_0<=T_2-1;scat_0++) {
-+if ((T_66 <= -1) && (T_67 == 0)) {
-+  S1(0);
-+}
-+for (scat_0=max(max(0,T_66+1),-T_67+1);scat_0<=T_2-1;scat_0++) {
-   S1(scat_0);
- }
- for (scat_0=T_2;scat_0<=min(T_66,T_67-1);scat_0++) {
-diff --git a/test/isl/jacobi-shared.c b/test/isl/jacobi-shared.c
-index e8e5ec7..9e345c6 100644
---- a/test/isl/jacobi-shared.c
-+++ b/test/isl/jacobi-shared.c
-@@ -1,6 +1,6 @@
- /* Generated from ../../../git/cloog/test/isl/jacobi-shared.cloog by CLooG 0.16.3-2-g5511bef gmp bits in 1.82s. */
- if ((h0+1)%2 == 0) {
--  if ((16*floord(t0-1,16) >= -N+g1+t0+1) && (16*floord(N+15*g1+15*t0+15,16) >= 15*g1+15*t0+19) && (32*floord(t1-1,32) <= g2+t1-3) && (32*floord(t1-1,32) >= -N+g2+t1+1)) {
-+  if ((16*floord(N+15*g1+15*t0+15,16) >= 15*g1+15*t0+19) && (16*floord(N+15*g1+15*t0+15,16) >= 16*g1+15*t0+17) && (32*floord(t1-1,32) <= g2+t1-3) && (32*floord(t1-1,32) >= -N+g2+t1+1)) { 
-     for (c0=max(-16*floord(t0-1,16)+t0,-16*floord(g1+t0-3,16)+t0);c0<=min(32,N-g1-1);c0+=16) {
-       c1 = 32*floord(-t1,32)+t1+32;
-       if (c1 <= 32) {
-diff --git a/test/vasilache.c b/test/vasilache.c
-index 5a00a33..fdff031 100644
---- a/test/vasilache.c
-+++ b/test/vasilache.c
-@@ -15,12 +15,12 @@ for (p1=0;p1<=N-1;p1++) {
-         S6(p1,p3,p5,p7-1);
-         S7(p1,p3,p5,p7);
-       }
--      if (p5 <= floord(N-33,32)) {
--        S6(p1,p3,p5,32*p5+31);
--      }
--      if (p5 >= ceild(N-32,32)) {
-+      if (p5 >= ceild(N-31,32)) {
-         S6(p1,p3,p5,N-1);
-       }
-+      if (p5 <= floord(N-32,32)) {
-+        S6(p1,p3,p5,32*p5+31);
-+      }
-     }
-   }
- }
diff --git a/core/cracklib/PKGBUILD b/core/cracklib/PKGBUILD
index aa65edc8f..fe94b5378 100644
--- a/core/cracklib/PKGBUILD
+++ b/core/cracklib/PKGBUILD
@@ -1,16 +1,15 @@
-# $Id: PKGBUILD 191698 2013-07-29 09:44:29Z tpowa $
+# $Id: PKGBUILD 197804 2013-10-30 11:02:40Z allan $
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 # Contributor: Federico Quagliata (quaqo) <quaqo@despammed.com>
 
 pkgname=cracklib
 pkgver=2.9.0
-pkgrel=1
+pkgrel=2
 pkgdesc="Password Checking Library"
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 url="http://sourceforge.net/projects/cracklib"
 depends=('glibc' 'zlib')
-options=('!libtool')
 source=(http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.gz)
 md5sums=('e0f94ac2138fd33c7e77b19c1e9a9390')
 
diff --git a/core/cryptsetup/PKGBUILD b/core/cryptsetup/PKGBUILD
index e86517e26..5c9b60735 100644
--- a/core/cryptsetup/PKGBUILD
+++ b/core/cryptsetup/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 195910 2013-10-05 07:30:48Z thomas $
+# $Id: PKGBUILD 197805 2013-10-30 11:02:47Z allan $
 # Maintainer: Thomas Bächler <thomas@archlinux.org>
 pkgname=cryptsetup
 pkgver=1.6.2
@@ -9,7 +9,7 @@ license=('GPL')
 url="http://code.google.com/p/cryptsetup/"
 groups=('base')
 depends=('device-mapper' 'libgcrypt' 'popt' 'util-linux')
-options=('!libtool' '!emptydirs')
+options=('!emptydirs')
 source=(http://cryptsetup.googlecode.com/files/${pkgname}-${pkgver}.tar.bz2
         http://cryptsetup.googlecode.com/files/${pkgname}-${pkgver}.tar.bz2.asc
         encrypt_hook
diff --git a/core/curl/0001-curl_multi_remove_handle-allow-multiple-removes.patch b/core/curl/0001-curl_multi_remove_handle-allow-multiple-removes.patch
deleted file mode 100644
index 73b23ea12..000000000
--- a/core/curl/0001-curl_multi_remove_handle-allow-multiple-removes.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 84f3b3dd448399f9548468676e1bd1475dba8de5 Mon Sep 17 00:00:00 2001
-From: Daniel Stenberg <daniel@haxx.se>
-Date: Thu, 29 Aug 2013 22:08:01 +0200
-Subject: [PATCH] curl_multi_remove_handle: allow multiple removes
-
-When removing an already removed handle, avoid that to ruin the
-internals and just return OK instead.
----
- lib/multi.c | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/lib/multi.c b/lib/multi.c
-index fb495e0..e723a3e 100644
---- a/lib/multi.c
-+++ b/lib/multi.c
-@@ -483,6 +483,10 @@ CURLMcode curl_multi_remove_handle(CURLM *multi_handle,
-   if(!GOOD_EASY_HANDLE(curl_handle))
-     return CURLM_BAD_EASY_HANDLE;
- 
-+  /* Prevent users from trying to remove same easy handle more than once */
-+  if(!data->multi)
-+    return CURLM_OK; /* it is already removed so let's say it is fine! */
-+
-   if(easy) {
-     bool premature = (data->mstate < CURLM_STATE_COMPLETED) ? TRUE : FALSE;
-     bool easy_owns_conn = (data->easy_conn &&
--- 
-1.8.4
-
diff --git a/core/curl/PKGBUILD b/core/curl/PKGBUILD
index af22269df..06868fc7f 100644
--- a/core/curl/PKGBUILD
+++ b/core/curl/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 193944 2013-09-07 15:30:07Z dreisner $
+# $Id: PKGBUILD 198761 2013-11-03 13:49:41Z dreisner $
 # Maintainer: Dave Reisner <dreisner@archlinux.org>
 # Contributor: Angel Velasquez <angvp@archlinux.org>
 # Contributor: Eric Belanger <eric@archlinux.org>
@@ -6,27 +6,27 @@
 # Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
 
 pkgname=curl
-pkgver=7.32.0
-pkgrel=2
+pkgver=7.33.0
+pkgrel=3
 pkgdesc="An URL retrieval utility and library"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://curl.haxx.se"
 license=('MIT')
 depends=('ca-certificates' 'libssh2' 'openssl' 'zlib')
 provides=('libcurl.so')
-options=('!libtool')
+options=('strip' 'debug')
 source=("http://curl.haxx.se/download/$pkgname-$pkgver.tar.gz"{,.asc}
-        0001-curl_multi_remove_handle-allow-multiple-removes.patch
+        "0001-glob-fix-regression-from-commit-5ca96cb844.patch::https://github.com/bagder/curl/commit/867b52a.patch"
         curlbuild.h)
-md5sums=('f77cf3cb59cf2bfe686b80338323fd40'
+md5sums=('c8a4eaac7ce7b0d1bf458d62ccd4ef93'
          'SKIP'
-         '589a2ccdf90e198fca398809e9d16128'
+         'd71c7eab7d38f1731f78285634a4c390'
          '751bd433ede935c8fae727377625a8ae')
 
 prepare() {
   cd "$pkgname-$pkgver"
 
-  patch -Np1 <"$srcdir"/0001-curl_multi_remove_handle-allow-multiple-removes.patch 
+  patch -Np1 < "$srcdir"/0001-glob-fix-regression-from-commit-5ca96cb844.patch
 }
 
 build() {
diff --git a/core/db/PKGBUILD b/core/db/PKGBUILD
index 0d5a9dc20..f29e0eefc 100644
--- a/core/db/PKGBUILD
+++ b/core/db/PKGBUILD
@@ -1,20 +1,18 @@
-# $Id: PKGBUILD 195826 2013-10-01 16:41:14Z bpiotrowski $
+# $Id: PKGBUILD 197695 2013-10-28 15:56:31Z andyrtr $
 # Maintainer: Stéphane Gaudreault <stephane@archlinux.org>
 # Contributor: Allan McRae <allan@archlinux.org>
 # Contributor: Andreas Radke <andyrtr@archlinux.org>
 
 pkgname=db
-pkgver=5.3.21
-pkgrel=2
+pkgver=5.3.28
+pkgrel=1
 pkgdesc="The Berkeley DB embedded database system"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.oracle.com/technology/software/products/berkeley-db/index.html"
 license=('custom')
 depends=('gcc-libs' 'sh')
-options=('!libtool')
-install=db.install
 source=(http://download.oracle.com/berkeley-db/db-${pkgver}.tar.gz)
-sha1sums=('32e43c4898c8996750c958a90c174bd116fcba83')
+sha1sums=('fa3f8a41ad5101f43d08bc0efb6241c9b6fc1ae9')
 
 build() {
   cd "${srcdir}"/$pkgname-${pkgver}/build_unix
diff --git a/core/db/db.install b/core/db/db.install
deleted file mode 100644
index 03b64042d..000000000
--- a/core/db/db.install
+++ /dev/null
@@ -1,5 +0,0 @@
-post_upgrade() {
-  if [ "$(vercmp $2 5.1)" -lt 0 ]; then
-    echo " >> Major version update. Consider running db_upgrade on Berkeley DB databases."
-  fi
-}
diff --git a/core/dbus/PKGBUILD b/core/dbus/PKGBUILD
index d61465f41..9d3daa0ef 100644
--- a/core/dbus/PKGBUILD
+++ b/core/dbus/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 194433 2013-09-16 10:42:42Z jgc $
+# $Id: PKGBUILD 197807 2013-10-30 11:03:01Z allan $
 # Maintainer: Tom Gundersen <teg@jklm.no>
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: Link Dupont <link@subpop.net>
 #
 pkgname=dbus
-pkgver=1.6.14
+pkgver=1.6.16
 pkgrel=1
 pkgdesc="Freedesktop.org message bus system"
 url="http://www.freedesktop.org/Software/dbus"
@@ -16,7 +16,6 @@ optdepends=('libx11: dbus-launch support')
 provides=('dbus-core')
 conflicts=('dbus-core')
 replaces=('dbus-core')
-options=(!libtool)
 source=(http://dbus.freedesktop.org/releases/dbus/dbus-$pkgver.tar.gz
         30-dbus systemd-user-session.patch)
 
@@ -48,6 +47,6 @@ package(){
 
   install -Dm644 COPYING "$pkgdir/usr/share/licenses/dbus/COPYING"
 }
-md5sums=('1c22aebdf952e92908800f1ec2aeb0c4'
+md5sums=('1de63d9983d7785836ffae6c2181c698'
          '3314d727fa57fc443fce25b5cbeebbcc'
          'd8a1bd529b3ddca671ee1a695a143db9')
diff --git a/core/dialog/PKGBUILD b/core/dialog/PKGBUILD
index c0322bebd..01252795c 100644
--- a/core/dialog/PKGBUILD
+++ b/core/dialog/PKGBUILD
@@ -1,12 +1,13 @@
-# $Id: PKGBUILD 195853 2013-10-02 13:25:41Z foutrelis $
+# $Id: PKGBUILD 197224 2013-10-24 09:07:05Z foutrelis $
 # Maintainer: Evangelos Foutras <evangelos@foutrelis.com>
 # Contributor: Stéphane Gaudreault <stephane@archlinux.org>
 # Contributor: Allan McRae <allan@archlinux.org>
 # Contributor: Andreas Radke <andyrtr@archlinux.org>
 
 pkgname=dialog
-pkgver=1.2_20131001
+pkgver=1.2_20130928
 pkgrel=1
+epoch=1
 pkgdesc="A tool to display dialog boxes from shell scripts"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://invisible-island.net/dialog/"
@@ -14,7 +15,7 @@ license=('LGPL2.1')
 depends=('ncurses')
 options=('staticlibs')
 source=(ftp://invisible-island.net/$pkgname/$pkgname-${pkgver/_/-}.tgz)
-sha256sums=('b22215d56dfbfa7f025092759e8f144b17321e14829b2a273f68d745a1f0dca5')
+sha256sums=('6fcf8daa50335e4d08da9f4f5ea5e1025efe84c3a719a56e871eb83ed0fd2b4c')
 
 build() {
   cd "$srcdir/$pkgname-${pkgver/_/-}"
diff --git a/core/dmraid/PKGBUILD b/core/dmraid/PKGBUILD
index 64564e85c..0747ebc40 100644
--- a/core/dmraid/PKGBUILD
+++ b/core/dmraid/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 186295 2013-05-24 07:56:32Z tpowa $
+# $Id: PKGBUILD 197790 2013-10-30 08:14:33Z tpowa $
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 #Contributor: Urs Wolfer <uwolfer @ fwo.ch>
 
 pkgname=dmraid
 pkgver=1.0.0.rc16.3
-pkgrel=9
+pkgrel=10
 pkgdesc="Device mapper RAID interface"
 url="http://people.redhat.com/~heinzm/sw/dmraid/"
 conflicts=('mkinitcpio<0.7')
diff --git a/core/dosfstools/PKGBUILD b/core/dosfstools/PKGBUILD
index bcab9740d..77e15652f 100644
--- a/core/dosfstools/PKGBUILD
+++ b/core/dosfstools/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 191697 2013-07-29 09:44:27Z tpowa $
+# $Id: PKGBUILD 196781 2013-10-19 06:36:41Z tpowa $
 # Maintainer: dorphell <dorphell@archlinux.org>
 # Committer: Judd Vinet <jvinet@zeroflux.org>
 pkgname=dosfstools
-pkgver=3.0.22
+pkgver=3.0.23
 pkgrel=1
 pkgdesc="DOS filesystem utilities"
 arch=(i686 x86_64 'mips64el')
@@ -10,7 +10,7 @@ depends=('glibc')
 source=(http://www.daniel-baumann.ch/files/software/$pkgname/$pkgname-$pkgver.tar.xz{,.sig})
 url="http://www.daniel-baumann.ch/software/dosfstools/"
 license=('GPL2')
-md5sums=('301f01ca8a734011c0257134bcf475c8'
+md5sums=('bfdca786880a7f1cc9ce8ac68cb1fd51'
          'SKIP')
 
 build() {
diff --git a/core/e2fsprogs/PKGBUILD b/core/e2fsprogs/PKGBUILD
index 16ef05f87..2def1a4df 100644
--- a/core/e2fsprogs/PKGBUILD
+++ b/core/e2fsprogs/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 188851 2013-06-23 03:24:28Z foutrelis $
+# $Id: PKGBUILD 197436 2013-10-26 01:07:56Z allan $
 # Maintainer: Ronald van Haren <ronald.archlinux.org>
 # Contributor: judd <jvinet@zeroflux.org>
 
 pkgname=e2fsprogs
 pkgver=1.42.8
-pkgrel=1
+pkgrel=2
 pkgdesc="Ext2/3/4 filesystem utilities"
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL' 'LGPL' 'MIT')
@@ -15,6 +15,7 @@ makedepends=('bc')
 source=("http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.gz"
         'MIT-LICENSE')
 backup=('etc/mke2fs.conf')
+options=('staticlibs')
 install=${pkgname}.install
 sha1sums=('79cdb2374a9c0e68f01739598679db06d546b897'
           'f4a0d5b0cdb980e3fedd6f5e7dde0b0ffb7bbdfb')
@@ -42,6 +43,9 @@ package() {
   sed -i -e 's#^SS_DIR=.*#SS_DIR="/usr/share/ss"#' "${pkgdir}/usr/bin/mk_cmds"
   sed -i -e 's#^ET_DIR=.*#ET_DIR="/usr/share/et"#' "${pkgdir}/usr/bin/compile_et"
 
+  # remove static libraries with a shared counterpart
+  rm ${pkgdir}/usr/lib/lib{com_err,e2p,ext2fs,ss}.a
+
   # install MIT license
   install -Dm644 "${srcdir}/MIT-LICENSE" \
     "${pkgdir}/usr/share/licenses/${pkgname}/MIT-LICENSE"
diff --git a/core/efibootmgr/PKGBUILD b/core/efibootmgr/PKGBUILD
index 28cb02ea6..2a6515a72 100755
--- a/core/efibootmgr/PKGBUILD
+++ b/core/efibootmgr/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 194435 2013-09-16 12:11:58Z tpowa $
+# $Id: PKGBUILD 197808 2013-10-30 11:03:08Z allan $
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 # Contributor: Murtuza Akhtari <inxsible at gmail dot com>
 # Contributor: Keshav Padram Amburay <(the.ridikulus.rat) (aatt) (gemmaeiil) (ddoott) (ccoomm)>
@@ -17,7 +17,7 @@ url="https://github.com/vathpela/efibootmgr"
 license=('GPL2')
 makedepends=('git')
 depends=('pciutils' 'efivar' 'zlib')
-options=('strip' 'zipman' '!emptydirs' '!libtool')
+options=('strip' 'zipman' '!emptydirs')
 
 source=("${_gitname}::git+${_gitroot}#branch=${_gitbranch}")
 sha1sums=('SKIP')
diff --git a/core/expat/PKGBUILD b/core/expat/PKGBUILD
index bd0571dfa..18db4d2c3 100644
--- a/core/expat/PKGBUILD
+++ b/core/expat/PKGBUILD
@@ -1,22 +1,21 @@
-# $Id: PKGBUILD 183047 2013-04-17 02:02:02Z allan $
+# $Id: PKGBUILD 197159 2013-10-23 13:04:23Z allan $
 # Maintainer: Allan McRae <allan@archlinux.org>
 # Committer: Judd Vinet <jvinet@zeroflux.org>
 
 pkgname=expat
 pkgver=2.1.0
-pkgrel=2
+pkgrel=3
 pkgdesc="An XML parser library"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://expat.sourceforge.net/"
 license=('custom')
 depends=('glibc')
-options=('!libtool')
 source=(http://downloads.sourceforge.net/sourceforge/expat/${pkgname}-${pkgver}.tar.gz)
 md5sums=('dd7dab7a5fea97d2a6a43f511449b7cd')
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
-  ./configure --prefix=/usr #--mandir=/usr/share/man
+  ./configure --prefix=/usr
   make
 }
 
diff --git a/core/fakeroot/PKGBUILD b/core/fakeroot/PKGBUILD
index 254049c41..19330d06b 100644
--- a/core/fakeroot/PKGBUILD
+++ b/core/fakeroot/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 194710 2013-09-23 00:56:24Z allan $
+# $Id: PKGBUILD 197809 2013-10-30 11:03:15Z allan $
 # Maintainer: Allan McRae <allan@archlinux.org>
 # Contributor: Jochem Kossen <j.kossen@home.nl>
 
@@ -12,7 +12,6 @@ url="http://packages.debian.org/fakeroot"
 groups=('base-devel')
 install=fakeroot.install
 depends=('glibc' 'filesystem' 'sed' 'util-linux' 'sh')
-options=('!libtool')
 source=(http://ftp.debian.org/debian/pool/main/f/${pkgname}/${pkgname}_${pkgver}.orig.tar.bz2)
 md5sums=('9777a81d4d1878422447a1d0030c1f9f')
 
diff --git a/core/file/PKGBUILD b/core/file/PKGBUILD
index ba6f0439f..175913607 100644
--- a/core/file/PKGBUILD
+++ b/core/file/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 195182 2013-09-26 23:59:54Z allan $
+# $Id: PKGBUILD 197810 2013-10-30 11:03:22Z allan $
 # Maintainer: Allan McRae <allan@archlinux.org>
 # Contributor: Andreas Radke <andyrtr@archlinux.org>
 
@@ -11,7 +11,6 @@ license=('custom')
 groups=('base' 'base-devel')
 url="http://www.darwinsys.com/file/"
 depends=('glibc' 'zlib')
-options=('!libtool')
 source=(ftp://ftp.astron.com/pub/${pkgname}/${pkgname}-${pkgver}.tar.gz)
 md5sums=('3f99565532f548d7540912c4642d1ede')
 
diff --git a/core/flex/PKGBUILD b/core/flex/PKGBUILD
index 2afb4187b..801252b58 100644
--- a/core/flex/PKGBUILD
+++ b/core/flex/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 164810 2012-08-06 13:29:17Z allan $
+# $Id: PKGBUILD 196829 2013-10-20 11:50:22Z allan $
 # Maintainer: Allan McRae <allan@archlinux.org>
 # Contributor: judd <jvinet@zeroflux.org>
 
@@ -11,6 +11,7 @@ url="http://flex.sourceforge.net"
 license=('custom')
 groups=('base-devel')
 depends=('glibc' 'm4' 'sh')
+options=('staticlibs')
 install=flex.install
 source=(http://downloads.sourceforge.net/sourceforge/flex/flex-$pkgver.tar.bz2
         lex.sh)
diff --git a/core/gawk/PKGBUILD b/core/gawk/PKGBUILD
index 288e552d6..f7e45cfd8 100644
--- a/core/gawk/PKGBUILD
+++ b/core/gawk/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 186293 2013-05-24 07:53:32Z tpowa $
+# $Id: PKGBUILD 197682 2013-10-28 10:54:43Z tpowa $
 # Maintainer:
 # Contributor: Tom Newsom <Jeepster@gmx.co.uk>
 
 pkgname=gawk
 pkgver=4.1.0
-pkgrel=1
+pkgrel=2
 pkgdesc="GNU version of awk"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.gnu.org/software/gawk/"
diff --git a/core/gcc/PKGBUILD b/core/gcc/PKGBUILD
index c6a0452bb..c6d78cabd 100644
--- a/core/gcc/PKGBUILD
+++ b/core/gcc/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 193063 2013-08-15 12:08:11Z allan $
+# $Id: PKGBUILD 197286 2013-10-25 01:09:21Z allan $
 # Maintainer: Allan McRae <allan@archlinux.org>
 
 # toolchain build order: linux-api-headers->glibc->binutils->gcc->binutils->glibc
@@ -9,9 +9,9 @@ if [ "${CARCH}" != "mips64el" ]; then
 else
     pkgname=('gcc' 'gcc-libs' 'gcc-fortran' 'gcc-objc')
 fi
-pkgver=4.8.1
+pkgver=4.8.2
 pkgrel=3
-_snapshot=4.8-20130725
+#_snapshot=4.8-20130725
 pkgdesc="The GNU Compiler Collection"
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL' 'LGPL' 'FDL' 'custom')
@@ -19,11 +19,11 @@ url="http://gcc.gnu.org"
 makedepends=('binutils>=2.23' 'libmpc' 'cloog' 'doxygen')
 [[ "$CARCH" != "mips64el" ]] && makedepends+=('gcc-ada')
 checkdepends=('dejagnu' 'inetutils')
-options=('!libtool' '!emptydirs')
-source=(#ftp://gcc.gnu.org/pub/gcc/releases/gcc-${pkgver}/gcc-${pkgver}.tar.bz2)
-        ftp://gcc.gnu.org/pub/gcc/snapshots/${_snapshot}/gcc-${_snapshot}.tar.bz2
+options=('!emptydirs')
+source=(ftp://gcc.gnu.org/pub/gcc/releases/gcc-${pkgver}/gcc-${pkgver}.tar.bz2
+        #ftp://gcc.gnu.org/pub/gcc/snapshots/${_snapshot}/gcc-${_snapshot}.tar.bz2
         gcc-4.8-filename-output.patch)
-md5sums=('e21f259bc4c44e61e19a780ad5badfeb'
+md5sums=('a3d7d63b9cb6b6ea049469a0c4a43c9d'
          '40cb437805e2f7a006aa0d0c3098ab0f')
 
 if [ -n "${_snapshot}" ]; then
@@ -158,6 +158,7 @@ package_gcc()
   pkgdesc="The GNU Compiler Collection - C and C++ frontends"
   depends=("gcc-libs=$pkgver-$pkgrel" 'binutils>=2.23' 'libmpc' 'cloog')
   groups=('base-devel')
+  options=('staticlibs')
   install=gcc.install
 
   cd ${srcdir}/gcc-build
@@ -168,17 +169,21 @@ package_gcc()
   mv $pkgdir{,/usr/share/gdb/auto-load}/usr/lib/libstdc++.so.6.0.18-gdb.py
 
   # unfortunately it is much, much easier to install the lot and clean-up the mess...
-  rm -f $pkgdir/usr/bin/{{$CHOST-,}gfortran,{$CHOST-,}gccgo,gnat*}
-  rm -f $pkgdir/usr/lib/*.so*
-  rm -f $pkgdir/usr/lib/lib{atomic,gfortran,go{,begin},iberty,objc}.a
-  rm -f $pkgdir/usr/lib/libgfortran.spec
-  rm -rf $pkgdir/usr/lib/gcc/$CHOST/${pkgver}/{ada{include,lib},finclude,include/objc}
-  rm -f $pkgdir/usr/lib/gcc/$CHOST/${pkgver}/{cc1obj{,plus},f951,gnat1,go1}
-  rm -f $pkgdir/usr/lib/gcc/$CHOST/${pkgver}/{libcaf_single,libgfortranbegin}.a
-  rm -rf $pkgdir/usr/lib/go
-  rm -f $pkgdir/usr/share/info/{gccgo,gfortran,gnat*,libgomp,libquadmath,libitm}.info
-  rm -f $pkgdir/usr/share/locale/{de,fr}/LC_MESSAGES/libstdc++.mo
-  rm -f $pkgdir/usr/share/man/man1/{gccgo,gfortran}.1
+  rm $pkgdir/usr/bin/{{$CHOST-,}gfortran,{$CHOST-,}gccgo,gnat*}
+  rm $pkgdir/usr/lib/*.so*
+  rm $pkgdir/usr/lib/lib{atomic,gfortran,go{,begin},iberty,objc}.a
+  rm $pkgdir/usr/lib/libgfortran.spec
+  rm -r $pkgdir/usr/lib/gcc/$CHOST/${pkgver}/{ada{include,lib},finclude,include/objc}
+  rm $pkgdir/usr/lib/gcc/$CHOST/${pkgver}/{cc1obj{,plus},f951,gnat1,go1}
+  rm $pkgdir/usr/lib/gcc/$CHOST/${pkgver}/{libcaf_single,libgfortranbegin}.a
+  rm -r $pkgdir/usr/lib/go
+  rm $pkgdir/usr/share/info/{gccgo,gfortran,gnat*,libgomp,libquadmath,libitm}.info
+  rm $pkgdir/usr/share/locale/{de,fr}/LC_MESSAGES/libstdc++.mo
+  rm $pkgdir/usr/share/man/man1/{gccgo,gfortran}.1
+  
+  # remove static libraries - note libstdc++.a is needed for the binutils and glibc testsuite
+  rm $pkgdir/usr/lib/lib{asan,gomp,itm,mudflap{,th},quadmath}.a
+  [[ $CARCH = "x86_64" ]] && rm $pkgdir/usr/lib/libtsan.a
 
   # many packages expect this symlinks
   ln -s gcc ${pkgdir}/usr/bin/cc
@@ -226,6 +231,7 @@ package_gcc-fortran()
 {
   pkgdesc="Fortran front-end for GCC"
   depends=("gcc=$pkgver-$pkgrel")
+  options=('staticlibs' '!emptydirs')
   install=gcc-fortran.install
 
   cd ${srcdir}/gcc-build
@@ -236,12 +242,13 @@ package_gcc-fortran()
 
   ln -s gfortran ${pkgdir}/usr/bin/f95
 
-  # remove files included in gcc-libs or gcc
-  rm -f ${pkgdir}/usr/lib/lib{gfortran,gcc_s}.so*
-  rm -f ${pkgdir}/usr/lib/libquadmath.{a,so*}
-  rm -f ${pkgdir}/usr/lib/gcc/$CHOST/${pkgver}/{*.o,libgc*}
-  rm -f ${pkgdir}/usr/share/info/libquadmath.info
-  rm -fr ${pkgdir}/usr/lib/gcc/$CHOST/${pkgver}/include
+  # remove files included in gcc-libs or gcc and unnneeded static lib
+  rm ${pkgdir}/usr/lib/lib{gfortran,gcc_s}.so*
+  rm ${pkgdir}/usr/lib/libquadmath.{a,so*}
+  rm ${pkgdir}/usr/lib/gcc/$CHOST/${pkgver}/{*.o,libgc*}
+  rm ${pkgdir}/usr/share/info/libquadmath.info
+  rm -r ${pkgdir}/usr/lib/gcc/$CHOST/${pkgver}/include
+  rm ${pkgdir}/usr/lib/libgfortran.a
 
   # Install Runtime Library Exception
   install -Dm644 ${srcdir}/${_basedir}/COPYING.RUNTIME \
@@ -272,6 +279,7 @@ package_gcc-ada()
 {
   pkgdesc="Ada front-end for GCC (GNAT)"
   depends=("gcc=$pkgver-$pkgrel")
+  options=('staticlibs' '!emptydirs')
   install=gcc-ada.install
 
   cd ${srcdir}/gcc-build/gcc
@@ -279,7 +287,7 @@ package_gcc-ada()
   install -m755 gnat1 $pkgdir/usr/lib/gcc/$CHOST/$pkgver
 
   ln -s gcc ${pkgdir}/usr/bin/gnatgcc
-  
+
   # Install Runtime Library Exception
   install -Dm644 ${srcdir}/${_basedir}/COPYING.RUNTIME \
     ${pkgdir}/usr/share/licenses/gcc-ada/RUNTIME.LIBRARY.EXCEPTION
@@ -289,12 +297,14 @@ package_gcc-go()
 {
   pkgdesc="Go front-end for GCC"
   depends=("gcc=$pkgver-$pkgrel")
+  options=('staticlibs' '!emptydirs')
   install=gcc-go.install
 
   cd ${srcdir}/gcc-build
   make -j1 DESTDIR=$pkgdir install-target-libgo
   make -j1 -C gcc DESTDIR=$pkgdir go.install-{common,man,info}
   install -Dm755 gcc/go1 $pkgdir/usr/lib/gcc/$CHOST/$pkgver/go1
+  rm $pkgdir/usr/lib/lib{atomic,go}.a
 
   # Install Runtime Library Exception
   install -Dm644 ${srcdir}/${_basedir}/COPYING.RUNTIME \
diff --git a/core/gdbm/PKGBUILD b/core/gdbm/PKGBUILD
index 71da45002..97e801b2d 100644
--- a/core/gdbm/PKGBUILD
+++ b/core/gdbm/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 195488 2013-10-01 06:09:23Z bpiotrowski $
+# $Id: PKGBUILD 197797 2013-10-30 10:37:51Z allan $
 # Contributor: Stéphane Gaudreault <stephane@archlinux.org>
 # Contributor: Allan McRae <allan@archlinux.org>
 # Contributor: judd <jvinet@zeroflux.org>
 
 pkgname=gdbm
 pkgver=1.10
-pkgrel=2
+pkgrel=3
 pkgdesc="GNU database library"
 url="http://www.gnu.org/software/gdbm/gdbm.html"
 license=('GPL')
@@ -13,7 +13,7 @@ arch=('i686' 'x86_64' 'mips64el')
 depends=('glibc' 'sh')
 source=(ftp://ftp.gnu.org/gnu/gdbm/${pkgname}-${pkgver}.tar.gz
         gdbm-1.10-zeroheaders.patch)
-options=('!libtool' '!makeflags')
+options=('!makeflags')
 install=gdbm.install
 md5sums=('88770493c2559dc80b561293e39d3570'
          'ac255b10452005237836cd2d3a470733')
diff --git a/core/gettext/PKGBUILD b/core/gettext/PKGBUILD
index 90731c03d..27a87056a 100644
--- a/core/gettext/PKGBUILD
+++ b/core/gettext/PKGBUILD
@@ -1,17 +1,17 @@
-# $Id: PKGBUILD 193578 2013-08-24 12:17:50Z tpowa $
+# $Id: PKGBUILD 197811 2013-10-30 11:03:28Z allan $
 # Maintainer:
 
 pkgname=gettext
 pkgver=0.18.3.1
-pkgrel=1
+pkgrel=2
 pkgdesc="GNU internationalization library"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.gnu.org/software/gettext/"
 license=('GPL')
 groups=('base' 'base-devel')
-depends=('gcc-libs' 'acl' 'sh' 'glib2')
+depends=('gcc-libs' 'acl' 'sh' 'glib2' 'libunistring')
 optdepends=('cvs: for autopoint tool')
-options=(!libtool !docs)
+options=(!docs)
 install=gettext.install
 source=(ftp://ftp.gnu.org/pub/gnu/gettext/${pkgname}-${pkgver}.tar.gz{,.sig})
 md5sums=('3fc808f7d25487fc72b5759df7419e02'
diff --git a/core/glib2/PKGBUILD b/core/glib2/PKGBUILD
index dbe30c874..c460aa00f 100644
--- a/core/glib2/PKGBUILD
+++ b/core/glib2/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 196009 2013-10-07 11:50:04Z jgc $
+# $Id: PKGBUILD 197812 2013-10-30 11:03:36Z allan $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgbase=glib2
 pkgname=(glib2 glib2-docs)
-pkgver=2.38.0
+pkgver=2.38.1
 pkgrel=1
 pkgdesc="Common C routines used by GTK+ and other libs"
 url="http://www.gtk.org/"
@@ -11,7 +11,7 @@ arch=(i686 x86_64 mips64el)
 makedepends=('pkg-config' 'python2' 'libxslt' 'docbook-xml' 'pcre' 'libffi' 'elfutils')
 source=(http://ftp.gnome.org/pub/GNOME/sources/glib/${pkgver%.*}/glib-$pkgver.tar.xz
         revert-warn-glib-compile-schemas.patch)
-sha256sums=('7513a7de5e814ccb48206340a8773ea523d6a7bf04dc74565de69b899bc2ff32'
+sha256sums=('01906c62ac666d2ab3183cc07261b2536fab7b211c6129ab66b119c2af56d159'
             '049240975cd2f1c88fbe7deb28af14d4ec7d2640495f7ca8980d873bb710cc97')
 
 prepare() {
@@ -37,7 +37,7 @@ package_glib2() {
   depends=('pcre' 'libffi')
   optdepends=('python2: for gdbus-codegen and gtester-report'
               'elfutils: gresource inspection tool')
-  options=('!docs' '!libtool' '!emptydirs')
+  options=('!docs' '!emptydirs')
   license=('LGPL')
 
   cd glib-$pkgver
diff --git a/core/glibc/PKGBUILD b/core/glibc/PKGBUILD
index b77a6eaa5..76c4f5859 100644
--- a/core/glibc/PKGBUILD
+++ b/core/glibc/PKGBUILD
@@ -1,12 +1,14 @@
-# $Id: PKGBUILD 195163 2013-09-26 03:20:58Z allan $
+# $Id: PKGBUILD 197798 2013-10-30 10:37:54Z allan $
 # Maintainer: Allan McRae <allan@archlinux.org>
 
 # toolchain build order: linux-api-headers->glibc->binutils->gcc->binutils->glibc
 # NOTE: valgrind requires rebuilt with each major glibc version
 
+# NOTE: adjust version in install script when locale files are updated
+
 pkgname=glibc
 pkgver=2.18
-pkgrel=5
+pkgrel=9
 pkgdesc="GNU C Library"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.gnu.org/software/libc"
@@ -17,13 +19,16 @@ makedepends=('gcc>=4.7')
 backup=(etc/gai.conf
         etc/locale.gen
         etc/nscd.conf)
-options=('!strip')
+options=('!strip' 'staticlibs')
 install=glibc.install
 source=(http://ftp.gnu.org/gnu/libc/${pkgname}-${pkgver}.tar.xz{,.sig}
+        glibc-2.18-make-4.patch
         glibc-2.18-readdir_r-CVE-2013-4237.patch
-	glibc-2.18-malloc-corrupt-CVE-2013-4332.patch
-	glibc-2.18-strcoll-CVE-2012-4412+4424.patch
-	glibc-2.18-ptr-mangle-CVE-2013-4788.patch
+        glibc-2.18-malloc-corrupt-CVE-2013-4332.patch
+        glibc-2.18-strcoll-CVE-2012-4412+4424.patch
+        glibc-2.18-ptr-mangle-CVE-2013-4788.patch
+        glibc-2.18-getaddrinfo-CVE-2013-4458.patch
+        glibc-2.18-getaddrinfo-assertion.patch
         glibc-2.18-strstr-hackfix.patch
         nscd.service
         nscd.tmpfiles
@@ -31,19 +36,25 @@ source=(http://ftp.gnu.org/gnu/libc/${pkgname}-${pkgver}.tar.xz{,.sig}
         locale-gen)
 md5sums=('88fbbceafee809e82efd52efa1e3c58f'
          'SKIP'
+         'e1883c2d1b01ff73650db5f5bb5a5a52'
          '154da6bf5a5248f42a7bf5bf08e01a47'
          'b79561ab9dce900e9bbeaf0d49927c2b'
          'c7264b99d0f7e51922a4d3126182c40a'
          '9749ba386b08a8fe53e7ecede9bf2dfb'
+         '71329fccb8eb583fb0d67b55f1e8df68'
+         'd4d86add33f22125777e0ecff06bc9bb'
          '4441f6dfe7d75ced1fa75e54dd21d36e'
          'd5fab2cd3abea65aa5ae696ea4a47d6b'
          'da662ca76e7c8d7efbc7986ab7acea2d'
          '07ac979b6ab5eeb778d55f041529d623'
-         '476e9113489f93b348b21e144b6a8fcf')
+         'b5fd017036fb91199ee76f670da8c15b')
 
 prepare() {
   cd ${srcdir}/${pkgname}-${pkgver}
-  
+
+  # compatibility with make-4.0 (submitted upstream)
+  patch -p1 -i $srcdir/glibc-2.18-make-4.patch
+
   # upstream commit 91ce4085
   patch -p1 -i $srcdir/glibc-2.18-readdir_r-CVE-2013-4237.patch
 
@@ -51,13 +62,17 @@ prepare() {
   patch -p1 -i $srcdir/glibc-2.18-malloc-corrupt-CVE-2013-4332.patch
 
   # upstream commits 1326ba1a, 141f3a77 and 303e567a
-  # https://sourceware.org/ml/libc-alpha/2013-08/msg00394.html
-  # https://sourceware.org/ml/libc-alpha/2013-08/msg00462.html
   patch -p1 -i $srcdir/glibc-2.18-strcoll-CVE-2012-4412+4424.patch
 
   # upstream commits c61b4d41 and 0b1f8e35
   patch -p1 -i $srcdir/glibc-2.18-ptr-mangle-CVE-2013-4788.patch
 
+  # upstream commit 7cbcdb36
+  patch -p1 -i $srcdir/glibc-2.18-getaddrinfo-CVE-2013-4458.patch
+
+  # upstream commit 894f3f10
+  patch -p1 -i $srcdir/glibc-2.18-getaddrinfo-assertion.patch
+
   # hack fix for strstr issues on x86
   patch -p1 -i $srcdir/glibc-2.18-strstr-hackfix.patch
 
@@ -118,7 +133,7 @@ build() {
 check() {
   # Known to fail on mips64el.
   if [ "$CARCH" != "mips64el" ]; then
-  # bug to file - the linker commands need to be reordered
+  # the linker commands need to be reordered - fixed in 2.19
   LDFLAGS=${LDFLAGS/--as-needed,/}
 
   cd ${srcdir}/glibc-build
@@ -151,6 +166,10 @@ package() {
   sed -e '1,3d' -e 's|/| |g' -e 's|\\| |g' -e 's|^|#|g' \
     ${srcdir}/glibc-${pkgver}/localedata/SUPPORTED >> ${pkgdir}/etc/locale.gen
 
+  # remove the static libraries that have a shared counterpart
+  # note: keep libc, libdl, libm, libpthread for binutils testsuite
+  rm $pkgdir/usr/lib/lib{anl,BrokenLocale,crypt,nsl,resolv,rt,util}.a
+
   # Do not strip the following files for improved debugging support
   # ("improved" as in not breaking gdb and valgrind...):
   #   ld-${pkgver}.so
diff --git a/core/glibc/glibc-2.18-getaddrinfo-CVE-2013-4458.patch b/core/glibc/glibc-2.18-getaddrinfo-CVE-2013-4458.patch
new file mode 100644
index 000000000..a7bc67c6f
--- /dev/null
+++ b/core/glibc/glibc-2.18-getaddrinfo-CVE-2013-4458.patch
@@ -0,0 +1,41 @@
+diff --git a/sysdeps/posix/getaddrinfo.c b/sysdeps/posix/getaddrinfo.c
+index e6ce4cf..8ff74b4 100644
+--- a/sysdeps/posix/getaddrinfo.c
++++ b/sysdeps/posix/getaddrinfo.c
+@@ -197,7 +197,22 @@ gaih_inet_serv (const char *servicename, const struct gaih_typeproto *tp,
+ 				&rc, &herrno, NULL, &localcanon));	      \
+     if (rc != ERANGE || herrno != NETDB_INTERNAL)			      \
+       break;								      \
+-    tmpbuf = extend_alloca (tmpbuf, tmpbuflen, 2 * tmpbuflen);		      \
++    if (!malloc_tmpbuf && __libc_use_alloca (alloca_used + 2 * tmpbuflen))    \
++      tmpbuf = extend_alloca_account (tmpbuf, tmpbuflen, 2 * tmpbuflen,	      \
++				      alloca_used);			      \
++    else								      \
++      {									      \
++	char *newp = realloc (malloc_tmpbuf ? tmpbuf : NULL,		      \
++			      2 * tmpbuflen);				      \
++	if (newp == NULL)						      \
++	  {								      \
++	    result = -EAI_MEMORY;					      \
++	    goto free_and_return;					      \
++	  }								      \
++	tmpbuf = newp;							      \
++	malloc_tmpbuf = true;						      \
++	tmpbuflen = 2 * tmpbuflen;					      \
++      }									      \
+   }									      \
+   if (status == NSS_STATUS_SUCCESS && rc == 0)				      \
+     h = &th;								      \
+@@ -209,7 +224,8 @@ gaih_inet_serv (const char *servicename, const struct gaih_typeproto *tp,
+ 	{								      \
+ 	  __set_h_errno (herrno);					      \
+ 	  _res.options |= old_res_options & RES_USE_INET6;		      \
+-	  return -EAI_SYSTEM;						      \
++	  result = -EAI_SYSTEM;						      \
++	  goto free_and_return;						      \
+ 	}								      \
+       if (herrno == TRY_AGAIN)						      \
+ 	no_data = EAI_AGAIN;						      \
+-- 
+1.8.4.1
+
diff --git a/core/glibc/glibc-2.18-getaddrinfo-assertion.patch b/core/glibc/glibc-2.18-getaddrinfo-assertion.patch
new file mode 100644
index 000000000..2f1f7c694
--- /dev/null
+++ b/core/glibc/glibc-2.18-getaddrinfo-assertion.patch
@@ -0,0 +1,39 @@
+diff --git a/sysdeps/posix/getaddrinfo.c b/sysdeps/posix/getaddrinfo.c
+index 0f4b885..e6ce4cf 100644
+--- a/sysdeps/posix/getaddrinfo.c
++++ b/sysdeps/posix/getaddrinfo.c
+@@ -1666,13 +1666,13 @@ rfc3484_sort (const void *p1, const void *p2, void *arg)
+ 
+ 	      /* Fill in the results in all the records.  */
+ 	      for (int i = 0; i < src->nresults; ++i)
+-		if (src->results[i].index == a1_index)
++		if (a1_index != -1 && src->results[i].index == a1_index)
+ 		  {
+ 		    assert (src->results[i].native == -1
+ 			    || src->results[i].native == a1_native);
+ 		    src->results[i].native = a1_native;
+ 		  }
+-		else if (src->results[i].index == a2_index)
++		else if (a2_index != -1 && src->results[i].index == a2_index)
+ 		  {
+ 		    assert (src->results[i].native == -1
+ 			    || src->results[i].native == a2_native);
+@@ -2532,7 +2532,14 @@ getaddrinfo (const char *name, const char *service,
+ 			  tmp.addr[0] = 0;
+ 			  tmp.addr[1] = 0;
+ 			  tmp.addr[2] = htonl (0xffff);
+-			  tmp.addr[3] = sinp->sin_addr.s_addr;
++			  /* Special case for lo interface, the source address
++			     being possibly different than the interface
++			     address. */
++			  if ((ntohl(sinp->sin_addr.s_addr) & 0xff000000)
++			      == 0x7f000000)
++			    tmp.addr[3] = htonl(0x7f000001);
++			  else
++			    tmp.addr[3] = sinp->sin_addr.s_addr;
+ 			}
+ 		      else
+ 			{
+-- 
+1.8.4.1
+
diff --git a/core/glibc/glibc-2.18-make-4.patch b/core/glibc/glibc-2.18-make-4.patch
new file mode 100644
index 000000000..374933464
--- /dev/null
+++ b/core/glibc/glibc-2.18-make-4.patch
@@ -0,0 +1,45 @@
+From dc76f0c32dae689a08aa21a1d206d4cd62adb278 Mon Sep 17 00:00:00 2001
+From: Marc-Antoine Perennou <Marc-Antoine@Perennou.com>
+Date: Thu, 10 Oct 2013 14:26:12 +0900
+Subject: [PATCH] configure: allow building with GNU Make 4
+
+Currently, configure errors telling make 4 is too old
+since it does not match our regexp.
+
+configure.in: allow GNU Make 4.*
+
+Signed-off-by: Marc-Antoine Perennou <Marc-Antoine@Perennou.com>
+---
+ configure    | 2 +-
+ configure.in | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/configure b/configure
+index 5e2f4d0..e139bf0 100755
+--- a/configure
++++ b/configure
+@@ -4761,7 +4761,7 @@ $as_echo_n "checking version of $MAKE... " >&6; }
+   ac_prog_version=`$MAKE --version 2>&1 | sed -n 's/^.*GNU Make[^0-9]*\([0-9][0-9.]*\).*$/\1/p'`
+   case $ac_prog_version in
+     '') ac_prog_version="v. ?.??, bad"; ac_verc_fail=yes;;
+-    3.79* | 3.[89]*)
++    3.79* | 3.[89]* | 4.*)
+        ac_prog_version="$ac_prog_version, ok"; ac_verc_fail=no;;
+     *) ac_prog_version="$ac_prog_version, bad"; ac_verc_fail=yes;;
+ 
+diff --git a/configure.in b/configure.in
+index a7f9881..95c36b6 100644
+--- a/configure.in
++++ b/configure.in
+@@ -984,7 +984,7 @@ AC_CHECK_PROG_VER(CC, ${ac_tool_prefix}gcc ${ac_tool_prefix}cc, -v,
+   critic_missing="$critic_missing gcc")
+ AC_CHECK_PROG_VER(MAKE, gnumake gmake make, --version,
+   [GNU Make[^0-9]*\([0-9][0-9.]*\)],
+-  [3.79* | 3.[89]*], critic_missing="$critic_missing make")
++  [3.79* | 3.[89]* | 4.*], critic_missing="$critic_missing make")
+ 
+ AC_CHECK_PROG_VER(MSGFMT, gnumsgfmt gmsgfmt msgfmt, --version,
+   [GNU gettext.* \([0-9]*\.[0-9.]*\)],
+-- 
+1.8.4.1
+
diff --git a/core/glibc/glibc.install b/core/glibc/glibc.install
index f8147a6cf..6b405486e 100644
--- a/core/glibc/glibc.install
+++ b/core/glibc/glibc.install
@@ -3,7 +3,10 @@ filelist=(libc.info{,-1,-2,-3,-4,-5,-6,-7,-8,-9,-10,-11})
 
 post_upgrade() {
   ldconfig -r .
-  locale-gen
+  
+  if [[ $(vercmp 2.18 $2) = 1 ]]; then
+    locale-gen
+  fi
   
   [[ -x usr/bin/install-info ]] || return 0
   for file in ${filelist[@]}; do
diff --git a/core/glibc/locale-gen b/core/glibc/locale-gen
index 5aff344c4..51191f810 100755
--- a/core/glibc/locale-gen
+++ b/core/glibc/locale-gen
@@ -4,39 +4,53 @@ set -e
 
 LOCALEGEN=/etc/locale.gen
 LOCALES=/usr/share/i18n/locales
-if [ -n "$POSIXLY_CORRECT" ]; then
-  unset POSIXLY_CORRECT
-fi
+unset POSIXLY_CORRECT
 
-
-[ -f $LOCALEGEN -a -s $LOCALEGEN ] || exit 0;
+[ -s "$LOCALEGEN" ] || exit 0
 
 # Remove all old locale dir and locale-archive before generating new
 # locale data.
-rm -rf /usr/lib/locale/* || true
+rm -rf /usr/lib/locale/*
 
 umask 022
 
-is_entry_ok() {
-  if [ -n "$locale" -a -n "$charset" ] ; then
-    true
-  else
-    echo "error: Bad entry '$locale $charset'"
-    false
-  fi
+gen() {
+	local locale=$1
+	local charset=$2
+	local input=
+
+	if [ -z "$locale" ] || [ -z "$charset" ]; then
+		echo "error: Bad entry '$locale $charset'"
+		return
+	fi
+
+	printf '  %s.%s\n' "$(echo "$locale" | sed 's/\([^.\@]*\).*/\1/')" "$charset"
+
+	if [ -f "$LOCALES/$locale" ]; then
+		input=$locale
+	else
+		input=$(echo $locale | sed 's/\([^.]*\)[^@]*\(.*\)/\1\2/')
+	fi
+
+	localedef -i "$input" -c -f "$charset" -A /usr/share/locale/locale.alias "$locale"
 }
 
+maxjobs=$(grep -c processor /proc/cpuinfo 2>/dev/null || echo 1)
 echo "Generating locales..."
 while read locale charset; do \
-	case $locale in \#*) continue;; "") continue;; esac; \
-	is_entry_ok || continue
-	echo -n "  `echo $locale | sed 's/\([^.\@]*\).*/\1/'`"; \
-	echo -n ".$charset"; \
-	echo -n `echo $locale | sed 's/\([^\@]*\)\(\@.*\)*/\2/'`; \
-	echo -n '...'; \
-        if [ -f $LOCALES/$locale ]; then input=$locale; else \
-        input=`echo $locale | sed 's/\([^.]*\)[^@]*\(.*\)/\1\2/'`; fi; \
-	localedef -i $input -c -f $charset -A /usr/share/locale/locale.alias $locale; \
-	echo ' done'; \
+	case $locale in
+		\#*|'')
+			continue
+			;;
+	esac
+	gen "$locale" "$charset" &
+
+	# keep no more than $maxjobs jobs in flight
+	while [ $(jobs | wc -l) -ge $maxjobs ]; do
+		sleep 0.25
+		jobs >/dev/null
+	done
 done < $LOCALEGEN
+wait
+
 echo "Generation complete."
diff --git a/core/gmp/PKGBUILD b/core/gmp/PKGBUILD
index f8bff89b0..f19fa68be 100644
--- a/core/gmp/PKGBUILD
+++ b/core/gmp/PKGBUILD
@@ -1,16 +1,15 @@
-# $Id: PKGBUILD 195874 2013-10-03 04:29:19Z allan $
+# $Id: PKGBUILD 197162 2013-10-23 13:04:59Z allan $
 # Maintainer: Allan McRae <allan@archlinux.org>
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=gmp
 pkgver=5.1.3
-pkgrel=1
+pkgrel=2
 pkgdesc="A free library for arbitrary precision arithmetic"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://gmplib.org/"
 depends=('gcc-libs' 'sh')
 license=('LGPL3')
-options=('!libtool')
 install=gmp.install
 source=(ftp://ftp.gmplib.org/pub/gmp-${pkgver}/gmp-${pkgver}.tar.xz{,.sig})
 md5sums=('e5fe367801ff067b923d1e6a126448aa'
diff --git a/core/gpgme/PKGBUILD b/core/gpgme/PKGBUILD
index f56856153..00d418785 100644
--- a/core/gpgme/PKGBUILD
+++ b/core/gpgme/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 193205 2013-08-19 07:48:04Z tpowa $
+# $Id: PKGBUILD 197813 2013-10-30 11:03:42Z allan $
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 # Contributor: Roman Kyrylych <roman@archlinux.org>
 # Contributor: Sarah Hay <sarah@archlinux.org>
@@ -12,7 +12,7 @@ url="http://www.gnupg.org/related_software/gpgme/"
 license=('GPL')
 depends=('libgpg-error' 'pth' 'gnupg>=2')
 install=${pkgname}.install
-options=('!libtool' '!emptydirs')
+options=('!emptydirs')
 source=(ftp://ftp.gnupg.org/gcrypt/${pkgname}/${pkgname}-${pkgver}.tar.bz2{,.sig})
 md5sums=('334e524cffa8af4e2f43ae8afe585672'
          'SKIP')
diff --git a/core/gpm/PKGBUILD b/core/gpm/PKGBUILD
index 5c5e106c5..0bc6550b2 100644
--- a/core/gpm/PKGBUILD
+++ b/core/gpm/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 186057 2013-05-20 18:53:27Z eric $
+# $Id: PKGBUILD 197717 2013-10-28 22:26:50Z eric $
 # Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgname=gpm
 pkgver=1.20.7
-pkgrel=3
+pkgrel=4
 pkgdesc="A mouse server for the console and xterm"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.nico.schottelius.org/software/gpm/"
diff --git a/core/grep/PKGBUILD b/core/grep/PKGBUILD
index 5c37c9bd7..caabdfaa2 100644
--- a/core/grep/PKGBUILD
+++ b/core/grep/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 176245 2013-01-28 00:29:23Z allan $
+# $Id: PKGBUILD 197799 2013-10-30 10:37:55Z allan $
 # Maintainer: Allan McRae <allan@archlinux.org>
 # Contributor: judd <jvinet@zeroflux.org>
 
 pkgname=grep
-pkgver=2.14
-pkgrel=2
+pkgver=2.15
+pkgrel=1
 pkgdesc="A string search utility"
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL3')
@@ -14,8 +14,8 @@ depends=('glibc' 'pcre' 'sh')
 makedepends=('texinfo')
 install=${pkgname}.install
 source=(ftp://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.xz{,.sig})
-md5sums=('d4a3f03849d1e17ce56ab76aa5a24cab'
-         'b94fdcaa058b47a9a25099c26cd2e4c3')
+md5sums=('8cab8ca52bcae735af40278423c7c942'
+         'SKIP')
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
diff --git a/core/iptables/PKGBUILD b/core/iptables/PKGBUILD
index 3fba35fe2..13c9a2c90 100644
--- a/core/iptables/PKGBUILD
+++ b/core/iptables/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 187030 2013-06-03 11:15:14Z allan $
+# $Id: PKGBUILD 197814 2013-10-30 11:03:50Z allan $
 # Maintainer: Ronald van Haren <ronald.archlinux.org>
 # Contributor: Thomas Baechler <thomas@archlinux.org>
 
@@ -12,7 +12,6 @@ url='http://www.netfilter.org/projects/iptables/index.html'
 depends=('glibc' 'bash')
 makedepends=('linux-api-headers')
 backup=('etc/xtables/connlabel.conf')
-options=('!libtool')
 source=(http://www.netfilter.org/projects/iptables/files/${pkgname}-${pkgver}.tar.bz2{,.sig}
         empty.rules
         simple_firewall.rules
diff --git a/core/isl/PKGBUILD b/core/isl/PKGBUILD
index 5e04bcfa8..9a8b1224c 100644
--- a/core/isl/PKGBUILD
+++ b/core/isl/PKGBUILD
@@ -1,15 +1,14 @@
-# $Id: PKGBUILD 193525 2013-08-22 05:37:20Z allan $
+# $Id: PKGBUILD 197163 2013-10-23 13:05:00Z allan $
 # Maintainer: Allan McRae <allan@archlinux.org>
 
 pkgname=isl
 pkgver=0.12.1
-pkgrel=1
+pkgrel=2
 pkgdesc="Library for manipulating sets and relations of integer points bounded by linear constraints"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://freecode.com/projects/isl"
 depends=('gmp')
 license=('MIT')
-options=('!libtool')
 source=(ftp://ftp.linux.student.kuleuven.be/pub/people/skimo/isl/$pkgname-$pkgver.tar.bz2)
 md5sums=('27d381085ff1b5733c3e8a9b6ad24a4d')
 
diff --git a/core/keyutils/PKGBUILD b/core/keyutils/PKGBUILD
index 3bfd63f4b..37ae8968e 100644
--- a/core/keyutils/PKGBUILD
+++ b/core/keyutils/PKGBUILD
@@ -1,32 +1,32 @@
-# $Id: PKGBUILD 186780 2013-05-31 07:19:13Z tpowa $
+# $Id: PKGBUILD 198652 2013-11-01 13:53:34Z eric $
 # Maintainer: Stéphane Gaudreault <stephane@archlinux.org>
 # Contributor: Tobias Powalowski <tpowa@archlinux.org>
 pkgname=keyutils
-pkgver=1.5.5
-pkgrel=5
+pkgver=1.5.8
+pkgrel=1
 pkgdesc="Linux Key Management Utilities"
 arch=(i686 x86_64 'mips64el')
 url="http://www.kernel.org"
 license=('GPL2' 'LGPL2.1')
 depends=('glibc' 'sh')
-backup=(etc/request-key.conf)
+backup=('etc/request-key.conf')
 source=(http://people.redhat.com/~dhowells/${pkgname}/${pkgname}-${pkgver}.tar.bz2
-request-key.conf.patch)
-md5sums=('d759680b2f23c99af95938f5026f25fb'
+        request-key.conf.patch)
+md5sums=('3c7f463039b83833c12a9414c2fcb389'
          '89a819a7e4e90936b210c9d5020d296d')
 
 prepare() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+  cd ${pkgname}-${pkgver}
   # fix paths of binaries in /etc/request-key.conf
   patch -Np0 -i ../request-key.conf.patch
 }
 
 build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+  cd ${pkgname}-${pkgver}
   make CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" SBINDIR='/usr/bin' BINDIR='/usr/bin'
 }
 
 package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+  cd ${pkgname}-${pkgver}
   make DESTDIR="${pkgdir}" SBINDIR='/usr/bin' BINDIR='/usr/bin' LIBDIR='/usr/lib' USRLIBDIR='/usr/lib'  install
 }
diff --git a/core/kmod/PKGBUILD b/core/kmod/PKGBUILD
index 71911ca48..2cc64e971 100644
--- a/core/kmod/PKGBUILD
+++ b/core/kmod/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 193604 2013-08-25 14:43:28Z dreisner $
+# $Id: PKGBUILD 197816 2013-10-30 11:04:03Z allan $
 # Maintainer: Dave Reisner <dreisner@archlinux.org>
 
 pkgname=kmod
@@ -10,7 +10,6 @@ url='http://git.kernel.org/?p=utils/kernel/kmod/kmod.git;a=summary'
 license=('GPL2')
 depends=('glibc' 'zlib')
 makedepends=('gtk-doc')
-options=('!libtool')
 provides=('module-init-tools=3.16' 'libkmod.so')
 conflicts=('module-init-tools')
 replaces=('module-init-tools')
diff --git a/core/ldns/PKGBUILD b/core/ldns/PKGBUILD
index 44607652a..98ac36415 100644
--- a/core/ldns/PKGBUILD
+++ b/core/ldns/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 171551 2012-11-19 03:55:29Z bisson $
+# $Id: PKGBUILD 197817 2013-10-30 11:04:09Z allan $
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
 # Contributor: mathieui <mathieui@mathieui.net>
 # Contributor: jiribb <jiribb@gmail.com>
@@ -10,7 +10,6 @@ pkgdesc='Fast DNS library supporting recent RFCs'
 url='http://www.nlnetlabs.nl/projects/ldns/'
 license=('custom:BSD')
 arch=('i686' 'x86_64' 'mips64el')
-options=('!libtool')
 depends=('openssl' 'dnssec-anchors')
 optdepends=('libpcap: ldns-dpa tool')
 makedepends=('libpcap')
diff --git a/core/libarchive/PKGBUILD b/core/libarchive/PKGBUILD
index 44931f986..cfd07fac2 100644
--- a/core/libarchive/PKGBUILD
+++ b/core/libarchive/PKGBUILD
@@ -1,20 +1,23 @@
-# $Id: PKGBUILD 193605 2013-08-25 14:43:38Z dreisner $
+# $Id: PKGBUILD 197256 2013-10-24 19:47:22Z dreisner $
 # Maintainer: Dan McGee <dan@archlinux.org>
 
 pkgname=libarchive
 pkgver=3.1.2
-pkgrel=2
+pkgrel=4
 pkgdesc="library that can create and read several streaming archive formats"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://libarchive.org/"
 license=('BSD')
 depends=('acl' 'attr' 'bzip2' 'expat' 'lzo2' 'openssl' 'xz' 'zlib')
+options=('strip' 'debug' 'libtool')
 provides=('libarchive.so')
 source=("http://libarchive.org/downloads/$pkgname-$pkgver.tar.gz"
         '0001-mtree-fix-line-filename-length-calculation.patch'
+        https://github.com/libarchive/libarchive/commit/22531545514043e04633e1c015c7540b9de9dbe4.patch
         'libarchive-3.1.2-acl.patch')
 md5sums=('efad5a503f66329bb9d2f4308b5de98a'
          'fda89c145bbcd793a96b06b463ef6a72'
+         '6432f3360abd5645461a9c825c75b307'
          'a5c995661c62429ceff2c23ea322393b')
 
 build() {
@@ -27,6 +30,9 @@ build() {
   # https://code.google.com/p/libarchive/issues/detail?id=329
   patch -Np1 -i "$srcdir/libarchive-3.1.2-acl.patch"
 
+  # CVE-2013-0211
+  patch -Np1 -i "$srcdir/22531545514043e04633e1c015c7540b9de9dbe4.patch"
+
   ./configure --prefix=/usr --without-xml2
   make
 }
diff --git a/core/libassuan/PKGBUILD b/core/libassuan/PKGBUILD
index 86047c79b..a3c8709d6 100644
--- a/core/libassuan/PKGBUILD
+++ b/core/libassuan/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 189897 2013-07-11 06:27:54Z tpowa $
+# $Id: PKGBUILD 197818 2013-10-30 11:04:17Z allan $
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 
 pkgname=libassuan
@@ -9,7 +9,6 @@ arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 url="http://www.gnupg.org/related_software/libassuan"
 depends=('libgpg-error')
-options=('!libtool')
 source=(ftp://ftp.gnupg.org/gcrypt/$pkgname/$pkgname-$pkgver.tar.bz2)
 install=libassuan.install
 md5sums=('757243cc4a71b30ed8d8dbe784035d36')
diff --git a/core/libedit/PKGBUILD b/core/libedit/PKGBUILD
index 3e51cfdb5..fa676f1a8 100644
--- a/core/libedit/PKGBUILD
+++ b/core/libedit/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 187329 2013-06-05 12:52:10Z bisson $
+# $Id: PKGBUILD 197819 2013-10-30 11:04:23Z allan $
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
 # Maintainer: Vesa Kaihlavirta <vesa@archlinux.org>
 # Contributor: Roman Cheplyaka <roma@ro-che.info>
@@ -11,7 +11,6 @@ url='http://www.thrysoee.dk/editline/'
 arch=('i686' 'x86_64' 'mips64el')
 license=('BSD')
 depends=('ncurses')
-options=('!libtool')
 source=("http://www.thrysoee.dk/editline/libedit-${pkgver/_/-}.tar.gz")
 sha1sums=('9c3fe7af5ba3d86c608872de3d6e8179add8cc88')
 
diff --git a/core/libevent/PKGBUILD b/core/libevent/PKGBUILD
index 4dd3967a6..4b4119908 100644
--- a/core/libevent/PKGBUILD
+++ b/core/libevent/PKGBUILD
@@ -1,17 +1,16 @@
-# $Id: PKGBUILD 177868 2013-02-10 13:06:19Z tomegun $
+# $Id: PKGBUILD 197437 2013-10-26 01:07:57Z allan $
 # Maintainer: Tom Gundersen <teg@jklm.no>
 # Contributor: Judd <jvinet@zeroflux.org>
 
 pkgname=libevent
 pkgver=2.0.21
-pkgrel=2
+pkgrel=3
 pkgdesc="An event notification library"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.monkey.org/~provos/libevent/"
 license=('BSD')
 depends=('openssl')
 optdepends=('python2: to use event_rpcgen.py')
-options=('!libtool')
 source=(https://github.com/downloads/${pkgname}/${pkgname}/${pkgname}-$pkgver-stable.tar.gz{,.asc})
 
 build() {
diff --git a/core/libffi/PKGBUILD b/core/libffi/PKGBUILD
index ffdcc73a9..ea0981e35 100644
--- a/core/libffi/PKGBUILD
+++ b/core/libffi/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 195482 2013-10-01 05:58:29Z bpiotrowski $
+# $Id: PKGBUILD 197820 2013-10-30 11:04:33Z allan $
 # Contributor: Stéphane Gaudreault <stephane@archlinux.org>
 # Contributor: Jan de Groot <jgc@archlinux.org>
 
@@ -11,7 +11,6 @@ url="http://sourceware.org/libffi/"
 license=('MIT')
 depends=('glibc')
 checkdepends=('dejagnu')
-options=('!libtool')
 install=libffi.install
 source=(ftp://sourceware.org/pub/libffi/libffi-${pkgver}.tar.gz)
 sha1sums=('f5230890dc0be42fb5c58fbf793da253155de106')
diff --git a/core/libgcrypt/PKGBUILD b/core/libgcrypt/PKGBUILD
index 74af6846c..5028378bf 100644
--- a/core/libgcrypt/PKGBUILD
+++ b/core/libgcrypt/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 191717 2013-07-29 14:03:23Z andyrtr $
+# $Id: PKGBUILD 197821 2013-10-30 11:04:40Z allan $
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 
 pkgname=libgcrypt
@@ -9,7 +9,7 @@ arch=(i686 x86_64 'mips64el')
 url="http://www.gnupg.org"
 license=('LGPL')
 depends=('libgpg-error>=1.10-2')
-options=('!libtool' '!emptydirs')
+options=('!emptydirs')
 install=$pkgname.install
 source=(ftp://ftp.gnupg.org/gcrypt/${pkgname}/${pkgname}-${pkgver}.tar.bz2
 	#ftp://ftp.franken.de/pub/crypt/mirror/ftp.gnupg.org/gcrypt/libgcrypt/${pkgname}-${pkgver}.tar.bz2
diff --git a/core/libgpg-error/PKGBUILD b/core/libgpg-error/PKGBUILD
index b83b425bb..a0f491857 100644
--- a/core/libgpg-error/PKGBUILD
+++ b/core/libgpg-error/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 189754 2013-07-07 09:05:18Z andyrtr $
+# $Id: PKGBUILD 197822 2013-10-30 11:04:47Z allan $
 # Maintainer: judd <jvinet@zeroflux.org>
 
 pkgname=libgpg-error
@@ -9,7 +9,6 @@ arch=(i686 x86_64 'mips64el')
 url="http://www.gnupg.org"
 license=('LGPL')
 depends=('glibc' 'sh')
-options=(!libtool)
 source=(ftp://ftp.gnupg.org/gcrypt/libgpg-error/${pkgname}-${pkgver}.tar.bz2{,.sig})
 	#ftp://ftp.franken.de/pub/crypt/mirror/ftp.gnupg.org/gcrypt/libgpg-error/${pkgname}-${pkgver}.tar.bz2)
 sha1sums=('259f359cd1440b21840c3a78e852afd549c709b8'
diff --git a/core/libgssglue/PKGBUILD b/core/libgssglue/PKGBUILD
index 4ef5b8d41..c7277e32e 100644
--- a/core/libgssglue/PKGBUILD
+++ b/core/libgssglue/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 165600 2012-08-27 07:54:23Z tomegun $
+# $Id: PKGBUILD 197800 2013-10-30 10:37:56Z allan $
 # Maintainer: Tom Gundersen <teg@jklm.no>
 # Contributor: Tobias Powalowski <tpowa@archlinux.org>
 
 pkgname=libgssglue
 pkgver=0.4
-pkgrel=1
+pkgrel=2
 pkgdesc="Exports a gssapi interface which calls other random gssapi libraries"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.citi.umich.edu/projects/nfsv4/linux/"
@@ -12,7 +12,6 @@ license=('BSD')
 depends=('glibc')
 makedepends=('pkgconfig' 'autoconf')
 backup=(etc/gssapi_mech.conf)
-options=('!libtool')
 source=(http://www.citi.umich.edu/projects/nfsv4/linux/$pkgname/$pkgname-$pkgver.tar.gz
         gssapi_mech.conf)
 
diff --git a/core/libksba/PKGBUILD b/core/libksba/PKGBUILD
index 8271eaff2..ef9a6d03f 100644
--- a/core/libksba/PKGBUILD
+++ b/core/libksba/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 183487 2013-04-22 09:10:14Z tpowa $
+# $Id: PKGBUILD 197823 2013-10-30 11:04:53Z allan $
 # Maintainer: 
 # Contributor: Damir Perisa <damir.perisa@bluewin.ch>
 
@@ -11,7 +11,6 @@ license=('GPL')
 url="ftp://ftp.gnupg.org/gcrypt/alpha/libksba"
 depends=('bash' 'libgpg-error' 'glibc')
 source=(ftp://ftp.gnupg.org/gcrypt/$pkgname/$pkgname-$pkgver.tar.bz2)
-options=(!libtool)
 install=libksba.install
 
 build() {
diff --git a/core/libmpc/PKGBUILD b/core/libmpc/PKGBUILD
index 9862a825e..535e95513 100644
--- a/core/libmpc/PKGBUILD
+++ b/core/libmpc/PKGBUILD
@@ -1,15 +1,14 @@
-# $Id: PKGBUILD 166514 2012-09-09 07:34:43Z allan $
+# $Id: PKGBUILD 197164 2013-10-23 13:05:01Z allan $
 # Maintainer: Allan McRae <allan@archlinux.org>
 
 pkgname=libmpc
 pkgver=1.0.1
-pkgrel=1.1
+pkgrel=2
 pkgdesc="Library for the arithmetic of complex numbers with arbitrarily high precision"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.multiprecision.org/"
 license=('LGPL')
-depends=('mpfr>=3.0.0')
-options=('!libtool')
+depends=('mpfr')
 install=libmpc.install
 source=(http://www.multiprecision.org/mpc/download/mpc-${pkgver/_/-}.tar.gz{,.sig})
 md5sums=('b32a2e1a3daa392372fbd586d1ed3679'
diff --git a/core/libnl/PKGBUILD b/core/libnl/PKGBUILD
index 7cd99eb0a..f70db147a 100644
--- a/core/libnl/PKGBUILD
+++ b/core/libnl/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 189873 2013-07-10 08:18:16Z thomas $
+# $Id: PKGBUILD 197824 2013-10-30 11:05:01Z allan $
 # Maintainer: Thomas Bächler <thomas@archlinux.org>
 
 pkgname=libnl
@@ -10,7 +10,6 @@ url="http://www.infradead.org/~tgr/libnl/"
 license=(GPL)
 depends=(glibc)
 backup=(etc/libnl/classid etc/libnl/pktloc)
-options=(!libtool)
 source=("$url/files/$pkgname-$pkgver.tar.gz")
 sha256sums=('c7c5f267dfeae0c1a530bf96b71fb7c8dbbb07d54beef49b6712d8d6166f629b')
 
diff --git a/core/libpipeline/PKGBUILD b/core/libpipeline/PKGBUILD
index 1116f7fea..cfefe2e16 100644
--- a/core/libpipeline/PKGBUILD
+++ b/core/libpipeline/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 188248 2013-06-13 13:32:04Z andyrtr $
+# $Id: PKGBUILD 197825 2013-10-30 11:05:08Z allan $
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 
 pkgname=libpipeline
@@ -9,7 +9,6 @@ arch=('i686' 'x86_64' 'mips64el')
 url="http://libpipeline.nongnu.org/"
 license=('GPL')
 depends=('glibc')
-options=('!libtool')
 source=(http://download.savannah.gnu.org/releases/libpipeline/$pkgname-$pkgver.tar.gz{,.sig})
 md5sums=('a98b07f6f487fa268d1ebd99806b85ff'
          'SKIP')
diff --git a/core/librpcsecgss/PKGBUILD b/core/librpcsecgss/PKGBUILD
index 0547d6416..86ba947a2 100644
--- a/core/librpcsecgss/PKGBUILD
+++ b/core/librpcsecgss/PKGBUILD
@@ -1,17 +1,16 @@
-# $Id: PKGBUILD 142792 2011-11-15 09:00:03Z tpowa $
+# $Id: PKGBUILD 197826 2013-10-30 11:05:14Z allan $
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 # Contributor: Andrew Krawchyk <krawch_a@denison.edu>, Marco Lima <cipparello gmail com>
 
 pkgname=librpcsecgss
 pkgver=0.19
-pkgrel=7.1
+pkgrel=8
 pkgdesc="Library for RPCSECGSS support"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.citi.umich.edu/projects/nfsv4/linux/"
 license=('GPL')
 depends=('glibc' 'krb5' 'libgssglue')
 makedepends=('pkg-config' 'autoconf')
-options=('!libtool')
 source=("http://www.citi.umich.edu/projects/nfsv4/linux/${pkgname}/${pkgname}-${pkgver}.tar.gz")
 md5sums=('b45ed565bdc3099023aa35830ec92997')
 
diff --git a/core/libsasl/PKGBUILD b/core/libsasl/PKGBUILD
index 47e20bf0a..3632f77fc 100644
--- a/core/libsasl/PKGBUILD
+++ b/core/libsasl/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 195994 2013-10-07 10:32:39Z jgc $
+# $Id: PKGBUILD 197827 2013-10-30 11:05:21Z allan $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 # This package spans multiple repositories. 
@@ -13,7 +13,7 @@ pkgdesc="Cyrus Simple Authentication Service Layer (SASL) library"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://cyrusimap.web.cmu.edu/"
 license=('custom')
-options=('!makeflags' '!libtool')
+options=('!makeflags')
 makedepends=('postgresql-libs' 'libmariadbclient' 'libldap' 'krb5' 'openssl' 'sqlite2')
 source=(ftp://ftp.cyrusimap.org/cyrus-sasl/cyrus-sasl-${pkgver}.tar.gz
         cyrus-sasl-2.1.22-qa.patch
diff --git a/core/libssh2/PKGBUILD b/core/libssh2/PKGBUILD
index 4df093749..6b90eecb7 100644
--- a/core/libssh2/PKGBUILD
+++ b/core/libssh2/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 173038 2012-12-09 15:23:11Z dreisner $
+# $Id: PKGBUILD 198760 2013-11-03 13:49:40Z dreisner $
 # Maintainer: Dave Reisner <dreisner@archlinux.org>
 # Contributor: Angel Velasquez <angvp@archlinux.org> 
 # Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com>
@@ -7,7 +7,7 @@
 
 pkgname=libssh2
 pkgver=1.4.3
-pkgrel=1
+pkgrel=2
 pkgdesc="A library implementing the SSH2 protocol as defined by Internet Drafts"
 url="http://www.libssh2.org/"
 arch=('i686' 'x86_64' 'mips64el')
@@ -15,7 +15,6 @@ license=('BSD')
 depends=('openssl')
 makedepends=('zlib')
 provides=('libssh2.so')
-options=('!libtool')
 source=("http://www.libssh2.org/download/$pkgname-$pkgver.tar.gz"{,.asc})
 md5sums=('071004c60c5d6f90354ad1b701013a0b'
          'bd01eca1e58c15233d69dae411dd2656')
diff --git a/core/libtirpc/PKGBUILD b/core/libtirpc/PKGBUILD
index fb70c3cc8..b88305735 100644
--- a/core/libtirpc/PKGBUILD
+++ b/core/libtirpc/PKGBUILD
@@ -1,17 +1,16 @@
-# $Id: PKGBUILD 185038 2013-05-10 16:21:42Z tomegun $
+# $Id: PKGBUILD 197801 2013-10-30 10:37:59Z allan $
 # Maintainer: Tom Gundersen <teg@jklm.no>
 # Contributor: Tobias Powalowski <tpowa@archlinux.org>
 
 pkgname=libtirpc
 pkgver=0.2.3
-pkgrel=1
+pkgrel=2
 pkgdesc="Transport Independent RPC library (SunRPC replacement)"
 arch=(i686 x86_64 mips64el)
 url="http://libtirpc.sourceforge.net/"
 license=('BSD')
 depends=('libgssglue')
 backup=('etc/netconfig')
-options=('!libtool')
 source=(http://downloads.sourceforge.net/sourceforge/libtirpc/${pkgname}-${pkgver}.tar.bz2
        libtirpc-build.patch)
 
diff --git a/core/libtool/PKGBUILD b/core/libtool/PKGBUILD
index 53ca4d00e..5f916f86d 100644
--- a/core/libtool/PKGBUILD
+++ b/core/libtool/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 188783 2013-06-20 06:35:11Z allan $
+# $Id: PKGBUILD 197158 2013-10-23 13:04:23Z allan $
 # Maintainer: Allan McRae <allan@archlinux.org>
 # Contributor: judd <jvinet@zeroflux.org>
 
@@ -6,13 +6,13 @@
 
 pkgname=('libtool' 'libltdl')
 pkgver=2.4.2
-pkgrel=10
+_gccver=4.8.2
+pkgrel=12
 pkgdesc="A generic library support script"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.gnu.org/software/libtool"
 license=('GPL')
-makedepends=('gcc=4.8.1')
-options=('!libtool')
+makedepends=("gcc=${_gccver}")
 source=(ftp://ftp.gnu.org/pub/gnu/libtool/${pkgname}-${pkgver}.tar.xz{,.sig}
         nopic.patch)
 md5sums=('2ec8997e0c07249eb4cbd072417d70fe'
@@ -35,7 +35,7 @@ check() {
 }
 
 package_libtool() {
-  depends=('sh' "libltdl=$pkgver" 'tar' 'gcc=4.8.1')
+  depends=('sh' "libltdl=$pkgver" 'tar' "gcc=${_gccver}")
   groups=('base-devel')
   install=libtool.install
 
@@ -43,7 +43,7 @@ package_libtool() {
   
   make DESTDIR=${pkgdir} install-binSCRIPTS install-man install-info \
                          install-data-local
-  rm -rf ${pkgdir}/usr/share/libtool/libltdl/
+  rm -r ${pkgdir}/usr/share/libtool/libltdl/
 }
 
 package_libltdl() {
@@ -52,5 +52,5 @@ package_libltdl() {
   cd ${srcdir}/${pkgbase}-${pkgver}
   make DESTDIR=${pkgdir} install-libLTLIBRARIES install-includeHEADERS \
                          install-ltdlincludeHEADERS install-data-local
-  rm -rf ${pkgdir}/usr/share/{aclocal,libtool/config}
+  rm -r ${pkgdir}/usr/share/{aclocal,libtool/config}
 }
diff --git a/core/libusbx/PKGBUILD b/core/libusbx/PKGBUILD
index a708fc92c..78f874dd4 100644
--- a/core/libusbx/PKGBUILD
+++ b/core/libusbx/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 194438 2013-09-16 12:13:08Z tpowa $
+# $Id: PKGBUILD 197829 2013-10-30 11:05:34Z allan $
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 pkgname=libusbx
 pkgver=1.0.17
@@ -9,7 +9,6 @@ arch=(i686 x86_64 mips64el)
 url="http://libusbx.org"
 license=('LGPL')
 source=(http://downloads.sourceforge.net/${pkgname}/releases/${pkgver}/${pkgname}-${pkgver}.tar.bz2)
-options=(!libtool)
 replaces=('libusb1' 'libusb')
 provides=("libusb=$pkgver")
 conflicts=("libusb")
diff --git a/core/linux-atm/PKGBUILD b/core/linux-atm/PKGBUILD
index a14393a05..7d171ef97 100644
--- a/core/linux-atm/PKGBUILD
+++ b/core/linux-atm/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 186297 2013-05-24 07:57:23Z tpowa $
+# $Id: PKGBUILD 197830 2013-10-30 11:05:41Z allan $
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 # Contributor: Surain Mallawa Arachchi <mas@crc32.net>
 
 pkgname=linux-atm
 pkgver=2.5.2
-pkgrel=3
+pkgrel=4
 pkgdesc="Drivers and tools to support ATM networking under Linux."
 arch=('i686' 'x86_64' 'mips64el')
 depends=('glibc')
@@ -12,7 +12,7 @@ url="http://linux-atm.sourceforge.net/"
 license=(GPL)
 source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.gz
         man-pages.patch)
-options=(!libtool !makeflags)
+options=(!makeflags)
 md5sums=('d49499368c3cf15f73a05d9bce8824a8'
          '181390736336cdb615ae32f1ae5acfa6')
 
diff --git a/core/logrotate/PKGBUILD b/core/logrotate/PKGBUILD
index 8066904f1..49702e089 100644
--- a/core/logrotate/PKGBUILD
+++ b/core/logrotate/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 192722 2013-08-14 17:32:14Z pierre $
+# $Id: PKGBUILD 196792 2013-10-19 09:14:49Z pierre $
 # Maintainer: Pierre Schmitz <pierre@archlinux.de>
 
 pkgname=logrotate
-pkgver=3.8.6
+pkgver=3.8.7
 pkgrel=1
 pkgdesc="Rotates system logs automatically"
 arch=('i686' 'x86_64' 'mips64el')
@@ -16,10 +16,10 @@ source=("https://fedorahosted.org/releases/l/o/logrotate/logrotate-${pkgver}.tar
         'paths.patch'
         'logrotate.conf'
         'logrotate.cron.daily')
-md5sums=('cd0082bbd7248e627ec659f2442fcdf9'
+md5sums=('99e08503ef24c3e2e3ff74cc5f3be213'
          'e76526bcd6fc33c9d921e1cb1eff1ffb'
          '86209d257c8b8bc0ae34d6f6ef057c0f'
-         '3909380f8a55fa160f62ed976a8bef4b')
+         'dd5fd26724274fd9c827eadad60ff4c5')
 
 build() {
 	cd "$srcdir/${pkgname}-${pkgver}"
diff --git a/core/logrotate/logrotate.cron.daily b/core/logrotate/logrotate.cron.daily
index 37d9e534c..11fe09c52 100755
--- a/core/logrotate/logrotate.cron.daily
+++ b/core/logrotate/logrotate.cron.daily
@@ -16,7 +16,11 @@ if [ -x /usr/bin/nice ]; then
 fi
 
 if [ -x /usr/bin/ionice ]; then
-  CMD_LOGROTATE="/usr/bin/ionice -c ${IONICE_CLASS:-2} -n ${IONICE_PRIORITY:-7} ${CMD_LOGROTATE}"
+  IONICE_CMD="/usr/bin/ionice -c ${IONICE_CLASS:-2}"
+  if [ $IONICE_CLASS -ne 3 ]; then
+    IONICE_CMD="${IONICE_CMD} -n ${IONICE_PRIORITY:-7}"
+  fi
+  CMD_LOGROTATE="${IONICE_CMD} ${CMD_LOGROTATE}"
 fi
 
 ${CMD_LOGROTATE}
diff --git a/core/lvm2/PKGBUILD b/core/lvm2/PKGBUILD
index 9cc0623f8..6da781f60 100644
--- a/core/lvm2/PKGBUILD
+++ b/core/lvm2/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 196179 2013-10-07 23:45:54Z thomas $
+# $Id: PKGBUILD 197750 2013-10-29 09:58:36Z thomas $
 # Maintainer: Eric Bélanger <eric@archlinux.org>
 # Maintainer: Thomas Bächler <thomas@archlinux.org>
 
 pkgbase=lvm2
 pkgname=('lvm2' 'device-mapper')
 pkgver=2.02.103
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64' 'mips64el')
 url="http://sourceware.org/lvm2/"
 license=('GPL2' 'LGPL2.1')
@@ -31,7 +31,7 @@ sha1sums=('1194babd8d3cd5a9620bec1fe98a3be060465daf'
           'ccefad65fde3d50331a42b0e90a1539dc7c8b9e4'
           '01782ce8e10718c1513e3906b126f30f682f5cab'
           '1d56f47a81350ae37ffbf61ee036fe31f4c5d504'
-          'adf26f5e5636de9c055b2ac3b179641a543a8937'
+          'aad90fce0e12eda41d38571d8eb27c5d5a8c59ec'
           'f857a4a63fcc604a981e56875edda91767d4f1bf'
           'fcfc265e3b10294cc4b10949a342e9db4310b186')
 
diff --git a/core/lvm2/lvm-monitoring.service b/core/lvm2/lvm-monitoring.service
index 138e91a08..14b2d1dee 100644
--- a/core/lvm2/lvm-monitoring.service
+++ b/core/lvm2/lvm-monitoring.service
@@ -2,8 +2,7 @@
 Description=Monitoring of LVM2 mirrors, snapshots etc. using dmeventd or progress polling
 Documentation=man:dmeventd(8) man:lvcreate(8) man:lvchange(8) man:vgchange(8)
 Requires=dmeventd.socket
-After=dmeventd.socket lvmetad.socket lvmetad.service dmeventd.service
-Before=local-fs-pre.target
+After=dmeventd.socket lvmetad.socket
 DefaultDependencies=no
 Conflicts=shutdown.target
 
diff --git a/core/lzo2/PKGBUILD b/core/lzo2/PKGBUILD
index e4632a529..a4d341ce3 100644
--- a/core/lzo2/PKGBUILD
+++ b/core/lzo2/PKGBUILD
@@ -1,16 +1,15 @@
-# $Id: PKGBUILD 136471 2011-08-30 06:25:43Z tpowa $
+# $Id: PKGBUILD 197831 2013-10-30 11:05:49Z allan $
 # Contributor: Low Kian Seong <fastmail_low@speedymail.org>
 # Maintainer: dorphell <dorphell@archlinux.org>
 pkgname=lzo2
 pkgver=2.06
-pkgrel=1.1
+pkgrel=3
 pkgdesc="Portable lossless data compression library"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.oberhumer.com/opensource/lzo"
 license=('GPL')
 depends=('glibc')
 source=(http://www.oberhumer.com/opensource/lzo/download/lzo-${pkgver}.tar.gz)
-options=(!libtool)
 md5sums=('95380bd4081f85ef08c5209f4107e9f8')
 
 build() {
@@ -21,7 +20,13 @@ build() {
 
   # build minilzo
   gcc $CFLAGS -fpic -Iinclude/lzo -o minilzo/minilzo.o -c minilzo/minilzo.c
-  gcc -g -shared -o libminilzo.so.0 -Wl,-soname,libminilzo.so.0 minilzo/minilzo.o
+  gcc $LDFLAGS -shared -o libminilzo.so.0 -Wl,-soname,libminilzo.so.0 minilzo/minilzo.o
+}
+
+check() {
+  cd "${srcdir}/lzo-${pkgver}"
+  make test # Larger test
+  make check
 }
 
 package() {
diff --git a/core/make/PKGBUILD b/core/make/PKGBUILD
index 9d6a8660a..ffe4143ca 100644
--- a/core/make/PKGBUILD
+++ b/core/make/PKGBUILD
@@ -1,54 +1,23 @@
-# $Id: PKGBUILD 189479 2013-07-03 10:09:10Z allan $
+# $Id: PKGBUILD 196827 2013-10-20 11:42:36Z allan $
 # Maintainer: Allan McRae <allan@archlinux.org>
 # Contributor: judd <jvinet@zeroflux.org>
 
 pkgname=make
-pkgver=3.82
-pkgrel=6
+pkgver=4.0
+pkgrel=1
 pkgdesc="GNU make utility to maintain groups of programs"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.gnu.org/software/make"
 license=('GPL3')
 groups=('base-devel')
-depends=('glibc' 'sh')
+depends=('glibc' 'sh' 'guile')
 install=$pkgname.install
-source=(ftp://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.bz2{,.sig}
-        make-3.82-bug30612.patch
-        make-3.82-bug30723.patch
-        make-3.82-sort-blank.patch
-        make-3.82-makeflags.patch
-        make-3.82-expensive_glob.patch
-        make-3.82-dont-prune-intermediate.patch)
-md5sums=('1a11100f3c63fcf5753818e59d63088f'
-         'SKIP'
-         '8714ba22911a58ab3eb42ac3f4c6c3bd'
-         '662e6450e19a5acdaa5c9fcb8ad78dea'
-         '7d01a99f389d8f08dec93ed479071ee4'
-         'bc12ad4d0c6e6c0e72d9fb61054f446b'
-         'e58d4211c5b29d7d927a304d082849e7'
-         '45ac9e987f4bf16c0d7e1685db943917')
+source=(ftp://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.bz2{,.sig})
+md5sums=('571d470a7647b455e3af3f92d79f1c18'
+         'SKIP')
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
-  
-  # http://savannah.gnu.org/bugs/?30612
-  patch -Np1 -i $srcdir/make-3.82-bug30612.patch
-  
-  # http://savannah.gnu.org/bugs/?30723
-  patch -Np1 -i $srcdir/make-3.82-bug30723.patch
-  
-  # https://bugs.archlinux.org/task/22733 (fix from Fedora)
-  patch -Np1 -i $srcdir/make-3.82-sort-blank.patch
-  
-  # https://savannah.gnu.org/bugs/?33873
-  patch -Np0 -i $srcdir/make-3.82-makeflags.patch
-  
-  # http://lists.gnu.org/archive/html/bug-make/2011-04/msg00002.html
-  patch -Np0 -i $srcdir/make-3.82-expensive_glob.patch
- 
-  # https://savannah.gnu.org/bugs/?30653
-  patch -Np0 -i $srcdir/make-3.82-dont-prune-intermediate.patch
-
   ./configure --prefix=/usr
   make
 }
diff --git a/core/man-db/PKGBUILD b/core/man-db/PKGBUILD
index e2671a68f..85387f10a 100644
--- a/core/man-db/PKGBUILD
+++ b/core/man-db/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 189192 2013-06-29 06:03:40Z andyrtr $
+# $Id: PKGBUILD 197832 2013-10-30 11:05:56Z allan $
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 # Contributor: Sergej Pupykin <sergej@aur.archlinux.org>
 
@@ -20,7 +20,6 @@ replaces=('man')
 install=${pkgname}.install
 source=(http://savannah.nongnu.org/download/man-db/$pkgname-$pkgver.tar.xz{,.sig}
         convert-mans man-db.cron.daily)
-options=('!libtool')
 md5sums=('36f59d9314b45a266ba350584b4d7cc1'
          'SKIP'
          '2b7662a7d5b33fe91f9f3e034361a2f6'
diff --git a/core/mpfr/PKGBUILD b/core/mpfr/PKGBUILD
index e64a984db..4a7e99916 100644
--- a/core/mpfr/PKGBUILD
+++ b/core/mpfr/PKGBUILD
@@ -1,27 +1,28 @@
-# $Id: PKGBUILD 180068 2013-03-15 22:55:34Z allan $
+# $Id: PKGBUILD 197157 2013-10-23 13:04:22Z allan $
 # Maintainer: Allan McRae <allan@archlinux.org>
 # Contributor: damir <damir@archlinux.org>
 
 pkgname=mpfr
 _pkgver=3.1.2
-#_patchlevel=p1
-#pkgver=${_pkgver}.${_patchlevel}
-pkgver=${_pkgver}
-pkgrel=1
+_patchlevel=p3
+pkgver=${_pkgver}.${_patchlevel}
+#pkgver=${_pkgver}
+pkgrel=2
 pkgdesc="Multiple-precision floating-point library"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.mpfr.org/"
 license=('LGPL')
 depends=('gmp>=5.0')
-options=('!libtool')
 install=mpfr.install
-source=(http://www.mpfr.org/mpfr-current/mpfr-${_pkgver}.tar.xz{,.asc})
+source=(http://www.mpfr.org/mpfr-current/mpfr-${_pkgver}.tar.xz{,.asc}
+        mpfr-${_pkgver}-${_patchlevel}.patch)
 md5sums=('e3d203d188b8fe60bb6578dd3152e05c'
-         '63d1a00bedd4fed3717115297f70d029')
+         'SKIP'
+         'd22c975afc8599b06dd0d6c1128ac078')
 
 build() {
   cd "${srcdir}/${pkgname}-${_pkgver}"
-  #patch -p1 -i $srcdir/mpfr-${_pkgver}-${_patchlevel}.patch
+  patch -p1 -i $srcdir/mpfr-${_pkgver}-${_patchlevel}.patch
   ./configure --prefix=/usr --enable-thread-safe --enable-shared
   make
 }
diff --git a/core/mpfr/mpfr-3.1.2-p3.patch b/core/mpfr/mpfr-3.1.2-p3.patch
new file mode 100644
index 000000000..0339944b6
--- /dev/null
+++ b/core/mpfr/mpfr-3.1.2-p3.patch
@@ -0,0 +1,779 @@
+diff -Naurd mpfr-3.1.2-a/PATCHES mpfr-3.1.2-b/PATCHES
+--- mpfr-3.1.2-a/PATCHES	2013-09-26 10:52:52.000000000 +0000
++++ mpfr-3.1.2-b/PATCHES	2013-09-26 10:52:52.000000000 +0000
+@@ -0,0 +1 @@
++exp_2
+diff -Naurd mpfr-3.1.2-a/VERSION mpfr-3.1.2-b/VERSION
+--- mpfr-3.1.2-a/VERSION	2013-03-13 15:37:28.000000000 +0000
++++ mpfr-3.1.2-b/VERSION	2013-09-26 10:52:52.000000000 +0000
+@@ -1 +1 @@
+-3.1.2
++3.1.2-p1
+diff -Naurd mpfr-3.1.2-a/src/exp_2.c mpfr-3.1.2-b/src/exp_2.c
+--- mpfr-3.1.2-a/src/exp_2.c	2013-03-13 15:37:28.000000000 +0000
++++ mpfr-3.1.2-b/src/exp_2.c	2013-09-26 10:52:52.000000000 +0000
+@@ -204,7 +204,7 @@
+           for (k = 0; k < K; k++)
+             {
+               mpz_mul (ss, ss, ss);
+-              exps <<= 1;
++              exps *= 2;
+               exps += mpz_normalize (ss, ss, q);
+             }
+           mpfr_set_z (s, ss, MPFR_RNDN);
+diff -Naurd mpfr-3.1.2-a/src/mpfr.h mpfr-3.1.2-b/src/mpfr.h
+--- mpfr-3.1.2-a/src/mpfr.h	2013-03-13 15:37:37.000000000 +0000
++++ mpfr-3.1.2-b/src/mpfr.h	2013-09-26 10:52:52.000000000 +0000
+@@ -27,7 +27,7 @@
+ #define MPFR_VERSION_MAJOR 3
+ #define MPFR_VERSION_MINOR 1
+ #define MPFR_VERSION_PATCHLEVEL 2
+-#define MPFR_VERSION_STRING "3.1.2"
++#define MPFR_VERSION_STRING "3.1.2-p1"
+ 
+ /* Macros dealing with MPFR VERSION */
+ #define MPFR_VERSION_NUM(a,b,c) (((a) << 16L) | ((b) << 8) | (c))
+diff -Naurd mpfr-3.1.2-a/src/version.c mpfr-3.1.2-b/src/version.c
+--- mpfr-3.1.2-a/src/version.c	2013-03-13 15:37:34.000000000 +0000
++++ mpfr-3.1.2-b/src/version.c	2013-09-26 10:52:52.000000000 +0000
+@@ -25,5 +25,5 @@
+ const char *
+ mpfr_get_version (void)
+ {
+-  return "3.1.2";
++  return "3.1.2-p1";
+ }
+diff -Naurd mpfr-3.1.2-a/PATCHES mpfr-3.1.2-b/PATCHES
+--- mpfr-3.1.2-a/PATCHES	2013-09-26 10:56:55.000000000 +0000
++++ mpfr-3.1.2-b/PATCHES	2013-09-26 10:56:55.000000000 +0000
+@@ -0,0 +1 @@
++fits-smallneg
+diff -Naurd mpfr-3.1.2-a/VERSION mpfr-3.1.2-b/VERSION
+--- mpfr-3.1.2-a/VERSION	2013-09-26 10:52:52.000000000 +0000
++++ mpfr-3.1.2-b/VERSION	2013-09-26 10:56:55.000000000 +0000
+@@ -1 +1 @@
+-3.1.2-p1
++3.1.2-p2
+diff -Naurd mpfr-3.1.2-a/src/fits_u.h mpfr-3.1.2-b/src/fits_u.h
+--- mpfr-3.1.2-a/src/fits_u.h	2013-03-13 15:37:35.000000000 +0000
++++ mpfr-3.1.2-b/src/fits_u.h	2013-09-26 10:56:55.000000000 +0000
+@@ -32,17 +32,20 @@
+   int res;
+ 
+   if (MPFR_UNLIKELY (MPFR_IS_SINGULAR (f)))
+-    /* Zero always fit */
+-    return MPFR_IS_ZERO (f) ? 1 : 0;
+-  else if (MPFR_IS_NEG (f))
+-    /* Negative numbers don't fit */
+-    return 0;
+-  /* now it fits if
+-     (a) f <= MAXIMUM
+-     (b) round(f, prec(slong), rnd) <= MAXIMUM */
++    return MPFR_IS_ZERO (f) ? 1 : 0;  /* Zero always fits */
+ 
+   e = MPFR_GET_EXP (f);
+ 
++  if (MPFR_IS_NEG (f))
++    return e >= 1 ? 0  /* f <= -1 does not fit */
++      : rnd != MPFR_RNDN ? MPFR_IS_LIKE_RNDU (rnd, -1)  /* directed mode */
++      : e < 0 ? 1  /* f > -1/2 fits in MPFR_RNDN */
++      : mpfr_powerof2_raw(f);  /* -1/2 fits, -1 < f < -1/2 don't */
++
++  /* Now it fits if
++     (a) f <= MAXIMUM
++     (b) round(f, prec(slong), rnd) <= MAXIMUM */
++
+   /* first compute prec(MAXIMUM); fits in an int */
+   for (s = MAXIMUM, prec = 0; s != 0; s /= 2, prec ++);
+ 
+diff -Naurd mpfr-3.1.2-a/src/fits_uintmax.c mpfr-3.1.2-b/src/fits_uintmax.c
+--- mpfr-3.1.2-a/src/fits_uintmax.c	2013-03-13 15:37:33.000000000 +0000
++++ mpfr-3.1.2-b/src/fits_uintmax.c	2013-09-26 10:56:55.000000000 +0000
+@@ -27,51 +27,19 @@
+ #include "mpfr-intmax.h"
+ #include "mpfr-impl.h"
+ 
+-#ifdef _MPFR_H_HAVE_INTMAX_T
+-
+-/* We can't use fits_u.h <= mpfr_cmp_ui */
+-int
+-mpfr_fits_uintmax_p (mpfr_srcptr f, mpfr_rnd_t rnd)
+-{
+-  mpfr_exp_t e;
+-  int prec;
+-  uintmax_t s;
+-  mpfr_t x;
+-  int res;
+-
+-  if (MPFR_UNLIKELY (MPFR_IS_SINGULAR (f)))
+-    /* Zero always fit */
+-    return MPFR_IS_ZERO (f) ? 1 : 0;
+-  else if (MPFR_IS_NEG (f))
+-    /* Negative numbers don't fit */
+-    return 0;
+-  /* now it fits if
+-     (a) f <= MAXIMUM
+-     (b) round(f, prec(slong), rnd) <= MAXIMUM */
+-
+-  e = MPFR_GET_EXP (f);
+-
+-  /* first compute prec(MAXIMUM); fits in an int */
+-  for (s = MPFR_UINTMAX_MAX, prec = 0; s != 0; s /= 2, prec ++);
+-
+-  /* MAXIMUM needs prec bits, i.e. MAXIMUM = 2^prec - 1 */
+-
+-  /* if e <= prec - 1, then f < 2^(prec-1) < MAXIMUM */
+-  if (e <= prec - 1)
+-    return 1;
++/* Note: though mpfr-impl.h is included in fits_u.h, we also include it
++   above so that it gets included even when _MPFR_H_HAVE_INTMAX_T is not
++   defined; this is necessary to avoid an empty translation unit, which
++   is forbidden by ISO C. Without this, a failing test can be reproduced
++   by creating an invalid stdint.h somewhere in the default include path
++   and by compiling MPFR with "gcc -ansi -pedantic-errors". */
+ 
+-  /* if e >= prec + 1, then f >= 2^prec > MAXIMUM */
+-  if (e >= prec + 1)
+-    return 0;
++#ifdef _MPFR_H_HAVE_INTMAX_T
+ 
+-  MPFR_ASSERTD (e == prec);
++#define FUNCTION   mpfr_fits_uintmax_p
++#define MAXIMUM    MPFR_UINTMAX_MAX
++#define TYPE       uintmax_t
+ 
+-  /* hard case: first round to prec bits, then check */
+-  mpfr_init2 (x, prec);
+-  mpfr_set (x, f, rnd);
+-  res = MPFR_GET_EXP (x) == e;
+-  mpfr_clear (x);
+-  return res;
+-}
++#include "fits_u.h"
+ 
+ #endif
+diff -Naurd mpfr-3.1.2-a/src/mpfr.h mpfr-3.1.2-b/src/mpfr.h
+--- mpfr-3.1.2-a/src/mpfr.h	2013-09-26 10:52:52.000000000 +0000
++++ mpfr-3.1.2-b/src/mpfr.h	2013-09-26 10:56:55.000000000 +0000
+@@ -27,7 +27,7 @@
+ #define MPFR_VERSION_MAJOR 3
+ #define MPFR_VERSION_MINOR 1
+ #define MPFR_VERSION_PATCHLEVEL 2
+-#define MPFR_VERSION_STRING "3.1.2-p1"
++#define MPFR_VERSION_STRING "3.1.2-p2"
+ 
+ /* Macros dealing with MPFR VERSION */
+ #define MPFR_VERSION_NUM(a,b,c) (((a) << 16L) | ((b) << 8) | (c))
+diff -Naurd mpfr-3.1.2-a/src/version.c mpfr-3.1.2-b/src/version.c
+--- mpfr-3.1.2-a/src/version.c	2013-09-26 10:52:52.000000000 +0000
++++ mpfr-3.1.2-b/src/version.c	2013-09-26 10:56:55.000000000 +0000
+@@ -25,5 +25,5 @@
+ const char *
+ mpfr_get_version (void)
+ {
+-  return "3.1.2-p1";
++  return "3.1.2-p2";
+ }
+diff -Naurd mpfr-3.1.2-a/tests/tfits.c mpfr-3.1.2-b/tests/tfits.c
+--- mpfr-3.1.2-a/tests/tfits.c	2013-03-13 15:37:45.000000000 +0000
++++ mpfr-3.1.2-b/tests/tfits.c	2013-09-26 10:56:55.000000000 +0000
+@@ -33,155 +33,176 @@
+ #include "mpfr-intmax.h"
+ #include "mpfr-test.h"
+ 
+-#define ERROR1 { printf("Initial error for x="); mpfr_dump(x); exit(1); }
+-#define ERROR2 { printf("Error for x="); mpfr_dump(x); exit(1); }
++#define ERROR1(N)                                               \
++  do                                                            \
++    {                                                           \
++      printf("Error %d for rnd = %s and x = ", N,               \
++             mpfr_print_rnd_mode ((mpfr_rnd_t) r));             \
++      mpfr_dump(x);                                             \
++      exit(1);                                                  \
++    }                                                           \
++  while (0)
+ 
+ static void check_intmax (void);
+ 
+ int
+ main (void)
+ {
+-  mpfr_t x;
++  mpfr_t x, y;
++  int i, r;
+ 
+   tests_start_mpfr ();
+ 
+   mpfr_init2 (x, 256);
++  mpfr_init2 (y, 8);
+ 
+-  /* Check NAN */
+-  mpfr_set_nan (x);
+-  if (mpfr_fits_ulong_p (x, MPFR_RNDN))
+-    ERROR1;
+-  if (mpfr_fits_slong_p (x, MPFR_RNDN))
+-    ERROR1;
+-  if (mpfr_fits_uint_p (x, MPFR_RNDN))
+-    ERROR1;
+-  if (mpfr_fits_sint_p (x, MPFR_RNDN))
+-    ERROR1;
+-  if (mpfr_fits_ushort_p (x, MPFR_RNDN))
+-    ERROR1;
+-  if (mpfr_fits_sshort_p (x, MPFR_RNDN))
+-    ERROR1;
++  RND_LOOP (r)
++    {
+ 
+-  /* Check INF */
+-  mpfr_set_inf (x, 1);
+-  if (mpfr_fits_ulong_p (x, MPFR_RNDN))
+-    ERROR1;
+-  if (mpfr_fits_slong_p (x, MPFR_RNDN))
+-    ERROR1;
+-  if (mpfr_fits_uint_p (x, MPFR_RNDN))
+-    ERROR1;
+-  if (mpfr_fits_sint_p (x, MPFR_RNDN))
+-    ERROR1;
+-  if (mpfr_fits_ushort_p (x, MPFR_RNDN))
+-    ERROR1;
+-  if (mpfr_fits_sshort_p (x, MPFR_RNDN))
+-    ERROR1;
++      /* Check NAN */
++      mpfr_set_nan (x);
++      if (mpfr_fits_ulong_p (x, (mpfr_rnd_t) r))
++        ERROR1 (1);
++      if (mpfr_fits_slong_p (x, (mpfr_rnd_t) r))
++        ERROR1 (2);
++      if (mpfr_fits_uint_p (x, (mpfr_rnd_t) r))
++        ERROR1 (3);
++      if (mpfr_fits_sint_p (x, (mpfr_rnd_t) r))
++        ERROR1 (4);
++      if (mpfr_fits_ushort_p (x, (mpfr_rnd_t) r))
++        ERROR1 (5);
++      if (mpfr_fits_sshort_p (x, (mpfr_rnd_t) r))
++        ERROR1 (6);
+ 
+-  /* Check Zero */
+-  MPFR_SET_ZERO (x);
+-  if (!mpfr_fits_ulong_p (x, MPFR_RNDN))
+-    ERROR2;
+-  if (!mpfr_fits_slong_p (x, MPFR_RNDN))
+-    ERROR2;
+-  if (!mpfr_fits_uint_p (x, MPFR_RNDN))
+-    ERROR2;
+-  if (!mpfr_fits_sint_p (x, MPFR_RNDN))
+-    ERROR2;
+-  if (!mpfr_fits_ushort_p (x, MPFR_RNDN))
+-    ERROR2;
+-  if (!mpfr_fits_sshort_p (x, MPFR_RNDN))
+-    ERROR2;
++      /* Check INF */
++      mpfr_set_inf (x, 1);
++      if (mpfr_fits_ulong_p (x, (mpfr_rnd_t) r))
++        ERROR1 (7);
++      if (mpfr_fits_slong_p (x, (mpfr_rnd_t) r))
++        ERROR1 (8);
++      if (mpfr_fits_uint_p (x, (mpfr_rnd_t) r))
++        ERROR1 (9);
++      if (mpfr_fits_sint_p (x, (mpfr_rnd_t) r))
++        ERROR1 (10);
++      if (mpfr_fits_ushort_p (x, (mpfr_rnd_t) r))
++        ERROR1 (11);
++      if (mpfr_fits_sshort_p (x, (mpfr_rnd_t) r))
++        ERROR1 (12);
+ 
+-  /* Check small op */
+-  mpfr_set_str1 (x, "1@-1");
+-  if (!mpfr_fits_ulong_p (x, MPFR_RNDN))
+-    ERROR2;
+-  if (!mpfr_fits_slong_p (x, MPFR_RNDN))
+-    ERROR2;
+-  if (!mpfr_fits_uint_p (x, MPFR_RNDN))
+-    ERROR2;
+-  if (!mpfr_fits_sint_p (x, MPFR_RNDN))
+-    ERROR2;
+-  if (!mpfr_fits_ushort_p (x, MPFR_RNDN))
+-    ERROR2;
+-  if (!mpfr_fits_sshort_p (x, MPFR_RNDN))
+-    ERROR2;
++      /* Check Zero */
++      MPFR_SET_ZERO (x);
++      if (!mpfr_fits_ulong_p (x, (mpfr_rnd_t) r))
++        ERROR1 (13);
++      if (!mpfr_fits_slong_p (x, (mpfr_rnd_t) r))
++        ERROR1 (14);
++      if (!mpfr_fits_uint_p (x, (mpfr_rnd_t) r))
++        ERROR1 (15);
++      if (!mpfr_fits_sint_p (x, (mpfr_rnd_t) r))
++        ERROR1 (16);
++      if (!mpfr_fits_ushort_p (x, (mpfr_rnd_t) r))
++        ERROR1 (17);
++      if (!mpfr_fits_sshort_p (x, (mpfr_rnd_t) r))
++        ERROR1 (18);
+ 
+-  /* Check 17 */
+-  mpfr_set_ui (x, 17, MPFR_RNDN);
+-  if (!mpfr_fits_ulong_p (x, MPFR_RNDN))
+-    ERROR2;
+-  if (!mpfr_fits_slong_p (x, MPFR_RNDN))
+-    ERROR2;
+-  if (!mpfr_fits_uint_p (x, MPFR_RNDN))
+-    ERROR2;
+-  if (!mpfr_fits_sint_p (x, MPFR_RNDN))
+-    ERROR2;
+-  if (!mpfr_fits_ushort_p (x, MPFR_RNDN))
+-    ERROR2;
+-  if (!mpfr_fits_sshort_p (x, MPFR_RNDN))
+-    ERROR2;
++      /* Check small positive op */
++      mpfr_set_str1 (x, "1@-1");
++      if (!mpfr_fits_ulong_p (x, (mpfr_rnd_t) r))
++        ERROR1 (19);
++      if (!mpfr_fits_slong_p (x, (mpfr_rnd_t) r))
++        ERROR1 (20);
++      if (!mpfr_fits_uint_p (x, (mpfr_rnd_t) r))
++        ERROR1 (21);
++      if (!mpfr_fits_sint_p (x, (mpfr_rnd_t) r))
++        ERROR1 (22);
++      if (!mpfr_fits_ushort_p (x, (mpfr_rnd_t) r))
++        ERROR1 (23);
++      if (!mpfr_fits_sshort_p (x, (mpfr_rnd_t) r))
++        ERROR1 (24);
+ 
+-  /* Check all other values */
+-  mpfr_set_ui (x, ULONG_MAX, MPFR_RNDN);
+-  mpfr_mul_2exp (x, x, 1, MPFR_RNDN);
+-  if (mpfr_fits_ulong_p (x, MPFR_RNDN))
+-    ERROR1;
+-  if (mpfr_fits_slong_p (x, MPFR_RNDN))
+-    ERROR1;
+-  mpfr_mul_2exp (x, x, 40, MPFR_RNDN);
+-  if (mpfr_fits_ulong_p (x, MPFR_RNDN))
+-    ERROR1;
+-  if (mpfr_fits_uint_p (x, MPFR_RNDN))
+-    ERROR1;
+-  if (mpfr_fits_sint_p (x, MPFR_RNDN))
+-    ERROR1;
+-  if (mpfr_fits_ushort_p (x, MPFR_RNDN))
+-    ERROR1;
+-  if (mpfr_fits_sshort_p (x, MPFR_RNDN))
+-    ERROR1;
++      /* Check 17 */
++      mpfr_set_ui (x, 17, MPFR_RNDN);
++      if (!mpfr_fits_ulong_p (x, (mpfr_rnd_t) r))
++        ERROR1 (25);
++      if (!mpfr_fits_slong_p (x, (mpfr_rnd_t) r))
++        ERROR1 (26);
++      if (!mpfr_fits_uint_p (x, (mpfr_rnd_t) r))
++        ERROR1 (27);
++      if (!mpfr_fits_sint_p (x, (mpfr_rnd_t) r))
++        ERROR1 (28);
++      if (!mpfr_fits_ushort_p (x, (mpfr_rnd_t) r))
++        ERROR1 (29);
++      if (!mpfr_fits_sshort_p (x, (mpfr_rnd_t) r))
++        ERROR1 (30);
+ 
+-  mpfr_set_ui (x, ULONG_MAX, MPFR_RNDN);
+-  if (!mpfr_fits_ulong_p (x, MPFR_RNDN))
+-    ERROR2;
+-  mpfr_set_ui (x, LONG_MAX, MPFR_RNDN);
+-  if (!mpfr_fits_slong_p (x, MPFR_RNDN))
+-    ERROR2;
+-  mpfr_set_ui (x, UINT_MAX, MPFR_RNDN);
+-  if (!mpfr_fits_uint_p (x, MPFR_RNDN))
+-    ERROR2;
+-  mpfr_set_ui (x, INT_MAX, MPFR_RNDN);
+-  if (!mpfr_fits_sint_p (x, MPFR_RNDN))
+-    ERROR2;
+-  mpfr_set_ui (x, USHRT_MAX, MPFR_RNDN);
+-  if (!mpfr_fits_ushort_p (x, MPFR_RNDN))
+-    ERROR2;
+-  mpfr_set_ui (x, SHRT_MAX, MPFR_RNDN);
+-  if (!mpfr_fits_sshort_p (x, MPFR_RNDN))
+-    ERROR2;
++      /* Check all other values */
++      mpfr_set_ui (x, ULONG_MAX, MPFR_RNDN);
++      mpfr_mul_2exp (x, x, 1, MPFR_RNDN);
++      if (mpfr_fits_ulong_p (x, (mpfr_rnd_t) r))
++        ERROR1 (31);
++      if (mpfr_fits_slong_p (x, (mpfr_rnd_t) r))
++        ERROR1 (32);
++      mpfr_mul_2exp (x, x, 40, MPFR_RNDN);
++      if (mpfr_fits_ulong_p (x, (mpfr_rnd_t) r))
++        ERROR1 (33);
++      if (mpfr_fits_uint_p (x, (mpfr_rnd_t) r))
++        ERROR1 (34);
++      if (mpfr_fits_sint_p (x, (mpfr_rnd_t) r))
++        ERROR1 (35);
++      if (mpfr_fits_ushort_p (x, (mpfr_rnd_t) r))
++        ERROR1 (36);
++      if (mpfr_fits_sshort_p (x, (mpfr_rnd_t) r))
++        ERROR1 (37);
+ 
+-  mpfr_set_si (x, 1, MPFR_RNDN);
+-  if (!mpfr_fits_sint_p (x, MPFR_RNDN))
+-    ERROR2;
+-  if (!mpfr_fits_sshort_p (x, MPFR_RNDN))
+-    ERROR2;
++      mpfr_set_ui (x, ULONG_MAX, MPFR_RNDN);
++      if (!mpfr_fits_ulong_p (x, (mpfr_rnd_t) r))
++        ERROR1 (38);
++      mpfr_set_ui (x, LONG_MAX, MPFR_RNDN);
++      if (!mpfr_fits_slong_p (x, (mpfr_rnd_t) r))
++        ERROR1 (39);
++      mpfr_set_ui (x, UINT_MAX, MPFR_RNDN);
++      if (!mpfr_fits_uint_p (x, (mpfr_rnd_t) r))
++        ERROR1 (40);
++      mpfr_set_ui (x, INT_MAX, MPFR_RNDN);
++      if (!mpfr_fits_sint_p (x, (mpfr_rnd_t) r))
++        ERROR1 (41);
++      mpfr_set_ui (x, USHRT_MAX, MPFR_RNDN);
++      if (!mpfr_fits_ushort_p (x, (mpfr_rnd_t) r))
++        ERROR1 (42);
++      mpfr_set_ui (x, SHRT_MAX, MPFR_RNDN);
++      if (!mpfr_fits_sshort_p (x, (mpfr_rnd_t) r))
++        ERROR1 (43);
+ 
+-  /* Check negative value */
+-  mpfr_set_si (x, -1, MPFR_RNDN);
+-  if (!mpfr_fits_sint_p (x, MPFR_RNDN))
+-    ERROR2;
+-  if (!mpfr_fits_sshort_p (x, MPFR_RNDN))
+-    ERROR2;
+-  if (!mpfr_fits_slong_p (x, MPFR_RNDN))
+-    ERROR2;
+-  if (mpfr_fits_uint_p (x, MPFR_RNDN))
+-    ERROR1;
+-  if (mpfr_fits_ushort_p (x, MPFR_RNDN))
+-    ERROR1;
+-  if (mpfr_fits_ulong_p (x, MPFR_RNDN))
+-    ERROR1;
++      mpfr_set_si (x, 1, MPFR_RNDN);
++      if (!mpfr_fits_sint_p (x, (mpfr_rnd_t) r))
++        ERROR1 (44);
++      if (!mpfr_fits_sshort_p (x, (mpfr_rnd_t) r))
++        ERROR1 (45);
++
++      /* Check negative op */
++      for (i = 1; i <= 4; i++)
++        {
++          int inv;
++
++          mpfr_set_si_2exp (x, -i, -2, MPFR_RNDN);
++          mpfr_rint (y, x, (mpfr_rnd_t) r);
++          inv = MPFR_NOTZERO (y);
++          if (!mpfr_fits_ulong_p (x, (mpfr_rnd_t) r) ^ inv)
++            ERROR1 (46);
++          if (!mpfr_fits_slong_p (x, (mpfr_rnd_t) r))
++            ERROR1 (47);
++          if (!mpfr_fits_uint_p (x, (mpfr_rnd_t) r) ^ inv)
++            ERROR1 (48);
++          if (!mpfr_fits_sint_p (x, (mpfr_rnd_t) r))
++            ERROR1 (49);
++          if (!mpfr_fits_ushort_p (x, (mpfr_rnd_t) r) ^ inv)
++            ERROR1 (50);
++          if (!mpfr_fits_sshort_p (x, (mpfr_rnd_t) r))
++            ERROR1 (51);
++        }
++    }
+ 
+   mpfr_clear (x);
++  mpfr_clear (y);
+ 
+   check_intmax ();
+ 
+@@ -189,85 +210,98 @@
+   return 0;
+ }
+ 
+-static void check_intmax (void)
++static void
++check_intmax (void)
+ {
+ #ifdef _MPFR_H_HAVE_INTMAX_T
+-  mpfr_t x;
++  mpfr_t x, y;
++  int i, r;
+ 
+-  mpfr_init2 (x, sizeof (uintmax_t)*CHAR_BIT);
++  mpfr_init2 (x, sizeof (uintmax_t) * CHAR_BIT);
++  mpfr_init2 (y, 8);
+ 
+-  /* Check NAN */
+-  mpfr_set_nan (x);
+-  if (mpfr_fits_uintmax_p (x, MPFR_RNDN))
+-    ERROR1;
+-  if (mpfr_fits_intmax_p (x, MPFR_RNDN))
+-    ERROR1;
++  RND_LOOP (r)
++    {
++      /* Check NAN */
++      mpfr_set_nan (x);
++      if (mpfr_fits_uintmax_p (x, (mpfr_rnd_t) r))
++        ERROR1 (52);
++      if (mpfr_fits_intmax_p (x, (mpfr_rnd_t) r))
++        ERROR1 (53);
+ 
+-  /* Check INF */
+-  mpfr_set_inf (x, 1);
+-  if (mpfr_fits_uintmax_p (x, MPFR_RNDN))
+-    ERROR1;
+-  if (mpfr_fits_intmax_p (x, MPFR_RNDN))
+-    ERROR1;
++      /* Check INF */
++      mpfr_set_inf (x, 1);
++      if (mpfr_fits_uintmax_p (x, (mpfr_rnd_t) r))
++        ERROR1 (54);
++      if (mpfr_fits_intmax_p (x, (mpfr_rnd_t) r))
++        ERROR1 (55);
+ 
+-  /* Check Zero */
+-  MPFR_SET_ZERO (x);
+-  if (!mpfr_fits_uintmax_p (x, MPFR_RNDN))
+-    ERROR2;
+-  if (!mpfr_fits_intmax_p (x, MPFR_RNDN))
+-    ERROR2;
++      /* Check Zero */
++      MPFR_SET_ZERO (x);
++      if (!mpfr_fits_uintmax_p (x, (mpfr_rnd_t) r))
++        ERROR1 (56);
++      if (!mpfr_fits_intmax_p (x, (mpfr_rnd_t) r))
++        ERROR1 (57);
+ 
+-  /* Check small op */
+-  mpfr_set_str1 (x, "1@-1");
+-  if (!mpfr_fits_uintmax_p (x, MPFR_RNDN))
+-    ERROR2;
+-  if (!mpfr_fits_intmax_p (x, MPFR_RNDN))
+-    ERROR2;
++      /* Check positive small op */
++      mpfr_set_str1 (x, "1@-1");
++      if (!mpfr_fits_uintmax_p (x, (mpfr_rnd_t) r))
++        ERROR1 (58);
++      if (!mpfr_fits_intmax_p (x, (mpfr_rnd_t) r))
++        ERROR1 (59);
+ 
+-  /* Check 17 */
+-  mpfr_set_ui (x, 17, MPFR_RNDN);
+-  if (!mpfr_fits_uintmax_p (x, MPFR_RNDN))
+-    ERROR2;
+-  if (!mpfr_fits_intmax_p (x, MPFR_RNDN))
+-    ERROR2;
++      /* Check 17 */
++      mpfr_set_ui (x, 17, MPFR_RNDN);
++      if (!mpfr_fits_uintmax_p (x, (mpfr_rnd_t) r))
++        ERROR1 (60);
++      if (!mpfr_fits_intmax_p (x, (mpfr_rnd_t) r))
++        ERROR1 (61);
+ 
+-  /* Check hugest */
+-  mpfr_set_ui_2exp (x, 42, sizeof (uintmax_t) * 32, MPFR_RNDN);
+-  if (mpfr_fits_uintmax_p (x, MPFR_RNDN))
+-    ERROR1;
+-  if (mpfr_fits_intmax_p (x, MPFR_RNDN))
+-    ERROR1;
++      /* Check hugest */
++      mpfr_set_ui_2exp (x, 42, sizeof (uintmax_t) * 32, MPFR_RNDN);
++      if (mpfr_fits_uintmax_p (x, (mpfr_rnd_t) r))
++        ERROR1 (62);
++      if (mpfr_fits_intmax_p (x, (mpfr_rnd_t) r))
++        ERROR1 (63);
+ 
+-  /* Check all other values */
+-  mpfr_set_uj (x, MPFR_UINTMAX_MAX, MPFR_RNDN);
+-  mpfr_add_ui (x, x, 1, MPFR_RNDN);
+-  if (mpfr_fits_uintmax_p (x, MPFR_RNDN))
+-    ERROR1;
+-  mpfr_set_uj (x, MPFR_UINTMAX_MAX, MPFR_RNDN);
+-  if (!mpfr_fits_uintmax_p (x, MPFR_RNDN))
+-    ERROR2;
+-  mpfr_set_sj (x, MPFR_INTMAX_MAX, MPFR_RNDN);
+-  mpfr_add_ui (x, x, 1, MPFR_RNDN);
+-  if (mpfr_fits_intmax_p (x, MPFR_RNDN))
+-    ERROR1;
+-  mpfr_set_sj (x, MPFR_INTMAX_MAX, MPFR_RNDN);
+-  if (!mpfr_fits_intmax_p (x, MPFR_RNDN))
+-    ERROR2;
+-  mpfr_set_sj (x, MPFR_INTMAX_MIN, MPFR_RNDN);
+-  if (!mpfr_fits_intmax_p (x, MPFR_RNDN))
+-    ERROR2;
+-  mpfr_sub_ui (x, x, 1, MPFR_RNDN);
+-  if (mpfr_fits_intmax_p (x, MPFR_RNDN))
+-    ERROR1;
++      /* Check all other values */
++      mpfr_set_uj (x, MPFR_UINTMAX_MAX, MPFR_RNDN);
++      mpfr_add_ui (x, x, 1, MPFR_RNDN);
++      if (mpfr_fits_uintmax_p (x, (mpfr_rnd_t) r))
++        ERROR1 (64);
++      mpfr_set_uj (x, MPFR_UINTMAX_MAX, MPFR_RNDN);
++      if (!mpfr_fits_uintmax_p (x, (mpfr_rnd_t) r))
++        ERROR1 (65);
++      mpfr_set_sj (x, MPFR_INTMAX_MAX, MPFR_RNDN);
++      mpfr_add_ui (x, x, 1, MPFR_RNDN);
++      if (mpfr_fits_intmax_p (x, (mpfr_rnd_t) r))
++        ERROR1 (66);
++      mpfr_set_sj (x, MPFR_INTMAX_MAX, MPFR_RNDN);
++      if (!mpfr_fits_intmax_p (x, (mpfr_rnd_t) r))
++        ERROR1 (67);
++      mpfr_set_sj (x, MPFR_INTMAX_MIN, MPFR_RNDN);
++      if (!mpfr_fits_intmax_p (x, (mpfr_rnd_t) r))
++        ERROR1 (68);
++      mpfr_sub_ui (x, x, 1, MPFR_RNDN);
++      if (mpfr_fits_intmax_p (x, (mpfr_rnd_t) r))
++        ERROR1 (69);
+ 
+-  /* Check negative value */
+-  mpfr_set_si (x, -1, MPFR_RNDN);
+-  if (!mpfr_fits_intmax_p (x, MPFR_RNDN))
+-    ERROR2;
+-  if (mpfr_fits_uintmax_p (x, MPFR_RNDN))
+-    ERROR1;
++      /* Check negative op */
++      for (i = 1; i <= 4; i++)
++        {
++          int inv;
++
++          mpfr_set_si_2exp (x, -i, -2, MPFR_RNDN);
++          mpfr_rint (y, x, (mpfr_rnd_t) r);
++          inv = MPFR_NOTZERO (y);
++          if (!mpfr_fits_uintmax_p (x, (mpfr_rnd_t) r) ^ inv)
++            ERROR1 (70);
++          if (!mpfr_fits_intmax_p (x, (mpfr_rnd_t) r))
++            ERROR1 (71);
++        }
++    }
+ 
+   mpfr_clear (x);
++  mpfr_clear (y);
+ #endif
+ }
+-
+diff -Naurd mpfr-3.1.2-a/PATCHES mpfr-3.1.2-b/PATCHES
+--- mpfr-3.1.2-a/PATCHES	2013-10-09 13:34:21.000000000 +0000
++++ mpfr-3.1.2-b/PATCHES	2013-10-09 13:34:21.000000000 +0000
+@@ -0,0 +1 @@
++clang-divby0
+diff -Naurd mpfr-3.1.2-a/VERSION mpfr-3.1.2-b/VERSION
+--- mpfr-3.1.2-a/VERSION	2013-09-26 10:52:52.000000000 +0000
++++ mpfr-3.1.2-b/VERSION	2013-10-09 13:34:21.000000000 +0000
+@@ -1 +1 @@
+-3.1.2-p2
++3.1.2-p3
+diff -Naurd mpfr-3.1.2-a/src/mpfr-impl.h mpfr-3.1.2-b/src/mpfr-impl.h
+--- mpfr-3.1.2-a/src/mpfr-impl.h	2013-03-13 15:37:36.000000000 +0000
++++ mpfr-3.1.2-b/src/mpfr-impl.h	2013-10-09 13:34:21.000000000 +0000
+@@ -468,8 +468,16 @@
+ #define MPFR_LIMBS_PER_FLT ((IEEE_FLT_MANT_DIG-1)/GMP_NUMB_BITS+1)
+ 
+ /* Visual C++ doesn't support +1.0/0.0, -1.0/0.0 and 0.0/0.0
+-   at compile time. */
+-#if defined(_MSC_VER) && defined(_WIN32) && (_MSC_VER >= 1200)
++   at compile time.
++   Clang with -fsanitize=undefined is a bit similar due to a bug:
++     http://llvm.org/bugs/show_bug.cgi?id=17381
++   but even without its sanitizer, it may be better to use the
++   double_zero version until IEEE 754 division by zero is properly
++   supported:
++     http://llvm.org/bugs/show_bug.cgi?id=17000
++*/
++#if (defined(_MSC_VER) && defined(_WIN32) && (_MSC_VER >= 1200)) || \
++    defined(__clang__)
+ static double double_zero = 0.0;
+ # define DBL_NAN (double_zero/double_zero)
+ # define DBL_POS_INF ((double) 1.0/double_zero)
+@@ -501,6 +509,8 @@
+    (with Xcode 2.4.1, i.e. the latest one). */
+ #define LVALUE(x) (&(x) == &(x) || &(x) != &(x))
+ #define DOUBLE_ISINF(x) (LVALUE(x) && ((x) > DBL_MAX || (x) < -DBL_MAX))
++/* The DOUBLE_ISNAN(x) macro is also valid on long double x
++   (assuming that the compiler isn't too broken). */
+ #ifdef MPFR_NANISNAN
+ /* Avoid MIPSpro / IRIX64 / gcc -ffast-math (incorrect) optimizations.
+    The + must not be replaced by a ||. With gcc -ffast-math, NaN is
+diff -Naurd mpfr-3.1.2-a/src/mpfr.h mpfr-3.1.2-b/src/mpfr.h
+--- mpfr-3.1.2-a/src/mpfr.h	2013-09-26 10:52:52.000000000 +0000
++++ mpfr-3.1.2-b/src/mpfr.h	2013-10-09 13:34:21.000000000 +0000
+@@ -27,7 +27,7 @@
+ #define MPFR_VERSION_MAJOR 3
+ #define MPFR_VERSION_MINOR 1
+ #define MPFR_VERSION_PATCHLEVEL 2
+-#define MPFR_VERSION_STRING "3.1.2-p2"
++#define MPFR_VERSION_STRING "3.1.2-p3"
+ 
+ /* Macros dealing with MPFR VERSION */
+ #define MPFR_VERSION_NUM(a,b,c) (((a) << 16L) | ((b) << 8) | (c))
+diff -Naurd mpfr-3.1.2-a/src/version.c mpfr-3.1.2-b/src/version.c
+--- mpfr-3.1.2-a/src/version.c	2013-09-26 10:52:52.000000000 +0000
++++ mpfr-3.1.2-b/src/version.c	2013-10-09 13:34:21.000000000 +0000
+@@ -25,5 +25,5 @@
+ const char *
+ mpfr_get_version (void)
+ {
+-  return "3.1.2-p2";
++  return "3.1.2-p3";
+ }
+diff -Naurd mpfr-3.1.2-a/tests/tget_flt.c mpfr-3.1.2-b/tests/tget_flt.c
+--- mpfr-3.1.2-a/tests/tget_flt.c	2013-03-13 15:37:44.000000000 +0000
++++ mpfr-3.1.2-b/tests/tget_flt.c	2013-10-09 13:34:21.000000000 +0000
+@@ -28,9 +28,17 @@
+ main (void)
+ {
+   mpfr_t x, y;
+-  float f, g, infp;
++  float f, g;
+   int i;
++#if !defined(MPFR_ERRDIVZERO)
++  float infp;
++#endif
++
++  tests_start_mpfr ();
+ 
++#if !defined(MPFR_ERRDIVZERO)
++  /* The definition of DBL_POS_INF involves a division by 0. This makes
++     "clang -O2 -fsanitize=undefined -fno-sanitize-recover" fail. */
+   infp = (float) DBL_POS_INF;
+   if (infp * 0.5 != infp)
+     {
+@@ -38,8 +46,7 @@
+       fprintf (stderr, "(this is probably a compiler bug, please report)\n");
+       exit (1);
+     }
+-
+-  tests_start_mpfr ();
++#endif
+ 
+   mpfr_init2 (x, 24);
+   mpfr_init2 (y, 24);
+@@ -353,6 +360,7 @@
+       printf ("expected %.8e, got %.8e\n", g, f);
+       exit (1);
+     }
++#if !defined(MPFR_ERRDIVZERO)
+   f = mpfr_get_flt (x, MPFR_RNDN); /* first round to 2^128 (even rule),
+                                       thus we should get +Inf */
+   g = infp;
+@@ -376,6 +384,7 @@
+       printf ("expected %.8e, got %.8e\n", g, f);
+       exit (1);
+     }
++#endif
+ 
+   mpfr_clear (x);
+   mpfr_clear (y);
+diff -Naurd mpfr-3.1.2-a/tests/tset_ld.c mpfr-3.1.2-b/tests/tset_ld.c
+--- mpfr-3.1.2-a/tests/tset_ld.c	2013-03-13 15:37:44.000000000 +0000
++++ mpfr-3.1.2-b/tests/tset_ld.c	2013-10-09 13:34:21.000000000 +0000
+@@ -47,8 +47,11 @@
+ static int
+ Isnan_ld (long double d)
+ {
+-  double e = (double) d;
+-  if (DOUBLE_ISNAN (e))
++  /* Do not convert d to double as this can give an overflow, which
++     may confuse compilers without IEEE 754 support (such as clang
++     -fsanitize=undefined), or trigger a trap if enabled.
++     The DOUBLE_ISNAN macro should work fine on long double. */
++  if (DOUBLE_ISNAN (d))
+     return 1;
+   LONGDOUBLE_NAN_ACTION (d, goto yes);
+   return 0;
diff --git a/core/ncurses/PKGBUILD b/core/ncurses/PKGBUILD
index dd9889019..163d72062 100644
--- a/core/ncurses/PKGBUILD
+++ b/core/ncurses/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 180326 2013-03-20 13:37:40Z allan $
+# $Id: PKGBUILD 197156 2013-10-23 13:04:21Z allan $
 # Maintainer: Allan McRae <allan@archlinux.org>
 # Contributor: judd <jvinet@zeroflux.org>
 
 pkgname=ncurses
 pkgver=5.9
-pkgrel=5
+pkgrel=6
 pkgdesc="System V Release 4.0 curses emulation library"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.gnu.org/software/ncurses/"
@@ -40,9 +40,7 @@ package() {
   # fool packages looking to link to non-wide-character ncurses libraries
   for lib in ncurses form panel menu; do
     echo "INPUT(-l${lib}w)" >${pkgdir}/usr/lib/lib${lib}.so
-    ln -s lib${lib}w.a ${pkgdir}/usr/lib/lib${lib}.a
   done
-  ln -s libncurses++w.a ${pkgdir}/usr/lib/libncurses++.a
 
   for lib in ncurses ncurses++ form panel menu; do
     ln -s ${lib}w.pc ${pkgdir}/usr/lib/pkgconfig/${lib}.pc
@@ -51,8 +49,6 @@ package() {
   # some packages look for -lcurses during build
   echo "INPUT(-lncursesw)" >${pkgdir}/usr/lib/libcursesw.so
   ln -s libncurses.so ${pkgdir}/usr/lib/libcurses.so
-  ln -s libncursesw.a ${pkgdir}/usr/lib/libcursesw.a
-  ln -s libncurses.a ${pkgdir}/usr/lib/libcurses.a
 
   # non-widec compatibility libraries
   cd ${srcdir}/ncurses-build
diff --git a/core/nfsidmap/PKGBUILD b/core/nfsidmap/PKGBUILD
index 5f00e41da..90c961ae0 100644
--- a/core/nfsidmap/PKGBUILD
+++ b/core/nfsidmap/PKGBUILD
@@ -1,16 +1,15 @@
-# $Id: PKGBUILD 167157 2012-09-26 16:38:02Z tpowa $
+# $Id: PKGBUILD 197833 2013-10-30 11:06:02Z allan $
 # Maintainer: 
 # Contributor: Judd <jvinet@zeroflux.org>
 
 pkgname=nfsidmap
 pkgver=0.25
-pkgrel=1
+pkgrel=2
 pkgdesc="Library to help mapping IDs, mainly for NFSv4"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.citi.umich.edu/projects/nfsv4/linux/"
 depends=('glibc' 'libldap>=2.4.18')
 license=('custom:nfsidmap')
-options=(!libtool)
 source=(http://www.citi.umich.edu/projects/nfsv4/linux/libnfsidmap/libnfsidmap-$pkgver.tar.gz)
 
 build() {
diff --git a/core/nilfs-utils/PKGBUILD b/core/nilfs-utils/PKGBUILD
index 6e2204bb5..7829ccb7a 100644
--- a/core/nilfs-utils/PKGBUILD
+++ b/core/nilfs-utils/PKGBUILD
@@ -1,17 +1,16 @@
-# $Id: PKGBUILD 187036 2013-06-03 11:15:27Z allan $
+# $Id: PKGBUILD 197802 2013-10-30 10:38:00Z allan $
 # Maintainer: Dan McGee <dan@archlinux.org>
 # Contributor: Geoffroy Carrier <geoffroy.carrier@koon.fr>
 
 pkgname=nilfs-utils
 pkgver=2.1.5
-pkgrel=2
+pkgrel=3
 pkgdesc="A log-structured file system supporting continuous snapshotting (userspace utils)"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.nilfs.org/"
 license=('GPL2' 'LGPL2.1')
 backup=('etc/nilfs_cleanerd.conf')
 depends=('util-linux')
-options=(!libtool)
 source=(http://www.nilfs.org/download/$pkgname-$pkgver.tar.bz2)
 md5sums=('f072cc53c288492061b3199d63e32177')
 
diff --git a/core/openldap/PKGBUILD b/core/openldap/PKGBUILD
index e1e900456..2a8f2126d 100644
--- a/core/openldap/PKGBUILD
+++ b/core/openldap/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 193901 2013-09-04 19:28:51Z eric $
+# $Id: PKGBUILD 198764 2013-11-03 16:44:35Z eric $
 # Maintainer:
 
 pkgbase=openldap
 pkgname=('libldap' 'openldap')
-pkgver=2.4.36
+pkgver=2.4.37
 pkgrel=1
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.openldap.org/"
@@ -11,7 +11,7 @@ license=('custom')
 makedepends=('libltdl' 'libsasl' 'e2fsprogs' 'util-linux' 'chrpath')
 source=(ftp://ftp.openldap.org/pub/OpenLDAP/openldap-release/${pkgbase}-${pkgver}.tgz
         slapd.service slapd.tmpfiles openldap-ntlm.patch)
-sha1sums=('da0e18a28a5dade5c98d9a382fd8f0a676a12aca'
+sha1sums=('179b3d51f7569cca768384fee92aa43c8a82c5d9'
           '2441815efbfa01ad7a1d39068e5503b53d1d04b0'
           '59241a813d7508294e4ef1cec3bfe1f5495e109d'
           'e4afd9f1c810ef4c4cd8fe1101dfe5887f2b7eef')
@@ -52,7 +52,6 @@ package_libldap() {
   pkgdesc="Lightweight Directory Access Protocol (LDAP) client libraries"
   depends=('libsasl' 'e2fsprogs')
   backup=('etc/openldap/ldap.conf')
-  options=('!libtool')
 
   cd ${pkgbase}-${pkgver}
   for dir in include libraries doc/man/man3 ; do
@@ -75,7 +74,7 @@ package_openldap() {
   pkgdesc="Lightweight Directory Access Protocol (LDAP) client and server"
   depends=("libldap>=${pkgver}" 'libltdl')
   backup=('etc/openldap/slapd.conf' 'etc/openldap/slapd.ldif')
-  options=('!libtool' 'emptydirs')
+  options=('emptydirs')
   install=openldap.install
 
   cd ${pkgbase}-${pkgver}
diff --git a/core/openssl/PKGBUILD b/core/openssl/PKGBUILD
index ce3bf2728..033396bc8 100644
--- a/core/openssl/PKGBUILD
+++ b/core/openssl/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 178169 2013-02-17 17:21:40Z pierre $
+# $Id: PKGBUILD 197168 2013-10-23 13:51:53Z pierre $
 # Maintainer: Pierre Schmitz <pierre@archlinux.de>
 
 pkgname=openssl
@@ -6,7 +6,7 @@ _ver=1.0.1e
 # use a pacman compatible version scheme
 pkgver=${_ver/[a-z]/.${_ver//[0-9.]/}}
 #pkgver=$_ver
-pkgrel=3
+pkgrel=4
 pkgdesc='The Open Source toolkit for Secure Sockets Layer and Transport Layer Security'
 arch=('i686' 'x86_64' 'mips64el')
 url='https://www.openssl.org'
@@ -18,13 +18,15 @@ backup=('etc/ssl/openssl.cnf')
 source=("https://www.openssl.org/source/${pkgname}-${_ver}.tar.gz"
         "https://www.openssl.org/source/${pkgname}-${_ver}.tar.gz.asc"
         'no-rpath.patch'
-        'ca-dir.patch')
+        'ca-dir.patch'
+        'openssl-1.0.1e-fix_pod_syntax-1.patch')
 md5sums=('66bf6f10f060d561929de96f9dfe5b8c'
-         'e18847df48d39416f4ca5064887a2e28'
+         'SKIP'
          'dc78d3d06baffc16217519242ce92478'
-         '3bf51be3a1bbd262be46dc619f92aa90')
+         '3bf51be3a1bbd262be46dc619f92aa90'
+         '88d3bef4bbdc640b0412315d8d347bdf')
 
-build() {
+prepare() {
 	cd $srcdir/$pkgname-$_ver
 
 	# remove rpath: http://bugs.archlinux.org/task/14367
@@ -32,6 +34,12 @@ build() {
 	# set ca dir to /etc/ssl by default
 	patch -p0 -i $srcdir/ca-dir.patch
 
+	patch -p1 -i $srcdir/openssl-1.0.1e-fix_pod_syntax-1.patch
+}
+
+build() {
+	cd $srcdir/$pkgname-$_ver
+
   case "${CARCH}" in
 	'x86_64')
 		openssltarget='linux-x86_64'
@@ -44,7 +52,7 @@ build() {
 
 	# mark stack as non-executable: http://bugs.archlinux.org/task/12434
 	./Configure --prefix=/usr --openssldir=/etc/ssl --libdir=lib \
-		shared zlib enable-md2 ${optflags} \
+		shared zlib ${optflags} \
 		"${openssltarget}" \
 		-Wa,--noexecstack "${CFLAGS}" "${LDFLAGS}"
 
diff --git a/core/openssl/openssl-1.0.1e-fix_pod_syntax-1.patch b/core/openssl/openssl-1.0.1e-fix_pod_syntax-1.patch
new file mode 100644
index 000000000..ba25afec3
--- /dev/null
+++ b/core/openssl/openssl-1.0.1e-fix_pod_syntax-1.patch
@@ -0,0 +1,393 @@
+Submitted By: Martin Ward <macros_the_black at ntlworld dot com>
+Date: 2013-06-18
+Initial Package Version: 1.0.1e
+Upstream Status: Unknown
+Origin: self, based on fedora
+Description: Fixes install with perl-5.18.
+
+diff -Naur openssl-1.0.1e.orig/doc/apps/cms.pod openssl-1.0.1e/doc/apps/cms.pod
+--- openssl-1.0.1e.orig/doc/apps/cms.pod	2013-06-06 14:35:15.867871879 +0100
++++ openssl-1.0.1e/doc/apps/cms.pod	2013-06-06 14:35:25.791747119 +0100
+@@ -450,28 +450,28 @@
+ 
+ =over 4
+ 
+-=item 0
++=item C<0>
+ 
+ the operation was completely successfully.
+ 
+-=item 1 
++=item C<1>
+ 
+ an error occurred parsing the command options.
+ 
+-=item 2
++=item C<2>
+ 
+ one of the input files could not be read.
+ 
+-=item 3
++=item C<3>
+ 
+ an error occurred creating the CMS file or when reading the MIME
+ message.
+ 
+-=item 4
++=item C<4>
+ 
+ an error occurred decrypting or verifying the message.
+ 
+-=item 5
++=item C<5>
+ 
+ the message was verified correctly but an error occurred writing out
+ the signers certificates.
+diff -Naur openssl-1.0.1e.orig/doc/apps/smime.pod openssl-1.0.1e/doc/apps/smime.pod
+--- openssl-1.0.1e.orig/doc/apps/smime.pod	2013-06-06 14:35:15.867871879 +0100
++++ openssl-1.0.1e/doc/apps/smime.pod	2013-06-06 14:35:25.794747082 +0100
+@@ -308,28 +308,28 @@
+ 
+ =over 4
+ 
+-=item 0
++=item C<0>
+ 
+ the operation was completely successfully.
+ 
+-=item 1 
++=item C<1>
+ 
+ an error occurred parsing the command options.
+ 
+-=item 2
++=item C<2>
+ 
+ one of the input files could not be read.
+ 
+-=item 3
++=item C<3>
+ 
+ an error occurred creating the PKCS#7 file or when reading the MIME
+ message.
+ 
+-=item 4
++=item C<4>
+ 
+ an error occurred decrypting or verifying the message.
+ 
+-=item 5
++=item C<5>
+ 
+ the message was verified correctly but an error occurred writing out
+ the signers certificates.
+diff -Naur openssl-1.0.1e.orig/doc/crypto/X509_STORE_CTX_get_error.pod openssl-1.0.1e/doc/crypto/X509_STORE_CTX_get_error.pod
+--- openssl-1.0.1e.orig/doc/crypto/X509_STORE_CTX_get_error.pod	2013-06-06 14:35:15.874871791 +0100
++++ openssl-1.0.1e/doc/crypto/X509_STORE_CTX_get_error.pod	2013-06-06 14:37:13.826388940 +0100
+@@ -278,6 +278,8 @@
+ an application specific error. This will never be returned unless explicitly
+ set by an application.
+ 
++=back
++
+ =head1 NOTES
+ 
+ The above functions should be used instead of directly referencing the fields
+diff -Naur openssl-1.0.1e.orig/doc/ssl/SSL_accept.pod openssl-1.0.1e/doc/ssl/SSL_accept.pod
+--- openssl-1.0.1e.orig/doc/ssl/SSL_accept.pod	2013-06-06 14:35:15.871871829 +0100
++++ openssl-1.0.1e/doc/ssl/SSL_accept.pod	2013-06-06 14:35:25.796747057 +0100
+@@ -44,12 +44,12 @@
+ 
+ =over 4
+ 
+-=item 1
++=item C<1>
+ 
+ The TLS/SSL handshake was successfully completed, a TLS/SSL connection has been
+ established.
+ 
+-=item 0
++=item C<0>
+ 
+ The TLS/SSL handshake was not successful but was shut down controlled and
+ by the specifications of the TLS/SSL protocol. Call SSL_get_error() with the
+diff -Naur openssl-1.0.1e.orig/doc/ssl/SSL_clear.pod openssl-1.0.1e/doc/ssl/SSL_clear.pod
+--- openssl-1.0.1e.orig/doc/ssl/SSL_clear.pod	2013-06-06 14:35:15.871871829 +0100
++++ openssl-1.0.1e/doc/ssl/SSL_clear.pod	2013-06-06 14:35:25.803746969 +0100
+@@ -56,12 +56,12 @@
+ 
+ =over 4
+ 
+-=item 0
++=item C<0>
+ 
+ The SSL_clear() operation could not be performed. Check the error stack to
+ find out the reason.
+ 
+-=item 1
++=item C<1>
+ 
+ The SSL_clear() operation was successful.
+ 
+diff -Naur openssl-1.0.1e.orig/doc/ssl/SSL_COMP_add_compression_method.pod openssl-1.0.1e/doc/ssl/SSL_COMP_add_compression_method.pod
+--- openssl-1.0.1e.orig/doc/ssl/SSL_COMP_add_compression_method.pod	2013-06-06 14:35:15.870871842 +0100
++++ openssl-1.0.1e/doc/ssl/SSL_COMP_add_compression_method.pod	2013-06-06 14:35:25.806746931 +0100
+@@ -53,11 +53,11 @@
+ 
+ =over 4
+ 
+-=item 0
++=item C<0>
+ 
+ The operation succeeded.
+ 
+-=item 1
++=item C<1>
+ 
+ The operation failed. Check the error queue to find out the reason.
+ 
+diff -Naur openssl-1.0.1e.orig/doc/ssl/SSL_connect.pod openssl-1.0.1e/doc/ssl/SSL_connect.pod
+--- openssl-1.0.1e.orig/doc/ssl/SSL_connect.pod	2013-06-06 14:35:15.869871854 +0100
++++ openssl-1.0.1e/doc/ssl/SSL_connect.pod	2013-06-06 14:35:25.808746906 +0100
+@@ -41,12 +41,12 @@
+ 
+ =over 4
+ 
+-=item 1
++=item C<1>
+ 
+ The TLS/SSL handshake was successfully completed, a TLS/SSL connection has been
+ established.
+ 
+-=item 0
++=item C<0>
+ 
+ The TLS/SSL handshake was not successful but was shut down controlled and
+ by the specifications of the TLS/SSL protocol. Call SSL_get_error() with the
+diff -Naur openssl-1.0.1e.orig/doc/ssl/SSL_CTX_add_session.pod openssl-1.0.1e/doc/ssl/SSL_CTX_add_session.pod
+--- openssl-1.0.1e.orig/doc/ssl/SSL_CTX_add_session.pod	2013-06-06 14:35:15.871871829 +0100
++++ openssl-1.0.1e/doc/ssl/SSL_CTX_add_session.pod	2013-06-06 14:35:25.816746805 +0100
+@@ -52,13 +52,13 @@
+ 
+ =over 4
+ 
+-=item 0
++=item C<0>
+ 
+  The operation failed. In case of the add operation, it was tried to add
+  the same (identical) session twice. In case of the remove operation, the
+  session was not found in the cache.
+ 
+-=item 1
++=item C<1>
+  
+  The operation succeeded.
+ 
+diff -Naur openssl-1.0.1e.orig/doc/ssl/SSL_CTX_load_verify_locations.pod openssl-1.0.1e/doc/ssl/SSL_CTX_load_verify_locations.pod
+--- openssl-1.0.1e.orig/doc/ssl/SSL_CTX_load_verify_locations.pod	2013-06-06 14:35:15.870871842 +0100
++++ openssl-1.0.1e/doc/ssl/SSL_CTX_load_verify_locations.pod	2013-06-06 14:35:25.818746780 +0100
+@@ -100,13 +100,13 @@
+ 
+ =over 4
+ 
+-=item 0
++=item C<0>
+ 
+ The operation failed because B<CAfile> and B<CApath> are NULL or the
+ processing at one of the locations specified failed. Check the error
+ stack to find out the reason.
+ 
+-=item 1
++=item C<1>
+ 
+ The operation succeeded.
+ 
+diff -Naur openssl-1.0.1e.orig/doc/ssl/SSL_CTX_set_client_CA_list.pod openssl-1.0.1e/doc/ssl/SSL_CTX_set_client_CA_list.pod
+--- openssl-1.0.1e.orig/doc/ssl/SSL_CTX_set_client_CA_list.pod	2013-06-06 14:35:15.871871829 +0100
++++ openssl-1.0.1e/doc/ssl/SSL_CTX_set_client_CA_list.pod	2013-06-06 14:35:25.821746742 +0100
+@@ -66,11 +66,11 @@
+ 
+ =over 4
+ 
+-=item 1
++=item C<1>
+ 
+ The operation succeeded.
+ 
+-=item 0
++=item C<0>
+ 
+ A failure while manipulating the STACK_OF(X509_NAME) object occurred or
+ the X509_NAME could not be extracted from B<cacert>. Check the error stack
+diff -Naur openssl-1.0.1e.orig/doc/ssl/SSL_CTX_set_session_id_context.pod openssl-1.0.1e/doc/ssl/SSL_CTX_set_session_id_context.pod
+--- openssl-1.0.1e.orig/doc/ssl/SSL_CTX_set_session_id_context.pod	2013-06-06 14:35:15.871871829 +0100
++++ openssl-1.0.1e/doc/ssl/SSL_CTX_set_session_id_context.pod	2013-06-06 14:35:25.828746654 +0100
+@@ -64,13 +64,13 @@
+ 
+ =over 4
+ 
+-=item 0
++=item C<0>
+ 
+ The length B<sid_ctx_len> of the session id context B<sid_ctx> exceeded
+ the maximum allowed length of B<SSL_MAX_SSL_SESSION_ID_LENGTH>. The error
+ is logged to the error stack.
+ 
+-=item 1
++=item C<1>
+ 
+ The operation succeeded.
+ 
+diff -Naur openssl-1.0.1e.orig/doc/ssl/SSL_CTX_set_ssl_version.pod openssl-1.0.1e/doc/ssl/SSL_CTX_set_ssl_version.pod
+--- openssl-1.0.1e.orig/doc/ssl/SSL_CTX_set_ssl_version.pod	2013-06-06 14:35:15.871871829 +0100
++++ openssl-1.0.1e/doc/ssl/SSL_CTX_set_ssl_version.pod	2013-06-06 14:35:25.831746617 +0100
+@@ -42,11 +42,11 @@
+ 
+ =over 4
+ 
+-=item 0
++=item C<0>
+ 
+ The new choice failed, check the error stack to find out the reason.
+ 
+-=item 1
++=item C<1>
+ 
+ The operation succeeded.
+ 
+diff -Naur openssl-1.0.1e.orig/doc/ssl/SSL_CTX_use_psk_identity_hint.pod openssl-1.0.1e/doc/ssl/SSL_CTX_use_psk_identity_hint.pod
+--- openssl-1.0.1e.orig/doc/ssl/SSL_CTX_use_psk_identity_hint.pod	2013-06-06 14:35:15.870871842 +0100
++++ openssl-1.0.1e/doc/ssl/SSL_CTX_use_psk_identity_hint.pod	2013-06-06 14:36:42.456783309 +0100
+@@ -81,6 +81,8 @@
+ 
+ Return values from the server callback are interpreted as follows:
+ 
++=over
++
+ =item > 0
+ 
+ PSK identity was found and the server callback has provided the PSK
+@@ -94,9 +96,11 @@
+ connection will fail with decryption_error before it will be finished
+ completely.
+ 
+-=item 0
++=item C<0>
+ 
+ PSK identity was not found. An "unknown_psk_identity" alert message
+ will be sent and the connection setup fails.
+ 
++=back
++
+ =cut
+diff -Naur openssl-1.0.1e.orig/doc/ssl/SSL_do_handshake.pod openssl-1.0.1e/doc/ssl/SSL_do_handshake.pod
+--- openssl-1.0.1e.orig/doc/ssl/SSL_do_handshake.pod	2013-06-06 14:35:15.869871854 +0100
++++ openssl-1.0.1e/doc/ssl/SSL_do_handshake.pod	2013-06-06 14:35:25.839746516 +0100
+@@ -45,12 +45,12 @@
+ 
+ =over 4
+ 
+-=item 1
++=item C<1>
+ 
+ The TLS/SSL handshake was successfully completed, a TLS/SSL connection has been
+ established.
+ 
+-=item 0
++=item C<0>
+ 
+ The TLS/SSL handshake was not successful but was shut down controlled and
+ by the specifications of the TLS/SSL protocol. Call SSL_get_error() with the
+diff -Naur openssl-1.0.1e.orig/doc/ssl/SSL_read.pod openssl-1.0.1e/doc/ssl/SSL_read.pod
+--- openssl-1.0.1e.orig/doc/ssl/SSL_read.pod	2013-06-06 14:35:15.871871829 +0100
++++ openssl-1.0.1e/doc/ssl/SSL_read.pod	2013-06-06 14:35:25.847746415 +0100
+@@ -86,7 +86,7 @@
+ The read operation was successful; the return value is the number of
+ bytes actually read from the TLS/SSL connection.
+ 
+-=item 0
++=item C<0>
+ 
+ The read operation was not successful. The reason may either be a clean
+ shutdown due to a "close notify" alert sent by the peer (in which case
+diff -Naur openssl-1.0.1e.orig/doc/ssl/SSL_session_reused.pod openssl-1.0.1e/doc/ssl/SSL_session_reused.pod
+--- openssl-1.0.1e.orig/doc/ssl/SSL_session_reused.pod	2013-06-06 14:35:15.871871829 +0100
++++ openssl-1.0.1e/doc/ssl/SSL_session_reused.pod	2013-06-06 14:35:25.849746390 +0100
+@@ -27,11 +27,11 @@
+ 
+ =over 4
+ 
+-=item 0
++=item C<0>
+ 
+ A new session was negotiated.
+ 
+-=item 1
++=item C<1>
+ 
+ A session was reused.
+ 
+diff -Naur openssl-1.0.1e.orig/doc/ssl/SSL_set_fd.pod openssl-1.0.1e/doc/ssl/SSL_set_fd.pod
+--- openssl-1.0.1e.orig/doc/ssl/SSL_set_fd.pod	2013-06-06 14:35:15.869871854 +0100
++++ openssl-1.0.1e/doc/ssl/SSL_set_fd.pod	2013-06-06 14:35:25.852746353 +0100
+@@ -35,11 +35,11 @@
+ 
+ =over 4
+ 
+-=item 0
++=item C<0>
+ 
+ The operation failed. Check the error stack to find out why.
+ 
+-=item 1
++=item C<1>
+ 
+ The operation succeeded.
+ 
+diff -Naur openssl-1.0.1e.orig/doc/ssl/SSL_set_session.pod openssl-1.0.1e/doc/ssl/SSL_set_session.pod
+--- openssl-1.0.1e.orig/doc/ssl/SSL_set_session.pod	2013-06-06 14:35:15.870871842 +0100
++++ openssl-1.0.1e/doc/ssl/SSL_set_session.pod	2013-06-06 14:35:25.855746315 +0100
+@@ -37,11 +37,11 @@
+ 
+ =over 4
+ 
+-=item 0
++=item C<0>
+ 
+ The operation failed; check the error stack to find out the reason.
+ 
+-=item 1
++=item C<1>
+ 
+ The operation succeeded.
+ 
+diff -Naur openssl-1.0.1e.orig/doc/ssl/SSL_shutdown.pod openssl-1.0.1e/doc/ssl/SSL_shutdown.pod
+--- openssl-1.0.1e.orig/doc/ssl/SSL_shutdown.pod	2013-06-06 14:35:15.870871842 +0100
++++ openssl-1.0.1e/doc/ssl/SSL_shutdown.pod	2013-06-06 14:35:25.857746290 +0100
+@@ -92,12 +92,12 @@
+ 
+ =over 4
+ 
+-=item 1
++=item C<1>
+ 
+ The shutdown was successfully completed. The "close notify" alert was sent
+ and the peer's "close notify" alert was received.
+ 
+-=item 0
++=item C<0>
+ 
+ The shutdown is not yet finished. Call SSL_shutdown() for a second time,
+ if a bidirectional shutdown shall be performed.
+diff -Naur openssl-1.0.1e.orig/doc/ssl/SSL_write.pod openssl-1.0.1e/doc/ssl/SSL_write.pod
+--- openssl-1.0.1e.orig/doc/ssl/SSL_write.pod	2013-06-06 14:35:15.870871842 +0100
++++ openssl-1.0.1e/doc/ssl/SSL_write.pod	2013-06-06 14:35:25.865746189 +0100
+@@ -79,7 +79,7 @@
+ The write operation was successful, the return value is the number of
+ bytes actually written to the TLS/SSL connection.
+ 
+-=item 0
++=item C<0>
+ 
+ The write operation was not successful. Probably the underlying connection
+ was closed. Call SSL_get_error() with the return value B<ret> to find out,
diff --git a/core/openvpn/PKGBUILD b/core/openvpn/PKGBUILD
index 929a98c7f..e69405d48 100644
--- a/core/openvpn/PKGBUILD
+++ b/core/openvpn/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 188197 2013-06-12 15:53:27Z thomas $
+# $Id: PKGBUILD 197835 2013-10-30 11:06:16Z allan $
 # Maintainer: Thomas Bächler <thomas@archlinux.org>
 
 pkgname=openvpn
@@ -24,7 +24,6 @@ md5sums=('06e5f93dbf13f2c19647ca15ffc23ac1'
          'SKIP'
          '57ef7353ba2c28c04dfc387c3ca77a4f'
          'e1bd1523e38745e948c710db1a330bb1')
-options=(!libtool)
 
 build() {
   cd $srcdir/$pkgname-$pkgver
diff --git a/core/pam/PKGBUILD b/core/pam/PKGBUILD
index a562da503..bcb75977e 100644
--- a/core/pam/PKGBUILD
+++ b/core/pam/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 186139 2013-05-21 09:11:14Z tpowa $
+# $Id: PKGBUILD 197836 2013-10-30 11:06:23Z allan $
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 # Contributor: judd <jvinet@zeroflux.org>
 
 pkgname=pam
-pkgver=1.1.6
-pkgrel=4
+pkgver=1.1.8
+pkgrel=2
 pkgdesc="PAM (Pluggable Authentication Modules) library"
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL2')
@@ -15,23 +15,26 @@ backup=(etc/security/{access.conf,group.conf,limits.conf,namespace.conf,namespac
 source=(https://fedorahosted.org/releases/l/i/linux-pam/Linux-PAM-$pkgver.tar.bz2
         #http://www.kernel.org/pub/linux/libs/pam/library/Linux-PAM-$pkgver.tar.bz2
         ftp://ftp.archlinux.org/other/pam_unix2/pam_unix2-2.9.1.tar.bz2
-        pam_unix2-glibc216.patch
-        pam_namespace-build-1.1.6.patch)
-options=('!libtool' '!emptydirs')
-md5sums=('7b73e58b7ce79ffa321d408de06db2c4'
+        pam_unix2-glibc216.patch)
+options=('!emptydirs')
+md5sums=('35b6091af95981b1b2cd60d813b5e4ee'
          'da6a46e5f8cd3eaa7cbc4fc3a7e2b555'
-         'dac109f68e04a4df37575fda6001ea17'
-         '440a510164ba5eb69bf41e129746ff44')
+         'dac109f68e04a4df37575fda6001ea17')
 
 build() {
   cd $srcdir/Linux-PAM-$pkgver
   ./configure --libdir=/usr/lib --sbindir=/usr/bin
-  patch -Np0 -i ../pam_namespace-build-1.1.6.patch
   make
 
   cd $srcdir/pam_unix2-2.9.1
   patch -Np1 -i ../pam_unix2-glibc216.patch
-  ./configure --libdir=/usr/lib --sbindir=/usr/bin
+
+  # modify flags to build against the pam compiled here, not a system lib.
+  ./configure \
+      CFLAGS="$CFLAGS -I$srcdir/Linux-PAM-$pkgver/libpam/include/" \
+      LDFLAGS="$LDFLAGS -L$srcdir/Linux-PAM-$pkgver/libpam/.libs/" \
+      --libdir=/usr/lib \
+      --sbindir=/usr/bin
   make
 }
 
diff --git a/core/pam/pam.install b/core/pam/pam.install
deleted file mode 100644
index 9d4588084..000000000
--- a/core/pam/pam.install
+++ /dev/null
@@ -1,12 +0,0 @@
-# arg 1:  the new package version
-post_install() {
-  # need to run this immediately -- pacman only runs it at the end of
-  # all package installs
-  /sbin/ldconfig -r .
-}
-
-# arg 1:  the new package version
-# arg 2:  the old package version
-post_upgrade() {
-  post_install $1
-}
diff --git a/core/pam/pam_namespace-build-1.1.6.patch b/core/pam/pam_namespace-build-1.1.6.patch
deleted file mode 100644
index aeabc234c..000000000
--- a/core/pam/pam_namespace-build-1.1.6.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- modules/pam_namespace/Makefile~	2012-10-12 10:59:13.557550706 +0200
-+++ modules/pam_namespace/Makefile	2012-10-12 10:59:13.564217270 +0200
-@@ -869,7 +869,7 @@
- 
- 
- install-data-local:
--	mkdir -p $(namespaceddir)
-+	mkdir -p $(DESTDIR)$(namespaceddir)
- README: pam_namespace.8.xml namespace.conf.5.xml
- -include $(top_srcdir)/Make.xml.rules
- 
diff --git a/core/pciutils/PKGBUILD b/core/pciutils/PKGBUILD
index 960c043e4..cb47cdaf7 100644
--- a/core/pciutils/PKGBUILD
+++ b/core/pciutils/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 186143 2013-05-21 09:11:35Z tpowa $
+# $Id: PKGBUILD 197782 2013-10-30 07:26:12Z tpowa $
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 pkgname=pciutils
 pkgver=3.2.0
-pkgrel=3
+pkgrel=4
 pkgdesc="PCI bus configuration space access library and tools"
 arch=(i686 x86_64 'mips64el')
 license=('GPL2')
diff --git a/core/pcre/PKGBUILD b/core/pcre/PKGBUILD
index 0d96d3182..35cc57f83 100644
--- a/core/pcre/PKGBUILD
+++ b/core/pcre/PKGBUILD
@@ -1,17 +1,16 @@
-# $Id: PKGBUILD 187186 2013-06-05 04:57:31Z allan $
+# $Id: PKGBUILD 197154 2013-10-23 13:04:19Z allan $
 # Maintainer: Allan McRae <allan@archlinux.org>
 # Contributor: Eric Belanger <eric@archlinux.org>
 # Contributor: John Proctor <jproctor@prium.net>
 
 pkgname=pcre
 pkgver=8.33
-pkgrel=1
+pkgrel=2
 pkgdesc="A library that implements Perl 5-style regular expressions"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.pcre.org/"
 license=('BSD')
 depends=('gcc-libs')
-options=('!libtool')
 source=(ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/${pkgname}-${pkgver}.tar.bz2{,.sig})
 md5sums=('21514018448ac10062ece7a668fca949'
          'SKIP')
diff --git a/core/popt/PKGBUILD b/core/popt/PKGBUILD
index 99df35922..b2e9a8883 100644
--- a/core/popt/PKGBUILD
+++ b/core/popt/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 195971 2013-10-06 19:11:33Z eric $
+# $Id: PKGBUILD 197837 2013-10-30 11:06:32Z allan $
 # Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgname=popt
@@ -9,7 +9,6 @@ arch=('i686' 'x86_64' 'mips64el')
 url="http://rpm5.org"
 license=('custom')
 depends=('glibc')
-options=('!libtool')
 source=(http://rpm5.org/files/${pkgname}/${pkgname}-${pkgver}.tar.gz)
 sha1sums=('cfe94a15a2404db85858a81ff8de27c8ff3e235e')
 
diff --git a/core/procps-ng/PKGBUILD b/core/procps-ng/PKGBUILD
index 9a0322d1a..b55947c1a 100644
--- a/core/procps-ng/PKGBUILD
+++ b/core/procps-ng/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 194509 2013-09-17 03:04:40Z bisson $
+# $Id: PKGBUILD 197838 2013-10-30 11:06:38Z allan $
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
 # Contributor: Eric Bélanger <eric@archlinux.org>
 
@@ -19,7 +19,6 @@ conflicts=('procps')
 provides=('procps')
 replaces=('procps')
 
-options=('!libtool')
 install=install
 
 build() {
diff --git a/core/pth/PKGBUILD b/core/pth/PKGBUILD
index 5c69dbceb..9a2b8a3a2 100644
--- a/core/pth/PKGBUILD
+++ b/core/pth/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 146737 2012-01-16 22:52:42Z dreisner $
+# $Id: PKGBUILD 197839 2013-10-30 11:06:47Z allan $
 # Maintainer: damir <damir@archlinux.org>
 
 pkgname=pth
@@ -9,7 +9,7 @@ arch=('i686' 'x86_64' 'mips64el')
 url="http://www.gnu.org/software/pth/"
 license=('LGPL')
 depends=('glibc' 'awk')
-options=('!libtool' '!makeflags')
+options=('!makeflags')
 source=(ftp://ftp.gnu.org/gnu/pth/$pkgname-$pkgver.tar.gz{,.sig})
 sha1sums=('9a71915c89ff2414de69fe104ae1016d513afeee'
           '8cb16dffbf15ba92bda8d08918eaf5995642fc38')
diff --git a/core/readline/PKGBUILD b/core/readline/PKGBUILD
index 43282abe3..4b62a61e6 100644
--- a/core/readline/PKGBUILD
+++ b/core/readline/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 163855 2012-07-21 11:22:57Z allan $
+# $Id: PKGBUILD 197153 2013-10-23 13:04:18Z allan $
 # Maintainer: Allan McRae <allan@archlinux.org>
 # Contributor: judd <jvinet@zeroflux.org>
 
@@ -6,7 +6,7 @@ pkgname=readline
 _basever=6.2
 _patchlevel=004 #prepare for some patches
 pkgver=$_basever.$_patchlevel
-pkgrel=1
+pkgrel=2
 pkgdesc="GNU readline library"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://tiswww.case.edu/php/chet/readline/rltop.html"
@@ -38,14 +38,14 @@ build() {
   cd ${srcdir}/${pkgname}-$_basever
   for (( p=1; p<=$((10#${_patchlevel})); p++ )); do
     msg "applying patch readline${_basever//./}-$(printf "%03d" $p)"
-    patch -Np0 -i $srcdir/readline${_basever//./}-$(printf "%03d" $p)
+    patch -p0 -i $srcdir/readline${_basever//./}-$(printf "%03d" $p)
   done
 
   # Remove RPATH from shared objects (FS#14366)
   sed -i 's|-Wl,-rpath,$(libdir) ||g' support/shobj-conf
 
   # build with -fPIC for x86_64 (FS#15634)
-  [ $CARCH == "x86_64" ] && CFLAGS="$CFLAGS -fPIC"
+  [[ $CARCH == "x86_64" ]] && CFLAGS="$CFLAGS -fPIC"
 
   ./configure --prefix=/usr
   make SHLIB_LIBS=-lncurses
diff --git a/core/s-nail/PKGBUILD b/core/s-nail/PKGBUILD
index 7a685f014..f626cd410 100644
--- a/core/s-nail/PKGBUILD
+++ b/core/s-nail/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 196202 2013-10-08 07:40:42Z bisson $
+# $Id: PKGBUILD 197187 2013-10-23 17:10:51Z bisson $
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
 # Contributor: Stéphane Gaudreault <stephane@archlinux.org>
 # Contributor: Sergej Pupykin <pupykin.s@arch@gmail.com>
 # Contributor: Andreas Wagner <Andreas.Wagner@em.uni-frankfurt.de>
 
 pkgname=s-nail
-pkgver=14.4.4
+pkgver=14.4.5
 pkgrel=1
 pkgdesc='Mail processing system with a command syntax reminiscent of ed'
 url='http://sourceforge.net/projects/s-nail/'
@@ -14,7 +14,7 @@ arch=('i686' 'x86_64' 'mips64el')
 depends=('openssl')
 optdepends=('smtp-forwarder: for sending mail')
 source=("http://downloads.sourceforge.net/project/${pkgname}/${pkgname}-${pkgver//./_}.tar.gz")
-sha1sums=('6aaa2ca4c269a073cdfd778de0f05d8eb2303737')
+sha1sums=('cc972ddacdf9593739289eb0589ad0939255dfd7')
 
 groups=('base')
 backup=('etc/mail.rc')
@@ -22,6 +22,11 @@ replaces=('mailx' 'mailx-heirloom' 'heirloom-mailx')
 provides=('mailx' 'mailx-heirloom' 'heirloom-mailx')
 conflicts=('mailx' 'mailx-heirloom' 'heirloom-mailx')
 
+prepare() {
+	cd "${srcdir}/${pkgname}-${pkgver}"
+	sed 's/s-nail/mail/g' -i cc-test.sh
+}
+
 build() {
 	cd "${srcdir}/${pkgname}-${pkgver}"
 	make \
@@ -30,20 +35,22 @@ build() {
 		MANDIR=/usr/share/man \
 		MAILSPOOL=/var/spool/mail \
 		SID= NAIL=mail \
+		config
+	make \
 		CFLAGS="${CFLAGS} ${CPPFLAGS}" \
 		LDFLAGS="${LDFLAGS}" \
-		DESTDIR="${pkgdir}" \
-		all
+		build
 }
 
+
 check() {
 	cd "${srcdir}/${pkgname}-${pkgver}"
-	#./cc-test.sh
+	make test
 }
 
 package() {
 	cd "${srcdir}/${pkgname}-${pkgver}"
-	make -f mk.mk install
+	make DESTDIR="${pkgdir}" packager-install
 	ln -sf mail "${pkgdir}"/usr/bin/mailx
 	ln -sf mail.1.gz "${pkgdir}"/usr/share/man/man1/mailx.1.gz
 	install -Dm644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/COPYING"
diff --git a/core/shadow/PKGBUILD b/core/shadow/PKGBUILD
index 8500e395a..816678c68 100644
--- a/core/shadow/PKGBUILD
+++ b/core/shadow/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 187042 2013-06-03 11:15:35Z allan $
+# $Id: PKGBUILD 197840 2013-10-30 11:06:53Z allan $
 # Maintainer: Dave Reisner <dreisner@archlinux.org>
 # Maintainer: Aaron Griffin <aaron@archlinux.org>
 
 pkgname=shadow
 pkgver=4.1.5.1
-pkgrel=6
+pkgrel=7
 pkgdesc="Password and account management tool suite with support for shadow files and PAM"
 arch=('i686' 'x86_64' 'mips64el')
 url='http://pkg-shadow.alioth.debian.org/'
@@ -16,7 +16,7 @@ backup=(etc/login.defs
         etc/pam.d/{chpasswd,newusers,groupadd,groupdel,groupmod}
         etc/pam.d/{chgpasswd,groupmems}
         etc/default/useradd)
-options=('!libtool')
+options=(strip debug)
 install='shadow.install'
 source=("http://pkg-shadow.alioth.debian.org/releases/$pkgname-$pkgver.tar.bz2"{,.sig}
         LICENSE
@@ -114,7 +114,7 @@ package() {
 
   # Remove utilities provided by util-linux
   rm \
-      "$pkgdir"/usr/bin/{login,su,chsh,chfn,sg} \
+      "$pkgdir"/usr/bin/{login,su,chsh,chfn,sg,nologin} \
       "$pkgdir"/usr/sbin/{vipw,vigr}
 
   # but we keep newgrp, as sg is really an alias to it
@@ -127,6 +127,7 @@ package() {
           -name 'su.1'      -o \
           -name 'logoutd.8' -o \
           -name 'login.1'   -o \
+          -name 'nologin.8' -o \
           -name 'vipw.8'    -o \
           -name 'vigr.8'    -o \
           -name 'newgrp.1' ')' \
diff --git a/core/sudo/PKGBUILD b/core/sudo/PKGBUILD
index 4d5450f9d..84511dd8a 100644
--- a/core/sudo/PKGBUILD
+++ b/core/sudo/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 195898 2013-10-04 13:41:05Z foutrelis $
+# $Id: PKGBUILD 197841 2013-10-30 11:07:01Z allan $
 # Maintainer: Evangelos Foutras <evangelos@foutrelis.com>
 # Contributor: Allan McRae <allan@archlinux.org>
 # Contributor: Tom Newsom <Jeepster@gmx.co.uk>
@@ -14,7 +14,6 @@ license=('custom')
 groups=('base-devel')
 depends=('glibc' 'pam')
 backup=('etc/sudoers' 'etc/pam.d/sudo')
-options=('!libtool')
 source=(http://www.sudo.ws/sudo/dist/$pkgname-$_sudover.tar.gz{,.sig}
         sudo.pam)
 sha256sums=('9f911c1e9297fb8006deb52fa81197a8d06b9d54e70672f723c467ecae992fc9'
diff --git a/core/sysfsutils/PKGBUILD b/core/sysfsutils/PKGBUILD
index a76eb10bf..e12494892 100644
--- a/core/sysfsutils/PKGBUILD
+++ b/core/sysfsutils/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 158624 2012-05-05 03:20:18Z dreisner $
+# $Id: PKGBUILD 197842 2013-10-30 11:07:08Z allan $
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 
 pkgname=sysfsutils
@@ -12,7 +12,6 @@ groups=('base')
 depends=('glibc')
 source=(http://downloads.sourceforge.net/sourceforge/linux-diag/${pkgname}-${pkgver}.tar.gz)
 md5sums=('14e7dcd0436d2f49aa403f67e1ef7ddc')
-options=(!libtool)
 
 build() {
   cd "$pkgname-$pkgver"
diff --git a/core/systemd/0001-mount-check-for-NULL-before-reading-pm-what.patch b/core/systemd/0001-mount-check-for-NULL-before-reading-pm-what.patch
new file mode 100644
index 000000000..27256484c
--- /dev/null
+++ b/core/systemd/0001-mount-check-for-NULL-before-reading-pm-what.patch
@@ -0,0 +1,29 @@
+From 9c03872bc8fb2a381eafe7301ef9811b641686dd Mon Sep 17 00:00:00 2001
+From: Dave Reisner <dreisner@archlinux.org>
+Date: Fri, 4 Oct 2013 18:22:40 -0400
+Subject: [PATCH] mount: check for NULL before reading pm->what
+
+Since a57f7e2c828b85, a mount unit with garbage in it would cause
+systemd to crash on loading it.
+
+ref: https://bugs.freedesktop.org/show_bug.cgi?id=70148
+---
+ src/core/mount.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/core/mount.c b/src/core/mount.c
+index 93bfa99..db055f0 100644
+--- a/src/core/mount.c
++++ b/src/core/mount.c
+@@ -182,7 +182,7 @@ static int mount_add_mount_links(Mount *m) {
+          * for the source path (if this is a bind mount) to be
+          * available. */
+         pm = get_mount_parameters_fragment(m);
+-        if (pm && path_is_absolute(pm->what)) {
++        if (pm && pm->what && path_is_absolute(pm->what)) {
+                 r = unit_require_mounts_for(UNIT(m), pm->what);
+                 if (r < 0)
+                         return r;
+-- 
+1.8.4.1
+
diff --git a/core/systemd/0001-shared-util-fix-off-by-one-error-in-tag_to_udev_node.patch b/core/systemd/0001-shared-util-fix-off-by-one-error-in-tag_to_udev_node.patch
new file mode 100644
index 000000000..8c8ea46c2
--- /dev/null
+++ b/core/systemd/0001-shared-util-fix-off-by-one-error-in-tag_to_udev_node.patch
@@ -0,0 +1,50 @@
+From 1d5989fd803d2019de0f6aaaf3cfb1cb2bbc3cdb Mon Sep 17 00:00:00 2001
+From: Dave Reisner <dreisner@archlinux.org>
+Date: Sun, 6 Oct 2013 18:26:23 -0400
+Subject: [PATCH] shared/util: fix off-by-one error in tag_to_udev_node
+
+Triggered false negatives when encoding a string which needed every
+character to be escaped, e.g. "LABEL=/".
+---
+ src/shared/util.c            | 2 +-
+ src/test/test-device-nodes.c | 4 +++-
+ 2 files changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/src/shared/util.c b/src/shared/util.c
+index 82f4221..31cea79 100644
+--- a/src/shared/util.c
++++ b/src/shared/util.c
+@@ -3527,7 +3527,7 @@ static char *tag_to_udev_node(const char *tagvalue, const char *by) {
+         if (u == NULL)
+                 return NULL;
+ 
+-        enc_len = strlen(u) * 4;
++        enc_len = strlen(u) * 4 + 1;
+         t = new(char, enc_len);
+         if (t == NULL)
+                 return NULL;
+diff --git a/src/test/test-device-nodes.c b/src/test/test-device-nodes.c
+index 2f3dedb..59ba4be 100644
+--- a/src/test/test-device-nodes.c
++++ b/src/test/test-device-nodes.c
+@@ -26,7 +26,7 @@
+ 
+ /* helpers for test_encode_devnode_name */
+ static char *do_encode_string(const char *in) {
+-        size_t out_len = strlen(in) * 4;
++        size_t out_len = strlen(in) * 4 + 1;
+         char *out = malloc(out_len);
+ 
+         assert_se(out);
+@@ -46,6 +46,8 @@ static void test_encode_devnode_name(void) {
+         assert_se(expect_encoded_as("pinkiepie", "pinkiepie"));
+         assert_se(expect_encoded_as("valíd\\ųtf8", "valíd\\x5cųtf8"));
+         assert_se(expect_encoded_as("s/ash/ng", "s\\x2fash\\x2fng"));
++        assert_se(expect_encoded_as("/", "\\x2f"));
++        assert_se(expect_encoded_as("!", "\\x21"));
+ }
+ 
+ int main(int argc, char *argv[]) {
+-- 
+1.8.4.1
+
diff --git a/core/systemd/PKGBUILD b/core/systemd/PKGBUILD
index e25d29d5f..d8855ba6c 100644
--- a/core/systemd/PKGBUILD
+++ b/core/systemd/PKGBUILD
@@ -4,27 +4,33 @@
 pkgbase=systemd
 pkgname=('systemd' 'systemd-sysvcompat')
 pkgver=208
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.freedesktop.org/wiki/Software/systemd"
 makedepends=('acl' 'cryptsetup' 'dbus-core' 'docbook-xsl' 'gobject-introspection' 'gperf'
              'gtk-doc' 'intltool' 'kmod' 'libcap' 'libgcrypt'  'libmicrohttpd' 'libxslt'
              'linux-api-headers' 'pam' 'python' 'quota-tools' 'xz')
-options=('!libtool' 'strip' 'debug' '!distcc')
+options=('strip' 'debug')
 source=("http://www.freedesktop.org/software/$pkgname/$pkgname-$pkgver.tar.xz"
         'initcpio-hook-udev'
         'initcpio-install-systemd'
         'initcpio-install-udev'
-        '0001-fix-lingering-references-to-var-lib-backlight-random.patch')
+        '0001-fix-lingering-references-to-var-lib-backlight-random.patch'
+        '0001-mount-check-for-NULL-before-reading-pm-what.patch'
+        '0001-shared-util-fix-off-by-one-error-in-tag_to_udev_node.patch')
 md5sums=('df64550d92afbffb4f67a434193ee165'
          '29245f7a240bfba66e2b1783b63b6b40'
          '8b68b0218a3897d4d37a6ccf47914774'
          'bde43090d4ac0ef048e3eaee8202a407'
-         '1b191c4e7a209d322675fd199e3abc66')
+         '1b191c4e7a209d322675fd199e3abc66'
+         'a693bef63548163ffc165f4c4801ebf7'
+         'ccafe716d87df9c42af0d1960b5a4105')
 
 prepare() {
   cd "$pkgname-$pkgver"
-  patch -Np1 -i ../0001-fix-lingering-references-to-var-lib-backlight-random.patch
+  patch -Np1 < "$srcdir"/0001-fix-lingering-references-to-var-lib-backlight-random.patch
+  patch -Np1 < "$srcdir"/0001-mount-check-for-NULL-before-reading-pm-what.patch
+  patch -Np1 < "$srcdir"/0001-shared-util-fix-off-by-one-error-in-tag_to_udev_node.patch
 }
 
 build() {
@@ -48,8 +54,7 @@ build() {
 }
 
 check() {
-  # two tests fail due to running under nspawn
-  make -C "$pkgname-$pkgver" check || true
+  make -C "$pkgname-$pkgver" check || :
 }
 
 package_systemd() {
@@ -73,6 +78,7 @@ package_systemd() {
           etc/dbus-1/system.d/org.freedesktop.locale1.conf
           etc/dbus-1/system.d/org.freedesktop.machine1.conf
           etc/dbus-1/system.d/org.freedesktop.timedate1.conf
+          etc/pam.d/systemd-user
           etc/systemd/bootchart.conf
           etc/systemd/journald.conf
           etc/systemd/logind.conf
@@ -121,7 +127,7 @@ package_systemd() {
      "$srcdir"/_sysvcompat/usr/share/man/man8
 
   # include MIT license, since it's technically custom
-  install -Dm755 "$srcdir/$pkgname-$pkgver/LICENSE.MIT" \
+  install -Dm644 "$srcdir/$pkgname-$pkgver/LICENSE.MIT" \
       "$pkgdir/usr/share/licenses/systemd/LICENSE.MIT"
 }
 
diff --git a/core/systemd/systemd.install b/core/systemd/systemd.install
index f22536360..1e79585d7 100644
--- a/core/systemd/systemd.install
+++ b/core/systemd/systemd.install
@@ -69,7 +69,7 @@ post_upgrade() {
   if [ "$(vercmp 183 "$2")" -eq 1 ]; then
     # systemctl seems to be whiny on sysvinit. this will succeed unless something
     # horrific happens, so just mask the error.
-    systemctl -q enable getty@.service || true
+    systemctl -q enable getty@tty1.service || true
   fi
 
   if [ "$(vercmp 194-4 "$2")" -eq 1 ]; then
diff --git a/core/sysvinit-tools/PKGBUILD b/core/sysvinit-tools/PKGBUILD
index a576e6a05..4dc356e74 100644
--- a/core/sysvinit-tools/PKGBUILD
+++ b/core/sysvinit-tools/PKGBUILD
@@ -1,10 +1,11 @@
-# $Id: PKGBUILD 187044 2013-06-03 11:15:38Z allan $
+# $Id: PKGBUILD 197264 2013-10-24 20:11:17Z dreisner $
 # Maintainer: Tom Gundersen <teg@jklm.no>
 # Maintainer: Eric Belanger <eric@archlinux.org>
 
 pkgname=sysvinit-tools
+pkgdesc="Linux System V Init Tools"
 pkgver=2.88
-pkgrel=11
+pkgrel=12
 arch=('i686' 'x86_64' 'mips64el')
 url="http://savannah.nongnu.org/projects/sysvinit"
 license=('GPL')
@@ -17,33 +18,25 @@ sha1sums=('f2ca149df1314a91f3007cccd7a0aa47d990de26'
           'bbecfa7dfa45ac7c37ed8ac59fb53f6a85064b32')
 
 build() {
-  cd "${srcdir}/sysvinit-${pkgver}dsf"
+  cd "$srcdir/sysvinit-${pkgver}dsf"
 
   # FS#30005
   patch -p1 -d "src" -i "${srcdir}/0001-simplify-writelog.patch"
   patch -p1 -d "src" -i "${srcdir}/0002-remove-ansi-escape-codes-from-log-file.patch"
 
-  make 
+  # only build what we need...
+  make -C src fstab-decode killall5 bootlogd
 }
 
 package() {
-  pkgdesc="Linux System V Init Tools"
-
-  cd "${srcdir}/sysvinit-${pkgver}dsf"
-  make ROOT="${pkgdir}" install
-
-  cd "${pkgdir}"
-  ### drop the stuff provided by systemd-sysvcompat and util-linux
-  rm -r usr/share/man/man5
-  rm -r usr/include
-  rm bin/mountpoint
-  rm sbin/{halt,init,poweroff,reboot,runlevel,shutdown,telinit,sulogin}
-  rm usr/bin/{mesg,utmpdump,wall}
-  rm usr/share/man/man1/{mountpoint,mesg,utmpdump,wall}.1
-  rm usr/share/man/man8/{halt,init,poweroff,reboot,runlevel,shutdown,telinit,sulogin}.8
-  ### usrmerge
-  mv sbin/* usr/bin/
-  rm -r sbin
-  mv bin/* usr/bin/
-  rm -r bin
+  cd "$srcdir/sysvinit-${pkgver}dsf"
+
+  install -dm755 "$pkgdir/usr/bin" "$pkgdir/usr/share/man/man8"
+
+  # binaries
+  install -m755 src/{fstab-decode,killall5,bootlogd} "$pkgdir/usr/bin"
+  ln -s killall5 "$pkgdir/usr/bin/pidof"
+
+  # manpages
+  install -m644 man/{bootlogd,pidof,killall5,fstab-decode}.8 "$pkgdir/usr/share/man/man8"
 }
diff --git a/core/util-linux/PKGBUILD b/core/util-linux/PKGBUILD
index ee267fb16..ec5086bb4 100644
--- a/core/util-linux/PKGBUILD
+++ b/core/util-linux/PKGBUILD
@@ -1,23 +1,24 @@
-# $Id: PKGBUILD 192147 2013-08-06 13:08:02Z tomegun $
+# $Id: PKGBUILD 197844 2013-10-30 11:07:21Z allan $
 # Maintainer: Tom Gundersen <teg@jklm.no>
 # Maintainer: Dave Reisner <dreisner@archlinux.org>
 # Contributor: judd <jvinet@zeroflux.org>
 
 pkgname=util-linux
-pkgver=2.23.2
+pkgver=2.24
 pkgrel=1
 pkgdesc="Miscellaneous system utilities for Linux"
 url="http://www.kernel.org/pub/linux/utils/util-linux/"
 arch=('i686' 'x86_64' 'mips64el')
 groups=('base' 'base-devel')
 depends=('pam' 'shadow' 'coreutils' 'glibc')
-makedepends=('systemd')
+optdepends=('python: python bindings to libmount')
+makedepends=('systemd' 'python')
 # checkdepends=('bc')
 conflicts=('util-linux-ng' 'eject')
 provides=("util-linux-ng=$pkgver" 'eject')
 license=('GPL2')
-options=('!libtool')
-source=("ftp://ftp.kernel.org/pub/linux/utils/$pkgname/v2.23/$pkgname-$pkgver.tar.xz"
+options=('strip' 'debug')
+source=("ftp://ftp.kernel.org/pub/linux/utils/$pkgname/v2.24/$pkgname-$pkgver.tar.xz"
         uuidd.tmpfiles
         pam-login
         pam-common
@@ -28,7 +29,7 @@ backup=(etc/pam.d/chfn
         etc/pam.d/su
         etc/pam.d/su-l)
 install=util-linux.install
-md5sums=('b39fde897334a4858bb2098edcce5b3f'
+md5sums=('4fac6443427f575fc5f3531a4ad2ca01'
          'a39554bfd65cccfd8254bb46922f4a67'
          '4368b3f98abd8a32662e094c54e7f9b1'
          'a31374fef2cba0ca34dfc7078e2969e4'
@@ -39,6 +40,7 @@ build() {
 
   ./configure --prefix=/usr \
               --libdir=/usr/lib \
+              --bindir=/usr/bin \
               --localstatedir=/run \
               --enable-fs-paths-extra=/usr/bin \
               --enable-raw \
@@ -47,10 +49,10 @@ build() {
               --enable-chfn-chsh \
               --enable-write \
               --enable-mesg \
-              --enable-socket-activation
+              --enable-socket-activation \
+              --with-python=3
 
 #              --enable-reset \ # part of ncurses
-#              --enable-line \ # not part of any package
 #              --enable-last \ # not compat
 
   make
@@ -83,6 +85,5 @@ package() {
   # usrmove
   cd "$pkgdir"
   mv {,usr/}sbin/* usr/bin
-  mv bin/* usr/bin
-  rmdir bin sbin usr/sbin
+  rmdir sbin usr/sbin
 }
diff --git a/core/vi/PKGBUILD b/core/vi/PKGBUILD
index ca5eaf501..61eef6950 100644
--- a/core/vi/PKGBUILD
+++ b/core/vi/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 171607 2012-11-20 05:26:38Z eric $
+# $Id: PKGBUILD 197845 2013-10-30 11:07:27Z allan $
 # Maintainer: tobias [ tobias at archlinux org ]
 
 pkgname=vi
@@ -12,7 +12,7 @@ license=('custom:ex')
 depends=('ncurses')
 optdepends=('heirloom-mailx: used by the preserve command for notification')
 groups=('base')
-options=(strip !libtool emptydirs)
+options=(strip emptydirs)
 source=(http://downloads.sourceforge.net/sourceforge/ex-vi/ex-${pkgver}.tar.bz2
         navkeys.patch
         increase-tube.patch
diff --git a/core/xfsprogs/PKGBUILD b/core/xfsprogs/PKGBUILD
index eeb8d3b10..ae080fc7e 100644
--- a/core/xfsprogs/PKGBUILD
+++ b/core/xfsprogs/PKGBUILD
@@ -1,15 +1,15 @@
-# $Id: PKGBUILD 186296 2013-05-24 07:56:54Z tpowa $
+# $Id: PKGBUILD 197846 2013-10-30 11:07:35Z allan $
 #
 pkgname=xfsprogs
 pkgver=3.1.11
-pkgrel=1
+pkgrel=2
 pkgdesc="XFS filesystem utilities"
 arch=('i686' 'x86_64' 'mips64el')
 license=('LGPL')
 url="http://oss.sgi.com/projects/xfs/"
 groups=('base')
 depends=('util-linux')
-options=('!makeflags' '!libtool')
+options=('!makeflags')
 # We mirror the sources as upstream tends to move them once a new release is out
 source=("ftp://ftp.archlinux.org/other/xfsprogs/${pkgname}-${pkgver}.tar.gz")
 md5sums=('de9f1f45026c2f4e0776058d429ff4b6')
diff --git a/core/xinetd/PKGBUILD b/core/xinetd/PKGBUILD
index fbdf3d48d..d16106d9c 100644
--- a/core/xinetd/PKGBUILD
+++ b/core/xinetd/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 186292 2013-05-24 07:53:31Z tpowa $
+# $Id: PKGBUILD 196783 2013-10-19 06:36:43Z tpowa $
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 # Contributor: Judd <jvinet@zeroflux.org>
 
 pkgname=xinetd
 pkgver=2.3.15
-pkgrel=3
+pkgrel=4
 pkgdesc="A secure replacement for inetd"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.xinetd.org/"
@@ -15,16 +15,21 @@ source=(http://www.xinetd.org/xinetd-$pkgver.tar.gz
         xinetd.conf
         servers
         services
-        xinetd.service)
+        xinetd.service
+        fix-CVE-2013-4342.patch)
 md5sums=('77358478fd58efa6366accae99b8b04c'
          'f109f699a07bc8cfb5791060f5e87f9e'
          '21f47b4aa20921cfaddddd9f9a407f81'
          '9fa2061dc7dd738c8424251deb86f81e'
-         '38be35b6e7146dc59902e243d9063b4c')
+         '38be35b6e7146dc59902e243d9063b4c'
+         'b14615c73753ceffbcc96d5e08f3c18d')
 
 prepare() {
   cd $srcdir/$pkgname-$pkgver
   sed -i "s#${prefix}/man#${prefix}/share/man#" configure
+  # fix #37310
+  # https://bugzilla.redhat.com/show_bug.cgi?id=1006100#c
+  patch -Np1 -i $srcdir/fix-CVE-2013-4342.patch
 }
 
 build() {
diff --git a/core/xinetd/fix-CVE-2013-4342.patch b/core/xinetd/fix-CVE-2013-4342.patch
new file mode 100644
index 000000000..83506c9c3
--- /dev/null
+++ b/core/xinetd/fix-CVE-2013-4342.patch
@@ -0,0 +1,13 @@
+diff --git a/xinetd/builtins.c b/xinetd/builtins.c
+index e61502f..a414cf3 100644
+--- a/xinetd/builtins.c
++++ b/xinetd/builtins.c
+@@ -695,7 +695,7 @@ static void tcpmux_handler( const struct server *serp )
+    if( SC_IS_INTERNAL( scp ) ) {
+       SC_INTERNAL(scp, nserp);
+    } else {
+-      exec_server(nserp);
++      child_process(nserp);
+    }
+ }
+ 
diff --git a/core/xz/PKGBUILD b/core/xz/PKGBUILD
index 33e7da05b..2d5da080c 100644
--- a/core/xz/PKGBUILD
+++ b/core/xz/PKGBUILD
@@ -1,16 +1,15 @@
-# $Id: PKGBUILD 189703 2013-07-05 05:55:43Z pierre $
+# $Id: PKGBUILD 197167 2013-10-23 13:51:52Z pierre $
 # Maintainer: Pierre Schmitz <pierre@archlinux.de>
 # Contributor: François Charette <firmicus@gmx.net>
 
 pkgname=xz
 pkgver=5.0.5
-pkgrel=1
+pkgrel=2
 pkgdesc='Library and command line tools for XZ and LZMA compressed files'
 arch=('i686' 'x86_64' 'mips64el')
 url='http://tukaani.org/xz/'
 license=('GPL' 'LGPL' 'custom')
 depends=('sh')
-options=('!libtool')
 source=("http://tukaani.org/${pkgname}/${pkgname}-${pkgver}.tar.gz"
         "http://tukaani.org/${pkgname}/${pkgname}-${pkgver}.tar.gz.sig")
 md5sums=('19d924e066b6fff0bc9d1981b4e53196'
diff --git a/core/zlib/PKGBUILD b/core/zlib/PKGBUILD
index bc6d05080..19e2cf8ba 100644
--- a/core/zlib/PKGBUILD
+++ b/core/zlib/PKGBUILD
@@ -1,23 +1,27 @@
-# $Id: PKGBUILD 184034 2013-05-02 08:15:23Z pierre $
+# $Id: PKGBUILD 197152 2013-10-23 13:04:17Z allan $
 # Maintainer: Pierre Schmitz <pierre@archlinux.de>
 
 pkgname=zlib
 pkgver=1.2.8
-pkgrel=1
+pkgrel=3
 pkgdesc='Compression library implementing the deflate compression method found in gzip and PKZIP'
 arch=('i686' 'x86_64' 'mips64el')
 license=('custom')
 url="http://www.zlib.net/"
 depends=('glibc')
+options=('staticlibs')  # needed by binutils testsuite
 source=("http://zlib.net/current/zlib-${pkgver}.tar.gz")
 md5sums=('44d667c142d7cda120332623eab69f40')
 
+prepare() {
+	cd ${srcdir}/zlib-$pkgver
+	grep -A 24 '^  Copyright' zlib.h > LICENSE
+}
+
 build() {
 	cd ${srcdir}/zlib-$pkgver
 	./configure --prefix=/usr
 	make
-
-	grep -A 24 '^  Copyright' zlib.h > LICENSE
 }
 
 check() {
diff --git a/cross/mips64el-unknown-linux-gnu-linux-libre-api-headers/PKGBUILD b/cross/mips64el-unknown-linux-gnu-linux-libre-api-headers/PKGBUILD
new file mode 100644
index 000000000..eb0ddb881
--- /dev/null
+++ b/cross/mips64el-unknown-linux-gnu-linux-libre-api-headers/PKGBUILD
@@ -0,0 +1,53 @@
+# $Id: PKGBUILD 180857 2013-03-27 11:11:40Z allan $
+# Maintainer: Allan McRae <allan@archlinux.org>
+# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
+
+# toolchain build order: linux-libre-api-headers->glibc->binutils->gcc->binutils->glibc
+export ARCH=mips
+_target=mips64el-unknown-linux-gnu
+_sysroot="/usr/${_target}"
+
+pkgname=${_target}-linux-libre-api-headers
+_basekernel=3.10
+_sublevel=9
+pkgver=${_basekernel}.${_sublevel}
+pkgrel=1
+pkgdesc="Kernel headers sanitized for use in userspace"
+arch=('i686' 'x86_64')
+url="http://www.gnu.org/software/libc"
+license=('GPL2')
+provides=("${_target}-linux-api-headers=${pkgver}")
+conflicts=("${_target}-linux-api-headers")
+replaces=("${_target}-linux-api-headers" )
+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}-gnu/patch-${_basekernel}-gnu-${pkgver}-gnu.xz")
+sha1sums=('22abb16dc6175bab805f2098c5a276ff700424cf'
+          '10f907e7127f14e1a7f524d1d39852d98622793f')
+sha256sums=('abee814b92422cfa3df90b62ad9ba888697fcc03a713adc2c7f68e0d0c23c329'
+            'd5bc5369b102dae74f0cbaeba19a6db1d0d919645672a16208b06a71aab1de1b')
+
+prepare() {
+  cd ${srcdir}/linux-${_basekernel}
+
+  if [ "${_basekernel}" != "${pkgver}" ]; then
+    patch -Np1 -i "${srcdir}/patch-${_basekernel}-gnu-${pkgver}-gnu"
+  fi
+}
+
+build() {
+  cd ${srcdir}/linux-${_basekernel}
+
+  make mrproper
+  make ARCH=${ARCH} headers_check
+}
+
+package() {
+  cd ${srcdir}/linux-${_basekernel}
+  make ARCH=${ARCH} INSTALL_HDR_PATH=${pkgdir}${_sysroot} headers_install
+
+  # use headers from libdrm
+  rm -r ${pkgdir}${_sysroot}/include/drm
+
+  # clean-up unnecessary files generated during install
+  find ${pkgdir} \( -name .install -o -name ..install.cmd \) -delete
+}
diff --git a/cross/xtensa-unknown-elf-binutils/PKGBUILD b/cross/xtensa-unknown-elf-binutils/PKGBUILD
index 072e5e50d..7b864eeb6 100644
--- a/cross/xtensa-unknown-elf-binutils/PKGBUILD
+++ b/cross/xtensa-unknown-elf-binutils/PKGBUILD
@@ -1,6 +1,6 @@
 # $Id: PKGBUILD 182407 2013-04-10 07:34:20Z allan $
 # Maintainer: Allan McRae <allan@archlinux.org>
-# Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
+# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
 # Maintainer (Parabola): Márcio Silva <coadde@lavabit.com>
 
 _pkgname=binutils
diff --git a/cross/xtensa-unknown-elf-gcc/PKGBUILD b/cross/xtensa-unknown-elf-gcc/PKGBUILD
index 76328723c..50d125e8a 100644
--- a/cross/xtensa-unknown-elf-gcc/PKGBUILD
+++ b/cross/xtensa-unknown-elf-gcc/PKGBUILD
@@ -1,6 +1,6 @@
 # $Id: PKGBUILD 186915 2013-05-31 23:25:14Z allan $
 # Maintainer: Allan McRae <allan@archlinux.org>
-# Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
+# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
 # Contributor (Parabola): Márcio Silva <coadde@lavabit.com>
 
 _pkgname=gcc
diff --git a/cross/xtensa-unknown-elf-linux-libre-api-headers/PKGBUILD b/cross/xtensa-unknown-elf-linux-libre-api-headers/PKGBUILD
index 5885001c0..2e75e0d9a 100644
--- a/cross/xtensa-unknown-elf-linux-libre-api-headers/PKGBUILD
+++ b/cross/xtensa-unknown-elf-linux-libre-api-headers/PKGBUILD
@@ -1,6 +1,6 @@
 # $Id: PKGBUILD 180857 2013-03-27 11:11:40Z allan $
 # Maintainer: Allan McRae <allan@archlinux.org>
-# Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
+# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
 
 # toolchain build order: linux-libre-api-headers->glibc->binutils->gcc->binutils->glibc
 export ARCH=xtensa
diff --git a/extra/a2ps/PKGBUILD b/extra/a2ps/PKGBUILD
index 398d72d70..8cbe130fb 100644
--- a/extra/a2ps/PKGBUILD
+++ b/extra/a2ps/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 191744 2013-07-30 07:00:10Z eric $
+# $Id: PKGBUILD 197210 2013-10-24 03:42:33Z eric $
 # Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgname=a2ps
 pkgver=4.14
-pkgrel=4
+pkgrel=5
 pkgdesc="An Any to PostScript filter"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.gnu.org/software/a2ps/"
@@ -11,7 +11,6 @@ license=('GPL3')
 depends=('ghostscript' 'psutils' 'imagemagick')
 makedepends=('gperf')
 backup=('etc/a2ps/a2ps.cfg' 'etc/a2ps/a2ps-site.cfg')
-options=('!libtool')
 install=a2ps.install
 source=(ftp://ftp.gnu.org/gnu/a2ps/${pkgname}-${pkgver}.tar.gz{,.sig}
         a2ps-4.13c-fnmatch-replacement.patch a2ps-4.13c-emacs.patch 
@@ -45,7 +44,7 @@ build() {
   libtoolize --force --copy
   autoreconf --force --install -I m4 
   ./configure --prefix=/usr --sysconfdir=/etc/a2ps \
-    --includedir=/usr/include --enable-nls
+    --includedir=/usr/include --enable-shared --enable-nls
   make
 }
 
diff --git a/extra/a52dec/PKGBUILD b/extra/a52dec/PKGBUILD
index 40c9e7366..399550ddf 100644
--- a/extra/a52dec/PKGBUILD
+++ b/extra/a52dec/PKGBUILD
@@ -1,17 +1,16 @@
-# $Id: PKGBUILD 191306 2013-07-23 13:24:20Z jgc $
+# $Id: PKGBUILD 197290 2013-10-25 01:17:05Z allan $
 # Maintainer:
 # Contributor: Thomas Baechler <thomas@archlinux.org>
 # Contributor: Sarah Hay <sarahhay@mb.sympatico.ca>
 
 pkgname=a52dec
 pkgver=0.7.4
-pkgrel=7
+pkgrel=8
 pkgdesc="A free library for decoding ATSC A/52 streams"
 url="http://liba52.sourceforge.net/"
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL2')
 depends=('glibc')
-options=(!libtool)
 source=("http://liba52.sourceforge.net/files/${pkgname}-${pkgver}.tar.gz"
         'a52dec-0.7.4-build.patch'
 	'configure.patch')
diff --git a/extra/aalib/PKGBUILD b/extra/aalib/PKGBUILD
index a7c274773..5380a10d7 100644
--- a/extra/aalib/PKGBUILD
+++ b/extra/aalib/PKGBUILD
@@ -1,30 +1,33 @@
-# $Id: PKGBUILD 149374 2012-02-07 09:56:45Z eric $
+# $Id: PKGBUILD 197212 2013-10-24 03:56:40Z eric $
 # Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgname=aalib
 pkgver=1.4rc5
-pkgrel=9.2
+pkgrel=10
 pkgdesc="A portable ASCII art graphic library"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://aa-project.sourceforge.net/aalib/"
 license=('LGPL')
 depends=('gpm' 'libx11')
 makedepends=('libxt')
-options=('!libtool')
 install=aalib.install
 source=(http://downloads.sourceforge.net/sourceforge/aa-project/${pkgname}-${pkgver}.tar.gz
 	aclocal-fixes.patch)
 sha1sums=('a23269e950a249d2ef93625837cace45ddbce03b'
           '98d8c5a13672a8107945d694ff4520e0bc87d3e9')
 
-build() {
-  cd "${srcdir}/${pkgname}-1.4.0"
+prepare() {
+  cd ${pkgname}-1.4.0
   patch -p0 -i "${srcdir}/aclocal-fixes.patch"
+}
+
+build() {
+  cd ${pkgname}-1.4.0
   ./configure --prefix=/usr --mandir=/usr/share/man --infodir=/usr/share/info --host=$CHOST
   make
 }
 
 package() {
-  cd "${srcdir}/${pkgname}-1.4.0"
+  cd ${pkgname}-1.4.0
   make DESTDIR="${pkgdir}" install
 }
diff --git a/extra/accountsservice/PKGBUILD b/extra/accountsservice/PKGBUILD
index ab7f8f246..1dfa64b75 100644
--- a/extra/accountsservice/PKGBUILD
+++ b/extra/accountsservice/PKGBUILD
@@ -1,26 +1,18 @@
-# $Id: PKGBUILD 193628 2013-08-26 09:59:39Z jgc $
+# $Id: PKGBUILD 197848 2013-10-30 11:14:12Z allan $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 
 pkgname=accountsservice
-pkgver=0.6.34
-pkgrel=2
+pkgver=0.6.35
+pkgrel=1
 pkgdesc="D-Bus interface for user account query and manipulation"
 arch=(i686 x86_64 'mips64el')
 url="http://www.freedesktop.org/software/accountsservice/"
 license=('GPL3')
 depends=('glib2' 'polkit' 'systemd')
-makedepends=('intltool' 'gobject-introspection' 'vala')
-options=('!libtool')
-source=($url/$pkgname-$pkgver.tar.xz more-exclusions.patch git-fixes.patch)
-md5sums=('dbf4323b688a314b4bf76890ad6d5279'
-         '45ef529fb38d32ec7a1d03005dd20ced'
-         '5082c3ba917c520b70f3c5089cb02c9c')
+makedepends=('intltool' 'gobject-introspection')
+source=($url/$pkgname-$pkgver.tar.xz)
+md5sums=('3a81133e95faafb603de4475802cb06a')
 
-prepare() {
-  cd $pkgname-$pkgver
-  patch -Np1 -i ../git-fixes.patch
-  patch -Np1 -i ../more-exclusions.patch
-}
 build() {
   cd $pkgname-$pkgver
   ./configure --prefix=/usr --sysconfdir=/etc \
diff --git a/extra/accountsservice/git-fixes.patch b/extra/accountsservice/git-fixes.patch
deleted file mode 100644
index b0c3c4019..000000000
--- a/extra/accountsservice/git-fixes.patch
+++ /dev/null
@@ -1,245 +0,0 @@
-diff --git a/src/daemon.c b/src/daemon.c
-index ec5cc82..f85050a 100644
---- a/src/daemon.c
-+++ b/src/daemon.c
-@@ -256,6 +256,13 @@ typedef struct {
-         GHashTable *logout_hash;
- } WTmpGeneratorState;
- 
-+static void
-+user_previous_login_free (UserPreviousLogin *previous_login)
-+{
-+        g_free (previous_login->id);
-+        g_free (previous_login);
-+}
-+
- static struct passwd *
- entry_generator_wtmp (GHashTable *users,
-                       gpointer   *state)
-@@ -365,11 +372,7 @@ entry_generator_wtmp (GHashTable *users,
- 
-                 user = g_hash_table_lookup (users, key);
-                 if (user == NULL) {
--                        for (l = accounting->previous_logins; l != NULL; l = l->next) {
--                                previous_login = l->data;
--                                g_free (previous_login->id);
--                        }
--                        g_list_free (accounting->previous_logins);
-+                        g_list_free_full (accounting->previous_logins, (GDestroyNotify) user_previous_login_free);
-                         continue;
-                 }
- 
-@@ -384,11 +387,10 @@ entry_generator_wtmp (GHashTable *users,
-                         g_variant_builder_add (builder2, "{sv}", "type", g_variant_new_string (previous_login->id));
-                         g_variant_builder_add (builder, "(xxa{sv})", previous_login->login_time, previous_login->logout_time, builder2);
-                         g_variant_builder_unref (builder2);
--                        g_free (previous_login->id);
-                 }
-                 g_object_set (user, "login-history", g_variant_new ("a(xxa{sv})", builder), NULL);
-                 g_variant_builder_unref (builder);
--                g_list_free (accounting->previous_logins);
-+                g_list_free_full (accounting->previous_logins, (GDestroyNotify) user_previous_login_free);
- 
-                 user_changed (user);
-         }
-@@ -491,7 +493,7 @@ entry_generator_cachedir (GHashTable *users,
-                 key_file = g_key_file_new ();
-                 if (g_key_file_load_from_file (key_file, filename, 0, NULL))
-                         user_update_from_keyfile (user, key_file);
--                g_key_file_free (key_file);
-+                g_key_file_unref (key_file);
-                 g_free (filename);
-         }
- 
-diff --git a/src/libaccountsservice/act-user-manager.c b/src/libaccountsservice/act-user-manager.c
-index fd660e5..cf2cbfa 100644
---- a/src/libaccountsservice/act-user-manager.c
-+++ b/src/libaccountsservice/act-user-manager.c
-@@ -1178,6 +1178,28 @@ get_current_session_id (ActUserManager *manager)
-                 return;
-         }
- #endif
-+
-+        if (manager->priv->ck_manager_proxy == NULL) {
-+                GError *error = NULL;
-+
-+                manager->priv->ck_manager_proxy = console_kit_manager_proxy_new_sync (manager->priv->connection,
-+                                                                                      G_DBUS_PROXY_FLAGS_NONE,
-+                                                                                      CK_NAME,
-+                                                                                      CK_MANAGER_PATH,
-+                                                                                      NULL,
-+                                                                                      &error);
-+                if (manager->priv->ck_manager_proxy == NULL) {
-+                        if (error != NULL) {
-+                                g_warning ("Failed to create ConsoleKit proxy: %s", error->message);
-+                                g_error_free (error);
-+                        } else {
-+                                g_warning ("Failed to create_ConsoleKit_proxy");
-+                        }
-+                        unload_seat (manager);
-+                        return;
-+                }
-+        }
-+
-         console_kit_manager_call_get_current_session (manager->priv->ck_manager_proxy, NULL,
-                                                       on_get_current_session_finished,
-                                                       g_object_ref (manager));
-@@ -1933,12 +1955,13 @@ reload_systemd_sessions (ActUserManager *manager)
- }
- 
- #endif
--static void
-+static gboolean
- on_session_monitor_event (GPollableInputStream *stream,
-                           ActUserManager       *manager)
- {
-         sd_login_monitor_flush (manager->priv->seat.session_monitor);
-         reload_systemd_sessions (manager);
-+        return TRUE;
- }
- 
- static void
-@@ -2535,9 +2558,13 @@ load_seat_incrementally (ActUserManager *manager)
- static gboolean
- load_idle (ActUserManager *manager)
- {
-+        /* The order below is important: load_seat_incrementally might
-+           set "is-loaded" immediately and we thus need to call
-+           load_users before it.
-+        */
-+        load_users (manager);
-         manager->priv->seat.state = ACT_USER_MANAGER_SEAT_STATE_UNLOADED + 1;
-         load_seat_incrementally (manager);
--        load_users (manager);
-         manager->priv->load_id = 0;
- 
-         return FALSE;
-@@ -2805,22 +2832,6 @@ act_user_manager_init (ActUserManager *manager)
-                           G_CALLBACK (on_user_removed_in_accounts_service),
-                           manager);
- 
--        manager->priv->ck_manager_proxy = console_kit_manager_proxy_new_sync (manager->priv->connection,
--                                                                              G_DBUS_PROXY_FLAGS_NONE,
--                                                                              CK_NAME,
--                                                                              CK_MANAGER_PATH,
--                                                                              NULL,
--                                                                              &error);
--        if (manager->priv->ck_manager_proxy == NULL) {
--                if (error != NULL) {
--                        g_warning ("Failed to create ConsoleKit proxy: %s", error->message);
--                        g_error_free (error);
--                } else {
--                        g_warning ("Failed to create_ConsoleKit_proxy");
--                }
--                return;
--        }
--
-         manager->priv->seat.state = ACT_USER_MANAGER_SEAT_STATE_UNLOADED;
- }
- 
-diff --git a/src/libaccountsservice/act-user.h b/src/libaccountsservice/act-user.h
-index 31b2cc6..e2966f4 100644
---- a/src/libaccountsservice/act-user.h
-+++ b/src/libaccountsservice/act-user.h
-@@ -64,7 +64,9 @@ const char    *act_user_get_shell                 (ActUser   *user);
- const char    *act_user_get_email                 (ActUser   *user);
- const char    *act_user_get_location              (ActUser   *user);
- guint          act_user_get_num_sessions          (ActUser   *user);
-+guint          act_user_get_num_sessions_anywhere (ActUser   *user);
- gboolean       act_user_is_logged_in              (ActUser   *user);
-+gboolean       act_user_is_logged_in_anywhere     (ActUser   *user);
- int            act_user_get_login_frequency       (ActUser   *user);
- gint64         act_user_get_login_time            (ActUser   *user);
- const GVariant*act_user_get_login_history         (ActUser   *user);
-diff --git a/src/user.c b/src/user.c
-index 5271b63..661067a 100644
---- a/src/user.c
-+++ b/src/user.c
-@@ -78,6 +78,8 @@ struct User {
- 
-         Daemon       *daemon;
- 
-+        GKeyFile     *keyfile;
-+
-         uid_t         uid;
-         gid_t         gid;
-         gchar        *user_name;
-@@ -360,6 +362,9 @@ user_update_from_keyfile (User     *user,
-             }
-         }
- 
-+        g_clear_pointer (&user->keyfile, g_key_file_unref);
-+        user->keyfile = g_key_file_ref (keyfile);
-+
-         g_object_thaw_notify (G_OBJECT (user));
- }
- 
-@@ -387,6 +392,8 @@ static void
- user_save_to_keyfile (User     *user,
-                       GKeyFile *keyfile)
- {
-+        g_key_file_remove_group (keyfile, "User", NULL);
-+
-         if (user->email)
-                 g_key_file_set_string (keyfile, "User", "Email", user->email);
- 
-@@ -412,15 +419,13 @@ static void
- save_extra_data (User *user)
- {
-         gchar *filename;
--        GKeyFile *keyfile;
-         gchar *data;
-         GError *error;
- 
--        keyfile = g_key_file_new ();
--        user_save_to_keyfile (user, keyfile);
-+        user_save_to_keyfile (user, user->keyfile);
- 
-         error = NULL;
--        data = g_key_file_to_data (keyfile, NULL, &error);
-+        data = g_key_file_to_data (user->keyfile, NULL, &error);
-         if (error == NULL) {
-                 filename = g_build_filename (USERDIR,
-                                              user->user_name,
-@@ -433,7 +438,6 @@ save_extra_data (User *user)
-                            user->user_name, error->message);
-                 g_error_free (error);
-         }
--        g_key_file_free (keyfile);
- }
- 
- static void
-@@ -1816,6 +1820,8 @@ user_finalize (GObject *object)
- 
-         user = USER (object);
- 
-+        g_clear_pointer (&user->keyfile, g_key_file_unref);
-+
-         g_free (user->object_path);
-         g_free (user->user_name);
-         g_free (user->real_name);
-@@ -1829,6 +1835,9 @@ user_finalize (GObject *object)
-         g_free (user->location);
-         g_free (user->password_hint);
- 
-+	if (user->login_history)
-+		g_variant_unref (user->login_history);
-+
-         if (G_OBJECT_CLASS (user_parent_class)->finalize)
-                 (*G_OBJECT_CLASS (user_parent_class)->finalize) (object);
- }
-@@ -1861,6 +1870,8 @@ user_set_property (GObject      *object,
-                 user->login_time = g_value_get_int64 (value);
-                 break;
-         case PROP_LOGIN_HISTORY:
-+                if (user->login_history)
-+                        g_variant_unref (user->login_history);
-                 user->login_history = g_variant_ref (g_value_get_variant (value));
-                 break;
-         case PROP_AUTOMATIC_LOGIN:
-@@ -2031,4 +2042,5 @@ user_init (User *user)
-         user->automatic_login = FALSE;
-         user->system_account = FALSE;
-         user->login_history = NULL;
-+        user->keyfile = g_key_file_new ();
- }
diff --git a/extra/accountsservice/more-exclusions.patch b/extra/accountsservice/more-exclusions.patch
deleted file mode 100644
index b9753b24b..000000000
--- a/extra/accountsservice/more-exclusions.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -u -r accountsservice-0.6.34/src/daemon.c accountsservice-0.6.34-more/src/daemon.c
---- accountsservice-0.6.34/src/daemon.c	2013-06-11 17:50:37.000000000 +0200
-+++ accountsservice-0.6.34-more/src/daemon.c	2013-07-09 15:06:46.608425655 +0200
-@@ -55,6 +55,7 @@
- #endif
- 
- static const char *default_excludes[] = {
-+        "git",
-         "bin",
-         "root",
-         "daemon",
diff --git a/extra/aiksaurus/PKGBUILD b/extra/aiksaurus/PKGBUILD
index 342a16357..b6f1d0f6a 100644
--- a/extra/aiksaurus/PKGBUILD
+++ b/extra/aiksaurus/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 137720 2011-09-10 13:53:53Z pierre $
+# $Id: PKGBUILD 197849 2013-10-30 11:14:35Z allan $
 # Maintainer: Ronald van Haren <ronald.archlinux.org>
 # Contributor: Jan de Groot <jgc@archlinux.org>
 
@@ -9,7 +9,6 @@ pkgdesc="A cross-platform, open-source thesaurus"
 url="http://aiksaurus.sourceforge.net/"
 license=('GPL')
 arch=('i686' 'x86_64' 'mips64el')
-options=('!libtool')
 depends=('gtk2')
 source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz"
         'aiksaurus-gcc44.patch')
diff --git a/extra/aisleriot/PKGBUILD b/extra/aisleriot/PKGBUILD
index 0e2730543..2dc4a915a 100644
--- a/extra/aisleriot/PKGBUILD
+++ b/extra/aisleriot/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 196010 2013-10-07 11:50:21Z jgc $
+# $Id: PKGBUILD 197850 2013-10-30 11:14:57Z allan $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 
 pkgname=aisleriot
-pkgver=3.10.0
+pkgver=3.10.1
 pkgrel=1
 pkgdesc="A collection of patience games written in guile scheme"
 arch=(i686 x86_64 mips64el)
@@ -14,10 +14,10 @@ makedepends=(intltool itstool docbook-xsl yelp-tools desktop-file-utils)
 optdepends=('libkdegames: KDE card sets'
             'pysolfc: PySol card sets'
             'pysolfc-cardsets: PySol card sets')
-options=('!emptydirs' '!libtool')
+options=('!emptydirs')
 install=aisleriot.install
 source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver:0:4}/$pkgname-$pkgver.tar.xz)
-sha256sums=('2b96e73fa2e3c75afc27b2a572c4175943fbaac015824a6f49c41bf479b26e02')
+sha256sums=('06558f1adbd6d73ba7dd5dffc864d903532a26e0c29920127a233f344423bd9a')
 
 build() {
   cd $pkgname-$pkgver
diff --git a/extra/allegro4/PKGBUILD b/extra/allegro4/PKGBUILD
index f38637cd8..4d5cd1da9 100644
--- a/extra/allegro4/PKGBUILD
+++ b/extra/allegro4/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 161080 2012-06-08 01:31:13Z ibiru $
+# $Id: PKGBUILD 197590 2013-10-27 03:29:02Z eric $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 # Contributor: Tom Newsom <Jeepster@gmx.co.uk>
 # Contributor: arjan <arjan@archlinux.org>
@@ -12,6 +12,7 @@ url="http://alleg.sourceforge.net/"
 license=('custom')
 depends=('sh' 'jack' 'libxpm' 'libxxf86vm' 'libxxf86dga' 'libxcursor' 'glu')
 makedepends=('cmake' 'libpng' 'mesa')
+options=('staticlibs')
 source=(http://downloads.sourceforge.net/alleg/allegro-${pkgver}.tar.gz
         LICENSE)
 md5sums=('4db71b0460fc99926ae91d223199c2e6'
diff --git a/extra/alsa-lib/PKGBUILD b/extra/alsa-lib/PKGBUILD
index 6bcc5090d..da6c0b24b 100644
--- a/extra/alsa-lib/PKGBUILD
+++ b/extra/alsa-lib/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 189842 2013-07-09 13:01:47Z tpowa $
+# $Id: PKGBUILD 197852 2013-10-30 11:15:49Z allan $
 # Maintainer: judd <jvinet@zeroflux.org>
 
 pkgname=alsa-lib
@@ -11,7 +11,6 @@ depends=('glibc')
 optdepends=('python2: for python smixer plugin')
 makedepends=('python2')
 license=('GPL')
-options=(!libtool)
 source=(ftp://ftp.alsa-project.org/pub/lib/$pkgname-$pkgver.tar.bz2)
 
 build() {
diff --git a/extra/alsa-oss/PKGBUILD b/extra/alsa-oss/PKGBUILD
index 808e16f84..d9ad5ce62 100644
--- a/extra/alsa-oss/PKGBUILD
+++ b/extra/alsa-oss/PKGBUILD
@@ -1,14 +1,13 @@
-# $Id: PKGBUILD 147698 2012-01-27 07:26:45Z tpowa $
+# $Id: PKGBUILD 197853 2013-10-30 11:16:13Z allan $
 # Contributor: judd <jvinet@zeroflux.org>
 
 pkgname=alsa-oss
 pkgver=1.0.25
-pkgrel=1.1
+pkgrel=2
 pkgdesc="OSS compatibility library"
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 url="http://www.alsa-project.org"
-options=('!libtool')
 depends=('alsa-lib')
 source=("ftp://ftp.alsa-project.org/pub/oss-lib/$pkgname-$pkgver.tar.bz2")
 
diff --git a/extra/alsa-plugins/PKGBUILD b/extra/alsa-plugins/PKGBUILD
index 179409919..7d8f78c7d 100644
--- a/extra/alsa-plugins/PKGBUILD
+++ b/extra/alsa-plugins/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 191885 2013-08-01 06:53:19Z bpiotrowski $
+# $Id: PKGBUILD 197855 2013-10-30 11:17:00Z allan $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Daniel Ehlers <danielehlers@mindeye.net>
@@ -17,7 +17,6 @@ optdepends=('libpulse: PulseAudio plugin'
             'ffmpeg: libavcodec resampling plugin, a52 plugin'
             'libsamplerate: libsamplerate resampling plugin'
             'speex: libspeexdsp resampling plugin')
-options=('!libtool')
 source=("ftp://ftp.alsa-project.org/pub/plugins/$pkgname-$pkgver.tar.bz2")
 md5sums=('ada0163e0e84c787bfc929ad0f3f5cb8')
 
diff --git a/extra/alsa-tools/PKGBUILD b/extra/alsa-tools/PKGBUILD
index 9c19f436c..90f1c18f6 100644
--- a/extra/alsa-tools/PKGBUILD
+++ b/extra/alsa-tools/PKGBUILD
@@ -17,7 +17,6 @@ optdepends=('fltk: hdspconf, hdspmixer'
             'gtk3: hdajackretask'
             'bash: couple of tools')
 provides=("$pkgname-emu10k1" "$pkgname-ice1712")
-options=('!libtool')
 source=("ftp://ftp.alsa-project.org/pub/tools/$pkgname-$pkgver.tar.bz2"
         "alsa-tools-1.0.27-mips.patch")
 md5sums=('1ea381d00a6069a98613aa7effa4cb51'
diff --git a/extra/alsaplayer/PKGBUILD b/extra/alsaplayer/PKGBUILD
index 4bdf5059d..77893813e 100644
--- a/extra/alsaplayer/PKGBUILD
+++ b/extra/alsaplayer/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 196265 2013-10-10 02:58:34Z eric $
+# $Id: PKGBUILD 197854 2013-10-30 11:16:38Z allan $
 # Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgname=alsaplayer
@@ -20,7 +20,6 @@ optdepends=('gtk2: for the gtk2 GUI interface' \
             'libsndfile: for sndfile support' \
             'libvorbis: for ogg vorbis support' \
             'libmikmod: for mod, s3m, it and xm formats supports')
-options=('!libtool')
 install=alsaplayer.install
 source=(http://alsaplayer.sourceforge.net/${pkgname}-${pkgver}.tar.bz2)
 sha1sums=('25817ebd1e5c36da31a88363315a1bf7a945ddfd')
diff --git a/extra/amule/PKGBUILD b/extra/amule/PKGBUILD
index cc49f7990..2d5df9f57 100644
--- a/extra/amule/PKGBUILD
+++ b/extra/amule/PKGBUILD
@@ -1,19 +1,25 @@
-# $Id: PKGBUILD 193960 2013-09-08 17:48:29Z giovanni $
+# $Id: PKGBUILD 197597 2013-10-27 14:10:21Z giovanni $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Henrik Ronellenfitsch <searinox@web.de>
 # Contributor: Alessio Sergi <sergi.alessio {at} gmail.com>
 # Contributor: Dario 'Dax' Vilardi <dax [at] deelab [dot] org>
+# Contributor: Anatol Pomozov <anatol.pomozov@gmail.com>
 
 pkgname=amule
 pkgver=10808
-pkgrel=1
+pkgrel=2
 pkgdesc="An eMule-like client for ed2k p2p network"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.amule.org"
 license=('GPL')
 depends=('wxgtk' 'gd' 'geoip' 'libupnp' 'crypto++')
-source=("http://amule.sourceforge.net/tarballs/aMule-SVN-r${pkgver}.tar.bz2")
-md5sums=('68099241871f4e47eee06bebc7ce20a1')
+install=amule.install
+source=("http://amule.sourceforge.net/tarballs/aMule-SVN-r${pkgver}.tar.bz2"
+        'amuled.systemd'
+        'amuleweb.systemd')
+md5sums=('68099241871f4e47eee06bebc7ce20a1'
+         '59772c41860e238f1c822feb8ca8d47f'
+         '05975c5d94bfc41fddb894d98b1115d5')
 
 build() {
   cd "${srcdir}/aMule-SVN-r${pkgver}"
@@ -40,5 +46,8 @@ build() {
 package() {
   cd "${srcdir}/aMule-SVN-r${pkgver}"
 
-  make DESTDIR=${pkgdir}/ install
+  make DESTDIR=${pkgdir} install
+
+  install -D -m644 "${srcdir}/amuled.systemd" "${pkgdir}/usr/lib/systemd/system/amuled.service"
+  install -D -m644 "${srcdir}/amuleweb.systemd" "${pkgdir}/usr/lib/systemd/system/amuleweb.service"
 }
diff --git a/extra/amule/amule.install b/extra/amule/amule.install
new file mode 100644
index 000000000..62dab1173
--- /dev/null
+++ b/extra/amule/amule.install
@@ -0,0 +1,29 @@
+post_install() {
+  post_upgrade
+  passwd -l amule &>/dev/null
+}
+
+_config_instructions() {
+  echo "If you plan to use external client (e.g. amuleGUI or amuleweb) then you need to"
+  echo "provide [ExternalConnect] configuration."
+  echo "You also need to specify amuleweb password."
+  echo "Please follow https://wiki.archlinux.org/index.php/AMule for more information."
+  echo "amuleweb can be started as 'systemctl start amuleweb'."
+}
+
+post_upgrade() {
+  # create user/group that the daemon will run as by default, do not delete this on uninstall, as it will own files
+  getent group amule >/dev/null || groupadd amule
+  getent passwd amule >/dev/null || useradd -c 'aMule Client' -g amule -d '/var/lib/amule' -m -s /bin/false amule
+
+  if [ ! -e /var/lib/amule/.aMule/amule.conf ]; then
+    _config_instructions
+  fi
+}
+
+post_remove() {
+  # TOTHINK: delete homedir and user account/group?
+  #getent passwd amule >/dev/null && userdel amule
+  #getent group amule >/dev/null && groupdel amule
+  true
+}
diff --git a/extra/amule/amuled.systemd b/extra/amule/amuled.systemd
new file mode 100644
index 000000000..e1878dfd9
--- /dev/null
+++ b/extra/amule/amuled.systemd
@@ -0,0 +1,11 @@
+[Unit]
+Description=aMule Daemon
+After=network.target
+
+# This assumes that a user 'amule' exists, with a writeable home directory
+[Service]
+User=amule
+ExecStart=/usr/bin/amuled
+
+[Install]
+WantedBy=multi-user.target
diff --git a/extra/amule/amuleweb.systemd b/extra/amule/amuleweb.systemd
new file mode 100644
index 000000000..1799f4ae8
--- /dev/null
+++ b/extra/amule/amuleweb.systemd
@@ -0,0 +1,13 @@
+[Unit]
+Description=aMule Webserver
+Requires=amuled.service
+
+[Service]
+User=amule
+ExecStart=/usr/bin/amuleweb --quiet
+# If amuled still starting then amuleweb exits, restart until amuleweb is up 
+Restart=on-success
+RestartSec=3s
+
+[Install]
+WantedBy=multi-user.target
diff --git a/extra/anjuta-extras/PKGBUILD b/extra/anjuta-extras/PKGBUILD
index b531384f0..de85a49db 100644
--- a/extra/anjuta-extras/PKGBUILD
+++ b/extra/anjuta-extras/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 196013 2013-10-07 11:50:25Z jgc $
+# $Id: PKGBUILD 197858 2013-10-30 11:18:09Z allan $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Contributor: Jan de Groot <jgc@archlinux.org>
 
@@ -13,7 +13,7 @@ makedepends=('intltool' 'itstool')
 install=anjuta-extras.install
 url="http://www.anjuta.org/"
 source=(ftp://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-options=('!libtool' '!emptydirs')
+options=('!emptydirs')
 sha256sums=('92f92e3c530f5649edfe4d8645e8cfd3161383cbc486c636ebb24cf2d2642213')
 
 build() {
diff --git a/extra/anjuta/PKGBUILD b/extra/anjuta/PKGBUILD
index 1805f0e19..322c9b46b 100644
--- a/extra/anjuta/PKGBUILD
+++ b/extra/anjuta/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 196012 2013-10-07 11:50:24Z jgc $
+# $Id: PKGBUILD 197857 2013-10-30 11:17:43Z allan $
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 # Contributor: Harley Laue <losinggeneration@yahoo.com>
 
@@ -13,7 +13,7 @@ makedepends=(gdl vte3 autogen devhelp glade libgda subversion neon gnome-icon-th
              gtk-doc yelp-tools gnome-common intltool gobject-introspection itstool gjs
              python)
 url="http://www.anjuta.org/"
-options=('!libtool' '!emptydirs')
+options=('!emptydirs')
 source=(ftp://ftp.gnome.org/pub/gnome/sources/$pkgbase/${pkgver%.*}/$pkgbase-$pkgver.tar.xz)
 sha256sums=('72c8569fcd629f3ed1f248cfd452e1f0b473e890421679bd5bb4d6ab2ce3fedb')
 
diff --git a/extra/anthy/PKGBUILD b/extra/anthy/PKGBUILD
index 4aa302790..c01289905 100644
--- a/extra/anthy/PKGBUILD
+++ b/extra/anthy/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 149031 2012-02-05 15:01:58Z bisson $
+# $Id: PKGBUILD 197859 2013-10-30 11:18:33Z allan $
 # Contributor: damir <damir@archlinux.org>
 # Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
@@ -11,7 +11,6 @@ pkgdesc='Hiragana text to Kana Kanji mixed text Japanese input method'
 arch=('i686' 'x86_64' 'mips64el')
 url='http://sourceforge.jp/projects/anthy/'
 license=('LGPL' 'GPL')
-options=('!libtool')
 source=("http://dl.sourceforge.jp/anthy/${_filecode}/${pkgname}-${pkgver}.tar.gz")
 sha1sums=('bfea9e74e208c4b976b6bd7ac6784cd290c636fd')
 
diff --git a/extra/apache/PKGBUILD b/extra/apache/PKGBUILD
index 1ee8ea565..bfbdc0958 100644
--- a/extra/apache/PKGBUILD
+++ b/extra/apache/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 190843 2013-07-18 19:19:10Z jgc $
+# $Id: PKGBUILD 197860 2013-10-30 11:18:54Z allan $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
@@ -8,7 +8,6 @@ pkgver=2.2.25
 pkgrel=1
 pkgdesc='A high performance Unix-based HTTP server'
 arch=('i686' 'x86_64' 'mips64el')
-options=('!libtool')
 url='http://www.apache.org/dist/httpd'
 license=('APACHE')
 backup=(etc/httpd/conf/httpd.conf
diff --git a/extra/apr-util/PKGBUILD b/extra/apr-util/PKGBUILD
index 41cc52485..f112d0eab 100644
--- a/extra/apr-util/PKGBUILD
+++ b/extra/apr-util/PKGBUILD
@@ -1,15 +1,14 @@
-# $Id: PKGBUILD 183103 2013-04-17 15:00:29Z jgc $
+# $Id: PKGBUILD 197862 2013-10-30 11:19:36Z allan $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Maintainer: Pierre Schmitz <pierre@archlinux.de>
 
 pkgname=apr-util
 pkgver=1.5.2
-pkgrel=1
+pkgrel=3
 pkgdesc="The Apache Portable Runtime"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://apr.apache.org/"
 depends=('apr' 'gdbm' 'expat' 'db' 'libldap' 'unixodbc')
-options=('!libtool')
 license=('APACHE')
 source=("http://www.apache.org/dist/apr/apr-util-${pkgver}.tar.bz2")
 md5sums=('89c1348aa79e898d7c34a6206311c9c2')
@@ -18,7 +17,7 @@ build() {
   cd "${srcdir}/apr-util-${pkgver}"
   ./configure --prefix=/usr --with-apr=/usr \
     --without-pgsql --without-mysql --without-sqlite2 --without-sqlite3 \
-    --with-berkeley-db=/usr --with-gdbm=/usr --with-ldap
+    --with-berkeley-db=/usr --with-gdbm=/usr --with-ldap --disable-static
   make
 }
 
diff --git a/extra/apr/PKGBUILD b/extra/apr/PKGBUILD
index d838041ec..169b2db37 100644
--- a/extra/apr/PKGBUILD
+++ b/extra/apr/PKGBUILD
@@ -1,16 +1,15 @@
-# $Id: PKGBUILD 190841 2013-07-18 18:46:16Z jgc $
+# $Id: PKGBUILD 197861 2013-10-30 11:19:15Z allan $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 
 pkgname=apr
 pkgver=1.4.8
-pkgrel=1
+pkgrel=2
 pkgdesc="The Apache Portable Runtime"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://apr.apache.org/"
 depends=('util-linux')
-options=('!libtool')
 license=('APACHE')
 source=(http://www.apache.org/dist/apr/apr-${pkgver}.tar.bz2)
 md5sums=('ce2ab01a0c3cdb71cf0a6326b8654f41')
@@ -20,7 +19,7 @@ build() {
   ./configure --prefix=/usr --includedir=/usr/include/apr-1 \
     --with-installbuilddir=/usr/share/apr-1/build \
     --enable-nonportable-atomics \
-    --with-devrandom=/dev/urandom
+    --with-devrandom=/dev/urandom --disable-static
   make
 }
 
diff --git a/extra/ardour/PKGBUILD b/extra/ardour/PKGBUILD
index fe8fc09b6..856c643fd 100644
--- a/extra/ardour/PKGBUILD
+++ b/extra/ardour/PKGBUILD
@@ -1,11 +1,12 @@
-# $Id: PKGBUILD 194389 2013-09-15 12:35:01Z schiv $
+# $Id: PKGBUILD 197518 2013-10-26 13:26:11Z schiv $
 # Maintainer: Ray Rashif <schiv@archlinux.org>
 # Contributor: SpepS <dreamspepser at yahoo dot it>
 # Contributor: see .contrib
 
 pkgname=ardour
 _pkgname=Ardour3
-pkgver=3.4
+pkgver=3.5.14
+_pkgver=3.5
 pkgrel=1
 pkgdesc="Professional-grade digital audio workstation"
 arch=('i686' 'x86_64' 'mips64el')
@@ -18,18 +19,18 @@ optdepends=('xjadeo: video monitoring')
 install=$pkgname.install
 source=("ftp://ftp.archlinux.org/other/$pkgname/$_pkgname-$pkgver.tar.bz2"
         "$pkgname.desktop")
-md5sums=('4c2286d9c5de6846e2abaa2a8fab0349'
+md5sums=('2e472cb38938a2e1fe3fb5b89d705adc'
          '316bd21ece5e2208a104fd09cac521af')
 
 prepare() {
-  cd "$srcdir/$_pkgname-$pkgver"
+  cd "$srcdir/$_pkgname-$_pkgver"
 
   # python2 fix
   sed -i 's/python ${SRC}/python2 ${SRC}/' libs/pbd/wscript
 }
 
 build() {
-  cd "$srcdir/$_pkgname-$pkgver"
+  cd "$srcdir/$_pkgname-$_pkgver"
 
   # SSE code is used by default on all arches.
   [ "$CARCH" == "mips64el" ] && extra=--no-fpu-optimization
@@ -42,7 +43,7 @@ build() {
 }
 
 package() {
-  cd "$srcdir/$_pkgname-$pkgver"
+  cd "$srcdir/$_pkgname-$_pkgver"
 
   python2 waf install --destdir="$pkgdir"
 
diff --git a/extra/aspell-de/PKGBUILD b/extra/aspell-de/PKGBUILD
index 61a0f09e5..d95f68aa5 100644
--- a/extra/aspell-de/PKGBUILD
+++ b/extra/aspell-de/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 160921 2012-06-07 02:05:22Z pierre $
+# $Id: PKGBUILD 197171 2013-10-23 13:51:59Z pierre $
 # Maintainer:
 # Contributor: Simo Leone <simo@archlinux.org>
 # Contributor: Tobias Kieslich <tobias@justdreams.de>
 
 pkgname=aspell-de
 pkgver=20120607
-pkgrel=1
+pkgrel=2
 pkgdesc="German dictionary for aspell"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://j3e.de/ispell/igerman98/index.html"
diff --git a/extra/aspell/PKGBUILD b/extra/aspell/PKGBUILD
index 5925a20d7..595029c79 100644
--- a/extra/aspell/PKGBUILD
+++ b/extra/aspell/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 131851 2011-07-16 03:59:19Z eric $
+# $Id: PKGBUILD 197863 2013-10-30 11:20:05Z allan $
 # Contributor: Jochem Kossen <j.kossen@home.nl>
 # Contributor: dorphell <dorphell@archlinux.org>
 # Contributor: Thayer Williams <thayer@archlinux.org>
@@ -14,7 +14,6 @@ arch=('i686' 'x86_64' 'mips64el')
 license=('LGPL')
 depends=('gcc-libs' 'ncurses')
 optdepends=('perl: to import old dictionaries')
-options=('!libtool')
 install=aspell.install
 source=(ftp://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.gz)
 md5sums=('e66a9c9af6a60dc46134fdacf6ce97d7')
diff --git a/extra/at-spi/PKGBUILD b/extra/at-spi/PKGBUILD
index 2c381d9ad..b2f00520e 100644
--- a/extra/at-spi/PKGBUILD
+++ b/extra/at-spi/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 148676 2012-02-05 11:46:33Z ibiru $
+# $Id: PKGBUILD 197866 2013-10-30 11:21:08Z allan $
 # Maintainer: Jan de Groot <jan@archlinux.org>
 
 pkgname=at-spi
@@ -9,7 +9,7 @@ arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 depends=('libbonobo' 'libxtst' 'gtk2' 'gconf')
 makedepends=('pkgconfig' 'python2' 'intltool' 'libice' 'libsm')
-options=('!libtool' '!emptydirs')
+options=('!emptydirs')
 url="http://www.gnome.org"
 install=at-spi.install
 source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/1.32/${pkgname}-${pkgver}.tar.bz2)
diff --git a/extra/at-spi2-atk/PKGBUILD b/extra/at-spi2-atk/PKGBUILD
index 5aa8592fe..476a398e4 100644
--- a/extra/at-spi2-atk/PKGBUILD
+++ b/extra/at-spi2-atk/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 196015 2013-10-07 11:50:27Z jgc $
+# $Id: PKGBUILD 197867 2013-10-30 11:21:29Z allan $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 
 pkgname=at-spi2-atk
@@ -10,7 +10,6 @@ url="http://www.gnome.org"
 license=('GPL2')
 depends=('at-spi2-core' 'libx11' 'atk')
 makedepends=('intltool')
-options=('!libtool')
 source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
 sha256sums=('dea7ff2f9bc9bbdb0351112616d738de718b55739cd2511afecac51604c31a94')
 
diff --git a/extra/at-spi2-core/PKGBUILD b/extra/at-spi2-core/PKGBUILD
index a388a9ee9..af9ba43ca 100644
--- a/extra/at-spi2-core/PKGBUILD
+++ b/extra/at-spi2-core/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 196016 2013-10-07 11:50:29Z jgc $
+# $Id: PKGBUILD 197868 2013-10-30 11:21:50Z allan $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 
 pkgname=at-spi2-core
-pkgver=2.10.0
+pkgver=2.10.1
 pkgrel=1
 pkgdesc="Protocol definitions and daemon for D-Bus at-spi"
 arch=('i686' 'x86_64' 'mips64el')
@@ -10,9 +10,8 @@ url="http://www.gnome.org"
 license=('GPL2')
 depends=('dbus' 'glib2' 'libxtst')
 makedepends=('intltool' 'gobject-introspection')
-options=('!libtool')
 source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('964155c7574220a00e11e1c0d91f2d3017ed603920eb1333ff9cbdb6a22744db')
+sha256sums=('349b7ad5e6a8eebbf88aaefcb67a0f49b025dbcdf6ad646978faf2ca84650119')
 
 build() {
   cd $pkgname-$pkgver
diff --git a/extra/atk/PKGBUILD b/extra/atk/PKGBUILD
index 7d1d7851f..87c7b8038 100644
--- a/extra/atk/PKGBUILD
+++ b/extra/atk/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 196014 2013-10-07 11:50:26Z jgc $
+# $Id: PKGBUILD 197864 2013-10-30 11:20:27Z allan $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=atk
@@ -9,7 +9,6 @@ arch=(i686 x86_64 'mips64el')
 license=('LGPL')
 depends=('glib2')
 makedepends=('gobject-introspection')
-options=('!libtool')
 source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
 url='http://www.gtk.org/'
 sha256sums=('636917a5036bc851d8491194645d284798ec118919a828be5e713b6ecc5b50b0')
diff --git a/extra/atkmm/PKGBUILD b/extra/atkmm/PKGBUILD
index 2056879b6..95365b23f 100644
--- a/extra/atkmm/PKGBUILD
+++ b/extra/atkmm/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 183599 2013-04-24 15:17:51Z heftig $
+# $Id: PKGBUILD 197865 2013-10-30 11:20:48Z allan $
 # Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com>
 
 pkgbase=atkmm
@@ -8,7 +8,7 @@ pkgrel=1
 arch=('i686' 'x86_64' 'mips64el')
 makedepends=('atk' 'glibmm' 'glibmm-docs' 'libsigc++')
 license=('LGPL')
-options=('!libtool' '!emptydirs')
+options=('!emptydirs')
 url="http://gtkmm.sourceforge.net/"
 source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgbase}/2.22/${pkgbase}-${pkgver}.tar.xz)
 sha256sums=('bfbf846b409b4c5eb3a52fa32a13d86936021969406b3dcafd4dd05abd70f91b')
diff --git a/extra/aubio/PKGBUILD b/extra/aubio/PKGBUILD
index 03e7c7ab7..8b0481a68 100644
--- a/extra/aubio/PKGBUILD
+++ b/extra/aubio/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 150683 2012-02-20 06:58:41Z allan $
+# $Id: PKGBUILD 197869 2013-10-30 11:22:11Z allan $
 # Maintainer: Tobias Kieslich tobias [funnychar] archlinux org
 # Contributor: Peter Baldwin <bald_pete@hotmail.com>
 # Contributor: Shinlun Hsieh <yngwiexx@yahoo.com.tw>
@@ -11,7 +11,6 @@ arch=('i686' 'x86_64' 'mips64el')
 url="http://aubio.org/"
 license=('GPL')
 depends=('libsamplerate' 'fftw' 'jack')
-options=('!libtool')
 source=("http://aubio.org/pub/${pkgname}-${pkgver}.tar.gz"
         aubio-linking.patch)
 md5sums=('ffc3e5e4880fec67064f043252263a44'
diff --git a/extra/audacious/PKGBUILD b/extra/audacious/PKGBUILD
index 38cd32a0f..679522107 100644
--- a/extra/audacious/PKGBUILD
+++ b/extra/audacious/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 193870 2013-09-03 05:57:09Z bisson $
+# $Id: PKGBUILD 198671 2013-11-01 21:03:18Z bisson $
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
 # Contributor: Alexander Fehr <pizzapunk gmail com>
 # Contributor: Giovanni Scafora <giovanni@archlinux.org>
 
 pkgname=audacious
-pkgver=3.4.1
+pkgver=3.4.2
 pkgrel=1
 pkgdesc='Lightweight, advanced audio player focused on audio quality'
 url='http://audacious-media-player.org/'
@@ -14,7 +14,7 @@ depends=('gtk3' 'dbus-glib' 'libguess' 'libsm' 'audacious-plugins'
          'hicolor-icon-theme' 'desktop-file-utils')
 optdepends=('unzip-libre: zipped skins support')
 source=("http://distfiles.audacious-media-player.org/${pkgname}-${pkgver}.tar.bz2")
-sha1sums=('4066bba6cb0e2d6602d65a2f35770d3b8a6c718f')
+sha1sums=('341452d3beceb57451f0675a61fabfd9c59d2dab')
 
 provides=('audacious-player')
 replaces=('audacious-player')
diff --git a/extra/audacity/PKGBUILD b/extra/audacity/PKGBUILD
index f326a8530..cdd8aabd6 100644
--- a/extra/audacity/PKGBUILD
+++ b/extra/audacity/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 193962 2013-09-08 19:31:47Z eric $
+# $Id: PKGBUILD 197206 2013-10-23 23:57:14Z eric $
 # Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgname=audacity
-pkgver=2.0.4
+pkgver=2.0.5
 pkgrel=1
 pkgdesc="A program that lets you manipulate digital audio waveforms"
 arch=('i686' 'x86_64' 'mips64el')
@@ -14,7 +14,7 @@ makedepends=('cmake')
 options=('!makeflags')
 install=audacity.install
 source=(http://audacity.googlecode.com/files/${pkgname}-minsrc-${pkgver}.tar.xz)
-sha1sums=('4c1a42137cef598e3d83829ca7c22dba62d215be')
+sha1sums=('f63cafb81f29e7f3813dc9f80fb1dfdbcfe46b33')
 
 build() {
   cd ${pkgname}-src-${pkgver}
diff --git a/extra/audiofile/PKGBUILD b/extra/audiofile/PKGBUILD
index 7a55f70a5..a0edcd21d 100644
--- a/extra/audiofile/PKGBUILD
+++ b/extra/audiofile/PKGBUILD
@@ -1,16 +1,15 @@
-# $Id: PKGBUILD 180118 2013-03-17 17:41:49Z schiv $
+# $Id: PKGBUILD 197870 2013-10-30 11:22:33Z allan $
 # Maintainer: Ray Rashif <schiv@archlinux.org>
 # Contributor: dorphell <dorphell@archlinux.org>
 
 pkgname=audiofile
 pkgver=0.3.6
-pkgrel=1
+pkgrel=2
 pkgdesc="Silicon Graphics Audio File Library"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.68k.org/~michael/audiofile/"
 license=('LGPL')
 depends=('gcc-libs' 'alsa-lib' 'flac')
-options=('!libtool')
 source=("http://audiofile.68k.org/$pkgname-$pkgver.tar.gz")
 md5sums=('2731d79bec0acef3d30d2fc86b0b72fd')
 
diff --git a/extra/autogen/PKGBUILD b/extra/autogen/PKGBUILD
index 2d145eddb..3f03e1717 100644
--- a/extra/autogen/PKGBUILD
+++ b/extra/autogen/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 188076 2013-06-08 11:18:21Z bpiotrowski $
+# $Id: PKGBUILD 197871 2013-10-30 11:22:53Z allan $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: Arjan Timmerman <arjan@soufly.nl>
 # Contributor: Tor Krill
@@ -11,7 +11,6 @@ arch=('i686' 'x86_64' 'mips64el')
 url="http://autogen.sourceforge.net/"
 license=('GPL3')
 depends=('guile' 'libxml2')
-options=('!libtool')
 install=autogen.install
 source=(http://ftp.gnu.org/gnu/${pkgname}/rel${pkgver}/${pkgname}-${pkgver}.tar.xz{,.sig})
 md5sums=('09b031866b7d89f0532b6c3168d67c59'
diff --git a/extra/autopano-sift-c/PKGBUILD b/extra/autopano-sift-c/PKGBUILD
deleted file mode 100644
index c908de4ce..000000000
--- a/extra/autopano-sift-c/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 148678 2012-02-05 11:46:36Z ibiru $
-# Maintainer: Tobias Kieslich <tobias@archlinux.org>
-# Contributor: Giovanni Scafora <giovanni@archlinux.org>
-# Contributor: Lukas Jirkovsky <l.jirkovsky@gmail.com>
-
-pkgname=autopano-sift-c
-pkgver=2.5.1
-pkgrel=3
-pkgdesc="Identify key feature points within arbitrary images"
-arch=('i686' 'x86_64' 'mips64el')
-url="http://hugin.sourceforge.net/"
-license=('GPL2')
-depends=('libxml2' 'libpano13' 'gcc-libs')
-makedepends=('cmake')
-provides=('autopano-sift')
-conflicts=('autopano-sift')
-replaces=('autopano-sift')
-source=(http://downloads.sourceforge.net/sourceforge/hugin/autopano-sift-C-${pkgver}.tar.gz)
-md5sums=('b9bade07e8c4f2ea383c22a082c260e0')
-
-build() {
-  cd "${srcdir}/autopano-sift-C-${pkgver}"
-  cmake -DCMAKE_INSTALL_PREFIX=/usr .
-  sed -i 's/-lz/-lz -lm/' CMakeFiles/{autopano,generatekeys}.dir/link.txt
-  make
-}
-
-package() {
-  cd "${srcdir}/autopano-sift-C-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/extra/avahi/PKGBUILD b/extra/avahi/PKGBUILD
index 4c280f793..1475f8834 100644
--- a/extra/avahi/PKGBUILD
+++ b/extra/avahi/PKGBUILD
@@ -1,15 +1,15 @@
-# $Id: PKGBUILD 191362 2013-07-24 02:13:43Z bisson $
-# Contributor: Douglas Soares de Andrade <douglas@archlinux.org>
+# $Id: PKGBUILD 198641 2013-10-31 16:48:15Z bisson $
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
+# Contributor: Douglas Soares de Andrade <douglas@archlinux.org>
 
 pkgname=avahi
 pkgver=0.6.31
-pkgrel=10
+pkgrel=11
 pkgdesc='Multicast/unicast DNS-SD framework'
 url='http://www.avahi.org/'
 license=('LGPL')
 arch=('i686' 'x86_64' 'mips64el')
-options=('!libtool' '!emptydirs')
+options=('!emptydirs')
 depends=('expat' 'libdaemon' 'glib2' 'libcap' 'gdbm' 'dbus')
 optdepends=('gtk3: avahi-discover-standalone, bshell, bssh, bvnc'
             'gtk2: gtk2 bindings'
@@ -42,6 +42,7 @@ prepare() {
 	sed '/^Libs:/s:$: -ldbus-1:' -i avahi-client.pc.in
 	sed 's:netdev:network:g' -i avahi-daemon/avahi-dbus.conf
 	sed 's:/sbin/resolvconf:/usr/sbin/resolvconf:g' -i */*.action
+	sed 's:-DG[^ ]*_DISABLE_DEPRECATED=1::g' -i avahi-ui/Makefile.*
 }
 
 build() {
@@ -56,7 +57,6 @@ build() {
 		--sysconfdir=/etc \
 		--localstatedir=/var \
 		--sbindir=/usr/bin \
-		--disable-static \
 		--disable-monodoc \
 		--enable-compat-libdns_sd \
 		--enable-compat-howl \
diff --git a/extra/avahi/install b/extra/avahi/install
index d333389ee..d4ae23e71 100644
--- a/extra/avahi/install
+++ b/extra/avahi/install
@@ -1,18 +1,7 @@
 post_install() {
 	getent group avahi &>/dev/null || groupadd -r -g 84 avahi >/dev/null
 	getent passwd avahi &>/dev/null || useradd -r -u 84 -g avahi -d / -s /bin/false -c avahi avahi >/dev/null
-
-	cat <<EOF
-==> The following daemons may be added to DAEMONS in /etc/rc.conf:
-==> avahi-daemon: the mdns responder, you probably want this.
-==>               dbus needs to be running when you start it.
-==> avahi-dnsconfd: daemon used for peer-to-peer automatic dns
-==>                 configuration on dhcp-less networks.
-
-==> To use some of the client applications you will have to install python.
-==> In addition, pygtk is required for the graphical ones and
-==> twisted for avahi-bookmarks.
-EOF
+	true
 }
 
 post_remove() {
diff --git a/extra/babl/PKGBUILD b/extra/babl/PKGBUILD
index 35fc6d398..51729539d 100644
--- a/extra/babl/PKGBUILD
+++ b/extra/babl/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 158344 2012-05-03 19:33:15Z eric $
+# $Id: PKGBUILD 197873 2013-10-30 11:23:34Z allan $
 # Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgname=babl
@@ -9,7 +9,7 @@ arch=('i686' 'x86_64' 'mips64el')
 url="http://gegl.org/babl/"
 license=('LGPL3')
 depends=('glibc')
-options=('!libtool' '!makeflags')
+options=('!makeflags')
 source=(ftp://ftp.gimp.org/pub/babl/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2)
 sha1sums=('ee60089e8e9d9390e730d3ae5e41074549928b7a')
 
diff --git a/extra/banshee/PKGBUILD b/extra/banshee/PKGBUILD
index 6c1d840d9..624438098 100644
--- a/extra/banshee/PKGBUILD
+++ b/extra/banshee/PKGBUILD
@@ -4,32 +4,39 @@
 
 pkgname=banshee
 pkgver=2.6.1
-pkgrel=1
+pkgrel=2
 pkgdesc="Music management and playback for GNOME"
 arch=('i686' 'x86_64')
 url="http://banshee.fm/"
 license=('MIT')
-depends=(libxxf86vm gstreamer0.10-base-plugins mono-addins dbus-sharp-glib boo libwebkit libsoup-gnome gdata-sharp taglib-sharp gudev-sharp gkeyfile-sharp gconf-sharp libmtp libgpod mono-zeroconf desktop-file-utils hicolor-icon-theme xdg-utils media-player-info gstreamer0.10-bad-plugins mono-upnp)
+depends=(libxxf86vm gstreamer0.10-base-plugins mono-addins dbus-sharp-glib webkitgtk2 libsoup-gnome gdata-sharp taglib-sharp gudev-sharp gkeyfile-sharp gconf-sharp libmtp libgpod mono-zeroconf desktop-file-utils hicolor-icon-theme media-player-info gstreamer0.10-bad-plugins mono-upnp)
 makedepends=('intltool' 'gnome-doc-utils' 'gtk-sharp-beans' 'gnome-common')
 optdepends=('gstreamer0.10-good-plugins: Extra media codecs'
             'gstreamer0.10-ugly-plugins: Extra media codecs'
             'gstreamer0.10-ffmpeg: Extra media codecs'
             'brasero: CD burning')
-options=('!libtool')
 install=$pkgname.install
-source=(http://download.gnome.org/sources/$pkgname/2.6/$pkgname-$pkgver.tar.xz)
-md5sums=('3c7775eecc079a018c468e9b4ab6cbe3')
+source=(http://download.gnome.org/sources/$pkgname/2.6/$pkgname-$pkgver.tar.xz
+        git-fixes.patch)
+sha256sums=('53b8990cd439963edbfa776b3029bd73809e413bec302e3b6cf3914c6e74fb64'
+            '57bac0eff43426044385c3650a677fb546f6e3e74a59b4b44dcd000a03e97fa6')
 
+prepare() {
+  cd $pkgname-$pkgver
+  patch -Np1 -i ../git-fixes.patch
+}
+  
 build() {
   export MONO_SHARED_DIR="$srcdir/.wabi"
   mkdir -p "$MONO_SHARED_DIR"
 
-  cd "$srcdir/$pkgname-$pkgver"
-  ./autogen.sh --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
+  cd $pkgname-$pkgver
+  MCS=/usr/bin/dmcs ./autogen.sh --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
               --disable-docs \
               --disable-static \
               --disable-scrollkeeper \
               --disable-schemas-install \
+              --disable-boo \
               --with-vendor-build-id=ArchLinux
   make
 }
diff --git a/extra/banshee/banshee.install b/extra/banshee/banshee.install
index 1d0fd332b..079ac953d 100644
--- a/extra/banshee/banshee.install
+++ b/extra/banshee/banshee.install
@@ -3,7 +3,7 @@ pkgname=banshee
 post_install() {
   update-desktop-database -q
   update-mime-database usr/share/mime &> /dev/null
-  xdg-icon-resource forceupdate
+  gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor
 }
 
 post_upgrade() {
diff --git a/extra/banshee/git-fixes.patch b/extra/banshee/git-fixes.patch
new file mode 100644
index 000000000..af83ee39e
--- /dev/null
+++ b/extra/banshee/git-fixes.patch
@@ -0,0 +1,8347 @@
+diff --git a/configure.ac b/configure.ac
+index f36063e..2b25142 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -145,6 +145,7 @@ if test "x$enable_gnome" = "xyes"; then
+ 	AM_CONDITIONAL(ENABLE_GNOME, true)
+ else
+ 	AM_CONDITIONAL(GCONF_SCHEMAS_INSTALL, false)
++	AM_CONDITIONAL(HAVE_DBUS_GLIB, false)
+ 	AM_CONDITIONAL(ENABLE_GNOME, false)
+ fi
+ 
+diff --git a/data/Makefile.am b/data/Makefile.am
+index 8c84cc4..d48f6b4 100644
+--- a/data/Makefile.am
++++ b/data/Makefile.am
+@@ -16,11 +16,20 @@ addin-xml-strings.cs: $(ADDIN_XML_FILES) $(top_srcdir)/build/addin-xml-string-ex
+ 	@echo "  GEN   $@"
+ 	$(MONO) $(top_srcdir)/build/addin-xml-string-extractor.exe $(ADDIN_XML_FILES) > $@
+ 
++@INTLTOOL_XML_RULE@
++appdatadir = $(datadir)/appdata
++appdata_DATA = $(appdata_in_files:.xml.in=.xml)
++appdata_in_files = banshee.appdata.xml.in
++
+ all: addin-xml-strings.cs
+ 
+ EXTRA_DIST = \
+ 	$(dbusservice_in_files) \
+-	addin-xml-strings.cs
++	addin-xml-strings.cs \
++	$(appdata_in_files)
++
++CLEANFILES = \
++        $(appdata_DATA)
+ 
+ DISTCLEANFILES = \
+ 	$(dbusservice_DATA)
+diff --git a/data/banshee.appdata.xml.in b/data/banshee.appdata.xml.in
+new file mode 100644
+index 0000000..e19c5d1
+--- /dev/null
++++ b/data/banshee.appdata.xml.in
+@@ -0,0 +1,25 @@
++<?xml version="1.0" encoding="UTF-8"?>
++<!-- Copyright 2013 Banshee Contributors <banshee-list@gnome.org> -->
++<application>
++  <id type="desktop">banshee.desktop</id>
++  <licence>CC0</licence><!-- licence of this file, not the program -->
++  <description>
++    <!-- Writing GNOME below, instead of just "Linux", is inclusive of *BSD OSs -->
++    <_p>
++      Banshee is an open source multimedia management and playback application
++      for GNOME, Mac and Windows.
++    </_p>
++
++    <_p>
++      Play your music and videos. Stay entertained and up to date with podcasts
++      and video podcasts.  Sync your Android, iPod, and other devices. We think
++      you'll love Banshee!
++    </_p>
++  </description>
++  <screenshots>
++    <screenshot type="default" width="450" height="335">http://banshee.fm/theme/images/slides/scaled/music-450.png</screenshot>
++    <screenshot width="600" height="432">http://download.banshee.fm/shots/banshee-190-track-actions.png</screenshot>
++  </screenshots>
++  <url type="homepage">http://banshee.fm/</url>
++  <updatecontact>banshee-list_at_gnome.org</updatecontact>
++</application>
+diff --git a/help/cs/cs.po b/help/cs/cs.po
+index ac3c8b4..6174e11 100644
+--- a/help/cs/cs.po
++++ b/help/cs/cs.po
+@@ -2,24 +2,25 @@
+ # Copyright (C) 2011 banshee's COPYRIGHT HOLDER
+ # This file is distributed under the same license as the banshee package.
+ #
+-# Marek Černocký <marek@manet.cz>, 2011, 2012.
++# Marek Černocký <marek@manet.cz>, 2011, 2012, 2013.
+ #
+ msgid ""
+ msgstr ""
+-"Project-Id-Version: banshee master\n"
+-"POT-Creation-Date: 2012-02-09 05:55+0000\n"
+-"PO-Revision-Date: 2012-03-26 09:54+0200\n"
++"Project-Id-Version: banshee banshee-2.6\n"
++"POT-Creation-Date: 2013-04-07 13:45+0000\n"
++"PO-Revision-Date: 2013-05-29 01:17+0200\n"
+ "Last-Translator: Marek Černocký <marek@manet.cz>\n"
+ "Language-Team: Czech <gnome-cs-list@gnome.org>\n"
++"Language: cs\n"
+ "MIME-Version: 1.0\n"
+ "Content-Type: text/plain; charset=UTF-8\n"
+ "Content-Transfer-Encoding: 8bit\n"
+-"Language: cs\n"
+ "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
++"X-Generator: Gtranslator 2.91.6\n"
+ 
+ #. When image changes, this message will be marked fuzzy or untranslated for you.
+ #. It doesn't matter what you translate it to: it's not used at all.
+-#: C/ui.page:29(None) C/introduction.page:45(None)
++#: C/ui.page:29(None)
+ msgid "@@image: 'figures/banshee.png'; md5=THIS FILE DOESN'T EXIST"
+ msgstr "@@image: 'figures/banshee.png'; md5=THIS FILE DOESN'T EXIST"
+ 
+@@ -32,7 +33,7 @@ msgstr "Přehled uživatelského rozhraní přehrávače <app>Banshee</app>."
+ #: C/manage-tags.page:13(name) C/manage-playlists.page:13(name)
+ #: C/manage-coverart.page:12(name) C/lastfm.page:12(name)
+ #: C/keyboardshortcuts.page:10(name) C/introduction.page:12(name)
+-#: C/index.page:9(name) C/import.page:11(name) C/extensions.page:11(name)
++#: C/index.page:10(name) C/import.page:11(name) C/extensions.page:11(name)
+ #: C/amazon.page:12(name) C/advanced.page:11(name) C/add-radio.page:14(name)
+ #: C/add-podcast.page:14(name)
+ msgid "Paul Cutler"
+@@ -43,7 +44,7 @@ msgstr "Paul Cutler"
+ #: C/manage-tags.page:14(email) C/manage-playlists.page:14(email)
+ #: C/manage-coverart.page:13(email) C/lastfm.page:13(email)
+ #: C/keyboardshortcuts.page:11(email) C/introduction.page:13(email)
+-#: C/index.page:10(email) C/import.page:12(email) C/extensions.page:12(email)
++#: C/index.page:11(email) C/import.page:12(email) C/extensions.page:12(email)
+ #: C/amazon.page:13(email) C/advanced.page:12(email)
+ #: C/add-radio.page:15(email) C/add-podcast.page:15(email)
+ msgid "pcutler@gnome.org"
+@@ -53,15 +54,15 @@ msgstr "pcutler@gnome.org"
+ msgid "Introduction to the Banshee User Interface"
+ msgstr "Úvod do uživatelského rozhraní Banshee"
+ 
+-#: C/ui.page:27(title) C/introduction.page:43(title)
++#: C/ui.page:27(title)
+ msgid "<gui>Banshee Media Player</gui> window"
+ msgstr "Okno <gui>Multimediálního přehrávače Banshee</gui>"
+ 
+-#: C/ui.page:28(app) C/introduction.page:44(app) C/index.page:21(title)
++#: C/ui.page:28(app) C/index.page:26(title)
+ msgid "Banshee Media Player"
+ msgstr "Multimediální přehrávač Banshee"
+ 
+-#: C/ui.page:30(p) C/introduction.page:46(p)
++#: C/ui.page:30(p)
+ msgid "<app>Banshee</app> library interface"
+ msgstr "Rozhraní kolekce <app>Banshee</app>"
+ 
+@@ -1332,8 +1333,8 @@ msgstr ""
+ "čímž celou akci završíte."
+ 
+ #: C/lastfm.page:58(title)
+-msgid "Enable Last.fm Song Reporting"
+-msgstr "Povolení oznamování skladeb z Last.fm"
++msgid "Enable Last.fm Song Reporting From Banshee"
++msgstr "Povolení oznamování skladeb Last.fm z Banshee"
+ 
+ #: C/lastfm.page:59(p)
+ msgid ""
+@@ -1341,31 +1342,88 @@ msgid ""
+ "ensure that you have enabled Banshee to report your songs. To enable Banshee "
+ "to report the songs to your Last.fm profile go to Banshee's preferences, "
+ "select the <gui>Source Specific</gui> tab, select <gui>Last.fm</gui> from "
+-"the dropdown, and press the <gui>Enable Song Reporting</gui> checkbox. If "
+-"you have an active internet connection Banshee will now send Last.fm "
+-"information regarding the songs you play. To view your play history visit "
+-"your profile on the Last.fm website. Last.fm will automatically update your "
+-"music metadata if any of your artist, song title, or album information is "
+-"incorrect (although we recommend that you use the Metadata Fixer extension "
+-"to correct your files instead)."
++"the dropdown, and press the <gui>Enable Song Reporting From Banshee</gui> "
++"checkbox. If you have an active internet connection Banshee will now send "
++"Last.fm information regarding the songs you play. To view your play history "
++"visit your profile on the Last.fm website. Last.fm will automatically update "
++"your music metadata if any of your artist, song title, or album information "
++"is incorrect (although we recommend that you use the Metadata Fixer "
++"extension to correct your files instead)."
+ msgstr ""
+ "Když máte přehrávač Banshee úspěšně propojený s profilem Last.fm, ujistěte "
+-"se, že jste v Banshee povolili oznamování svých skladeb.\n"
+-"Pro oznamování skladeb do svého profilu Last.fm přejděte v předvolbách na "
+-"kartu <gui>Dané zdrojem</gui>, v rozbalovacím seznamu vyberte <gui>Last.fm</"
+-"gui> a zaškrtněte políčko <gui>Povolit oznamování skladeb</gui>. V případě, "
+-"že máte aktivní internetové připojení, bude od teď přehrávač Banshee zasílat "
+-"na Last.fm informace o skladbách, které přehráváte. Pokud si chcete historii "
+-"přehrávání prohlédnout, navštivte svůj profil na webových stránkách Last.fm. "
+-"Když bude některý umělec, název skladby nebo název alba nesprávný, Last.fm "
+-"vaše hudební metadata automaticky aktualizuje (místo toho ale pro opravy "
+-"souborů spíše doporučujeme rozšíření Opravář metadat)."
++"se, že jste v Banshee povolili oznamování svých skladeb. Pro oznamování "
++"skladeb do svého profilu Last.fm přejděte v předvolbách na kartu <gui style="
++"\"tab\">Dané zdrojem</gui>, v rozbalovacím seznamu vyberte <gui style="
++"\"menuitem\">Last.fm</gui> a zaškrtněte políčko <gui style=\"checkbox"
++"\">Povolit oznamování skladeb</gui>. V případě, že máte funkční internetové "
++"připojení, bude od teď přehrávač Banshee zasílat na Last.fm informace o "
++"skladbách, které přehráváte. Pokud si chcete historii přehrávání "
++"prohlédnout, navštivte svůj profil na webových stránkách Last.fm. Když bude "
++"některý umělec, název skladby nebo název alba nesprávný, Last.fm vaše "
++"hudební metadata automaticky aktualizuje (místo toho ale pro opravy souborů "
++"spíše doporučujeme rozšíření Opravář metadat)."
+ 
+ #: C/lastfm.page:75(title)
++msgid "Enable Last.fm Song Reporting From Your Device"
++msgstr "Povolení oznamování skladeb Last.fm z vašeho zařízení"
++
++#: C/lastfm.page:76(p)
++msgid ""
++"After successfully linking Banshee to your Last.fm profile and enabling "
++"Banshee to report songs to Last.fm you can also enable scrobbling from a "
++"connected device. Banshee will, upon connection of your device, attempt to "
++"scrobble the songs you have played since the device was last connected and "
++"submit them to Last.fm."
++msgstr ""
++"Po úspěšném propojení Banshee s vaším profilem na Last.fm a po povolení "
++"Banshee oznamovat skladby na Last.fm, můžete povolit také sdílení seznamů "
++"skladeb (scrobbling) z připojených zařízení. Po připojení vašeho zařízení se "
++"Banshee pokusí zjistit, které skladby jste přehrávali od posledního "
++"připojení zařízení, a odešle je na Last.fm."
++
++#: C/lastfm.page:82(p)
++msgid ""
++"To enable scrobbling of a connected device go to Banshee's preferences, "
++"select the <gui>Source Specific</gui> tab, select <gui>Last.fm</gui> from "
++"the dropdown, and press the <gui>Enable Song Reporting From Device</gui> "
++"checkbox. If you have an active internet connection Banshee will, upon "
++"connection of your device, now attempt to gather information regarding the "
++"songs that you have played since it was last connected."
++msgstr ""
++"Jestli chcete sdílení seznamů skladeb z připojených zařízení zapnout, jděte "
++"do předvoleb Banshee, vyberte <gui>Dané zdrojem</gui>, v rozbalovacím "
++"seznamu vyberte <gui>Last.fm</gui> a zaškrtněte políčko <gui>Povolit "
++"oznamování skladeb ze zařízení</gui>. Pokud máte funkční internetové "
++"připojení, bude se Banshee po připojení vašeho zařízení pokoušet sesbírat "
++"informace týkající se skladeb, které jste přehrávali od doby, kdy bylo "
++"zařízení naposledy připojeno."
++
++#: C/lastfm.page:89(p)
++msgid ""
++"As with regular Banshee scrobbling submissions Last.fm will automatically "
++"update your music metadata if any of your artist, title, or album "
++"information is incorrect (although we again recommend that you use the "
++"Metadata Fixer extension to correct your files instead)."
++msgstr ""
++"Současně s pravidelným zasíláním seznamů skladem z Banshee na Last.fm se "
++"budou aktualizovat vaše hudbení metadata a to v situaci, kdy je údaj o "
++"umělci, názvu nebo albu uveden nesprávně (ačkoliv místo této funkce vám "
++"doporučujeme používat rozšíření Opravář metadat, které opravuje vaše "
++"soubory)."
++
++#: C/lastfm.page:94(p)
++msgid ""
++"Please note that currently Banshee only supports this feature with Apple "
++"products that are supported by the AppleDevice extension."
++msgstr ""
++"Vezměte prosím na vědomí, že v současnosti Banshee podporuje tuto funkci jen "
++"u produktů společnosti Apple, které jsou podporovány rozšířením AppleDevice."
++
++#: C/lastfm.page:101(title)
+ msgid "Listen to Last.fm Radio"
+ msgstr "Poslech rádia Last.fm"
+ 
+-#: C/lastfm.page:76(p)
++#: C/lastfm.page:102(p)
+ msgid ""
+ "Last.fm radio is free for residents of the United States, United Kingdom and "
+ "Germany. Residents of other countries will have to pay for a premium account "
+@@ -1379,7 +1437,7 @@ msgstr ""
+ "prémiovým funkcím: poslech seznamů skladeb a stanic hudby, kterou mají rádi "
+ "nebo si ji označili."
+ 
+-#: C/lastfm.page:83(p)
++#: C/lastfm.page:109(p)
+ msgid ""
+ "In Banshee's sources pane on the left hand side, you will now have a Last.fm "
+ "section, including your Last.fm radio stations. You will need an active "
+@@ -1611,30 +1669,34 @@ msgstr ""
+ "Banshee podporuje populární zařízení včetně většiny přehrávačů MP3 iPod, "
+ "Sandisk a Creative a telefonů se systémem Android."
+ 
+-#: C/index.page:24(title)
++#: C/index.page:14(name)
++msgid "Sindhu S"
++msgstr "Sindhu S"
++
++#: C/index.page:15(email)
++msgid "sindhus@live.in"
++msgstr "sindhus@live.in"
++
++#: C/index.page:29(title)
+ msgid "Add, Remove &amp; Play"
+ msgstr "Přidávání, odebírání a přehrávání"
+ 
+-#: C/index.page:28(title)
++#: C/index.page:33(title)
+ msgid "Manage &amp; Sort"
+ msgstr "Správa a řazení"
+ 
+-#: C/index.page:32(title)
++#: C/index.page:37(title)
+ msgid "Sync your media with a portable music player"
+ msgstr "Synchronizace vašich médií s přenosnými hudebními přehrávači"
+ 
+-#: C/index.page:36(title)
++#: C/index.page:41(title)
+ msgid "Add additional functionality to Banshee"
+ msgstr "Přidávání dalších funkcí do Banshee"
+ 
+-#: C/index.page:40(title)
++#: C/index.page:45(title)
+ msgid "Advanced options and help"
+ msgstr "Pokročilé volby a nápověda"
+ 
+-#: C/index.page:44(title)
+-msgid "Common Problems"
+-msgstr "Obvyklé problémy"
+-
+ #: C/import.page:8(desc)
+ msgid "Add music and videos from your computer to your Banshee library."
+ msgstr "Přidávejte hudbu a videa ze svého počítače do své kolekce Banshee."
+diff --git a/help/el/el.po b/help/el/el.po
+index 8fc97f8..da97e6f 100644
+--- a/help/el/el.po
++++ b/help/el/el.po
+@@ -1,38 +1,39 @@
+ # Copyright (C) 2010 banshee's COPYRIGHT HOLDER
+ # This file is distributed under the same license as the banshee package.
+ # Michael Kotsarinis <mk73628@gmail.com>, 2010, 2011.
++# Dimitris Spingos (Δημήτρης Σπίγγος) <dmtrs32@gmail.com>, 2013.
+ msgid ""
+ msgstr ""
+ "Project-Id-Version: banshee master\n"
+-"POT-Creation-Date: 2011-01-02 12:09+0000\n"
+-"PO-Revision-Date: 2011-01-15 09:12+0300\n"
+-"Last-Translator: Michael Kotsarinis <mk73628@gmail.com>\n"
+-"Language-Team: Greek team\n"
++"POT-Creation-Date: 2013-07-28 06:59+0000\n"
++"PO-Revision-Date: 2013-08-04 09:43+0300\n"
++"Last-Translator: Dimitris Spingos (Δημήτρης Σπίγγος) <dmtrs32@gmail.com>\n"
++"Language-Team: team@gnome.gr\n"
+ "Language: el\n"
+ "MIME-Version: 1.0\n"
+ "Content-Type: text/plain; charset=UTF-8\n"
+ "Content-Transfer-Encoding: 8bit\n"
+ "Plural-Forms: nplurals=2; plural=(n != 1);\n"
+-"X-Generator: Virtaal 0.5.2\n"
++"X-Generator: Virtaal 0.7.1\n"
+ "X-Poedit-Language: Greek\n"
+ "X-Poedit-Country: GREECE\n"
+ 
+ #. When image changes, this message will be marked fuzzy or untranslated for you.
+ #. It doesn't matter what you translate it to: it's not used at all.
+-#: C/ui.page:29(None) C/introduction.page:45(None)
++#: C/ui.page:29(None)
+ msgid "@@image: 'figures/banshee.png'; md5=THIS FILE DOESN'T EXIST"
+ msgstr "@@image: 'figures/banshee.png'; md5=THIS FILE DOESN'T EXIST"
+ 
+ #: C/ui.page:8(desc)
+ msgid "An overview of <app>Banshee's</app> user interface."
+-msgstr "Μια επισκόπηση της διεπαφής χρήστη του <app>Banshee</app>"
++msgstr "Μια επισκόπηση της διεπαφής χρήστη του <app>Banshee</app>."
+ 
+ #: C/ui.page:12(name) C/sync.page:12(name) C/sort.page:12(name)
+ #: C/search.page:12(name) C/play.page:12(name) C/play-queue.page:12(name)
+ #: C/manage-tags.page:13(name) C/manage-playlists.page:13(name)
+ #: C/manage-coverart.page:12(name) C/lastfm.page:12(name)
+ #: C/keyboardshortcuts.page:10(name) C/introduction.page:12(name)
+-#: C/index.page:9(name) C/import.page:11(name) C/extensions.page:11(name)
++#: C/index.page:10(name) C/import.page:11(name) C/extensions.page:11(name)
+ #: C/amazon.page:12(name) C/advanced.page:11(name) C/add-radio.page:14(name)
+ #: C/add-podcast.page:14(name)
+ msgid "Paul Cutler"
+@@ -43,7 +44,7 @@ msgstr "Paul Cutler"
+ #: C/manage-tags.page:14(email) C/manage-playlists.page:14(email)
+ #: C/manage-coverart.page:13(email) C/lastfm.page:13(email)
+ #: C/keyboardshortcuts.page:11(email) C/introduction.page:13(email)
+-#: C/index.page:10(email) C/import.page:12(email) C/extensions.page:12(email)
++#: C/index.page:11(email) C/import.page:12(email) C/extensions.page:12(email)
+ #: C/amazon.page:13(email) C/advanced.page:12(email)
+ #: C/add-radio.page:15(email) C/add-podcast.page:15(email)
+ msgid "pcutler@gnome.org"
+@@ -53,15 +54,15 @@ msgstr "pcutler@gnome.org"
+ msgid "Introduction to the Banshee User Interface"
+ msgstr "Εισαγωγή στη διεπαφή χρήστη του Banshee"
+ 
+-#: C/ui.page:27(title) C/introduction.page:43(title)
++#: C/ui.page:27(title)
+ msgid "<gui>Banshee Media Player</gui> window"
+ msgstr "Παράθυρο <gui>Αναπαραγωγή πολυμέσων Banshee</gui>"
+ 
+-#: C/ui.page:28(app) C/introduction.page:44(app) C/index.page:21(title)
++#: C/ui.page:28(app) C/index.page:26(title)
+ msgid "Banshee Media Player"
+ msgstr "Αναπαραγωγή πολυμέσων Banshee"
+ 
+-#: C/ui.page:30(p) C/introduction.page:46(p)
++#: C/ui.page:30(p)
+ msgid "<app>Banshee</app> library interface"
+ msgstr "Διεπαφή βιβλιοθήκης <app>Banshee</app>"
+ 
+@@ -130,11 +131,6 @@ msgstr ""
+ "βίντεο το Banshee θα εμφανίσει το βίντεο."
+ 
+ #: C/ui.page:65(p)
+-#| msgid ""
+-#| "To change Now Playing to hide the Banshee user interface and use the full "
+-#| "screen mode, you can press the <key>F</key>, press the <gui>Fullscreen</"
+-#| "gui> button in the upper right hand corner of Banshee, or choose "
+-#| "<guiseq>View<gui/>Fullscreen<gui/></guiseq> to start Fullscreen mode."
+ msgid ""
+ "To change Now Playing to hide the Banshee user interface and use the full "
+ "screen mode, you can press the <key>F</key>, press the <gui>Fullscreen</gui> "
+@@ -145,8 +141,8 @@ msgstr ""
+ "Για να αλλάξετε την τρέχουσα αναπαραγωγή για να αποκρυφτεί η διεπαφή χρήστη "
+ "του Banshee και να χρησιμοποιηθεί η κατάσταση πλήρους οθόνης, πατήστε το "
+ "<key>F</key> ή το κουμπί <gui>Πλήρης οθόνη</gui> στην πάνω δεξιά γωνία του "
+-"Banshee ή επιλέξτε <guiseq>Προβολή<gui/>Πλήρης οθόνη<gui/></guiseq> για να "
+-"αρχίσετε την κατάσταση πλήρους οθόνης."
++"Banshee ή επιλέξτε <guiseq><gui>Προβολή</gui><gui>Πλήρης "
++"οθόνη</gui></guiseq> για να αρχίσετε την κατάσταση πλήρους οθόνης."
+ 
+ #: C/ui.page:74(title)
+ msgid "Library"
+@@ -210,7 +206,7 @@ msgid ""
+ "with the notable exception of the Apple iPhone, iPad and iPod Touch."
+ msgstr ""
+ "Το Banshee υποστηρίζει σχεδόν όλες τις σύγχρονες φορητές συσκευές "
+-"αναπαραγωγής και τα «έξυπνα» κινητά με την αξιοσημείωτη εξαίρεση των iPhone, "
++"αναπαραγωγής και τα έξυπνα κινητά με την αξιοσημείωτη εξαίρεση των iPhone, "
+ "iPad και iPod Touch της Apple."
+ 
+ #: C/sync.page:42(p)
+@@ -320,8 +316,14 @@ msgid "Sync Your Entire Library"
+ msgstr "Συγχρονισμός ολόκληρης της βιβλιοθήκης σας"
+ 
+ #: C/sync.page:101(p)
++#| msgid ""
++#| "You can drag and drop media to your portable music player form Banshee. "
++#| "Select the file or files you want to copy to your portable media player "
++#| "and then press and hold your right mouse button and drag the file(s) to "
++#| "your portable media player icon in Banshee. This will copy the files to "
++#| "your device."
+ msgid ""
+-"You can drag and drop media to your portable music player form Banshee. "
++"You can drag and drop media to your portable music player from Banshee. "
+ "Select the file or files you want to copy to your portable media player and "
+ "then press and hold your right mouse button and drag the file(s) to your "
+ "portable media player icon in Banshee. This will copy the files to your "
+@@ -383,22 +385,24 @@ msgid "Remove Music From your Portable Music Player"
+ msgstr "Αφαιρέστε μουσική από τη φορητή σας συσκευή αναπαραγωγής"
+ 
+ #: C/sync.page:136(p)
++#| msgid ""
++#| "To remove songs stored on your portable music player, choose your player "
++#| "in Banshee to view its library. Then choose the tracks you would like to "
++#| "remove and right click the tracks and choose \"Delete\" or from the menu "
++#| "choose <guiseq><gui>Edit</gui><gui>Delete</gui></guiseq>."
+ msgid ""
+ "To remove songs stored on your portable music player, choose your player in "
+ "Banshee to view its library. Then choose the tracks you would like to remove "
+-"and right click the tracks and choose \"Delete\" or from the menu choose "
+-"<guiseq><gui>Edit</gui><gui>Delete</gui></guiseq>."
++"and right click the tracks and choose <gui>Delete</gui> or from the menu "
++"choose <guiseq><gui>Edit</gui><gui>Delete</gui></guiseq>."
+ msgstr ""
+ "Για να αφαιρέσετε τραγούδια αποθηκευμένα στη φορητή σας συσκευή, επιλέξτε τη "
+ "στο Banshee για να δείτε τη βιβλιοθήκη της. Έπειτα επιλέξτε τα κομμάτια που "
+-"θα θέλατε να αφαιρέσετε και κάντε δεξί κλικ στα κομμάτια και επιλέξτε "
+-"\"Διαγραφή\" ή από το μενού επιλέξτε <guiseq><gui>Επεξεργασία</"
+-"gui><gui>Διαγραφή</gui></guiseq>."
++"θα θέλατε να αφαιρέσετε και δεξιοπατήστε στα κομμάτια και επιλέξτε "
++"<gui>Διαγραφή</gui> ή από το μενού επιλέξτε "
++"<guiseq><gui>Επεξεργασία</gui><gui>Διαγραφή</gui></guiseq>."
+ 
+ #: C/sync.page:142(p)
+-#| msgid ""
+-#| "Deleting files from your portable music will permanently remove the files "
+-#| "and you will not be able to recover them."
+ msgid ""
+ "Deleting files from your portable music player will permanently remove the "
+ "files and you will not be able to recover them."
+@@ -419,9 +423,6 @@ msgid "Adding Columns"
+ msgstr "Προσθήκη στηλών"
+ 
+ #: C/sort.page:30(p)
+-#| msgid ""
+-#| "As your library grows, you may want to sort your library view to play "
+-#| "search or view certain songs, artists, or albums."
+ msgid ""
+ "As your library grows, you may want to change your library view to add "
+ "additional information about the songs in your library or change the way you "
+@@ -457,12 +458,6 @@ msgid "Sorting Columns"
+ msgstr "Ταξινόμηση στηλών"
+ 
+ #: C/sort.page:47(p)
+-#| msgid ""
+-#| "You can sort your library by using your mouse to click on any of the "
+-#| "columns displayed in library view. If you wish to sort your music library "
+-#| "by Artist, click the <gui>Artist</gui> column header and Banshee will "
+-#| "automically sort that column alphabetically. Clicking the <gui>Artist</"
+-#| "gui> column again will sort the column in reverse alphabetical order."
+ msgid ""
+ "You can sort your library by using your mouse to click on any of the columns "
+ "displayed in library view. If you wish to sort your music library by Artist, "
+@@ -512,27 +507,26 @@ msgstr ""
+ #| "Banshee will search all metatdata fields including Track Title, Album "
+ #| "Title, Album Artist, Year, etc. Any track whose metadata includes "
+ #| "<em>dave</em> and <em>matthews</em> will be returned. Search terms are "
+-#| "case, meaningyou don't have to capitalize. <em>dave</em>, <em>Dave</em>, "
++#| "case, meaning you don't have to capitalize. <em>dave</em>, <em>Dave</em>, "
+ #| "and <em>DAVE</em> all mean the same thing when searching."
+ msgid ""
+ "A search query consists of some basic terms, for example, <em>dave matthews</"
+ "em>. By entering <em>dave matthews</em> in the search box, Banshee will "
+-"search all metatdata fields including Track Title, Album Title, Album "
+-"Artist, Year, etc. Any track whose metadata includes <em>dave</em> and "
+-"<em>matthews</em> will be returned. Search terms are case, meaning you don't "
++"search all metadata fields including Track Title, Album Title, Album Artist, "
++"Year, etc. Any track whose metadata includes <em>dave</em> and <em>matthews</"
++"em> will be returned. Search terms are case insensitive, meaning you don't "
+ "have to capitalize. <em>dave</em>, <em>Dave</em>, and <em>DAVE</em> all mean "
+ "the same thing when searching."
+ msgstr ""
+ "Ένα ερώτημα αναζήτησης αποτελείται από μερικούς βασικούς όρους, "
+ "παραδείγματος χάριν, <em>dave matthews</em>. Εισάγοντας <em>dave "
+ "matthews</em> στο πεδίο αναζήτησης, το Banshee θα ψάξει σε όλα τα πεδία "
+-"μεταδεδομένων, περιλαμβανομένων των Τίτλου κομματιού, Τίτλου δίσκου, "
+-"Καλλιτέχνη δίσκου, Έτους, κλπ. Οποιοδήποτε κομμάτι του οποίου τα "
++"μεταδεδομένων, περιλαμβανομένων των τίτλου κομματιού, τίτλου δίσκου, "
++"καλλιτέχνη δίσκου, έτους, κλπ. Οποιοδήποτε κομμάτι του οποίου τα "
+ "μεταδεδομένα περιλαμβάνουν το <em>dave</em> και το <em>matthews</em> θα "
+-"εντοπισθεί. Οι όροι αναζήτησης δεν κάνουν διάκριση πεζών-κεφαλαίων, δηλαδή "
+-"δεν χρειάζεται να χρησιμοποιήσετε κεφαλαία στην αρχή των λέξεων. Τα "
+-"<em>dave</em>, <em>Dave</em>, και <em>DAVE</em> όλα σημαίνουν το ίδιο πράγμα "
+-"κατά την αναζήτηση."
++"επιστραφεί. Οι όροι αναζήτησης δεν κάνουν διάκριση πεζών-κεφαλαίων, δηλαδή "
++"δεν χρειάζεται να χρησιμοποιήσετε κεφαλαία. Τα <em>dave</em>, <em>Dave</em>, "
++"και <em>DAVE</em> όλα σημαίνουν το ίδιο πράγμα κατά την αναζήτηση."
+ 
+ #: C/search.page:43(title)
+ msgid "Basic Operators"
+@@ -594,7 +588,6 @@ msgid "OR, or, <key>|</key>, <key>,</key>"
+ msgstr "OR, or, <key>|</key>, <key>,</key>"
+ 
+ #: C/search.page:69(p)
+-#| msgid "Search results will be two terms with either result in any field."
+ msgid "Search results will be two songs with either result in any field."
+ msgstr ""
+ "Τα αποτελέσματα θα είναι δύο τραγούδια με οποιοδήποτε από τα δύο "
+@@ -605,9 +598,6 @@ msgid "NOT, not,<key>-</key>"
+ msgstr "NOT, not,<key>-</key>"
+ 
+ #: C/search.page:73(p)
+-#| msgid ""
+-#| "Do not display search results with any search team that follows the "
+-#| "operator of NOT, not,<key>-</key>."
+ msgid ""
+ "Do not display search results with any search term that follows the operator "
+ "of NOT, not,<key>-</key>."
+@@ -640,12 +630,15 @@ msgid "dave, matthews"
+ msgstr "dave, matthews"
+ 
+ #: C/search.page:92(p) C/search.page:97(p) C/search.page:102(p)
++#| msgid ""
++#| "Matches any fields in a track containing both <em>dave</em> or "
++#| "<em>matthews</em>."
+ msgid ""
+-"Matches any fields in a track containing both <em>dave</em> or <em>matthews</"
+-"em>."
++"Matches any fields in a track containing either <em>dave</em> or "
++"<em>matthews</em>."
+ msgstr ""
+-"Ταιριάζει με οποιαδήποτε πεδία ενός κομματιού περιλαμβάνουν το <em>dave</em> "
+-"ή το <em>matthews</em>."
++"Ταιριάζει με οποιαδήποτε πεδία ενός κομματιού που περιλαμβάνουν το "
++"<em>dave</em> ή το <em>matthews</em>."
+ 
+ #: C/search.page:97(p)
+ msgid "dave or matthews"
+@@ -660,8 +653,9 @@ msgid "-\"dave matthews\""
+ msgstr "-\"dave matthews\""
+ 
+ #: C/search.page:107(p)
+-msgid ""
+-"Displays all tracks whose fields do not containt <em>dave matthews</em>."
++#| msgid ""
++#| "Displays all tracks whose fields do not containt <em>dave matthews</em>."
++msgid "Displays all tracks whose fields do not contain <em>dave matthews</em>."
+ msgstr ""
+ "Εμφανίζει όλα τα κομμάτια των οποίων τα πεδία δεν περιέχουν <em>dave "
+ "matthews</em>."
+@@ -727,11 +721,6 @@ msgstr ""
+ "guiseq> από το μενού του Banshee."
+ 
+ #: C/play.page:42(p)
+-#| msgid ""
+-#| "You can also start playing an album by choosing the album in the album "
+-#| "browser and pressing use your mouse to double click the song name, press "
+-#| "the <key>Spacebar</key>, or choose <guiseq><gui>Playback</gui><gui>Play</"
+-#| "gui></guiseq> from the Banshee menu."
+ msgid ""
+ "You can also start playing an album by choosing the album in the album "
+ "browser and using your mouse to double click the song name, press the "
+@@ -740,9 +729,8 @@ msgid ""
+ msgstr ""
+ "Μπορείτε να ξεκινήσετε την αναπαραγωγή ενός δίσκου επιλέγοντας το δίσκο στην "
+ "περιήγηση δίσκων με διπλό κλικ στο όνομα του τραγουδιού, πατώντας το "
+-"<key>πλήκτρο διαστήματος</key> ή επιλέγοντας "
+-"<guiseq><gui>Αναπαραγωγή</gui><gui>Αναπαραγωγή</gui></guiseq> από το μενού "
+-"του Banshee."
++"<key>πλήκτρο διαστήματος</key> ή επιλέγοντας <guiseq><gui>Αναπαραγωγή</"
++"gui><gui>Αναπαραγωγή</gui></guiseq> από το μενού του Banshee."
+ 
+ #: C/play.page:48(p)
+ msgid ""
+@@ -797,8 +785,12 @@ msgid "Play a Podcast"
+ msgstr "Αναπαραγωγή φορητής εκπομπής"
+ 
+ #: C/play.page:76(p)
++#| msgid ""
++#| "Podcasts shows you all Podcasts you're subscribed too, all Podcast shows "
++#| "available, and the Podcast browser lists all Podcasts in order of newest "
++#| "first."
+ msgid ""
+-"Podcasts shows you all Podcasts you're subscribed too, all Podcast shows "
++"Podcasts shows you all Podcasts you're subscribed to, all Podcast shows "
+ "available, and the Podcast browser lists all Podcasts in order of newest "
+ "first."
+ msgstr ""
+@@ -897,19 +889,28 @@ msgstr ""
+ "αναπαραγωγής</gui>."
+ 
+ #: C/play-queue.page:43(p)
++#| msgid ""
++#| "You can select multiple files by using your mouse and pressing "
++#| "<key>Control</key> and choosing each file with your mouse or select a "
++#| "range of files by pressing <key>Shift</key> twice to select that range of "
++#| "files. You can then drag and drop it over the <gui>Play Queue</gui> in "
++#| "the far left window pane or right click the tracks and choose <gui>Add to "
++#| "Play Queue</gui>."
+ msgid ""
+ "You can select multiple files by using your mouse and pressing <key>Control</"
+ "key> and choosing each file with your mouse or select a range of files by "
+-"pressing <key>Shift</key> twice to select that range of files. You can then "
+-"drag and drop it over the <gui>Play Queue</gui> in the far left window pane "
+-"or right click the tracks and choose <gui>Add to Play Queue</gui>."
++"pressing <key>Shift</key> and clicking twice to select that range of files. "
++"You can then drag and drop it over the <gui>Play Queue</gui> in the far left "
++"window pane or right click the tracks and choose <gui>Add to Play Queue</"
++"gui>."
+ msgstr ""
+-"Μπορείτε να επιλέξετε πολλαπλά αρχεία με το ποντίκι και πατώντας το "
++"Μπορείτε να επιλέξετε πολλαπλά αρχεία με το ποντίκι, πατώντας το "
+ "<key>Control</key> και επιλέγοντας κάθε αρχείο με το ποντίκι σας ή "
+-"επιλέγοντας μια σειρά αρχείων πατώντας δυο φορές το <key>Shift</key> για να "
+-"τα επιλέξετε. Μπορείτε μετά να σύρετε και να τα αφήσετε πάνω στη <gui>Σειρά "
+-"αναπαραγωγής</gui> στο αριστερότερο πλαίσιο του παραθύρου ή να κάνετε δεξί "
+-"κλικ στα κομμάτια και να επιλέξτε <gui>Προσθήκη στη σειρά αναπαραγωγής</gui>."
++"επιλέγοντας μια σειρά αρχείων πατώντας το <key>Shift</key> και πατώντας δυο "
++"φορές για να επιλέξετε τα αρχεία. Μπορείτε μετά να σύρετε και να τα αφήσετε "
++"πάνω στη <gui>Σειρά αναπαραγωγής</gui> στο αριστερότερο πλαίσιο του "
++"παραθύρου ή να κάνετε δεξί κλικ στα κομμάτια και να επιλέξτε <gui>Προσθήκη "
++"στη σειρά αναπαραγωγής</gui>."
+ 
+ #: C/play-queue.page:56(title)
+ msgid "Organize Your Play Queue"
+@@ -986,7 +987,7 @@ msgstr ""
+ "διαδικτύου θα έχει ήδη ενσωματωμένα τα μεταδεδομένα και αν εισάγετε μουσική "
+ "από CD, το Banshee θα συμπεριλάβει τα μεταδεδομένα κατά την εξαγωγή από το "
+ "CD, αν είναι διαθέσιμα. Για περισσότερες πληροφορίες για την εξαγωγή CD και "
+-"την συμπερίληψη μεταδεδομένων δείτε την <link xref=\"εισαγωγή\"/>."
++"την συμπερίληψη μεταδεδομένων δείτε την <link xref=\"import\"/>."
+ 
+ #: C/manage-tags.page:39(p)
+ msgid ""
+@@ -1034,8 +1035,9 @@ msgstr ""
+ "προεπιλεγμένα πεδία που εμφανίζονται περιλαμβάνουν:"
+ 
+ #: C/manage-tags.page:63(gui)
+-msgid "Track Title:"
+-msgstr "Τίτλος κομματιού:"
++#| msgid "Track Title:"
++msgid "Track Title"
++msgstr "Τίτλος κομματιού"
+ 
+ #: C/manage-tags.page:64(gui)
+ msgid "Track Artist"
+@@ -1079,7 +1081,7 @@ msgstr ""
+ msgid "Create and manage playlists."
+ msgstr "Δημιουργία και διαχείριση λιστών αναπαραγωγής."
+ 
+-#: C/manage-playlists.page:19(title)
++#: C/manage-playlists.page:19(title) C/keyboardshortcuts.page:69(title)
+ msgid "Playlists"
+ msgstr "Λίστες αναπαραγωγής"
+ 
+@@ -1134,7 +1136,7 @@ msgstr ""
+ #| "gui><gui>New Playlist</gui></guiseq> or by selecing the track(s) you "
+ #| "would like to add to the playlist. Select the track(s), right click them, "
+ #| "and choose <guiseq><gui>Add to Playlist</gui><gui>New Playlist</gui></"
+-#| "guiseq>. You can also drag and drop them to a new playlist by selcting "
++#| "guiseq>. You can also drag and drop them to a new playlist by selecting "
+ #| "the track(s) and dragging them to the left hand window pane over "
+ #| "<gui>Music</gui>. As you drag it over <gui>Music</gui>, a new option "
+ #| "<gui><em>New Playlist</em></gui> will appear and you can drop the track"
+@@ -1143,7 +1145,7 @@ msgstr ""
+ #| "in the playlist."
+ msgid ""
+ "You can create a new playlist by pressing <keyseq><key>Control</key><key>N</"
+-"key></keyseq>, from the menu choosing <guiseq><gui>Menu</gui><gui>New "
++"key></keyseq>, from the menu choosing <guiseq><gui>Media</gui><gui>New "
+ "Playlist</gui></guiseq> or by selecing the track(s) you would like to add to "
+ "the playlist. Select the track(s), right click them, and choose "
+ "<guiseq><gui>Add to Playlist</gui><gui>New Playlist</gui></guiseq>. You can "
+@@ -1156,15 +1158,16 @@ msgid ""
+ msgstr ""
+ "Μπορείτε να δημιουργήσετε μια νέα λίστα αναπαραγωγής πατώντας "
+ "<keyseq><key>Control</key><key>N</key></keyseq>, από το μενού επιλέγοντας "
+-"<guiseq><gui>Μενού</gui><gui>Νέα λίστα αναπαραγωγής</gui></guiseq> ή "
++"<guiseq><gui>Μέσα</gui><gui>Νέα λίστα αναπαραγωγής</gui></guiseq> ή "
+ "επιλέγοντας τα κομμάτια που θέλετε να προσθέσετε στη λίστα αναπαραγωγής. "
+-"Επιλέξτε τα κομμάτια, κάντε δεξί κλικ και επιλέξτε <guiseq><gui>Προσθήκη στη "
++"Επιλέξτε τα κομμάτια, δεξιοπατήστε τα και επιλέξτε <guiseq><gui>Προσθήκη στη "
+ "λίστα αναπαραγωγής</gui><gui>Νέα λίστα αναπαραγωγής</gui></guiseq>. "
+ "Μπορείτε επίσης να σύρετε και να τα αφήσετε σε μια νέα λίστα αναπαραγωγής "
+-"επιλέγοντας τα κομμάτια και σύροντάς τα στο αριστερό πλαίσιο πάνω από το "
+-"<gui>Μουσική</gui>. Καθώς τα σύρετε πάνω από το <gui>Μουσική</gui>, θα "
+-"εμφανισθεί μια νέα επιλογή <gui><em>Νέα λίστα αναπαραγωγής</em></gui> και "
+-"μπορείτε να αφήσετε τα κομμάτια πάνω από αυτή για να προσθέσετε στη λίστα "
++"επιλέγοντας τα κομμάτια και σύροντάς τα στο αριστερό πλαίσιο του παραθύρου "
++"πάνω από το <gui>Μουσική</gui>. Καθώς τα σύρετε πάνω από το "
++"<gui>Μουσική</gui>, θα εμφανισθεί μια νέα επιλογή <gui><em>Νέα λίστα "
++"αναπαραγωγής</em></gui> και μπορείτε να αφήσετε τα κομμάτια πάνω από τη "
++"<gui><em>Νέα λίστα αναπαραγωγής</em></gui> για να τα προσθέσετε στη λίστα "
+ "αναπαραγωγής. Μπορείτε να επαναλάβετε αυτή τη διαδικασία μέχρι να προσθέσετε "
+ "όλα τα κομμάτια που θέλετε στη λίστα αναπαραγωγής."
+ 
+@@ -1326,10 +1329,9 @@ msgstr ""
+ "Πρόσφατα αγαπημένα (τραγούδια που ακούστηκαν συχνά την προηγούμενη εβδομάδα)"
+ 
+ #: C/manage-playlists.page:135(p)
+-msgid "Recently Added (Songs imported within the last week"
+-msgstr ""
+-"Πρόσφατες προσθήκες (τραγούδια που εισήχθησαν εντός της προηγούμενης "
+-"εβδομάδας)"
++#| msgid "Recently Added (Songs imported within the last week"
++msgid "Recently Added (Songs imported within the last week)"
++msgstr "Πρόσφατες προσθήκες (τραγούδια που εισήχθησαν την προηγούμενη εβδομάδα)"
+ 
+ #: C/manage-playlists.page:136(p)
+ msgid "Unheard (Songs that have not been played or skipped)"
+@@ -1371,15 +1373,6 @@ msgid "Last.fm"
+ msgstr "Last.fm"
+ 
+ #: C/lastfm.page:26(p)
+-#| msgid ""
+-#| "Last.fm is a popular online service that offers both free and paid "
+-#| "versions. Last.fm offers information on music artists and albums and if "
+-#| "you create a user profile Last.fm allows you to track the music you "
+-#| "listen to in Banshee for free. If you suscribe as a paying member, you "
+-#| "can also listen to streaming music from Last.fm in various music clients, "
+-#| "including Banshee. Last.fm offers multiple channels to stream, including "
+-#| "recommended music for you based on your listening habits, your favorites "
+-#| "and more."
+ msgid ""
+ "Last.fm is a popular online service that offers both free and paid versions. "
+ "Last.fm offers information on music artists and albums and if you create a "
+@@ -1392,33 +1385,43 @@ msgstr ""
+ "Το Last.fm είναι μια δημοφιλής δικτυακή υπηρεσία που προσφέρει τόσο δωρεάν "
+ "όσο και επί πληρωμή υπηρεσίες. Το Last.fm προσφέρει πληροφορίες για "
+ "καλλιτέχνες της μουσικής και δίσκους και αν δημιουργήσετε ένα προφίλ χρήστη, "
+-"το Last.fm σας επιτρέπει να παρακολουθείτε τη μουσική που ακούτε στο "
+-"Banshee δωρεάν. Αν γίνετε επί πληρωμή συνδρομητής, μπορείτε επίσης να ακούτε "
+-"ροές μουσικής από το Last.fm σε διάφορους πελάτες μουσικής, "
+-"περιλαμβανομένου του Banshee. Το Last.fm προσφέρει πολλαπλά κανάλια για "
+-"ροές, περιλαμβανομένης προτεινόμενης μουσικής για εσάς με βάση τις συνήθειες "
+-"ακρόασής σας, τα αγαπημένα σας και άλλα."
++"το Last.fm σας επιτρέπει να παρακολουθείτε τη μουσική που ακούτε στο Banshee "
++"δωρεάν. Αν γίνετε επί πληρωμή συνδρομητής, μπορείτε επίσης να ακούτε ροές "
++"μουσικής από το Last.fm σε διάφορους πελάτες μουσικής, περιλαμβανομένου του "
++"Banshee. Το Last.fm προσφέρει πολλαπλά κανάλια για ροές, περιλαμβανομένης "
++"προτεινόμενης μουσικής για εσάς με βάση τις συνήθειες ακρόασής σας, τα "
++"αγαπημένα σας και άλλα."
+ 
+ #: C/lastfm.page:35(title)
+ msgid "Enable Last.fm"
+ msgstr "Ενεργοποίηση Last.fm"
+ 
+ #: C/lastfm.page:36(p)
++#| msgid ""
++#| "To get the most out of Last.fm, you will want to create a Last.fm "
++#| "profile. Visit <link href=\"http://www.last.fm/join\">http://www.last.fm/"
++#| "join</link> to create an account or choose <guiseq><gui>Edit</"
++#| "gui><gui>Preferences</gui></guiseq> from the Banshee menu. Then press the "
++#| "<gui>Source Specific</gui> tab and press the <gui>Source</gui> drop down "
++#| "menu and choose <gui>Last.fm</gui> and select the <em>Sign up for Last."
++#| "fm</em> link."
+ msgid ""
+ "To get the most out of Last.fm, you will want to create a Last.fm profile. "
+ "Visit <link href=\"http://www.last.fm/join\">http://www.last.fm/join</link> "
+ "to create an account or choose <guiseq><gui>Edit</gui><gui>Preferences</"
+-"gui></guiseq> from the Banshee menu. Then press the <gui>Source Specific</"
+-"gui> tab and press the <gui>Source</gui> drop down menu and choose <gui>Last."
+-"fm</gui> and select the <em>Sign up for Last.fm</em> link."
+-msgstr ""
+-"Για να αξιοποιήσετε καλύτερα το Last.fm, θα πρέπει να δημιουργήσετε ένα "
+-"προφίλ. Επισκεφθείτε το <link href=\"http://www.last.fm/join\">http://www."
+-"last.fm/join</link> για να δημιουργήσετε ένα λογαριασμό ή επιλέξτε "
++"gui></guiseq> from the Banshee menu. Once in the preferences select the "
++"<gui>Source Specific</gui> tab, press the <gui>Source</gui> drop down menu, "
++"choose <gui>Last.fm</gui> and finally select the <em>Sign up for Last.fm</"
++"em> link."
++msgstr ""
++"Για να αξιοποιήσετε καλύτερα το Last.fm, θα πρέπει να δημιουργήσετε μια "
++"κατατομή στο Last.fm. Επισκεφθείτε το <link "
++"href=\"http://www.last.fm/join\">http://www.last.fm/join</link> για να "
++"δημιουργήσετε ένα λογαριασμό ή επιλέξτε "
+ "<guiseq><gui>Επεξεργασία</gui><gui>Προτιμήσεις</gui></guiseq> από το μενού "
+ "του Banshee. Μετά πατήστε την καρτέλα <gui>Για συγκεκριμένη πηγή</gui> και "
+ "πατήστε το αναπτυσσόμενο μενού <gui>Πηγή</gui>, επιλέξτε <gui>Last.fm</gui> "
+-"και επιλέξτε <em>Εγγραφή στο Last.fm</em>."
++"και επιλέξτε τελικά τον σύνδεσμο <em>Εγγραφή στο Last.fm</em>."
+ 
+ #: C/lastfm.page:45(p)
+ msgid ""
+@@ -1442,35 +1445,111 @@ msgstr ""
+ "<gui>Ολοκλήρωση σύνδεσης</gui> για να ολοκληρωθεί η διαδικασία."
+ 
+ #: C/lastfm.page:58(title)
+-msgid "Enable Last.fm Song Reporting"
+-msgstr "Ενεργοποίηση αναφοράς τραγουδιού στο Last.fm"
++#| msgid "Enable Last.fm Song Reporting"
++msgid "Enable Last.fm Song Reporting From Banshee"
++msgstr "Ενεργοποίηση αναφοράς τραγουδιού στο Last.fm από το Banshee"
+ 
+ #: C/lastfm.page:59(p)
+-msgid ""
+-"After you have successfully linked Banshee to your Last.fm profile, to "
+-"enable Banshee to report the songs to your Last.fm profile, in the "
+-"<gui>Source Specific</gui> tab in Banshee's preferences, press the "
+-"<gui>Enable Song Reporting</gui> checkbox. If you have an active internet "
+-"connection, Banshee will now send Last.fm information regarding the songs "
+-"you play. To view your play history, visit your profile on the Last.fm "
+-"website. Last.fm will automatically update your music metadata if any of "
+-"your artist, song title or album information is incorrect."
+-msgstr ""
+-"Αφού έχετε επιτυχώς συνδέσει το Banshee με το προφίλ σας στο Last.fm, για να "
+-"ενεργοποιήσετε την αναφορά τραγουδιών στο προφίλ σας του Last.fm, στην "
+-"καρτέλα <gui>Συγκεκριμένη πηγή</gui> στις προτιμήσεις του Banshee, πατήστε "
+-"στο πεδίο <gui>Ενεργοποίηση αναφοράς τραγουδιών</gui>. Αν έχετε ενεργή "
+-"σύνδεση στο διαδίκτυο, το Banshee θα στέλνει στο Last.fm πληροφορίες σχετικά "
+-"με τα τραγούδια που παίζετε. Για να προβάλετε το ιστορικό αναπαραγωγής σας, "
+-"επισκεφθείτε το προφίλ σας στην ιστοσελίδα του Last.fm. Το Last.fm θα "
+-"ενημερώνει αυτόματα τα μεταδεδομένα της μουσικής σας αν οι πληροφορίες για "
+-"κάποιο καλλιτέχνη, τίτλο τραγουδιού ή δίσκο είναι λανθασμένες."
+-
+-#: C/lastfm.page:72(title)
++#| msgid ""
++#| "After you have successfully linked Banshee to your Last.fm profile, to "
++#| "enable Banshee to report the songs to your Last.fm profile, in the "
++#| "<gui>Source Specific</gui> tab in Banshee's preferences, press the "
++#| "<gui>Enable Song Reporting</gui> checkbox. If you have an active internet "
++#| "connection, Banshee will now send Last.fm information regarding the songs "
++#| "you play. To view your play history, visit your profile on the Last.fm "
++#| "website. Last.fm will automatically update your music metadata if any of "
++#| "your artist, song title or album information is incorrect."
++msgid ""
++"After you have successfully linked Banshee to your Last.fm profile you must "
++"ensure that you have enabled Banshee to report your songs. To enable Banshee "
++"to report the songs to your Last.fm profile go to Banshee's preferences, "
++"select the <gui>Source Specific</gui> tab, select <gui>Last.fm</gui> from "
++"the dropdown, and press the <gui>Enable Song Reporting From Banshee</gui> "
++"checkbox. If you have an active internet connection Banshee will now send "
++"Last.fm information regarding the songs you play. To view your play history "
++"visit your profile on the Last.fm website. Last.fm will automatically update "
++"your music metadata if any of your artist, song title, or album information "
++"is incorrect (although we recommend that you use the Metadata Fixer "
++"extension to correct your files instead)."
++msgstr ""
++"Αφού έχετε επιτυχώς συνδέσει το Banshee με τη κατατομή σας στο Last.fm, "
++"πρέπει να βεβαιωθείτε ότι έχετε ενεργοποιήσει το Banshee για να αναφέρει τα "
++"τραγούδιά σας. Για την ενεργοποίηση του Banshee ώστε να αναφέρει τα "
++"τραγούδια στην κατατομή σας στο Last.fm, πηγαίνετε στις προτιμήσεις του "
++"Banshee, επιλέξτε στην καρτέλα <gui>Ειδική πηγή</gui>, επιλέξτε "
++"<gui>Last.fm</gui> από το πτυσσόμενο και πατήστε το πλαίσιο ελέγχου "
++"<gui>Ενεργοποίηση αναφοράς τραγουδιού από το Banshee</gui>. Αν έχετε μια "
++"ενεργή σύνδεση διαδικτύου Banshee, θα στείλει τώρα τις πληροφορίες του "
++"Last.fm σχετικά με τα τραγούδια που παίζετε. Για να προβάλετε το ιστορικό "
++"αναπαραγωγής, επισκεφτείτε την κατατομή σας στον ιστότοπο του Last.fm. Το "
++"Last.fm θα ενημερώσει αυτόματα τα μουσικά σας μεταδεδομένα, αν κάποιος από "
++"τα καλλιτέχνης, τίτλος τραγουδιού, ή πληροφορίες δίσκου είναι εσφαλμένο (αν "
++"και συνιστούμε να χρησιμοποιείτε την επέκταση Metadata Fixer για να "
++"διορθώσετε τα αρχεία σας)."
++
++#: C/lastfm.page:75(title)
++#| msgid "Enable Last.fm Song Reporting"
++msgid "Enable Last.fm Song Reporting From Your Device"
++msgstr "Ενεργοποίηση αναφοράς τραγουδιού στο Last.fm από τη συσκευή σας"
++
++#: C/lastfm.page:76(p)
++msgid ""
++"After successfully linking Banshee to your Last.fm profile and enabling "
++"Banshee to report songs to Last.fm you can also enable scrobbling from a "
++"connected device. Banshee will, upon connection of your device, attempt to "
++"scrobble the songs you have played since the device was last connected and "
++"submit them to Last.fm."
++msgstr ""
++"Μετά την πετυχημένη σύνδεση του Banshee στη κατατομή σας του Last.fm και την "
++"ενεργοποίηση του Banshee για αναφορά τραγουδιών στο Last.fm, μπορείτε "
++"επίσης να ενεργοποιήσετε τις επιλογές από μια συνδεμένη συσκευή. Το Banshee, "
++"με τη σύνδεση της συσκευής σας, θα προσπαθήσει να διαλέξει τα τραγούδια που "
++"έχετε παίξει από την τελευταία σύνδεση της συσκευής και να τα υποβάλλει στο "
++"Last.fm."
++
++#: C/lastfm.page:82(p)
++msgid ""
++"To enable scrobbling of a connected device go to Banshee's preferences, "
++"select the <gui>Source Specific</gui> tab, select <gui>Last.fm</gui> from "
++"the dropdown, and press the <gui>Enable Song Reporting From Device</gui> "
++"checkbox. If you have an active internet connection Banshee will, upon "
++"connection of your device, now attempt to gather information regarding the "
++"songs that you have played since it was last connected."
++msgstr ""
++"Για την ενεργοποίηση της επιλογής μιας συνδεμένης συσκευής πηγαίνετε στις "
++"προτιμήσεις του Banshee, επιλέξτε την καρτέλα <gui>Ειδική πηγή</gui>, "
++"επιλέξτε <gui>Last.fm</gui> από την πτυσσόμενη λίστα και πατήστε το πλαίσιο "
++"ελέγχου <gui>Ενεργοποίηση αναφοράς τραγουδιού από συσκευή</gui>. Αν έχετε "
++"μια ενεργή διαδικτυακή σύνδεση το Banshee, με τη σύνδεση της συσκευής σας, "
++"θα προσπαθήσει να συλλέξει πληροφορίες σχετικά με τα τραγούδια που έχουν "
++"παίξει από την τελευταία σύνδεση."
++
++#: C/lastfm.page:89(p)
++msgid ""
++"As with regular Banshee scrobbling submissions Last.fm will automatically "
++"update your music metadata if any of your artist, title, or album "
++"information is incorrect (although we again recommend that you use the "
++"Metadata Fixer extension to correct your files instead)."
++msgstr ""
++"Όπως με τις κανονικές υποβολές επιλογής του Banshee, το Last.fm θα "
++"ενημερώσει αυτόματα τα μουσικά σας μεταδεδομένα αν οποιαδήποτε από τις "
++"πληροφορίες καλλιτέχνη, τίτλου ή δίσκου είναι εσφαλμένες (αν και συνιστούμε "
++"πάλι τη χρήση της επέκτασης Metadata Fixer για διόρθωση των αρχείων σας)."
++
++#: C/lastfm.page:94(p)
++msgid ""
++"Please note that currently Banshee only supports this feature with Apple "
++"products that are supported by the AppleDevice extension."
++msgstr ""
++"Παρακαλούμε, σημειώστε ότι προς το παρόν το Banshee υποστηρίζει αυτό το "
++"γνώρισμα μόνο με προϊόντα Apple που υποστηρίζονται από την επέκταση "
++"AppleDevice."
++
++#: C/lastfm.page:101(title)
+ msgid "Listen to Last.fm Radio"
+ msgstr "Ακούστε το ραδιόφωνο του Last.fm"
+ 
+-#: C/lastfm.page:73(p)
++#: C/lastfm.page:102(p)
+ msgid ""
+ "Last.fm radio is free for residents of the United States, United Kingdom and "
+ "Germany. Residents of other countries will have to pay for a premium account "
+@@ -1483,21 +1562,21 @@ msgstr ""
+ "πληρώσουν για ένα λογαριασμό του Last.fm για ακούσουν ραδιόφωνο. Τα επί "
+ "πληρωμή μέλη, επίσης έχουν επιπλέον χαρακτηριστικά στο ραδιόφωνο: ακρόαση "
+ "λιστών αναπαραγωγής και σταθμούς μουσικής που σας αρέσουν ή έχετε "
+-"επισημάνει. "
++"επισημάνει."
+ 
+-#: C/lastfm.page:80(p)
++#: C/lastfm.page:109(p)
+ #| msgid ""
+-#| "In Banshee's context menu onthe left hand side, you will now have a Last."
+-#| "fm section, including your Lat.fm radio stations. You will need an active "
+-#| "internet connection to listen to Last.fm radio. Choose the radio station "
+-#| "you wish to listen to and Banshee will communicate with Last.fm to "
+-#| "populate songs for that radio station. Press the <gui>Play</gui> button "
+-#| "in Banshee or <key>Spacebar</key> to start streaming a Last.fm radio "
+-#| "station. You can also press the <gui>Next</gui> button in Banshee, "
++#| "In Banshee's context menu on the left hand side, you will now have a Last."
++#| "fm section, including your Last.fm radio stations. You will need an "
++#| "active internet connection to listen to Last.fm radio. Choose the radio "
++#| "station you wish to listen to and Banshee will communicate with Last.fm "
++#| "to populate songs for that radio station. Press the <gui>Play</gui> "
++#| "button in Banshee or <key>Spacebar</key> to start streaming a Last.fm "
++#| "radio station. You can also press the <gui>Next</gui> button in Banshee, "
+ #| "<key>N</key> or choose <guiseq><gui>Playback</gui><gui>Next</gui></"
+ #| "guiseq> to play the next song in your radio station queue."
+ msgid ""
+-"In Banshee's context menu on the left hand side, you will now have a Last.fm "
++"In Banshee's sources pane on the left hand side, you will now have a Last.fm "
+ "section, including your Last.fm radio stations. You will need an active "
+ "internet connection to listen to Last.fm radio. Choose the radio station you "
+ "wish to listen to and Banshee will communicate with Last.fm to populate "
+@@ -1507,16 +1586,17 @@ msgid ""
+ "<guiseq><gui>Playback</gui><gui>Next</gui></guiseq> to play the next song in "
+ "your radio station queue."
+ msgstr ""
+-"Στο μενού περιεχομένου του Banshee, στην αριστερή πλευρά, θα έχετε τώρα μια "
+-"ενότητα Last.fm, που περιλαμβάνει τους σταθμούς σας του Last.fm. Θα "
++"Στο παράθυρο πηγών του Banshee στα αριστερά, θα έχετε τώρα μια ενότητα "
++"Last.fmΣ, που συμπεριλαμβάνει τους σταθμούς σας του ραδιοφώνου Last.fm. Θα "
+ "χρειαστείτε μια ενεργή σύνδεση διαδικτύου για να ακούσετε το ραδιόφωνο του "
+ "Last.fm. Επιλέξτε το ραδιοφωνικό σταθμό που θέλετε να ακούσετε και το "
+ "Banshee θα επικοινωνήσει με το Last.fm για να συμπληρώσει τραγούδια για αυτό "
+ "το ραδιοφωνικό σταθμό. Πατήστε το κουμπί <gui>Αναπαραγωγή</gui> στο Banshee "
+-"ή το <key>Spacebar</key> για να αρχίσετε τη ροή του ραδιοφωνικού σταθμού. "
+-"Μπορείτε επίσης να πατήσετε το κουμπί <gui>Επόμενο</gui>, το <key>N</key> ή "
+-"να επιλέξετε <guiseq><gui>Αναπαραγωγή</gui><gui>Επόμενο</gui></guiseq> για "
+-"να αναπαράγετε το επόμενο τραγούδι στη σειρά του ραδιοφωνικού σταθμού."
++"ή το <key>πλήκτρο διαστήματος</key> για να αρχίσετε τη ροή του ραδιοφωνικού "
++"σταθμού Last.fm. Μπορείτε επίσης να πατήσετε το κουμπί <gui>Επόμενο</gui> "
++"στο Banshee, το <key>N</key> ή να επιλέξετε "
++"<guiseq><gui>Αναπαραγωγή</gui><gui>Επόμενο</gui></guiseq> για να αναπαράγετε "
++"το επόμενο τραγούδι στη σειρά του ραδιοφωνικού σταθμού."
+ 
+ #: C/keyboardshortcuts.page:7(desc) C/advanced.page:27(title)
+ #: C/advanced.page:29(title)
+@@ -1567,28 +1647,28 @@ msgstr "B"
+ msgid "Play the previous song"
+ msgstr "Αναπαραγωγή του προηγούμενου τραγουδιού"
+ 
+-#: C/keyboardshortcuts.page:49(title) C/keyboardshortcuts.page:69(title)
++#: C/keyboardshortcuts.page:49(title)
+ msgid "Library Interaction"
+ msgstr "Αλληλεπίδραση με βιβλιοθήκη"
+ 
+-#: C/keyboardshortcuts.page:56(key) C/keyboardshortcuts.page:76(key)
++#: C/keyboardshortcuts.page:56(p)
++msgid "<key>/</key>, <keyseq><key>Control</key><key>F</key></keyseq>"
++msgstr "<key>/</key>, <keyseq><key>Control</key><key>F</key></keyseq>"
++
++#: C/keyboardshortcuts.page:56(p)
++msgid "Move the focus to the search box"
++msgstr "Μεταφορά της εστίασης στο πεδίο αναζήτησης"
++
++#: C/keyboardshortcuts.page:60(key) C/keyboardshortcuts.page:76(key)
+ #: C/keyboardshortcuts.page:114(key) C/keyboardshortcuts.page:118(key)
+ #: C/keyboardshortcuts.page:123(key) C/keyboardshortcuts.page:127(key)
+ #: C/keyboardshortcuts.page:132(key) C/keyboardshortcuts.page:137(key)
+ msgid "Control"
+ msgstr "Έλεγχος"
+ 
+-#: C/keyboardshortcuts.page:56(key) C/keyboardshortcuts.page:110(key)
+-msgid "F"
+-msgstr "F"
+-
+-#: C/keyboardshortcuts.page:56(p)
+-msgid "Move the focus to the search box"
+-msgstr "Μεταφορά της εστίασης στο πεδίο αναζήτησης"
+-
+-#: C/keyboardshortcuts.page:60(p)
+-msgid "<key>/</key>, <keyseq><key>Control</key><key>F</key></keyseq>"
+-msgstr "<key>/</key>, <keyseq><key>Control</key><key>F</key></keyseq>"
++#: C/keyboardshortcuts.page:60(key)
++msgid "I"
++msgstr "I"
+ 
+ #: C/keyboardshortcuts.page:61(p)
+ msgid "Open import media dialog"
+@@ -1614,6 +1694,10 @@ msgstr "Σήμανση των επιλεγμένων επεισοδίων ως 
+ msgid "Interface"
+ msgstr "Διεπαφή"
+ 
++#: C/keyboardshortcuts.page:110(key)
++msgid "F"
++msgstr "F"
++
+ #: C/keyboardshortcuts.page:110(p)
+ msgid "Toggle full-screen mode"
+ msgstr "Εναλλαγή κατάστασης πλήρους οθόνης"
+@@ -1694,10 +1778,6 @@ msgid "Introduction"
+ msgstr "Εισαγωγή"
+ 
+ #: C/introduction.page:26(p)
+-#| msgid ""
+-#| "<app>Banshee</app> is a media player that allows you to play your music, "
+-#| "videos, and other media media as well sync it with portable devices to "
+-#| "take your media on the go."
+ msgid ""
+ "<app>Banshee</app> is a media player that allows you to play your music, "
+ "videos, and other media as well sync it with portable devices to take your "
+@@ -1730,30 +1810,34 @@ msgstr ""
+ "περισσότερων iPod, τους αναπαραγωγείς MP3 της Sandisk και της Creative και "
+ "κινητά με λειτουργικό Android."
+ 
+-#: C/index.page:24(title)
++#: C/index.page:14(name)
++msgid "Sindhu S"
++msgstr "Sindhu S"
++
++#: C/index.page:15(email)
++msgid "sindhus@live.in"
++msgstr "sindhus@live.in"
++
++#: C/index.page:29(title)
+ msgid "Add, Remove &amp; Play"
+ msgstr "Προσθήκη, Αφαίρεση &amp; Αναπαραγωγή"
+ 
+-#: C/index.page:28(title)
++#: C/index.page:33(title)
+ msgid "Manage &amp; Sort"
+ msgstr "Διαχείριση &amp; Ταξινόμηση"
+ 
+-#: C/index.page:32(title)
++#: C/index.page:37(title)
+ msgid "Sync your media with a portable music player"
+ msgstr "Συγχρονισμός των πολυμέσων σας με φορητή συσκευή μουσικής"
+ 
+-#: C/index.page:36(title)
++#: C/index.page:41(title)
+ msgid "Add additional functionality to Banshee"
+ msgstr "Προσθήκη επιπλέον λειτουργιών στο Banshee"
+ 
+-#: C/index.page:40(title)
++#: C/index.page:45(title)
+ msgid "Advanced options and help"
+ msgstr "Προχωρημένες επιλογές και βοήθεια"
+ 
+-#: C/index.page:44(title)
+-msgid "Common Problems"
+-msgstr "Συνήθη προβλήματα"
+-
+ #: C/import.page:8(desc)
+ msgid "Add music and videos from your computer to your Banshee library."
+ msgstr ""
+@@ -1846,11 +1930,6 @@ msgid "Videos From Photos Folder"
+ msgstr "Βίντεο από το φάκελο φωτογραφίες"
+ 
+ #: C/import.page:55(p)
+-#| msgid ""
+-#| "Many digital cameras can take short vidoes, and photo-management "
+-#| "applications often download these videos directly into your Photos "
+-#| "folder. Choose this option to import any videos that have been stored in "
+-#| "your Photos folder."
+ msgid ""
+ "Many digital cameras can take short videos, and photo-management "
+ "applications often download these videos directly into your Photos folder. "
+@@ -1990,13 +2069,6 @@ msgid "Buy Amazon MP3s in Banshee"
+ msgstr "Αγορά MP3 του Amazon στο Banshee"
+ 
+ #: C/amazon.page:53(p)
+-#| msgid ""
+-#| "You can also search for songs on Amazon within Banshee. Choose the Amazon "
+-#| "MP3 Store from the Banshee menu on the left. This will load the Amazon "
+-#| "MP3 Store just as if you were in a web browser. You can search Amazon for "
+-#| "the music you wish to buy and after logging in to Amazon, buy music with "
+-#| "one click. Banshee will automatically download and import the your "
+-#| "purchase into the library."
+ msgid ""
+ "You can also search for songs on Amazon within Banshee. Choose the Amazon "
+ "MP3 Store from the Banshee menu on the left. This will load the Amazon MP3 "
+@@ -2050,7 +2122,7 @@ msgstr ""
+ 
+ #: C/advanced.page:8(desc)
+ msgid "Get help for advanced actions."
+-msgstr "Βοήθεια για προχωρημένες ενέργειες"
++msgstr "Βοήθεια για προχωρημένες ενέργειες."
+ 
+ #: C/advanced.page:23(title)
+ msgid "Advanced Options and Help"
+@@ -2071,12 +2143,6 @@ msgid "What is Internet Radio?"
+ msgstr "Τι είναι το διαδικτυακό ραδιόφωνο;"
+ 
+ #: C/add-radio.page:31(p)
+-#| msgid ""
+-#| "Internet radio stations are similar to regular radio stations, allowing "
+-#| "an individual or organization to stream music live over the internet. "
+-#| "Internet radio stations can be a simultaneous stream of a regular radio "
+-#| "station, an amateur broadasting their own station, or commercial internet "
+-#| "radio stations that include live DJs and even commercials."
+ msgid ""
+ "Internet radio stations are similar to regular radio stations, allowing an "
+ "individual or organization to stream music live over the internet. Internet "
+@@ -2096,14 +2162,19 @@ msgid "Add Radio Station"
+ msgstr "Προσθήκη ραδιοφωνικού σταθμού"
+ 
+ #: C/add-radio.page:43(p)
++#| msgid ""
++#| "To add an internet radio station to Banshee, press <gui>Add Station</gui> "
++#| "in the upper right hand corner of Banshee or, from the menu, choose "
++#| "<guiseq><gui>Menu</gui><gui>Add Station</gui></guiseq>."
+ msgid ""
+ "To add an internet radio station to Banshee, press <gui>Add Station</gui> in "
+ "the upper right hand corner of Banshee or, from the menu, choose "
+-"<guiseq><gui>Menu</gui><gui>Add Station</gui></guiseq>."
++"<guiseq><gui>Media</gui><gui>Add Station</gui></guiseq>."
+ msgstr ""
+-"Για να προσθέσετε ένα ραδιοφωνικό σταθμό στο Banshee, πατήστε <gui>Προσθήκη "
+-"σταθμού</gui> στην πάνω δεξιά γωνία του Banshee ή από το μενού επιλέξτε "
+-"<guiseq><gui>Μενού</gui><gui>Προσθήκη σταθμού</gui></guiseq>."
++"Για να προσθέσετε ένα ραδιοφωνικό διαδικτυακό σταθμό στο Banshee, πατήστε "
++"<gui>Προσθήκη σταθμού</gui> στην πάνω δεξιά γωνία του Banshee, ή από το "
++"μενού, επιλέξτε <guiseq><gui>Μενού</gui><gui>Προσθήκη "
++"σταθμού</gui></guiseq>."
+ 
+ #: C/add-radio.page:48(p)
+ msgid ""
+@@ -2117,22 +2188,31 @@ msgstr ""
+ "δεσμού</gui>."
+ 
+ #: C/add-radio.page:54(p)
++#| msgid ""
++#| "Banshee will prompt you to enter the <gui>Station Genre</gui>. Choose the "
++#| "kind of music the internet radio station plays from the available drop "
++#| "down selections. You will then need to enter the <gui>Station Name</gui>. "
++#| "Enter a name for the radio station. Then press tab or use your mouse to "
++#| "select the <gui>Stream URL:</gui> dialog to paste the URL of the radio "
++#| "station. Using your mouse right click and choose <gui>Paste</gui> or "
++#| "press <keyseq><key>Control</key>+<key>V</key></keyseq>."
+ msgid ""
+ "Banshee will prompt you to enter the <gui>Station Genre</gui>. Choose the "
+ "kind of music the internet radio station plays from the available drop down "
+ "selections. You will then need to enter the <gui>Station Name</gui>. Enter a "
+ "name for the radio station. Then press tab or use your mouse to select the "
+-"<gui>Stream URL:</gui> dialog to paste the URL of the radio station. Using "
++"<gui>Stream URL</gui> field to paste the URL of the radio station. Using "
+ "your mouse right click and choose <gui>Paste</gui> or press "
+-"<keyseq><key>Control</key>+<key>V</key></keyseq>."
++"<keyseq><key>Control</key><key>V</key></keyseq>."
+ msgstr ""
+ "Το Banshee θα σας ζητήσει να εισάγετε το <gui>Είδος σταθμού</gui>. Επιλέξτε "
+-"το είδος της μουσικής που παίζει ο σταθμός από τις διαθέσιμες επιλογές. Στη "
+-"συνέχεια θα πρέπει εισάγετε το <gui>Όνομα σταθμού</gui>. Εισάγετε ένα όνομα "
+-"για το σταθμό. Μετά πατήστε το tab ή με το ποντίκι σας επιλέξτε το διάλογο "
+-"<gui>URL ροής:</gui> για να επικολλήσετε το URL του ραδιοφωνικού σταθμού. Με "
+-"χρήση του ποντικιού σας κάντε δεξί κλικ και επιλέξτε <gui>Επικόλληση</gui> ή "
+-"πατήστε <keyseq><key>Control</key>+<key>V</key></keyseq>."
++"το είδος της μουσικής που παίζει ο ραδιοφωνικός σταθμός από τις διαθέσιμες "
++"επιλογές. Στη συνέχεια θα πρέπει εισάγετε το <gui>Όνομα σταθμού</gui>. "
++"Εισάγετε ένα όνομα για τον ραδιοφωνικό σταθμό. Μετά πατήστε τον στηλοθέτη ή "
++"με το ποντίκι σας επιλέξτε το πεδίο <gui>URL ροής</gui> για να επικολλήσετε "
++"το URL του ραδιοφωνικού σταθμού. Με χρήση του ποντικιού σας δεξιοπατήστε και "
++"επιλέξτε <gui>Επικόλληση</gui> ή πατήστε "
++"<keyseq><key>Control</key>+<key>V</key></keyseq>."
+ 
+ #: C/add-radio.page:62(p)
+ msgid ""
+@@ -2265,4 +2345,11 @@ msgstr ""
+ #. Put one translator per line, in the form of NAME <EMAIL>, YEAR1, YEAR2
+ #: C/index.page:0(None)
+ msgid "translator-credits"
+-msgstr "Michael Kotsarinis <mk73628@gmail.com>, 2010"
++msgstr ""
++"Ελληνική μεταφραστική ομάδα GNOME\n"
++" Δημήτρης Σπίγγος <dmtrs32@gmail.com>, 2013\n"
++" Michael Kotsarinis <mk73628@gmail.com>, 2010\n"
++"Για περισσότερες πληροφορίες http://gnome.gr"
++
++#~ msgid "Common Problems"
++#~ msgstr "Συνήθη προβλήματα"
+diff --git a/libbanshee/banshee-player-pipeline.c b/libbanshee/banshee-player-pipeline.c
+index ed845f3..4dae104 100644
+--- a/libbanshee/banshee-player-pipeline.c
++++ b/libbanshee/banshee-player-pipeline.c
+@@ -360,9 +360,12 @@ _bp_pipeline_construct (BansheePlayer *player)
+     player->volume = gst_element_factory_make ("volume", NULL);
+     g_return_val_if_fail (player->volume != NULL, FALSE);
+ 
++// gstreamer on OS X does not call the callback upon initialization (see bgo#680917)
++#ifdef __APPLE__
+     // call the volume changed callback once so the volume from the pipeline is
+     // set in the player object
+     bp_volume_changed_callback (player->playbin, NULL, player);
++#endif
+ 
+     audiosinkqueue = gst_element_factory_make ("queue", "audiosinkqueue");
+     g_return_val_if_fail (audiosinkqueue != NULL, FALSE);
+diff --git a/po/POTFILES.in b/po/POTFILES.in
+index 19669bf..987d644 100644
+--- a/po/POTFILES.in
++++ b/po/POTFILES.in
+@@ -13,6 +13,7 @@ data/audio-profiles/wavpack.xml.in
+ data/audio-profiles/wav.xml.in
+ data/audio-profiles/wma.xml.in
+ data/desktop-files/common.desktop.in
++data/banshee.appdata.xml.in
+ libbanshee/banshee-bpmdetector.c
+ libbanshee/banshee-ripper.c
+ libbanshee/banshee-transcoder.c
+diff --git a/po/cs.po b/po/cs.po
+index 3c8ca2e..66e5755 100644
+--- a/po/cs.po
++++ b/po/cs.po
+@@ -5,15 +5,15 @@
+ # Lukáš Novotný <lukasnov@cvs.gnome.org>, 2005, 2006.
+ # Jakub Friedl <jfriedl@suse.cz>, 2006, 2007.
+ # Jiří Eischmann <jiri@eischmann.cz>, 2009.
+-# Marek Černocký <marek@manet.cz>, 2010, 2011, 2012.
++# Marek Černocký <marek@manet.cz>, 2010, 2011, 2012, 2013.
+ #
+ msgid ""
+ msgstr ""
+-"Project-Id-Version: banshee\n"
++"Project-Id-Version: banshee stable-2.6\n"
+ "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
+ "product=banshee&keywords=I18N+L10N&component=general\n"
+-"POT-Creation-Date: 2012-08-21 19:53+0000\n"
+-"PO-Revision-Date: 2012-09-03 00:09+0200\n"
++"POT-Creation-Date: 2013-10-03 17:27+0000\n"
++"PO-Revision-Date: 2013-10-07 22:22+0200\n"
+ "Last-Translator: Marek Černocký <marek@manet.cz>\n"
+ "Language-Team: Czech <gnome-cs-list@gnome.org>\n"
+ "Language: cs\n"
+@@ -21,6 +21,7 @@ msgstr ""
+ "Content-Type: text/plain; charset=UTF-8\n"
+ "Content-Transfer-Encoding: 8bit\n"
+ "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
++"X-Generator: Gtranslator 2.91.6\n"
+ 
+ #. ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice.addin.xml
+ #: ../data/addin-xml-strings.cs:8
+@@ -623,7 +624,7 @@ msgid "Audio Quality"
+ msgstr "Kvalita zvuku"
+ 
+ #: ../data/desktop-files/common.desktop.in.h:1
+-#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:196
++#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:194
+ msgid "Media Player"
+ msgstr "Multimediální přehrávač"
+ 
+@@ -639,6 +640,25 @@ msgstr "Multimediální přehrávač Banshee"
+ msgid "Play and organize your media collection"
+ msgstr "Přehrávat a organizovat své multimediální kolekce"
+ 
++#. Writing GNOME below, instead of just "Linux", is inclusive of *BSD OSs
++#: ../data/banshee.appdata.xml.in.h:2
++msgid ""
++"Banshee is an open source multimedia management and playback application for "
++"GNOME, Mac and Windows."
++msgstr ""
++"Banshee je svobodná aplikace s otevřeným kódem sloužící ke správě a "
++"přehrávání multimédií v GNOME, na Macu a ve Windows."
++
++#: ../data/banshee.appdata.xml.in.h:3
++msgid ""
++"Play your music and videos. Stay entertained and up to date with podcasts "
++"and video podcasts. Sync your Android, iPod, and other devices. We think "
++"you'll love Banshee!"
++msgstr ""
++"Přehrávejte si svoji hudbu a videa. Mějte k dispozici nepřetržitou zábavu s "
++"vždy aktuálními podcasty a videopodcasty. Synchronizujte vše se svými "
++"zařízeními Android, iPod a dalšími. Věříme, že budete Banshee milovat."
++
+ #: ../libbanshee/banshee-bpmdetector.c:202 ../libbanshee/banshee-ripper.c:270
+ #: ../src/Backends/Banshee.GStreamerSharp/Banshee.GStreamerSharp/AudioCdRipper.cs:240
+ msgid "Could not create pipeline"
+@@ -1297,7 +1317,7 @@ msgid "Stream location not found"
+ msgstr "Umístění proudu nebylo nalezeno"
+ 
+ #: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:347
+-#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:339
++#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:344
+ msgid "File not found"
+ msgstr "Soubor nenalezen"
+ 
+@@ -1964,7 +1984,7 @@ msgstr "Vymazat seznam skladeb"
+ #: ../src/Core/Banshee.ThickClient/Banshee.Gui/SourceActions.cs:176
+ #: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:135
+ #: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:462
+-#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/SourceView.cs:595
++#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/SourceView.cs:612
+ #: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/SourceView_DragAndDrop.cs:214
+ msgid "New Playlist"
+ msgstr "Nový seznam skladeb"
+@@ -2568,7 +2588,7 @@ msgstr "drm"
+ #: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/StatisticsPage.cs:234
+ #: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/StatisticsPage.cs:236
+ #: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/StatisticsPage.cs:238
+-#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:400
++#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:405
+ msgid "Unknown"
+ msgstr "Neznámý"
+ 
+@@ -2794,7 +2814,7 @@ msgstr ""
+ #: ../src/Core/Banshee.ThickClient/Banshee.Collection.Gui/ColumnCellDiscAndCount.cs:40
+ #: ../src/Core/Banshee.ThickClient/Banshee.Collection.Gui/ColumnCellTrackAndCount.cs:40
+ #: ../src/Core/Banshee.Widgets/Banshee.Widgets/StreamPositionLabel.cs:174
+-#: ../src/Dap/Banshee.Dap/Banshee.Dap.Gui/DapPropertiesDialog.cs:148
++#: ../src/Dap/Banshee.Dap/Banshee.Dap.Gui/DapPropertiesDialog.cs:149
+ #, csharp-format
+ msgid "{0} of {1}"
+ msgstr "{0} z {1}"
+@@ -3600,19 +3620,19 @@ msgstr "Nastavit čísla a počítadla všech disků na tuto hodnotu"
+ msgid "_Disc Number:"
+ msgstr "Číslo _disku:"
+ 
+-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/BasicTrackDetailsPage.cs:188
++#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/BasicTrackDetailsPage.cs:196
+ msgid "Set all years to this value"
+ msgstr "Nastavit všechny roky na tuto hodnotu"
+ 
+-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/BasicTrackDetailsPage.cs:189
++#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/BasicTrackDetailsPage.cs:197
+ msgid "_Year:"
+ msgstr "_Rok:"
+ 
+-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/BasicTrackDetailsPage.cs:196
++#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/BasicTrackDetailsPage.cs:204
+ msgid "Set all ratings to this value"
+ msgstr "Nastavit všechna hodnocení na tuto hodnotu"
+ 
+-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/BasicTrackDetailsPage.cs:197
++#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/BasicTrackDetailsPage.cs:205
+ msgid "_Rating:"
+ msgstr "_Hodnocení:"
+ 
+@@ -4282,29 +4302,29 @@ msgstr "Podporuje přebaly alb"
+ msgid "Supports photos"
+ msgstr "Podporuje fotografie"
+ 
+-#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:465
++#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:466
+ msgid "Track duration is zero"
+ msgstr "Délka stopy je nulová"
+ 
+-#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:571
++#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:570
+ msgid "Syncing iPod"
+ msgstr "Synchronizace s iPodem"
+ 
+-#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:572
++#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:571
+ msgid "Preparing to synchronize..."
+ msgstr "Připravuje se synchronizace…"
+ 
+-#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:575
++#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:593
+ #, csharp-format
+ msgid "Adding track {0} of {1}"
+ msgstr "Přidává se stopa {0} z {1}"
+ 
+-#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:611
++#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:636
+ #, csharp-format
+ msgid "Removing track {0} of {1}"
+ msgstr "Odstraňuje se stopa {0} z {1}"
+ 
+-#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:664
++#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:710
+ msgid "Writing media database"
+ msgstr "Zapisuje se databáze médií"
+ 
+@@ -4322,31 +4342,31 @@ msgstr "Zařízení"
+ msgid "Device Properties"
+ msgstr "Vlastnosti zařízení"
+ 
+-#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:203
++#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:201
+ msgid "Product"
+ msgstr "Produkt"
+ 
+-#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:204
++#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:202
+ msgid "Vendor"
+ msgstr "Dodavatel"
+ 
+-#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:287
++#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:292
+ #: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Data/PodcastSource.cs:141
+ #, csharp-format
+ msgid "Loading {0}"
+ msgstr "Probíhá načítání {0}"
+ 
+-#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:381
++#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:386
+ #: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/ColumnCellYesNo.cs:37
+ msgid "Yes"
+ msgstr "Ano"
+ 
+-#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:381
++#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:386
+ #: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/ColumnCellYesNo.cs:38
+ msgid "No"
+ msgstr "Žádný"
+ 
+-#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:402
++#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:407
+ #, csharp-format
+ msgid ""
+ "The {0} format is not supported by the device, and no converter was found to "
+@@ -4355,11 +4375,11 @@ msgstr ""
+ "Formát {0} není zařízením podporován a nebyl nalezen žádný převodník, který "
+ "by jej převedl"
+ 
+-#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:408
++#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:413
+ msgid "File format conversion support is not available"
+ msgstr "Podpora převodu formátu souboru není dostupná"
+ 
+-#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:434
++#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:439
+ msgid "Error converting file"
+ msgstr "Chyba při převádění souboru"
+ 
+@@ -4396,7 +4416,7 @@ msgstr[2] "Synchronizací se z vašeho zařízení odstraní {0} stop."
+ msgid "Are you sure you want to continue?"
+ msgstr "Opravdu chcete pokračovat?"
+ 
+-#: ../src/Dap/Banshee.Dap/Banshee.Dap.Gui/DapActions.cs:118
++#: ../src/Dap/Banshee.Dap/Banshee.Dap.Gui/DapActions.cs:121
+ msgid "Remove tracks"
+ msgstr "Odstranit stopy"
+ 
+@@ -4471,12 +4491,12 @@ msgstr "Importovat koupenou hudbu"
+ msgid "Disconnect"
+ msgstr "Odpojit"
+ 
+-#: ../src/Dap/Banshee.Dap/Banshee.Dap/RemovableSource.cs:108
++#: ../src/Dap/Banshee.Dap/Banshee.Dap/RemovableSource.cs:111
+ #, csharp-format
+ msgid "Disconnecting {0}..."
+ msgstr "Odpojuje se {0}…"
+ 
+-#: ../src/Dap/Banshee.Dap/Banshee.Dap/RemovableSource.cs:115
++#: ../src/Dap/Banshee.Dap/Banshee.Dap/RemovableSource.cs:118
+ #, csharp-format
+ msgid "Could not disconnect {0}: {1}"
+ msgstr "Nelze odpojit {0}: {1}"
+@@ -4845,11 +4865,11 @@ msgstr "Přihlášení"
+ msgid "Connecting to {0}"
+ msgstr "Připojování k {0}"
+ 
+-#: ../src/Extensions/Banshee.Daap/Banshee.Daap/DaapService.cs:185
++#: ../src/Extensions/Banshee.Daap/Banshee.Daap/DaapService.cs:186
+ msgid "Add Remote DAAP Server"
+ msgstr "Přidat vzdálený server DAAP"
+ 
+-#: ../src/Extensions/Banshee.Daap/Banshee.Daap/DaapService.cs:186
++#: ../src/Extensions/Banshee.Daap/Banshee.Daap/DaapService.cs:187
+ msgid "Add a new remote DAAP server"
+ msgstr "Přidat nový vzdálený server DAAP"
+ 
+diff --git a/po/el.po b/po/el.po
+index 504b4f0..9f8ed4f 100644
+--- a/po/el.po
++++ b/po/el.po
+@@ -4,21 +4,23 @@
+ # Michael Kotsarinis <mk73628@gmail.com>, 2011.
+ # Emmanouel Kapernaros <manolis@kapcom.gr>, 2011.
+ # Ioannis Zampoukas <ioza1964@yahoo.gr>, 2011.
+-#
++# Dimitris Spingos (Δημήτρης Σπίγγος) <dmtrs32@gmail.com>, 2013.
+ msgid ""
+ msgstr ""
+ "Project-Id-Version: Banshee\n"
+-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=banshee&keywords=I18N+L10N&component=general\n"
+-"POT-Creation-Date: 2012-06-03 13:55+0000\n"
+-"PO-Revision-Date: 2012-06-14 01:19+0200\n"
+-"Last-Translator: Tom Tryfonidis <tomtryf@gmail.com>\n"
+-"Language-Team: Greek <team@gnome.gr>\n"
++"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=banshe"
++"e&keywords=I18N+L10N&component=general\n"
++"POT-Creation-Date: 2013-05-28 23:24+0000\n"
++"PO-Revision-Date: 2013-07-28 09:56+0300\n"
++"Last-Translator: Dimitris Spingos (Δημήτρης Σπίγγος) <dmtrs32@gmail.com>\n"
++"Language-Team: team@gnome.gr\n"
++"Language: el\n"
+ "MIME-Version: 1.0\n"
+ "Content-Type: text/plain; charset=UTF-8\n"
+ "Content-Transfer-Encoding: 8bit\n"
+-"Language: el\n"
+-"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+-"X-Generator: Virtaal 0.6.1\n"
++"Plural-Forms: nplurals=2; plural=(n != 1);\n"
++"X-Generator: Virtaal 0.7.1\n"
++"X-Project-Style: gnome\n"
+ 
+ #. ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice.addin.xml
+ #: ../data/addin-xml-strings.cs:8
+@@ -29,10 +31,8 @@ msgstr "Υποστήριξη συσκευών Apple"
+ msgid "Support for most iPod/iPhone/iPad devices."
+ msgstr "Υποστήριξη για τις περισσότερες συσκευές iPod/iPhone/iPad."
+ 
+-#: ../data/addin-xml-strings.cs:10
+-#: ../data/addin-xml-strings.cs:15
+-#: ../data/addin-xml-strings.cs:20
+-#: ../data/addin-xml-strings.cs:25
++#: ../data/addin-xml-strings.cs:10 ../data/addin-xml-strings.cs:15
++#: ../data/addin-xml-strings.cs:20 ../data/addin-xml-strings.cs:25
+ msgid "Device Support"
+ msgstr "Υποστήριξη Συσκευής"
+ 
+@@ -51,8 +51,12 @@ msgid "Mass Storage Media Player Support"
+ msgstr "Υποστήριξη αναπαραγωγέα πολυμέσων μαζικής αποθήκευσης"
+ 
+ #: ../data/addin-xml-strings.cs:19
+-msgid "Support for USB-drive based devices, including many iAudio devices and Android, Pre, and Galaxy phones."
+-msgstr "Υποστήριξη για συσκευές τύπου USB-drive, συμπεριλαμβανομένων πολλών iAudio συσκευών και Android, Pre και Galaxy τηλεφώνων."
++msgid ""
++"Support for USB-drive based devices, including many iAudio devices and "
++"Android, Pre, and Galaxy phones."
++msgstr ""
++"Υποστήριξη για συσκευές τύπου USB-drive, συμπεριλαμβανομένων πολλών iAudio "
++"συσκευών και Android, Pre και Galaxy τηλεφώνων."
+ 
+ #. ../src/Dap/Banshee.Dap.Mtp/Banshee.Dap.Mtp.addin.xml
+ #: ../data/addin-xml-strings.cs:23
+@@ -61,7 +65,9 @@ msgstr "Υποστήριξη αναπαραγωγέα πολυμέσων MTP"
+ 
+ #: ../data/addin-xml-strings.cs:24
+ msgid "Support for MTP devices, including many Creative Zen devices."
+-msgstr "Υποστήριξη για συσκευές MTP, συμπεριλαμβανομένων πολλών συσκευών Creative Zen."
++msgstr ""
++"Υποστήριξη για συσκευές MTP, συμπεριλαμβανομένων πολλών συσκευών Creative "
++"Zen."
+ 
+ #. ../src/Extensions/Banshee.AmazonMp3.Store/Banshee.AmazonMp3.Store.addin.xml
+ #: ../data/addin-xml-strings.cs:28
+@@ -70,16 +76,13 @@ msgstr "Κατάστημα Amazon MP3"
+ 
+ #: ../data/addin-xml-strings.cs:29
+ msgid "Browse, search, and purchase music from the Amazon MP3 store."
+-msgstr "Περιήγηση, αναζήτηση και αγορά μουσικής από το κατάστημα MP3 του Amazon "
+-
+-#: ../data/addin-xml-strings.cs:30
+-#: ../data/addin-xml-strings.cs:35
+-#: ../data/addin-xml-strings.cs:65
+-#: ../data/addin-xml-strings.cs:70
+-#: ../data/addin-xml-strings.cs:85
+-#: ../data/addin-xml-strings.cs:95
+-#: ../data/addin-xml-strings.cs:100
+-#: ../data/addin-xml-strings.cs:115
++msgstr ""
++"Περιήγηση, αναζήτηση και αγορά μουσικής από το κατάστημα MP3 του Amazon."
++
++#: ../data/addin-xml-strings.cs:30 ../data/addin-xml-strings.cs:35
++#: ../data/addin-xml-strings.cs:65 ../data/addin-xml-strings.cs:70
++#: ../data/addin-xml-strings.cs:85 ../data/addin-xml-strings.cs:95
++#: ../data/addin-xml-strings.cs:100 ../data/addin-xml-strings.cs:115
+ #: ../data/addin-xml-strings.cs:165
+ msgid "Online Sources"
+ msgstr "Πηγές στο διαδίκτυο"
+@@ -102,12 +105,9 @@ msgstr "Βιβλιοθήκη ηοχγραφημένων βιβλίων"
+ msgid "Organize audiobooks, lectures, etc."
+ msgstr "Οργανώστε ηχογραφημένα βιβλία, διαλέξεις, κλπ."
+ 
+-#: ../data/addin-xml-strings.cs:40
+-#: ../data/addin-xml-strings.cs:75
+-#: ../data/addin-xml-strings.cs:90
+-#: ../data/addin-xml-strings.cs:135
+-#: ../data/addin-xml-strings.cs:145
+-#: ../data/addin-xml-strings.cs:150
++#: ../data/addin-xml-strings.cs:40 ../data/addin-xml-strings.cs:75
++#: ../data/addin-xml-strings.cs:90 ../data/addin-xml-strings.cs:135
++#: ../data/addin-xml-strings.cs:145 ../data/addin-xml-strings.cs:150
+ msgid "Core"
+ msgstr "Πυρήνας"
+ 
+@@ -120,20 +120,13 @@ msgstr "Σενάρια ενεργειών Boo"
+ msgid "Customize and extend Banshee with Boo-language scripts."
+ msgstr "Προσαρμόστε και επεκτείνετε το Banshee με script σε γλώσσα Boo."
+ 
+-#: ../data/addin-xml-strings.cs:45
+-#: ../data/addin-xml-strings.cs:50
+-#: ../data/addin-xml-strings.cs:55
+-#: ../data/addin-xml-strings.cs:60
+-#: ../data/addin-xml-strings.cs:80
+-#: ../data/addin-xml-strings.cs:105
+-#: ../data/addin-xml-strings.cs:110
+-#: ../data/addin-xml-strings.cs:120
+-#: ../data/addin-xml-strings.cs:125
+-#: ../data/addin-xml-strings.cs:130
+-#: ../data/addin-xml-strings.cs:140
+-#: ../data/addin-xml-strings.cs:155
+-#: ../data/addin-xml-strings.cs:160
+-#: ../data/addin-xml-strings.cs:170
++#: ../data/addin-xml-strings.cs:45 ../data/addin-xml-strings.cs:50
++#: ../data/addin-xml-strings.cs:55 ../data/addin-xml-strings.cs:60
++#: ../data/addin-xml-strings.cs:80 ../data/addin-xml-strings.cs:105
++#: ../data/addin-xml-strings.cs:110 ../data/addin-xml-strings.cs:120
++#: ../data/addin-xml-strings.cs:125 ../data/addin-xml-strings.cs:130
++#: ../data/addin-xml-strings.cs:140 ../data/addin-xml-strings.cs:155
++#: ../data/addin-xml-strings.cs:160 ../data/addin-xml-strings.cs:170
+ msgid "Utilities"
+ msgstr "Εφαρμογές"
+ 
+@@ -162,7 +155,8 @@ msgstr "Διαμοιρασμός DAAP"
+ 
+ #: ../data/addin-xml-strings.cs:59
+ msgid "Browse and listen to music shared over your local network."
+-msgstr "Περιηγηθείτε και ακούστε μουσική που διαμοιράζεται στο τοπικό σας δίκτυο."
++msgstr ""
++"Περιηγηθείτε και ακούστε μουσική που διαμοιράζεται στο τοπικό σας δίκτυο."
+ 
+ #. ../src/Extensions/Banshee.Emusic.Store/Banshee.Emusic.Store.addin.xml
+ #: ../data/addin-xml-strings.cs:63
+@@ -171,7 +165,7 @@ msgstr "Κατάστημα eMusic"
+ 
+ #: ../data/addin-xml-strings.cs:64
+ msgid "Browse, search, and purchase music and audiobooks from eMusic"
+-msgstr "Περιήγηση, αναζήτηση και αγορά μουσικής από το κατάστημα του eMusic "
++msgstr "Περιήγηση, αναζήτηση και αγορά μουσικής από το κατάστημα του eMusic"
+ 
+ #. ../src/Extensions/Banshee.Emusic/Banshee.Emusic.addin.xml
+ #: ../data/addin-xml-strings.cs:68
+@@ -198,7 +192,9 @@ msgstr "Επιδιόρθωση μεταδεδομένων"
+ 
+ #: ../data/addin-xml-strings.cs:79
+ msgid "Fix broken and missing metadata using bulk operations."
+-msgstr "Επιδιόρθωση κατεστραμμένων και ελλιπών μεταδεδομένων με χρήση μαζικών διαδικασιών."
++msgstr ""
++"Επιδιόρθωση κατεστραμμένων και ελλιπών μεταδεδομένων με χρήση μαζικών "
++"διαδικασιών."
+ 
+ #. ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive.addin.xml
+ #: ../data/addin-xml-strings.cs:83
+@@ -208,7 +204,9 @@ msgstr "Internet Archive"
+ 
+ #: ../data/addin-xml-strings.cs:84
+ msgid "Browse and search the Internet Archive's vast media collection."
+-msgstr "Περιήγηση και αναζήτηση της απέραντης συλλογής πολυμέσων του Internet Archive"
++msgstr ""
++"Περιήγηση και αναζήτηση της απέραντης συλλογής πολυμέσων της αρχειοθήκης "
++"διαδικτύου."
+ 
+ #. ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio.addin.xml
+ #: ../data/addin-xml-strings.cs:88
+@@ -226,7 +224,7 @@ msgstr "Υπηρεσία σύλληψης του Last.fm"
+ 
+ #: ../data/addin-xml-strings.cs:94
+ msgid "Last.fm scrobbling and context pane recommendations."
+-msgstr "Αυτόματη σύλληψη τραγουδιών του Last.fm (scrobbling) και προτάσεις στο πλαίσιο περιεχομένου."
++msgstr "Προτιμήσεις από Last.fm και προτάσεις στο παράθυρο περιεχομένου."
+ 
+ #. ../src/Extensions/Banshee.LastfmStreaming/Banshee.LastfmStreaming.addin.xml
+ #: ../data/addin-xml-strings.cs:98
+@@ -252,8 +250,12 @@ msgid "Mini Mode"
+ msgstr "Μικροσκοπική κατάσταση λειτουργίας"
+ 
+ #: ../data/addin-xml-strings.cs:109
+-msgid "Control Banshee through a small window with only playback controls and track information."
+-msgstr "Έλεγχος του Banshee μέσω ενός μικρού παραθύρου μόνο με κουμπιά αναπαραγωγής και πληροφορίες κομματιών."
++msgid ""
++"Control Banshee through a small window with only playback controls and track "
++"information."
++msgstr ""
++"Έλεγχος του Banshee μέσω ενός μικρού παραθύρου μόνο με κουμπιά αναπαραγωγής "
++"και πληροφορίες κομματιών."
+ 
+ #. ../src/Extensions/Banshee.MiroGuide/Banshee.MiroGuide.addin.xml
+ #: ../data/addin-xml-strings.cs:113
+@@ -262,7 +264,9 @@ msgstr "Miro Guide Podcast Directory"
+ 
+ #: ../data/addin-xml-strings.cs:114
+ msgid "Browse and subscribe to thousands of audio and video podcasts."
+-msgstr "Περιηγηθείτε και γίνεται συνδρομητές σε χιλιάδες φορητές εκπομπές ήχου και βίντεο."
++msgstr ""
++"Περιηγηθείτε και γίνεται συνδρομητές σε χιλιάδες φορητές εκπομπές ήχου και "
++"βίντεο."
+ 
+ #. ../src/Extensions/Banshee.Mpris/Banshee.Mpris.addin.xml
+ #: ../data/addin-xml-strings.cs:118
+@@ -289,7 +293,9 @@ msgstr "Εικονίδιο περιοχής ειδοποιήσεων"
+ 
+ #: ../data/addin-xml-strings.cs:129
+ msgid "Display an icon in the notification area for controlling Banshee."
+-msgstr "Εμφάνιση ενός εικονιδίου στην περιοχή ειδοποιήσεων για τον έλεγχο του Banshee."
++msgstr ""
++"Εμφάνιση ενός εικονιδίου στην περιοχή ειδοποιήσεων για τον έλεγχο του "
++"Banshee."
+ 
+ #. ../src/Extensions/Banshee.OpticalDisc/Banshee.OpticalDisc.addin.xml
+ #: ../data/addin-xml-strings.cs:133
+@@ -318,7 +324,9 @@ msgstr "Σειρά αναπαραγωγής"
+ 
+ #: ../data/addin-xml-strings.cs:144
+ msgid "Queue tracks in an ad-hoc playlist, or let the Auto DJ take over."
+-msgstr "Βάλτε σε σειρά τα κομμάτια σε μια λίστα αναπαραγωγής της στιγμής ή αφήστε τον Αυτόματο DJ να αναλάβει."
++msgstr ""
++"Βάλτε σε σειρά τα κομμάτια σε μια λίστα αναπαραγωγής της στιγμής ή αφήστε "
++"τον Αυτόματο DJ να αναλάβει."
+ 
+ #. ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.addin.xml
+ #: ../data/addin-xml-strings.cs:148
+@@ -331,7 +339,9 @@ msgstr "Φορητές εκπομπές (Podcasts)"
+ 
+ #: ../data/addin-xml-strings.cs:149
+ msgid "Subscribe to podcasts and stream or download episodes."
+-msgstr "Εγγραφείτε σε φορητές εκπομπές και μεταφορτώστε ή παρακολουθήστε σε ροή τα επεισόδια."
++msgstr ""
++"Εγγραφείτε σε φορητές εκπομπές και μεταφορτώστε ή παρακολουθήστε σε ροή τα "
++"επεισόδια."
+ 
+ #. ../src/Extensions/Banshee.SoundMenu/Banshee.SoundMenu.addin.xml
+ #: ../data/addin-xml-strings.cs:153
+@@ -349,7 +359,7 @@ msgstr "Πρόγραμμα μεταφόρτωσης torrent"
+ 
+ #: ../data/addin-xml-strings.cs:159
+ msgid "Support downloading BitTorrent files from podcasts."
+-msgstr "Υποστήριξη μεταφόρτωσης αρχείων φορητών εκπομπών  με BitTorrent."
++msgstr "Υποστήριξη μεταφόρτωσης αρχείων φορητών εκπομπών με BitTorrent."
+ 
+ #. ../src/Extensions/Banshee.UbuntuOneMusicStore/Banshee.UbuntuOneMusicStore.addin.xml
+ #: ../data/addin-xml-strings.cs:163
+@@ -360,8 +370,12 @@ msgid "Ubuntu One Music Store"
+ msgstr "Κατάστημα μουσικής Ubuntu One"
+ 
+ #: ../data/addin-xml-strings.cs:164
+-msgid "This extension grants access to the Ubuntu One Music Store, powered by 7digital."
+-msgstr "Αυτή η επέκταση δίνει πρόσβαση στο κατάστημα μουσικής Ubuntu One, που υποστηρίζεται από την 7digital."
++msgid ""
++"This extension grants access to the Ubuntu One Music Store, powered by "
++"7digital."
++msgstr ""
++"Αυτή η επέκταση δίνει πρόσβαση στο κατάστημα μουσικής Ubuntu One, που "
++"υποστηρίζεται από την 7digital."
+ 
+ #. ../src/Extensions/Banshee.UPnPClient/Banshee.UPnPClient.addin.xml
+ #: ../data/addin-xml-strings.cs:168
+@@ -369,9 +383,11 @@ msgid "UPnP Client"
+ msgstr "Πελάτης UPnP"
+ 
+ #: ../data/addin-xml-strings.cs:169
+-#| msgid "Browse and listen to music shared over your local network."
+-msgid "Browse and play music and videos shared over your local network using UPnP."
+-msgstr "Περιηγηθείτε και ακούστε μουσική που διαμοιράζεται στο τοπικό σας χρησιμοποιώντας το UPnP."
++msgid ""
++"Browse and play music and videos shared over your local network using UPnP."
++msgstr ""
++"Περιηγηθείτε και ακούστε μουσική που διαμοιράζεται στο τοπικό σας "
++"χρησιμοποιώντας το UPnP."
+ 
+ #. ../src/Extensions/Banshee.Wikipedia/Banshee.Wikipedia.addin.xml
+ #: ../data/addin-xml-strings.cs:173
+@@ -381,10 +397,10 @@ msgstr "Wikipedia"
+ 
+ #: ../data/addin-xml-strings.cs:174
+ msgid "View artist information from Wikipedia in the context pane."
+-msgstr "Προβολή πληροφοριών καλλιτέχνη από τη Wikipedia στο πλαίσιο περιεχομένου."
++msgstr ""
++"Προβολή πληροφοριών καλλιτέχνη από τη Wikipedia στο πλαίσιο περιεχομένου."
+ 
+-#: ../data/addin-xml-strings.cs:175
+-#: ../data/addin-xml-strings.cs:180
++#: ../data/addin-xml-strings.cs:175 ../data/addin-xml-strings.cs:180
+ msgid "Context Pane"
+ msgstr "Πλαίσιο περιεχομένου"
+ 
+@@ -403,8 +419,12 @@ msgid "AAC (Novell Encoder)"
+ msgstr "AAC (Κωδικοποιητής της Novell)"
+ 
+ #: ../data/audio-profiles/aac-novell.xml.in.h:2
+-msgid "Designed to be the successor of the MP3 format, AAC generally achieves better sound quality than MP3 at many bit rates."
+-msgstr "Σχεδιασμένο ως ο αντικαταστάτης του MP3, το AAC γενικά επιτυγχάνει καλύτερη ποιότητα ήχου σε σχέση με το MP3 σε διάφορους ρυθμούς διαμεταγωγής (bitrate)."
++msgid ""
++"Designed to be the successor of the MP3 format, AAC generally achieves "
++"better sound quality than MP3 at many bit rates."
++msgstr ""
++"Σχεδιασμένο ως ο αντικαταστάτης του MP3, το AAC γενικά επιτυγχάνει καλύτερη "
++"ποιότητα ήχου σε σχέση με το MP3 σε διάφορους ρυθμούς διαμεταγωγής."
+ 
+ #: ../data/audio-profiles/aac-novell.xml.in.h:3
+ #: ../data/audio-profiles/mp3-lame.xml.in.h:9
+@@ -412,7 +432,7 @@ msgstr "Σχεδιασμένο ως ο αντικαταστάτης του MP3,
+ #: ../data/audio-profiles/wavpack.xml.in.h:13
+ #: ../data/audio-profiles/wma.xml.in.h:4
+ msgid "Bitrate"
+-msgstr "Ρυθμός διαμεταγωγής (bitrate)"
++msgstr "Ρυθμός διαμεταγωγής"
+ 
+ #: ../data/audio-profiles/aac-novell.xml.in.h:4
+ msgid "Container"
+@@ -452,11 +472,16 @@ msgstr "Κανάλια"
+ 
+ #: ../data/audio-profiles/flac.xml.in.h:1
+ msgid "Free Lossless Audio Codec"
+-msgstr "Ελεύθερος Μη Απωλεστικός Κωδικοποιητής Ήχου (FLAC)"
++msgstr "Ελεύθερος μη απωλεστικός κωδικοποιητής ήχου (FLAC)"
+ 
+ #: ../data/audio-profiles/flac.xml.in.h:2
+-msgid "Free Lossless Audio Codec (FLAC) is an open source codec that compresses but does not degrade audio quality."
+-msgstr "Ο ελεύθερος μη απωλεστικός κωδικοποιητής ήχου (FLAC) είναι ένας κωδικοποιητής ανοιχτού κώδικα που συμπιέζει αλλά δεν υποβαθμίζει την ποιότητα του ήχου."
++msgid ""
++"Free Lossless Audio Codec (FLAC) is an open source codec that compresses but "
++"does not degrade audio quality."
++msgstr ""
++"Ο ελεύθερος μη απωλεστικός κωδικοποιητής ήχου (FLAC) είναι ένας "
++"κωδικοποιητής ανοιχτού κώδικα που συμπιέζει αλλά δεν υποβαθμίζει την "
++"ποιότητα του ήχου."
+ 
+ #: ../data/audio-profiles/mp3-lame.xml.in.h:1
+ msgid "MP3 (LAME Encoder)"
+@@ -464,8 +489,12 @@ msgstr "MP3 (Κωδικοποιητής LAME)"
+ 
+ #: ../data/audio-profiles/mp3-lame.xml.in.h:2
+ #: ../data/audio-profiles/mp3-xing.xml.in.h:2
+-msgid "A proprietary and older, but also popular, lossy audio format that produces larger files at lower bitrates."
+-msgstr "Μια ιδιοταγής και παλιότερο, αλλά επίσης διάσημη, απωλεστική μορφή συμπίεσης ήχου που παράγει μεγαλύτερα αρχεία σε χαμηλότερους ρυθμούς διαμεταγωγής."
++msgid ""
++"A proprietary and older, but also popular, lossy audio format that produces "
++"larger files at lower bitrates."
++msgstr ""
++"Μια ιδιοταγής και παλιότερο, αλλά επίσης διάσημη, απωλεστική μορφή συμπίεσης "
++"ήχου που παράγει μεγαλύτερα αρχεία σε χαμηλότερους ρυθμούς διαμεταγωγής."
+ 
+ #: ../data/audio-profiles/mp3-lame.xml.in.h:3
+ msgid "Encoding Mode"
+@@ -473,11 +502,11 @@ msgstr "Κατάσταση κωδικοποίησης"
+ 
+ #: ../data/audio-profiles/mp3-lame.xml.in.h:4
+ msgid "Constant Bitrate"
+-msgstr "Σταθερός ρυθμός διαμεταγωγής (bitrate)"
++msgstr "Σταθερός ρυθμός διαμεταγωγής"
+ 
+ #: ../data/audio-profiles/mp3-lame.xml.in.h:5
+ msgid "Variable Bitrate"
+-msgstr "Μεταβλητός ρυθμός διαμεταγωγής (bitrate)"
++msgstr "Μεταβλητός ρυθμός διαμεταγωγής"
+ 
+ #: ../data/audio-profiles/mp3-lame.xml.in.h:6
+ msgid "VBR Quality"
+@@ -506,8 +535,12 @@ msgid "Ogg Vorbis"
+ msgstr "Ogg Vorbis"
+ 
+ #: ../data/audio-profiles/vorbis.xml.in.h:2
+-msgid "Vorbis is an open source, lossy audio codec with high quality output at a lower file size than MP3."
+-msgstr "Το Vorbis είναι ένας απωλεστικός κωδικοποιητής ήχου, ανοιχτού κώδικα, με υψηλής ποιότητας έξοδο σε μικρότερο μέγεθος αρχείου από το MP3."
++msgid ""
++"Vorbis is an open source, lossy audio codec with high quality output at a "
++"lower file size than MP3."
++msgstr ""
++"Το Vorbis είναι ένας απωλεστικός κωδικοποιητής ήχου, ανοιχτού κώδικα, με "
++"υψηλής ποιότητας έξοδο σε μικρότερο μέγεθος αρχείου από το MP3."
+ 
+ #: ../data/audio-profiles/vorbis.xml.in.h:3
+ msgid "Audio quality"
+@@ -518,8 +551,13 @@ msgid "Wavpack"
+ msgstr "Wavpack"
+ 
+ #: ../data/audio-profiles/wavpack.xml.in.h:2
+-msgid "A fast and efficient open source audio format offering lossless and high-quality lossy encoding with great dynamic range."
+-msgstr "Μία γρήγορη και αποδοτική μορφή αρχείου, ανοιχτού κώδικα, που προσφέρει μη απωλεστική και υψηλής ποιότητας απωλεστική κωδικοποίηση με μεγάλο δυναμικό εύρος."
++msgid ""
++"A fast and efficient open source audio format offering lossless and high-"
++"quality lossy encoding with great dynamic range."
++msgstr ""
++"Μία γρήγορη και αποδοτική μορφή αρχείου, ανοιχτού κώδικα, που προσφέρει μη "
++"απωλεστική και υψηλής ποιότητας απωλεστική κωδικοποίηση με μεγάλο δυναμικό "
++"εύρος."
+ 
+ #: ../data/audio-profiles/wavpack.xml.in.h:3
+ msgid "Mode"
+@@ -566,27 +604,36 @@ msgid "Waveform PCM"
+ msgstr "Κυματομορφή PCM"
+ 
+ #: ../data/audio-profiles/wav.xml.in.h:2
+-msgid "WAV+PCM is a lossless format that holds uncompressed, raw pulse-code modulated (PCM) audio."
+-msgstr "Το WAV+PCM είναι μία μη απωλεστική μορφή που διατηρεί μη συμπιεσμένο, ακατέργαστο ήχο, παλμοκωδικής διαμόρφωσης (PCM)."
++msgid ""
++"WAV+PCM is a lossless format that holds uncompressed, raw pulse-code "
++"modulated (PCM) audio."
++msgstr ""
++"Το WAV+PCM είναι μία μη απωλεστική μορφή που διατηρεί μη συμπιεσμένο, "
++"ακατέργαστο ήχο, παλμοκωδικής διαμόρφωσης (PCM)."
+ 
+ #: ../data/audio-profiles/wma.xml.in.h:1
+ msgid "Windows Media Audio"
+ msgstr "Windows Media Audio"
+ 
+ #: ../data/audio-profiles/wma.xml.in.h:2
+-msgid "A proprietary lossy audio format with high quality output at a lower file size than MP3. A 96 kbps WMA is equivalent to a 128 kbps MP3."
+-msgstr "Μία ιδιοταγής απωλεστική μορφή ήχου με υψηλής ποιότητας έξοδο σε μικρότερο μέγεθος από MP3. Ένα αρχείο στα 96 kbps με WMA είναι ισοδύναμο με ένα στα 128 kbps με MP3."
++msgid ""
++"A proprietary lossy audio format with high quality output at a lower file "
++"size than MP3. A 96 kbps WMA is equivalent to a 128 kbps MP3."
++msgstr ""
++"Μία ιδιοταγής απωλεστική μορφή ήχου με υψηλής ποιότητας έξοδο σε μικρότερο "
++"μέγεθος από MP3. Ένα αρχείο στα 96 kbps με WMA είναι ισοδύναμο με ένα στα "
++"128 kbps με MP3."
+ 
+ #: ../data/audio-profiles/wma.xml.in.h:3
+ msgid "Use a variable bitrate"
+-msgstr "Χρήση μεταβλητού ρυθμού διαμεταγωγής (bitrate)"
++msgstr "Χρήση μεταβλητού ρυθμού διαμεταγωγής"
+ 
+ #: ../data/audio-profiles/wma.xml.in.h:5
+ msgid "Audio Quality"
+ msgstr "Ποιότητα ήχου"
+ 
+ #: ../data/desktop-files/common.desktop.in.h:1
+-#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:196
++#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:194
+ msgid "Media Player"
+ msgstr "Αναπαραγωγέας πολυμέσων"
+ 
+@@ -602,8 +649,7 @@ msgstr "Αναπαραγωγή πολυμέσων Banshee"
+ msgid "Play and organize your media collection"
+ msgstr "Αναπαραγωγή και οργάνωση της συλλογής σας πολυμέσων"
+ 
+-#: ../libbanshee/banshee-bpmdetector.c:202
+-#: ../libbanshee/banshee-ripper.c:270
++#: ../libbanshee/banshee-bpmdetector.c:202 ../libbanshee/banshee-ripper.c:270
+ #: ../src/Backends/Banshee.GStreamerSharp/Banshee.GStreamerSharp/AudioCdRipper.cs:240
+ msgid "Could not create pipeline"
+ msgstr "Δεν μπορεί να δημιουργηθεί διοχέτευση"
+@@ -633,8 +679,7 @@ msgid "Could not create fakesink plugin"
+ msgstr "Δεν μπορεί να δημιουργηθεί πρόσθετο fakesink"
+ 
+ #: ../libbanshee/banshee-bpmdetector.c:241
+-#: ../libbanshee/banshee-bpmdetector.c:250
+-#: ../libbanshee/banshee-ripper.c:311
++#: ../libbanshee/banshee-bpmdetector.c:250 ../libbanshee/banshee-ripper.c:311
+ #: ../src/Backends/Banshee.GStreamerSharp/Banshee.GStreamerSharp/AudioCdRipper.cs:281
+ msgid "Could not link pipeline elements"
+ msgstr "Δεν μπορούν να συνδεθούν στοιχεία διοχέτευσης"
+@@ -694,15 +739,15 @@ msgstr "Αδύνατη η κατασκευή διοχέτευσης"
+ 
+ #: ../src/Backends/Banshee.Gnome/Banshee.GnomeBackend/Brasero.cs:65
+ msgid "Write CD..."
+-msgstr "Εγγραφή CD…"
++msgstr "Εγγραφή CD..."
+ 
+ #: ../src/Backends/Banshee.Gnome/Banshee.GnomeBackend/Brasero.cs:66
+ msgid "Write selected tracks to an audio CD"
+-msgstr "Εγγραφή επιλεγμένων κομματιών σε ένα ψηφιακό δίσκο (CD) ήχου"
++msgstr "Εγγραφή επιλεγμένων κομματιών σε CD ήχου"
+ 
+ #: ../src/Backends/Banshee.Gnome/Banshee.GnomeBackend/Brasero.cs:105
+ msgid "Could not write CD"
+-msgstr "Αδύνατη η εγγραφή ψηφιακού δίσκου (CD)"
++msgstr "Αδύνατη η εγγραφή CD"
+ 
+ #: ../src/Backends/Banshee.Gnome/Banshee.GnomeBackend/Brasero.cs:106
+ msgid "Brasero could not be started"
+@@ -731,28 +776,36 @@ msgstr "Αδυναμία δημιουργίας οδηγού ανίχνευση
+ msgid "Could not initialize GStreamer library"
+ msgstr "Η αρχικοποίηση της βιβλιοθήκης GStreamer δεν μπορεί να γίνει"
+ 
+-#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:503
+-#: ../src/Backends/Banshee.GStreamerSharp/Banshee.GStreamerSharp/PlayerEngine.cs:553
++#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:504
++#: ../src/Backends/Banshee.GStreamerSharp/Banshee.GStreamerSharp/PlayerEngine.cs:555
+ msgid "Unknown Error"
+ msgstr "Άγνωστο σφάλμα"
+ 
+-#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:879
+-#: ../src/Backends/Banshee.GStreamerSharp/Banshee.GStreamerSharp/PlayerEngine.cs:978
++#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:880
++#: ../src/Backends/Banshee.GStreamerSharp/Banshee.GStreamerSharp/PlayerEngine.cs:980
+ msgid "_Enable ReplayGain correction"
+ msgstr "_Ενεργοποίηση διόρθωσης του ReplayGain"
+ 
+-#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:880
+-#: ../src/Backends/Banshee.GStreamerSharp/Banshee.GStreamerSharp/PlayerEngine.cs:979
+-msgid "For tracks that have ReplayGain data, automatically scale (normalize) playback volume"
+-msgstr "Για κομμάτια που έχουν δεδομένα κανονικοποίησης αναπαραγωγής (ReplayGain), αυτόματη προσαρμογή (κανονικοποίηση) της έντασης της αναπαραγωγής"
++#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:881
++#: ../src/Backends/Banshee.GStreamerSharp/Banshee.GStreamerSharp/PlayerEngine.cs:981
++msgid ""
++"For tracks that have ReplayGain data, automatically scale (normalize) "
++"playback volume"
++msgstr ""
++"Για κομμάτια που έχουν δεδομένα κέρδους αναπαραγωγής, αυτόματη κλιμάκωση "
++"(κανονικοποίηση) της έντασης της αναπαραγωγής"
+ 
+-#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:885
++#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:886
+ msgid "Enable _gapless playback"
+ msgstr "Ενεργοποίηση αναπαραγωγής δίχως _κενά"
+ 
+-#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:886
+-msgid "Eliminate the small playback gap on track change. Useful for concept albums and classical music"
+-msgstr "Εξάλειψη της μικρής διακοπής αναπαραγωγής κατά την αλλαγή κομματιού. Χρήσιμο για ειδικά λευκώματα και για κλασσική μουσική"
++#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:887
++msgid ""
++"Eliminate the small playback gap on track change. Useful for concept albums "
++"and classical music"
++msgstr ""
++"Εξάλειψη της μικρής διακοπής αναπαραγωγής κατά την αλλαγή κομματιού. Χρήσιμο "
++"για ειδικά λευκώματα και για κλασσική μουσική"
+ 
+ #: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/Transcoder.cs:63
+ msgid "Could not create transcoder"
+@@ -763,7 +816,7 @@ msgstr "Δεν είναι δυνατή η δημιουργία του διακω
+ msgid "Could not create encoder pipeline : {0}"
+ msgstr "Δεν μπορεί να δημιουργηθεί διοχέτευση κωδικοποιητή: {0}"
+ 
+-#: ../src/Backends/Banshee.GStreamerSharp/Banshee.GStreamerSharp/PlayerEngine.cs:800
++#: ../src/Backends/Banshee.GStreamerSharp/Banshee.GStreamerSharp/PlayerEngine.cs:802
+ msgid "GStreamer# 0.10"
+ msgstr "GStreamer# 0.10"
+ 
+@@ -772,27 +825,23 @@ msgstr "GStreamer# 0.10"
+ msgid "Could not create encoding pipeline : {0}"
+ msgstr "Δεν είναι δυνατή η δημιουργία κωδικοποίησης διοχέτευσης: {0}"
+ 
+-#: ../src/Backends/Banshee.Osx/Banshee.OsxBackend/OsxService.cs:91
+-#: ../src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/NotificationAreaService.cs:132
+-#: ../src/Extensions/Banshee.SoundMenu/Banshee.SoundMenu/SoundMenuService.cs:110
+-msgid "_Close"
+-msgstr "_Κλείσιμο"
+-
+-#: ../src/Backends/Banshee.Osx/Banshee.OsxBackend/OsxService.cs:92
+-#: ../src/Clients/Nereid/Nereid/PlayerInterface.cs:251
+-#: ../src/Extensions/Banshee.Fixup/Banshee.Fixup/FixSource.cs:79
+-#: ../src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/NotificationAreaService.cs:133
+-#: ../src/Extensions/Banshee.SoundMenu/Banshee.SoundMenu/SoundMenuService.cs:111
+-msgid "Close"
+-msgstr "Κλείσιμο"
++#. Translators: verb
++#: ../src/Backends/Banshee.Osx/Banshee.OsxBackend/OsxFileChooserDialog.cs:66
++#| msgid "_Import"
++msgid "Import"
++msgstr "Εισαγωγή"
+ 
+ #: ../src/Backends/Banshee.Windows/Banshee.Windows/VersionUpdater.cs:72
+ msgid "Can't check for updates"
+ msgstr "Αδυναμία ελέγχου ενημερώσεων"
+ 
+ #: ../src/Backends/Banshee.Windows/Banshee.Windows/VersionUpdater.cs:73
+-msgid "We're currently not able to check if there's a new version available. Please try again later."
+-msgstr "Αυτήν τη στιγμή δεν είμαστε  σε θέση να ελέγξουμε αν υπάρχει μια νέα έκδοση διαθέσιμη. Παρακαλώ δοκιμάστε αργότερα."
++msgid ""
++"We're currently not able to check if there's a new version available. Please "
++"try again later."
++msgstr ""
++"Αυτήν τη στιγμή δεν είμαστε σε θέση να ελέγξουμε αν υπάρχει μια νέα έκδοση "
++"διαθέσιμη. Παρακαλώ δοκιμάστε αργότερα."
+ 
+ #: ../src/Backends/Banshee.Windows/Banshee.Windows/VersionUpdater.cs:95
+ msgid "No update available"
+@@ -800,12 +849,14 @@ msgstr "Δεν υπάρχει διαθέσιμη ενημέρωση"
+ 
+ #: ../src/Backends/Banshee.Windows/Banshee.Windows/VersionUpdater.cs:95
+ msgid "You already have the latest version of Banshee installed."
+-msgstr "Έχετε ήδη την τελευταία έκδοση του Banshee εγκατεστημένη"
++msgstr "Έχετε ήδη την τελευταία έκδοση του Banshee εγκατεστημένη."
+ 
+ #: ../src/Backends/Banshee.Windows/Banshee.Windows/VersionUpdater.cs:106
+ #, csharp-format
+ msgid "A new version of Banshee ({0}) is available.{1}Do you want to update?"
+-msgstr "Μια νέα έκδοση του Banshee ({0}) είναι διαθέσιμη.{1}Θέλετε να την ενημερώσετε;"
++msgstr ""
++"Μια νέα έκδοση του Banshee ({0}) είναι διαθέσιμη.{1}Θέλετε να την "
++"ενημερώσετε;"
+ 
+ #: ../src/Backends/Banshee.Windows/Banshee.Windows/VersionUpdater.cs:108
+ msgid "Banshee update available"
+@@ -819,7 +870,6 @@ msgstr "Μεταφόρτωση {0}"
+ 
+ #: ../src/Backends/Banshee.Windows/Banshee.Windows/VersionUpdater.cs:144
+ #, csharp-format
+-#| msgid "{0} by {1} on {2}"
+ msgid "{0} MB / {1} MB ({2} KB/s)"
+ msgstr "{0} MB / {1} MB ({2} KB/s)"
+ 
+@@ -829,12 +879,16 @@ msgstr "Απέτυχε η μεταφόρτωση της ενημέρωσης"
+ 
+ #: ../src/Backends/Banshee.Windows/Banshee.Windows/VersionUpdater.cs:152
+ msgid "The download failed. Please try again later."
+-msgstr "Η μεταφόρτωση απέτυχε Παρακαλώ προσπαθήστε ξανά αργότερα."
++msgstr "Η μεταφόρτωση απέτυχε. Παρακαλώ προσπαθήστε ξανά αργότερα."
+ 
+ #: ../src/Backends/Banshee.Windows/Banshee.Windows/VersionUpdater.cs:165
+ #, csharp-format
+-msgid "The update finished downloading.{0}Do you want to shutdown Banshee and run the installer?"
+-msgstr "Η λήψη της ενημέρωσης ολοκληρώθηκε.{0}Θέλετε να κλείσετε το Banshee και να εκτελέσετε το πρόγραμμα εγκατάστασης;"
++msgid ""
++"The update finished downloading.{0}Do you want to shutdown Banshee and run "
++"the installer?"
++msgstr ""
++"Η λήψη της ενημέρωσης ολοκληρώθηκε.{0}Θέλετε να κλείσετε το Banshee και να "
++"εκτελέσετε το πρόγραμμα εγκατάστασης;"
+ 
+ #: ../src/Backends/Banshee.Windows/Banshee.Windows/VersionUpdater.cs:167
+ msgid "Update finished downloading"
+@@ -885,24 +939,35 @@ msgid "Playback Control Options"
+ msgstr "Επιλογές ελέγχου αναπαραγωγής"
+ 
+ #: ../src/Clients/Booter/Booter/Entry.cs:164
+-msgid "Play the next track, optionally restarting if the 'restart' value is set"
+-msgstr "Αναπαραγωγή του επόμενου κομματιού, προαιρετικά επανεκκίνηση αν η τιμή 'restart' έχει ορισθεί"
++msgid ""
++"Play the next track, optionally restarting if the 'restart' value is set"
++msgstr ""
++"Αναπαραγωγή του επόμενου κομματιού, προαιρετικά επανεκκίνηση αν η τιμή "
++"'restart' έχει ορισθεί"
+ 
+ #: ../src/Clients/Booter/Booter/Entry.cs:165
+-#, fuzzy
+ #| msgid ""
+ #| "Play the previous track, optionally restarting if the 'restart value is "
+ #| "set"
+-msgid "Play the previous track, optionally restarting if the 'restart' value is set"
+-msgstr "Αναπαραγωγή του προηγούμενου κομματιού, προαιρετικά επανεκκίνηση αν η τιμή 'restart' έχει ορισθεί"
++msgid ""
++"Play the previous track, optionally restarting if the 'restart' value is set"
++msgstr ""
++"Αναπαραγωγή του προηγούμενου κομματιού, προαιρετικά επανεκκίνηση αν η τιμή "
++"'restart' έχει ορισθεί"
+ 
+ #: ../src/Clients/Booter/Booter/Entry.cs:166
+-msgid "If the current song has been played longer than 4 seconds then restart it, otherwise the same as --previous"
+-msgstr "Αν το τρέχον τραγούδι έχει αναπαραχθεί για περισσότερα από 4 δευτερόλεπτα μετά επανέναρξη, αλλιώς είναι ίδιο με --previous"
++msgid ""
++"If the current song has been played longer than 4 seconds then restart it, "
++"otherwise the same as --previous"
++msgstr ""
++"Αν το τρέχον τραγούδι έχει αναπαραχθεί για περισσότερα από 4 δευτερόλεπτα "
++"μετά επανέναρξη, αλλιώς είναι ίδιο με --previous"
+ 
+ #: ../src/Clients/Booter/Booter/Entry.cs:167
+ msgid "Automatically start playing any tracks enqueued on the command line"
+-msgstr "Αυτόματη έναρξη αναπαραγωγής οποιουδήποτε κομματιού ακολουθεί στη γραμμή εντολών"
++msgstr ""
++"Αυτόματη έναρξη αναπαραγωγής οποιουδήποτε κομματιού ακολουθεί στη γραμμή "
++"εντολών"
+ 
+ #: ../src/Clients/Booter/Booter/Entry.cs:168
+ msgid "Start playback"
+@@ -921,12 +986,17 @@ msgid "Completely stop playback"
+ msgstr "Ολοκληρωτική διακοπή αναπαραγωγής"
+ 
+ #: ../src/Clients/Booter/Booter/Entry.cs:173
+-msgid "Enable or disable playback stopping after the currently playing track (value should be either 'true' or 'false')"
+-msgstr "Ενεργοποίηση ή απενεργοποίηση διακοπής αναπαραγωγής μετά το τρέχον αναπαραγόμενο κομμάτι (η τιμή θα πρέπει να είναι 'true' ή 'false')"
++msgid ""
++"Enable or disable playback stopping after the currently playing track (value "
++"should be either 'true' or 'false')"
++msgstr ""
++"Ενεργοποίηση ή απενεργοποίηση διακοπής αναπαραγωγής μετά το τρέχον "
++"αναπαραγόμενο κομμάτι (η τιμή θα πρέπει να είναι 'true' ή 'false')"
+ 
+ #: ../src/Clients/Booter/Booter/Entry.cs:174
+ msgid "Set the playback volume (0-100), prefix with +/- for relative values"
+-msgstr "Ρυθμίστε την ένταση αναπαραγωγής (0-100), με πρόσημο +/- για σχετικές τιμές"
++msgstr ""
++"Ρυθμίστε την ένταση αναπαραγωγής (0-100), με πρόσημο +/- για σχετικές τιμές"
+ 
+ #: ../src/Clients/Booter/Booter/Entry.cs:175
+ msgid "Seek to a specific point (seconds, float)"
+@@ -934,7 +1004,8 @@ msgstr "Αναζήτηση σε συγκεκριμένο σημείο (δευτ
+ 
+ #: ../src/Clients/Booter/Booter/Entry.cs:176
+ msgid "Set the currently played track's rating (0 to 5)"
+-msgstr "Ορίστε τη βαθμολόγηση του τρέχοντος κομματιού που αναπαράγεται (0 ως 5)"
++msgstr ""
++"Ορίστε τη βαθμολόγηση του τρέχοντος κομματιού που αναπαράγεται (0 ως 5)"
+ 
+ #: ../src/Clients/Booter/Booter/Entry.cs:179
+ msgid "Player Engine Query Options"
+@@ -1040,7 +1111,7 @@ msgstr "Βαθμοί"
+ #: ../src/Clients/Booter/Booter/Entry.cs:200
+ #: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:145
+ msgid "Bit Rate"
+-msgstr "Ρυθμός διαμεταγωγής (Bitrate)"
++msgstr "Ρυθμός διαμεταγωγής"
+ 
+ #: ../src/Clients/Booter/Booter/Entry.cs:203
+ msgid "User Interface Options"
+@@ -1060,7 +1131,8 @@ msgstr "Απόκρυψη της διεπαφής χρήστη"
+ 
+ #: ../src/Clients/Booter/Booter/Entry.cs:207
+ msgid "Do not present the user interface, regardless of any other options"
+-msgstr "Η διεπαφή χρήστη δεν παρουσιάζεται, ανεξάρτητα από οποιαδήποτε άλλη επιλογή"
++msgstr ""
++"Η διεπαφή χρήστη δεν παρουσιάζεται, ανεξάρτητα από οποιαδήποτε άλλη επιλογή"
+ 
+ #: ../src/Clients/Booter/Booter/Entry.cs:208
+ msgid "Present the import media dialog box"
+@@ -1096,7 +1168,7 @@ msgstr "Ενεργοποίηση εξαγωγής αποσφαλμάτωσης 
+ 
+ #: ../src/Clients/Booter/Booter/Entry.cs:218
+ msgid "Specify an alternate database to use"
+-msgstr "Ορίστε μία εναλλακτική βάση δεδομένων για χρήση "
++msgstr "Ορίστε μία εναλλακτική βάση δεδομένων για χρήση"
+ 
+ #: ../src/Clients/Booter/Booter/Entry.cs:219
+ msgid "Force fetching of missing cover artwork"
+@@ -1107,8 +1179,13 @@ msgid "Specify an alternate key, default is /apps/banshee-1/"
+ msgstr "Ορίστε ένα εναλλακτικό κλειδί, η προεπιλογή είναι /apps/banshee-1/"
+ 
+ #: ../src/Clients/Booter/Booter/Entry.cs:221
+-msgid "Optimize instance for running uninstalled; most notably, this will create an alternate Mono.Addins database in the working directory"
+-msgstr "Βελτιστοποίηση στιγμιότυπου για απεγκατεστημένη εκτέλεση• ειδικότερα, αυτό θα δημιουργήσει μία εναλλακτική βάση δεδομένων Mono.Addins στον τρέχοντα κατάλογο"
++msgid ""
++"Optimize instance for running uninstalled; most notably, this will create an "
++"alternate Mono.Addins database in the working directory"
++msgstr ""
++"Βελτιστοποίηση στιγμιότυπου για απεγκατεστημένη εκτέλεση• ειδικότερα, αυτό "
++"θα δημιουργήσει μία εναλλακτική βάση δεδομένων Mono.Addins στον τρέχοντα "
++"κατάλογο"
+ 
+ #: ../src/Clients/Booter/Booter/Entry.cs:223
+ msgid "Disable DBus support completely"
+@@ -1117,7 +1194,9 @@ msgstr "Εξολοκλήρου απενεργοποίηση υποστήριξη
+ #: ../src/Clients/Booter/Booter/Entry.cs:225
+ #, csharp-format
+ msgid "Skip loading a custom gtkrc file ({0}) if it exists"
+-msgstr "Παραβλέψτε την φόρτωση ενός προσαρμοσμένου αρχείου gtkrc ({0}) αν αυτό υπάρχει"
++msgstr ""
++"Παραβλέψτε την φόρτωση ενός προσαρμοσμένου αρχείου gtkrc ({0}) αν αυτό "
++"υπάρχει"
+ 
+ #: ../src/Clients/Booter/Booter/Entry.cs:256
+ #, csharp-format
+@@ -1164,6 +1243,13 @@ msgstr "{0} υπολείπονται"
+ msgid "Play Song"
+ msgstr "Αναπαραγωγή τραγουδιού"
+ 
++#: ../src/Clients/Nereid/Nereid/PlayerInterface.cs:251
++#: ../src/Extensions/Banshee.Fixup/Banshee.Fixup/FixSource.cs:79
++#: ../src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/NotificationAreaService.cs:133
++#: ../src/Extensions/Banshee.SoundMenu/Banshee.SoundMenu/SoundMenuService.cs:111
++msgid "Close"
++msgstr "Κλείσιμο"
++
+ #. Translators: this is a verb (command), not a noun (things)
+ #: ../src/Clients/Nereid/Nereid/PlayerInterface.cs:472
+ msgid "Search"
+@@ -1231,13 +1317,15 @@ msgid "Stream location not found"
+ msgstr "Η τοποθεσίας της ροής δε βρέθηκε"
+ 
+ #: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:347
+-#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:339
++#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:344
+ msgid "File not found"
+ msgstr "Το αρχείο δε βρέθηκε"
+ 
+ #: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:349
+ msgid "Codec for playing this media type not available"
+-msgstr "Ο αποκωδικοποιητής για για την αναπαραγωγή αυτού του τύπου πολυμέσων δεν είναι διαθέσιμος"
++msgstr ""
++"Ο αποκωδικοποιητής για την αναπαραγωγή αυτού του τύπου πολυμέσων δεν είναι "
++"διαθέσιμος"
+ 
+ #: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:351
+ msgid "File protected by Digital Rights Management (DRM)"
+@@ -1291,7 +1379,6 @@ msgid "_Jump to Playing Item"
+ msgstr "_Μεταπήδηση στο αναπαραγόμενο αντικείμενο"
+ 
+ #: ../src/Core/Banshee.Core/Banshee.Collection/YearInfo.cs:38
+-#| msgid "Unknown error"
+ msgid "Unknown Year"
+ msgstr "Άγνωστο έτος"
+ 
+@@ -1304,7 +1391,6 @@ msgstr "{0} ({1}:{2:00})"
+ 
+ #: ../src/Core/Banshee.Services/Banshee.Collection.Database/DatabaseAlbumArtistListModel.cs:76
+ #, csharp-format
+-#| msgid "All Artists ({0})"
+ msgid "All Album Artists ({0})"
+ msgstr "Όλοι οι δίσκοι των καλλιτεχνών ({0})"
+ 
+@@ -1321,7 +1407,7 @@ msgstr "Όλοι οι καλλιτέχνες ({0})"
+ #: ../src/Core/Banshee.Services/Banshee.Collection.Database/DatabaseImportManager.cs:173
+ #, csharp-format
+ msgid "File is empty so it could not be imported: {0}"
+-msgstr ""
++msgstr "Το αρχείο είναι κενό, γιαυτό δεν μπόρεσε να εισαχθεί: {0}"
+ 
+ #: ../src/Core/Banshee.Services/Banshee.Collection.Database/DatabaseQueryFilterModel.cs:48
+ #: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/StatisticsPage.cs:96
+@@ -1330,7 +1416,6 @@ msgstr "Τιμή"
+ 
+ #: ../src/Core/Banshee.Services/Banshee.Collection.Database/DatabaseYearListModel.cs:66
+ #, csharp-format
+-#| msgid "All Genres ({0})"
+ msgid "All Years ({0})"
+ msgstr "Όλα τα έτη ({0})"
+ 
+@@ -1344,7 +1429,9 @@ msgstr "κατά δίσκο"
+ 
+ #: ../src/Core/Banshee.Services/Banshee.Collection.Database/RandomByAlbum.cs:52
+ msgid "Play all songs from an album, then randomly choose another album"
+-msgstr "Αναπαραγωγή όλων των τραγουδιών από ένα δίσκο, και στη συνέχεια τυχαία επιλογή άλλου δίσκου"
++msgstr ""
++"Αναπαραγωγή όλων των τραγουδιών από ένα δίσκο, και στη συνέχεια τυχαία "
++"επιλογή άλλου δίσκου"
+ 
+ #: ../src/Core/Banshee.Services/Banshee.Collection.Database/RandomByArtist.cs:50
+ msgid "Shuffle by A_rtist"
+@@ -1356,7 +1443,9 @@ msgstr "κατά καλλιτέχνη"
+ 
+ #: ../src/Core/Banshee.Services/Banshee.Collection.Database/RandomByArtist.cs:52
+ msgid "Play all songs by an artist, then randomly choose another artist"
+-msgstr "Αναπαραγωγή όλων των τραγουδιών ενός καλλιτέχνη, έπειτα τυχαία επιλογή άλλου καλλιτέχνη"
++msgstr ""
++"Αναπαραγωγή όλων των τραγουδιών ενός καλλιτέχνη, έπειτα τυχαία επιλογή άλλου "
++"καλλιτέχνη"
+ 
+ #: ../src/Core/Banshee.Services/Banshee.Collection.Database/RandomByOff.cs:38
+ msgid "Shuffle _Off"
+@@ -1380,7 +1469,8 @@ msgstr "κατά βαθμολογία"
+ 
+ #: ../src/Core/Banshee.Services/Banshee.Collection.Database/RandomByRating.cs:48
+ msgid "Play songs randomly, prefer higher rated songs"
+-msgstr "Τυχαία αναπαραγωγή τραγουδιών, προτίμηση σε τραγούδια με υψηλότερη αξιολόγηση"
++msgstr ""
++"Τυχαία αναπαραγωγή τραγουδιών, προτίμηση σε τραγούδια με υψηλότερη αξιολόγηση"
+ 
+ #: ../src/Core/Banshee.Services/Banshee.Collection.Database/RandomByScore.cs:43
+ msgid "Shuffle by S_core"
+@@ -1393,7 +1483,9 @@ msgstr "κατά βαθμολογία"
+ 
+ #: ../src/Core/Banshee.Services/Banshee.Collection.Database/RandomByScore.cs:45
+ msgid "Play songs randomly, prefer higher scored songs"
+-msgstr "Τυχαία αναπαραγωγή τραγουδιών, προτίμηση σε τραγούδια με την υψηλότερη βαθμολογία"
++msgstr ""
++"Τυχαία αναπαραγωγή τραγουδιών, προτίμηση σε τραγούδια με την υψηλότερη "
++"βαθμολογία"
+ 
+ #: ../src/Core/Banshee.Services/Banshee.Collection.Database/RandomByTrack.cs:46
+ msgid "Shuffle by _Song"
+@@ -1414,12 +1506,12 @@ msgstr "Σάρωση για μέσα"
+ #: ../src/Core/Banshee.Services/Banshee.Collection/ImportManager.cs:188
+ #: ../src/Core/Banshee.Services/Banshee.Database/BansheeDbFormatMigrator.cs:1419
+ msgid "Scanning..."
+-msgstr "Σάρωση…"
++msgstr "Σάρωση..."
+ 
+ #: ../src/Core/Banshee.Services/Banshee.Collection/ImportManager.cs:204
+ #, csharp-format
+ msgid "Scanning ({0} files)..."
+-msgstr "Σάρωση ({0} αρχείων)…"
++msgstr "Σάρωση ({0} αρχείων)..."
+ 
+ #: ../src/Core/Banshee.Services/Banshee.Collection/ImportManager.cs:238
+ msgid "Importing Media"
+@@ -1428,7 +1520,8 @@ msgstr "Εισαγωγή μέσων"
+ #: ../src/Core/Banshee.Services/Banshee.Collection/ImportManager.cs:245
+ #: ../src/Core/Banshee.Services/Banshee.Library/ThreadPoolImportSource.cs:119
+ msgid "The import process is currently running. Would you like to stop it?"
+-msgstr "Η διαδικασία εισαγωγής εκτελείται αυτή τη στιγμή. Θα θέλατε να την διακόψετε;"
++msgstr ""
++"Η διαδικασία εισαγωγής εκτελείται αυτή τη στιγμή. Θα θέλατε να την διακόψετε;"
+ 
+ #: ../src/Core/Banshee.Services/Banshee.Collection/ImportManager.cs:251
+ #: ../src/Core/Banshee.Services/Banshee.Library/ThreadPoolImportSource.cs:81
+@@ -1447,8 +1540,11 @@ msgid "Upgrading your Banshee Database"
+ msgstr "Αναβαθμίστε την βάση δεδομένων σας του Banshee"
+ 
+ #: ../src/Core/Banshee.Services/Banshee.Database/BansheeDbFormatMigrator.cs:233
+-msgid "Please wait while your old Banshee database is migrated to the new format."
+-msgstr "Παρακαλώ περιμένετε όσο η παλιά σας βάση δεδομένων του Banshee  μεταφέρεται στη νέα μορφή."
++msgid ""
++"Please wait while your old Banshee database is migrated to the new format."
++msgstr ""
++"Παρακαλώ περιμένετε όσο η παλιά σας βάση δεδομένων του Banshee μεταφέρεται "
++"στη νέα μορφή."
+ 
+ #: ../src/Core/Banshee.Services/Banshee.Database/BansheeDbFormatMigrator.cs:1416
+ msgid "Refreshing Metadata"
+@@ -1526,12 +1622,31 @@ msgstr "Απαλό Ροκ"
+ msgid "Techno"
+ msgstr "Techno"
+ 
+-#: ../src/Core/Banshee.Services/Banshee.Library/LibrarySource.cs:58
++#: ../src/Core/Banshee.Services/Banshee.Library/LibrarySource.cs:63
+ msgid "Remove From Library"
+ msgstr "Αφαίρεση από τη βιβλιοθήκη"
+ 
++#: ../src/Core/Banshee.Services/Banshee.Library/LibrarySource.cs:77
++#: ../src/Core/Banshee.Services/Banshee.Sources/PrimarySource.cs:249
++msgid "File Organization"
++msgstr "Οργάνωση αρχείων"
++
++#: ../src/Core/Banshee.Services/Banshee.Library/LibrarySource.cs:81
++#| msgid "Co_py files to media folders when importing"
++msgid "Co_py files to media folder when importing"
++msgstr "Αντι_γραφή αρχείων σε φακέλους πολυμέσων κατά την εισαγωγή"
++
++#: ../src/Core/Banshee.Services/Banshee.Library/LibrarySource.cs:87
++msgid "_Update file and folder names"
++msgstr "_Ενημέρωση αρχείου και ονόματα φακέλων"
++
++#: ../src/Core/Banshee.Services/Banshee.Library/LibrarySource.cs:88
++msgid "Rename files and folders according to media metadata"
++msgstr ""
++"Μετονομασία αρχείων και φακέλων σύμφωνα με τα μεταδεδομένα των πολυμέσων"
++
+ #. Translators: {0} is the library name, eg 'Music Library' or 'Podcasts'
+-#: ../src/Core/Banshee.Services/Banshee.Library/LibrarySource.cs:121
++#: ../src/Core/Banshee.Services/Banshee.Library/LibrarySource.cs:167
+ #, csharp-format
+ msgid "{0} Folder"
+ msgstr "Φάκελος {0}"
+@@ -1608,105 +1723,107 @@ msgid "Search your music"
+ msgstr "Αναζήτηση της μουσικής σας"
+ 
+ #. Misc section
+-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:80
+-#: ../src/Core/Banshee.Services/Banshee.Preferences/PreferenceService.cs:66
++#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:89
++#: ../src/Core/Banshee.Services/Banshee.Preferences/PreferenceService.cs:62
+ msgid "Miscellaneous"
+ msgstr "Διάφορα"
+ 
+-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:83
++#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:92
+ msgid "_Sort an artist's albums by year, not title"
+ msgstr "_Ταξινόμηση των δίσκων ενός καλλιτέχνη κατά έτος και όχι κατά τίτλο"
+ 
+-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:93
++#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:102
+ #, csharp-format
+ msgid "{0} song"
+ msgid_plural "{0} songs"
+ msgstr[0] "{0} τραγούδι"
+ msgstr[1] "{0} τραγούδια"
+ 
+-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:114
++#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:131
+ msgid "Music Folder"
+ msgstr "Φάκελος μουσικής"
+ 
+-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:119
+-#: ../src/Core/Banshee.Services/Banshee.Library/VideoLibrarySource.cs:95
++#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:136
++#: ../src/Core/Banshee.Services/Banshee.Library/VideoLibrarySource.cs:107
+ msgid "Favorites"
+ msgstr "Αγαπημένα"
+ 
+-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:120
++#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:137
+ msgid "Songs rated four and five stars"
+ msgstr "Τραγούδια που αξιολογήθηκαν με τέσσερα και πέντε αστέρια"
+ 
+-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:124
++#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:141
+ msgid "Recent Favorites"
+ msgstr "Πρόσφατα αγαπημένα"
+ 
+-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:125
++#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:142
+ msgid "Songs listened to often in the past week"
+ msgstr "Τραγούδια που ακούστηκαν αρκετά συχνά την προηγούμενη εβδομάδα"
+ 
+-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:129
++#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:146
+ #: ../src/Extensions/Banshee.InternetArchive/InternetArchive/Sort.cs:95
+ msgid "Recently Added"
+ msgstr "Πρόσφατες προσθήκες"
+ 
+-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:130
++#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:147
+ msgid "Songs imported within the last week"
+ msgstr "Τραγούδια που εισάχθηκαν μέσα στην προηγούμενη εβδομάδα"
+ 
+-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:134
++#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:151
+ msgid "Recently Played"
+ msgstr "Πρόσφατες αναπαραγωγές"
+ 
+-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:135
++#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:152
+ msgid "Recently played songs"
+ msgstr "Πρόσφατα αναπαραχθέντα τραγούδια"
+ 
+-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:139
++#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:156
+ msgid "Unheard"
+ msgstr "Δεν το έχετε ακούσει"
+ 
+-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:140
++#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:157
+ msgid "Songs that have not been played or skipped"
+ msgstr "Τραγούδια που δεν έχουν αναπαραχθεί ή παραλειφθεί"
+ 
+-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:147
++#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:164
+ msgid "Neglected Favorites"
+ msgstr "Παραμελημένα αγαπημένα"
+ 
+-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:148
++#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:165
+ msgid "Favorites not played in over two months"
+ msgstr "Αγαπημένα που δεν έχουν αναπαραχθεί πάνω από δύο μήνες"
+ 
+-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:152
++#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:169
+ msgid "Least Favorite"
+ msgstr "Λιγότερο Αγαπημένο"
+ 
+-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:153
++#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:170
+ msgid "Songs rated one or two stars or that you have frequently skipped"
+-msgstr "Τραγούδια που έχουν αξιολογηθεί με ένα ή δύο αστέρια ή που παραλείπονται συχνά"
++msgstr ""
++"Τραγούδια που έχουν αξιολογηθεί με ένα ή δύο αστέρια ή που παραλείπονται "
++"συχνά"
+ 
+-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:157
++#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:174
+ msgid "700 MB of Favorites"
+ msgstr "700 MB από Αγαπημένα"
+ 
+-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:158
++#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:175
+ msgid "A data CD worth of favorite songs"
+-msgstr "Ένας ψηφιακός δίσκος (CD) δεδομένων για αγαπημένα τραγούδια"
++msgstr "Ένα CD δεδομένων για αγαπημένα τραγούδια"
+ 
+-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:163
++#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:180
+ msgid "80 Minutes of Favorites"
+ msgstr "80 λεπτά από αγαπημένα"
+ 
+-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:164
++#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:181
+ msgid "An audio CD worth of favorite songs"
+ msgstr "Ένα CD ήχου γεμάτο αγαπημένα τραγούδια"
+ 
+-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:169
++#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:186
+ msgid "Unrated"
+ msgstr "Μη αξιολογημένο"
+ 
+-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:170
++#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:187
+ msgid "Songs that haven't been rated"
+ msgstr "Τραγούδια που δεν έχουν αξιολογηθεί"
+ 
+@@ -1720,41 +1837,41 @@ msgid "Importing From {0}"
+ msgstr "Εισήχθηκε από {0}"
+ 
+ #. Catalog.GetString ("Video Library")
+-#: ../src/Core/Banshee.Services/Banshee.Library/VideoLibrarySource.cs:43
++#: ../src/Core/Banshee.Services/Banshee.Library/VideoLibrarySource.cs:44
+ #: ../src/Dap/Banshee.Dap/Banshee.Dap/VideoGroupSource.cs:38
+ msgid "Videos"
+ msgstr "Βίντεο"
+ 
+-#: ../src/Core/Banshee.Services/Banshee.Library/VideoLibrarySource.cs:48
++#: ../src/Core/Banshee.Services/Banshee.Library/VideoLibrarySource.cs:49
+ #: ../src/Extensions/Banshee.UPnPClient/Banshee.UPnPClient/UPnPVideoSource.cs:52
+ msgid "Search your videos"
+ msgstr "Αναζήτηση των βίντεο σας"
+ 
+-#: ../src/Core/Banshee.Services/Banshee.Library/VideoLibrarySource.cs:65
++#: ../src/Core/Banshee.Services/Banshee.Library/VideoLibrarySource.cs:66
+ #: ../src/Extensions/Banshee.UPnPClient/Banshee.UPnPClient/UPnPVideoSource.cs:69
+ msgid "Produced By"
+ msgstr "Δημιουργήθηκε από"
+ 
+-#: ../src/Core/Banshee.Services/Banshee.Library/VideoLibrarySource.cs:70
++#: ../src/Core/Banshee.Services/Banshee.Library/VideoLibrarySource.cs:78
+ #, csharp-format
+ msgid "{0} video"
+ msgid_plural "{0} videos"
+ msgstr[0] "{0} βίντεο"
+ msgstr[1] "{0} βίντεο"
+ 
+-#: ../src/Core/Banshee.Services/Banshee.Library/VideoLibrarySource.cs:90
++#: ../src/Core/Banshee.Services/Banshee.Library/VideoLibrarySource.cs:102
+ msgid "Videos Folder"
+ msgstr "Φάκελος βίντεο"
+ 
+-#: ../src/Core/Banshee.Services/Banshee.Library/VideoLibrarySource.cs:96
++#: ../src/Core/Banshee.Services/Banshee.Library/VideoLibrarySource.cs:108
+ msgid "Videos rated four and five stars"
+ msgstr "Βίντεο αξιολογημένα με τέσσερα και πέντε αστέρια"
+ 
+-#: ../src/Core/Banshee.Services/Banshee.Library/VideoLibrarySource.cs:100
++#: ../src/Core/Banshee.Services/Banshee.Library/VideoLibrarySource.cs:112
+ msgid "Unwatched"
+ msgstr "Δεν προβλήθηκαν"
+ 
+-#: ../src/Core/Banshee.Services/Banshee.Library/VideoLibrarySource.cs:101
++#: ../src/Core/Banshee.Services/Banshee.Library/VideoLibrarySource.cs:113
+ msgid "Videos that haven't been played yet"
+ msgstr "Βίντεο που δεν έχουν αναπαραχθεί ακόμη"
+ 
+@@ -1763,8 +1880,12 @@ msgid "Default player engine"
+ msgstr "Προεπιλεγμένη μηχανή αναπαραγωγής"
+ 
+ #: ../src/Core/Banshee.Services/Banshee.MediaEngine/PlayerEngineService.cs:108
+-msgid "No player engines were found. Please ensure Banshee has been cleanly installed."
+-msgstr "Δεν βρέθηκαν μηχανές αναπαραγωγής. Παρακαλούμε σιγουρευτείτε ότι το Banshee έχει εγκατασταθεί σωστά."
++msgid ""
++"No player engines were found. Please ensure Banshee has been cleanly "
++"installed."
++msgstr ""
++"Δεν βρέθηκαν μηχανές αναπαραγωγής. Παρακαλούμε σιγουρευτείτε ότι το Banshee "
++"έχει εγκατασταθεί σωστά."
+ 
+ #: ../src/Core/Banshee.Services/Banshee.MediaEngine/PlayerEngineService.cs:375
+ msgid "Problem with Player Engine"
+@@ -1780,8 +1901,12 @@ msgid "Initializing"
+ msgstr "Αρχικοποίηση"
+ 
+ #: ../src/Core/Banshee.Services/Banshee.MediaEngine/TranscoderService.cs:138
+-msgid "Files are currently being converted to another format. Would you like to stop this?"
+-msgstr "Τα αρχεία αυτή τη στιγμή μετατρέπονται σε άλλη μορφή. Θα θέλατε να διακόψετε τη διαδικασία;"
++msgid ""
++"Files are currently being converted to another format. Would you like to "
++"stop this?"
++msgstr ""
++"Τα αρχεία αυτή τη στιγμή μετατρέπονται σε άλλη μορφή. Θα θέλατε να διακόψετε "
++"τη διαδικασία;"
+ 
+ #: ../src/Core/Banshee.Services/Banshee.Metadata/SaveTrackMetadataJob.cs:52
+ msgid "Saving Metadata to File"
+@@ -1789,44 +1914,45 @@ msgstr "Αποθήκευση μεταδεδομένων σε αρχείο"
+ 
+ #: ../src/Core/Banshee.Services/Banshee.Metadata/SaveTrackMetadataService.cs:49
+ msgid "Sync _metadata between library and files"
+-msgstr ""
++msgstr "Συγχρονισμός _μεταδεδομένων μεταξύ βιβλιοθήκης και αρχείων"
+ 
+ #: ../src/Core/Banshee.Services/Banshee.Metadata/SaveTrackMetadataService.cs:50
+-#, fuzzy
+ #| msgid ""
+ #| "Enable this option to save rating metadata inside supported audio files"
+-msgid "Enable this option to have metadata in sync between your library and supported media files"
+-msgstr "Ενεργοποίηση αυτής της επιλογής για αποθήκευση μεταδεδομένων βαθμολογιών και αριθμών αναπαραγωγής μέσα στα υποστηριζόμενα αρχεία ήχου"
++msgid ""
++"Enable this option to have metadata in sync between your library and "
++"supported media files"
++msgstr ""
++"Ενεργοποίηση αυτής της επιλογής για συγχρονισμό μεταδεδομένων μεταξύ της "
++"βιβλιοθήκης και των υποστηριζόμενων αρχείων μέσων"
+ 
+ #: ../src/Core/Banshee.Services/Banshee.Metadata/SaveTrackMetadataService.cs:55
+ msgid "Sync _ratings between library and files"
+-msgstr ""
++msgstr "Συγχρονισμός _ταξινόμησης μεταξύ βιβλιοθήκης και αρχείων"
+ 
+ #: ../src/Core/Banshee.Services/Banshee.Metadata/SaveTrackMetadataService.cs:56
+-#, fuzzy
+ #| msgid ""
+ #| "Enable this option to save rating metadata inside supported audio files"
+-msgid "Enable this option to have rating metadata synced between your library and supported audio files"
+-msgstr "Ενεργοποίηση αυτής της επιλογής για αποθήκευση μεταδεδομένων βαθμολογιών και αριθμών αναπαραγωγής μέσα στα υποστηριζόμενα αρχεία ήχου"
++msgid ""
++"Enable this option to have rating metadata synced between your library and "
++"supported audio files"
++msgstr ""
++"Ενεργοποίηση αυτής της επιλογής για συγχρονισμό μεταδεδομένων ταξινόμησης "
++"μεταξύ της βιβλιοθήκης και των υποστηριζόμενων αρχείων ήχου"
+ 
+ #: ../src/Core/Banshee.Services/Banshee.Metadata/SaveTrackMetadataService.cs:61
+ msgid "Sync play counts between library and files"
+-msgstr ""
++msgstr "Συγχρονισμός αριθμών αναπαραγωγής μεταξύ βιβλιοθήκης και αρχείων"
+ 
+ #: ../src/Core/Banshee.Services/Banshee.Metadata/SaveTrackMetadataService.cs:62
+-#, fuzzy
+ #| msgid ""
+ #| "Enable this option to save playcount metadata inside supported audio files"
+-msgid "Enable this option to have playcount metadata synced between your library and supported audio files"
+-msgstr "Ενεργοποίηση αυτής της επιλογής για αποθήκευση μεταδεδομένων βαθμολογιών και αριθμών αναπαραγωγής μέσα στα υποστηριζόμενα αρχεία ήχου"
+-
+-#: ../src/Core/Banshee.Services/Banshee.Metadata/SaveTrackMetadataService.cs:67
+-msgid "_Update file and folder names"
+-msgstr "_Ενημέρωση αρχείου και ονόματα φακέλων"
+-
+-#: ../src/Core/Banshee.Services/Banshee.Metadata/SaveTrackMetadataService.cs:68
+-msgid "Rename files and folders according to media metadata"
+-msgstr "Μετονομασία αρχείων και φακέλων σύμφωνα με τα μεταδεδομένα των πολυμέσων"
++msgid ""
++"Enable this option to have playcount metadata synced between your library "
++"and supported audio files"
++msgstr ""
++"Ενεργοποίηση αυτής της επιλογής για συγχρονισμό μεταδεδομένων αριθμού "
++"αναπαραγωγής μεταξύ της βιβλιοθήκης σας και των υποστηριζόμενων αρχείων ήχου"
+ 
+ #: ../src/Core/Banshee.Services/Banshee.Networking/Network.cs:52
+ msgid "There is no available network connection"
+@@ -1834,19 +1960,23 @@ msgstr "Δεν υπάρχει διαθέσιμη δικτυακή σύνδεση
+ 
+ #: ../src/Core/Banshee.Services/Banshee.Networking/Network.cs:78
+ msgid "Cannot connect to NetworkManager or Wicd"
+-msgstr "Δεν είναι δυνατή η σύνδεση στη διαχείριση δικτύου (Network Manager ή Wicd)"
++msgstr "Αδύνατη η σύνδεση στον διαχειριστή δικτύου ή Wicd"
+ 
+ #: ../src/Core/Banshee.Services/Banshee.Networking/Network.cs:79
+ msgid "An available, working network connection will be assumed"
+-msgstr "Θα υποτεθεί διαθέσιμη, σε λειτουργία, σύνδεση δικτύου "
++msgstr "Θα υποτεθεί διαθέσιμη, σε λειτουργία, σύνδεση δικτύου"
+ 
+ #: ../src/Core/Banshee.Services/Banshee.Networking/Network.cs:159
+ msgid "_Disable features requiring Internet access"
+ msgstr "_Απενεργοποίηση χαρακτηριστικών που απαιτούν πρόσβαση στο διαδίκτυο"
+ 
+ #: ../src/Core/Banshee.Services/Banshee.Networking/Network.cs:160
+-msgid "Some features require a broadband Internet connection such as Last.fm or cover art fetching"
+-msgstr "Κάποια χαρακτηριστικά απαιτούν ευρυζωνική σύνδεση διαδικτύου όπως είναι το Last.fm ή η αναζήτηση για εξώφυλλο"
++msgid ""
++"Some features require a broadband Internet connection such as Last.fm or "
++"cover art fetching"
++msgstr ""
++"Κάποια χαρακτηριστικά απαιτούν ευρυζωνική σύνδεση διαδικτύου όπως είναι το "
++"Last.fm ή η αναζήτηση για εξώφυλλο"
+ 
+ #: ../src/Core/Banshee.Services/Banshee.Playlist/AbstractPlaylistSource.cs:153
+ msgid "Search this playlist"
+@@ -1871,7 +2001,7 @@ msgstr "Διαγραφή λίστας αναπαραγωγής"
+ #: ../src/Core/Banshee.ThickClient/Banshee.Gui/SourceActions.cs:176
+ #: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:135
+ #: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:462
+-#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/SourceView.cs:595
++#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/SourceView.cs:612
+ #: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/SourceView_DragAndDrop.cs:214
+ msgid "New Playlist"
+ msgstr "Νέα λίστα αναπαραγωγής"
+@@ -1914,11 +2044,7 @@ msgstr "Επεκτάσεις"
+ msgid "File Policies"
+ msgstr "Πολιτικές αρχείου"
+ 
+-#: ../src/Core/Banshee.Services/Banshee.Preferences/PreferenceService.cs:58
+-msgid "Co_py files to media folders when importing"
+-msgstr "Αντι_γραφή αρχείων σε φακέλους πολυμέσων όταν γίνεται εισαγωγή"
+-
+-#: ../src/Core/Banshee.Services/Banshee.Preferences/PreferenceService.cs:70
++#: ../src/Core/Banshee.Services/Banshee.Preferences/PreferenceService.cs:66
+ msgid "Improve Banshee by sending anonymous usage data"
+ msgstr "Βελτιώστε το Banshee στέλνοντας ανώνυμες πληροφορίες χρήσης"
+ 
+@@ -2046,7 +2172,7 @@ msgstr "bpm"
+ #. Translators: These are unique search fields. You can use CSV for synonyms. Please, no spaces. Blank ok.
+ #: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:147
+ msgid "bitrate"
+-msgstr "bitrate"
++msgstr "ρυθμός διαμεταγωγής"
+ 
+ #: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:147
+ msgid "kbs"
+@@ -2064,7 +2190,7 @@ msgstr "Ρυθμός δειγματοληψίας"
+ #. Translators: These are unique search fields. You can use CSV for synonyms. Please, no spaces. Blank ok.
+ #: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:156
+ msgid "samplerate"
+-msgstr "samplerate"
++msgstr "ρυθμός-δειγματοληψίας"
+ 
+ #: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:156
+ msgid "Hz"
+@@ -2073,16 +2199,16 @@ msgstr "Hz"
+ #. Translators: noun
+ #: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:163
+ msgid "Bits Per Sample"
+-msgstr "Bit ανά δείγμα"
++msgstr "Δυαδικά ανά δείγμα"
+ 
+ #. Translators: These are unique search fields. You can use CSV for synonyms. Please, no spaces. Blank ok.
+ #: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:165
+ msgid "bitspersample"
+-msgstr "bitspersample"
++msgstr "δυαδικά-ανά-δείγμα"
+ 
+ #: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:165
+ msgid "bitdepth"
+-msgstr "bitdepth"
++msgstr "βάθος-δυαδικών"
+ 
+ #: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:165
+ msgid "quantization"
+@@ -2189,7 +2315,7 @@ msgstr "Καταμέτρηση αναπαραγωγών"
+ #. Translators: These are unique search fields (and nouns). You can use CSV for synonyms. Please, no spaces. Blank ok.
+ #: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:242
+ msgid "plays"
+-msgstr "plays"
++msgstr "αναπαραγωγές"
+ 
+ #: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:242
+ msgid "playcount"
+@@ -2210,7 +2336,7 @@ msgstr "παραβλέψεις"
+ 
+ #: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:250
+ msgid "skipcount"
+-msgstr "skipcount"
++msgstr "παράλειψη-μέτρησης"
+ 
+ #: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:256
+ msgid "File Size"
+@@ -2291,7 +2417,7 @@ msgstr "Τελευταία Αναπαραγωγή"
+ #. Translators: These are unique search fields. You can use CSV for synonyms. Please, no spaces. Blank ok.
+ #: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:290
+ msgid "lastplayed"
+-msgstr "lastplayed"
++msgstr "τελευταία-αναπαραγωγή"
+ 
+ #: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:290
+ msgid "played"
+@@ -2308,7 +2434,7 @@ msgstr "Τελευταία Παράβλεψη"
+ #. Translators: These are unique search fields. You can use CSV for synonyms. Please, no spaces. Blank ok.
+ #: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:298
+ msgid "lastskipped"
+-msgstr "lastskipped"
++msgstr "τελευταία-παράβλεψη"
+ 
+ #: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:298
+ msgid "skipped"
+@@ -2360,7 +2486,7 @@ msgstr "Σφάλμα Αναπαραγωγής"
+ #. Translators: These are unique search fields (and nouns). Please, no spaces. Blank ok.
+ #: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:334
+ msgid "playbackerror"
+-msgstr "playbackerror"
++msgstr "σφάλμα-αναπαραγωγής"
+ 
+ #. Translators: noun
+ #: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:351
+@@ -2479,7 +2605,7 @@ msgstr "drm"
+ #: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/StatisticsPage.cs:234
+ #: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/StatisticsPage.cs:236
+ #: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/StatisticsPage.cs:238
+-#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:400
++#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:405
+ msgid "Unknown"
+ msgstr "Άγνωστο"
+ 
+@@ -2576,24 +2702,20 @@ msgstr "Ταξινόμηση λιστών αναπαραγωγής κατά"
+ msgid "Drive"
+ msgstr "Δίσκος"
+ 
+-#: ../src/Core/Banshee.Services/Banshee.Sources/PrimarySource.cs:249
+-msgid "File Organization"
+-msgstr "Οργάνωση αρχείων"
+-
+ #: ../src/Core/Banshee.Services/Banshee.Sources/PrimarySource.cs:250
+ msgid "Folder hie_rarchy"
+ msgstr "Ιε_ραρχία φακέλων"
+ 
+ #: ../src/Core/Banshee.Services/Banshee.Sources/PrimarySource.cs:251
+ msgid "File _name"
+-msgstr "_Όνομα αρχείου"
++msgstr "Ό_νομα αρχείου"
+ 
+-#: ../src/Core/Banshee.Services/Banshee.Sources/PrimarySource.cs:703
++#: ../src/Core/Banshee.Services/Banshee.Sources/PrimarySource.cs:706
+ #, csharp-format
+ msgid "Adding {0} of {1} to {2}"
+ msgstr "Προσθήκη {0} από {1} σε {2}"
+ 
+-#: ../src/Core/Banshee.Services/Banshee.Sources/PrimarySource.cs:722
++#: ../src/Core/Banshee.Services/Banshee.Sources/PrimarySource.cs:725
+ #, csharp-format
+ msgid "Deleting {0} of {1} From {2}"
+ msgstr "Διαγραφή {0} από {1} από {2}"
+@@ -2653,9 +2775,9 @@ msgid ""
+ "\n"
+ " Check your 'Preferred Applications' settings."
+ msgstr ""
+-"Δεν ήταν δυνατό το άνοιγμα του {0}: {1}\n"
++"Αδύνατο το άνοιγμα του {0}: {1}\n"
+ "\n"
+-"Ελέγξτε τις ρυθμίσεις για τις «Προτιμώμενες Εφαρμογές» σας."
++"Ελέγξτε τις ρυθμίσεις για τις 'Προτιμώμενες Εφαρμογές' σας."
+ 
+ #: ../src/Core/Banshee.ThickClient/Banshee.Addins.Gui/AddinView.cs:49
+ msgid "Show:"
+@@ -2681,26 +2803,32 @@ msgstr "Αναζήτηση:"
+ 
+ #: ../src/Core/Banshee.ThickClient/Banshee.Collection.Gui/AlbumListView.cs:76
+ msgid "Disable album grid"
+-msgstr "Απενεργοποίηση πίνακα δίσκων"
++msgstr "Απενεργοποίηση πλέγματος συλλογής"
+ 
+ #: ../src/Core/Banshee.ThickClient/Banshee.Collection.Gui/AlbumListView.cs:77
+ msgid "Disable album grid and show the classic layout instead"
+-msgstr "Απενεργοποίηση του πίνακα δίσκων και εμφάνιση της κλασσικής διάταξης"
++msgstr ""
++"Απενεργοποίηση του πλέγματος συλλογής και εμφάνιση της κλασσικής διάταξης"
+ 
+ #: ../src/Core/Banshee.ThickClient/Banshee.Collection.Gui/BaseTrackListView.cs:76
+ msgid "Cannot Reorder While Sorted"
+ msgstr "Αδυναμία επαναδιάταξης ενόσω είναι ταξινομημένα"
+ 
+ #: ../src/Core/Banshee.ThickClient/Banshee.Collection.Gui/BaseTrackListView.cs:77
+-msgid "To put the playlist in manual sort mode, click the currently sorted column header until the sort arrow goes away."
+-msgstr "Για να θέσετε τη λίστα αναπαραγωγής σε χειροκίνητη ταξινόμηση, κάντε κλικ στην κεφαλίδα της τρέχουσας ταξινομημένης στήλης μέχρι το βέλος ταξινόμησης να φύγει."
++msgid ""
++"To put the playlist in manual sort mode, click the currently sorted column "
++"header until the sort arrow goes away."
++msgstr ""
++"Για να θέσετε τη λίστα αναπαραγωγής σε χειροκίνητη ταξινόμηση, κάντε κλικ "
++"στην κεφαλίδα της τρέχουσας ταξινομημένης στήλης μέχρι το βέλος ταξινόμησης "
++"να φύγει."
+ 
+ #. Translators: this is {disc number} of {disc count}
+ #. Translators: this is {track number} of {track count}
+ #: ../src/Core/Banshee.ThickClient/Banshee.Collection.Gui/ColumnCellDiscAndCount.cs:40
+ #: ../src/Core/Banshee.ThickClient/Banshee.Collection.Gui/ColumnCellTrackAndCount.cs:40
+ #: ../src/Core/Banshee.Widgets/Banshee.Widgets/StreamPositionLabel.cs:174
+-#: ../src/Dap/Banshee.Dap/Banshee.Dap.Gui/DapPropertiesDialog.cs:148
++#: ../src/Dap/Banshee.Dap/Banshee.Dap.Gui/DapPropertiesDialog.cs:149
+ #, csharp-format
+ msgid "{0} of {1}"
+ msgstr "{0} από {1}"
+@@ -2723,7 +2851,7 @@ msgstr "Εξωτερικό Έγγραφο"
+ 
+ #: ../src/Core/Banshee.ThickClient/Banshee.Collection.Gui/CoverArtEditor.cs:80
+ msgid "Choose New Cover Art..."
+-msgstr "Επιλέξτε νέο εξώφυλλο…"
++msgstr "Επιλέξτε νέο εξώφυλλο..."
+ 
+ #: ../src/Core/Banshee.ThickClient/Banshee.Collection.Gui/CoverArtEditor.cs:98
+ msgid "Delete This Cover Art"
+@@ -2771,12 +2899,12 @@ msgstr "Απόκρυψη πλαισίου περιεχομένου"
+ 
+ #: ../src/Core/Banshee.ThickClient/Banshee.ContextPane/ContextPane.cs:144
+ msgid "Waiting for playback to begin..."
+-msgstr "Αναμονή για έναρξη της αναπαραγωγής…"
++msgstr "Αναμονή για έναρξη της αναπαραγωγής..."
+ 
+ #: ../src/Core/Banshee.ThickClient/Banshee.ContextPane/ContextPane.cs:150
+ #: ../src/Core/Banshee.Widgets/Banshee.Widgets/StreamPositionLabel.cs:152
+ msgid "Loading..."
+-msgstr "Φόρτωση…"
++msgstr "Φόρτωση..."
+ 
+ #: ../src/Core/Banshee.ThickClient/Banshee.Equalizer.Gui/EqualizerView.cs:74
+ msgid "Preamp"
+@@ -2842,10 +2970,6 @@ msgstr "Καταπληκτική Διαχείριση και Αναπαραγω
+ 
+ #: ../src/Core/Banshee.ThickClient/Banshee.Gui.Dialogs/AboutDialog.cs:98
+ #, csharp-format
+-#| msgid ""
+-#| "Copyright © 2005–{0} Novell, Inc.\n"
+-#| "Copyright © 2005–{0} Others\n"
+-#| "Copyright © 2005 Aaron Bockover"
+ msgid ""
+ "Copyright © 2005–{0} Novell, Inc.\n"
+ "Copyright © 2005–{1} Others\n"
+@@ -2864,8 +2988,13 @@ msgid "Important tasks are running"
+ msgstr "Εκτελούνται σημαντικές εργασίες"
+ 
+ #: ../src/Core/Banshee.ThickClient/Banshee.Gui.Dialogs/ConfirmShutdownDialog.cs:53
+-msgid "Closing Banshee now will cancel any currently running tasks. They cannot be resumed automatically the next time Banshee is run."
+-msgstr "Το κλείσιμο του Banshee θα ακυρώσει τις τρέχουσες εκτελέσιμες εργασίες. Δεν μπορούν να επαναληφθούν αυτόματα την επόμενη φορά που θα εκτελεστεί το Banshee."
++msgid ""
++"Closing Banshee now will cancel any currently running tasks. They cannot be "
++"resumed automatically the next time Banshee is run."
++msgstr ""
++"Το κλείσιμο του Banshee θα ακυρώσει τις τρέχουσες εκτελέσιμες εργασίες. Δεν "
++"μπορούν να επαναληφθούν αυτόματα την επόμενη φορά που θα εκτελεστεί το "
++"Banshee."
+ 
+ #: ../src/Core/Banshee.ThickClient/Banshee.Gui.Dialogs/ConfirmShutdownDialog.cs:60
+ msgid "Quit Anyway"
+@@ -2880,8 +3009,13 @@ msgid "Make Banshee the default media player?"
+ msgstr "Να γίνει το Banshee η προεπιλεγμένη εφαρμογή αναπαραγωγής πολυμέσων;"
+ 
+ #: ../src/Core/Banshee.ThickClient/Banshee.Gui.Dialogs/DefaultApplicationHelperDialog.cs:70
+-msgid "Currently another program is configured as the default media player.  Would you prefer Banshee to be the default?"
+-msgstr "Αυτή τη στιγμή ένα άλλο πρόγραμμα έχει ρυθμιστεί σαν η προεπιλεγμένη εφαρμογή αναπαραγωγής πολυμέσων. Θα προτιμούσατε να είναι προεπιλεγμένο το Banshee;"
++msgid ""
++"Currently another program is configured as the default media player.  Would "
++"you prefer Banshee to be the default?"
++msgstr ""
++"Αυτή τη στιγμή ένα άλλο πρόγραμμα έχει ρυθμιστεί σαν η προεπιλεγμένη "
++"εφαρμογή αναπαραγωγής πολυμέσων. Θα προτιμούσατε να είναι προεπιλεγμένο το "
++"Banshee;"
+ 
+ #: ../src/Core/Banshee.ThickClient/Banshee.Gui.Dialogs/DefaultApplicationHelperDialog.cs:72
+ #: ../src/Core/Banshee.ThickClient/Banshee.Gui/SourceActions.cs:443
+@@ -2894,13 +3028,13 @@ msgid "Make Banshee the Default"
+ msgstr "Ορίστε το Banshee ως προεπιλεγμένο"
+ 
+ #. Translators: verb
+-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Dialogs/FileChooserDialog.cs:53
++#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Dialogs/GtkFileChooserDialog.cs:53
+ msgid "I_mport"
+ msgstr "Ε_ισαγωγή"
+ 
+ #: ../src/Core/Banshee.ThickClient/Banshee.Gui.Dialogs/ImageFileChooserDialog.cs:39
+ msgid "Select album cover image"
+-msgstr "Επιλογή εικόνας εξωφύλλου για το δίσκο"
++msgstr "Επιλογή εικόνας εξωφύλλου για τη συλλογή"
+ 
+ #: ../src/Core/Banshee.ThickClient/Banshee.Gui.Dialogs/ImageFileChooserDialog.cs:47
+ msgid "All image files"
+@@ -2921,7 +3055,7 @@ msgstr "Άνοιγμα τοποθεσίας"
+ 
+ #: ../src/Core/Banshee.ThickClient/Banshee.Gui.Dialogs/OpenLocationDialog.cs:54
+ msgid "Browse..."
+-msgstr "Περιήγηση…"
++msgstr "Περιήγηση..."
+ 
+ #: ../src/Core/Banshee.ThickClient/Banshee.Gui.Dialogs/OpenLocationDialog.cs:64
+ msgid "Enter the address of the file you would like to open:"
+@@ -2937,7 +3071,7 @@ msgstr "_Πολυμέσα"
+ 
+ #: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:53
+ msgid "Import _Media..."
+-msgstr "Εισαγωγή _πολυμέσων…"
++msgstr "Εισαγωγή _πολυμέσων..."
+ 
+ #: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:54
+ msgid "Import media from a variety of sources"
+@@ -2945,7 +3079,7 @@ msgstr "Εισαγωγή μέσων από διάφορες πηγές"
+ 
+ #: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:57
+ msgid "Import _Playlist..."
+-msgstr "Εισαγωγή _λίστας αναπαραγωγής"
++msgstr "Εισαγωγή _λίστας αναπαραγωγής..."
+ 
+ #: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:58
+ msgid "Import a playlist"
+@@ -2961,7 +3095,7 @@ msgstr "Νέα σάρωση του φακέλου της Μουσικής Βιβ
+ 
+ #: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:67
+ msgid "Open _Location..."
+-msgstr "Άνοιγμα _τοποθεσίας…"
++msgstr "Άνοιγμα _τοποθεσίας..."
+ 
+ #: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:68
+ msgid "Open a remote location for playback"
+@@ -3064,7 +3198,7 @@ msgstr "Αναπαραγωγή του προηγούμενου αντικειμ
+ 
+ #: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackActions.cs:85
+ msgid "Seek _To..."
+-msgstr "Μετάβαση _Στο…"
++msgstr "Μετάβαση _στο..."
+ 
+ #: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackActions.cs:86
+ msgid "Seek to a specific location in current item"
+@@ -3084,7 +3218,9 @@ msgstr "_Διακοπή όταν ολοκληρωθεί"
+ 
+ #: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackActions.cs:100
+ msgid "Stop playback after the current item finishes playing"
+-msgstr "Διακοπή αναπαραγωγής μετά το τέλος της αναπαραγωγής του τρέχοντος αντικειμένου"
++msgstr ""
++"Διακοπή αναπαραγωγής μετά το τέλος της αναπαραγωγής του τρέχοντος "
++"αντικειμένου"
+ 
+ #: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackActions.cs:106
+ msgid "_Playback"
+@@ -3121,7 +3257,8 @@ msgstr "Επανάληψη ό_λων"
+ 
+ #: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackRepeatActions.cs:84
+ msgid "Play all songs before repeating playlist"
+-msgstr "Αναπαραγωγή όλων των τραγουδιών πριν την επανάληψη της λίστας αναπαραγωγής"
++msgstr ""
++"Αναπαραγωγή όλων των τραγουδιών πριν την επανάληψη της λίστας αναπαραγωγής"
+ 
+ #: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackRepeatActions.cs:88
+ msgid "Repeat Singl_e"
+@@ -3144,7 +3281,7 @@ msgstr "Υπότιτλος"
+ 
+ #: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackSubtitleActions.cs:65
+ msgid "Load File..."
+-msgstr "Φόρτωση αρχείου…"
++msgstr "Φόρτωση αρχείου..."
+ 
+ #: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackSubtitleActions.cs:66
+ msgid "Load subtitle file"
+@@ -3186,7 +3323,7 @@ msgstr "Δημιουργία νέας κενής λίστας αναπαραγω
+ 
+ #: ../src/Core/Banshee.ThickClient/Banshee.Gui/SourceActions.cs:79
+ msgid "New _Smart Playlist..."
+-msgstr "Νέα  έ_ξυπνη λίστα αναπαραγωγής…"
++msgstr "Νέα έ_ξυπνη λίστα αναπαραγωγής..."
+ 
+ #: ../src/Core/Banshee.ThickClient/Banshee.Gui/SourceActions.cs:80
+ msgid "Create a new smart playlist"
+@@ -3206,7 +3343,7 @@ msgstr "Μετονομασία"
+ 
+ #: ../src/Core/Banshee.ThickClient/Banshee.Gui/SourceActions.cs:97
+ msgid "Export Playlist..."
+-msgstr "Εξαγωγή λίστας αναπαραγωγής…"
++msgstr "Εξαγωγή λίστας αναπαραγωγής..."
+ 
+ #: ../src/Core/Banshee.ThickClient/Banshee.Gui/SourceActions.cs:98
+ msgid "Export a playlist"
+@@ -3317,7 +3454,9 @@ msgstr "Προσθήκη στη _λίστα αναπαραγωγής"
+ 
+ #: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:131
+ msgid "Append selected items to playlist or create new playlist from selection"
+-msgstr "Προσαρτήστε τα επιλεγμένα στοιχεία στη λίστα αναπαραγωγής ή δημιουργήστε νέα λίστα αναπαραγωγής από την επιλογή"
++msgstr ""
++"Προσαρτήστε τα επιλεγμένα στοιχεία στη λίστα αναπαραγωγής ή δημιουργήστε νέα "
++"λίστα αναπαραγωγής από την επιλογή"
+ 
+ #: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:136
+ msgid "Create new playlist from selected tracks"
+@@ -3329,7 +3468,7 @@ msgstr "Α_φαίρεση"
+ 
+ #: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:141
+ msgid "Remove selected track(s) from this source"
+-msgstr "Αφαιρέστε το(α) επιλεγμένο(α) κομμάτι(α) από την πηγή"
++msgstr "Αφαιρέστε τα επιλεγμένα κομμάτια από την πηγή"
+ 
+ #: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:144
+ msgid "Remove From _Library"
+@@ -3337,7 +3476,7 @@ msgstr "Αφαίρεση από τη _βιβλιοθήκη"
+ 
+ #: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:145
+ msgid "Remove selected track(s) from library"
+-msgstr "Αφαιρέστε το(α) επιλεγμένο(α) κομμάτι(α) από τη βιβλιοθήκη"
++msgstr "Αφαιρέστε τα επιλεγμένα κομμάτια από τη βιβλιοθήκη"
+ 
+ #: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:148
+ msgid "_Open Containing Folder"
+@@ -3353,7 +3492,7 @@ msgstr "_Διαγραφή από το δίσκο"
+ 
+ #: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:153
+ msgid "Permanently delete selected item(s) from medium"
+-msgstr "Διαγράψτε μόνιμα το επιλεγμένο(α) κομμάτι(α) από το μέσο"
++msgstr "Διαγράψτε μόνιμα τα επιλεγμένα κομμάτια από το μέσο"
+ 
+ #. Translators: this is a verb (command), not a noun (things)
+ #: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:159
+@@ -3369,7 +3508,7 @@ msgstr "Αναζήτηση για αντικείμενα που ταιριάζο
+ 
+ #: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:163
+ msgid "By Matching _Album"
+-msgstr "Ταίριασμα _δίσκου"
++msgstr "Ταίριασμα _συλλογής"
+ 
+ #: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:164
+ msgid "Search all songs of this album"
+@@ -3386,7 +3525,7 @@ msgstr "Αναζήτηση όλων των τραγουδιών αυτού το
+ #: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:322
+ #, csharp-format
+ msgid "_Delete From \"{0}\""
+-msgstr "_Διαγραφή από «{0}»"
++msgstr "_Διαγραφή από \"{0}\""
+ 
+ #: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:535
+ msgid "The folder could not be found."
+@@ -3394,14 +3533,18 @@ msgstr "Ο φάκελος δεν μπόρεσε να βρεθεί."
+ 
+ #: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:536
+ msgid "Please check that the track's location is accessible by the system."
+-msgstr "Παρακαλώ ελέγξτε ότι η τοποθεσία του κομματιού είναι προσβάσιμη από το σύστημα."
++msgstr ""
++"Παρακαλώ ελέγξτε ότι η τοποθεσία του κομματιού είναι προσβάσιμη από το "
++"σύστημα."
+ 
+ #: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:607
+ #, csharp-format
+ msgid "Are you sure you want to permanently delete this item?"
+-msgid_plural "Are you sure you want to permanently delete the selected {0} items?"
++msgid_plural ""
++"Are you sure you want to permanently delete the selected {0} items?"
+ msgstr[0] "Είστε σίγουρος ότι θέλετε να σβήσετε μόνιμα αυτό το αντικείμενο;"
+-msgstr[1] "Είστε σίγουρος ότι θέλετε να σβήσετε μόνιμα τα επιλεγμένα {0} αντικείμενα;"
++msgstr[1] ""
++"Είστε σίγουρος ότι θέλετε να σβήσετε μόνιμα τα επιλεγμένα {0} αντικείμενα;"
+ 
+ #: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:611
+ msgid "If you delete the selection, it will be permanently lost."
+@@ -3415,21 +3558,34 @@ msgstr "Αφαίρεση επιλογής από {0};"
+ #: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:617
+ #, csharp-format
+ msgid "Are you sure you want to remove the selected item from your {1}?"
+-msgid_plural "Are you sure you want to remove the selected {0} items from your {1}?"
+-msgstr[0] "Είστε σίγουροι για την διαγραφή του επιλεγμένου αντικειμένου από το δικό σας {1};"
+-msgstr[1] "Είστε σίγουροι για την διαγραφή των επιλεγμένων {0} αντικειμένων από το δικό σας {1};"
++msgid_plural ""
++"Are you sure you want to remove the selected {0} items from your {1}?"
++msgstr[0] ""
++"Είστε σίγουροι για την διαγραφή του επιλεγμένου αντικειμένου από το δικό σας "
++"{1};"
++msgstr[1] ""
++"Είστε σίγουροι για την διαγραφή των επιλεγμένων {0} αντικειμένων από το δικό "
++"σας {1};"
+ 
+ #: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/AlbumArtistEntry.cs:53
+ msgid "Com_pilation Album Artist:"
+-msgstr "Κα_λλιτέχνης συλλογής:"
++msgstr "_Σύνταξη συλλογής καλλιτέχνη:"
+ 
+ #: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/AlbumArtistEntry.cs:57
+-msgid "Check this if this track is part of an album with tracks by various artists"
+-msgstr "Έλεγχος εάν αυτό το κομμάτι αποτελεί μέρος ενός δίσκου με κομμάτια από διάφορους καλλιτέχνες"
++msgid ""
++"Check this if this track is part of an album with tracks by various artists"
++msgstr ""
++"Έλεγχος εάν αυτό το κομμάτι αποτελεί μέρος ενός δίσκου με κομμάτια από "
++"διάφορους καλλιτέχνες"
+ 
+ #: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/AlbumArtistEntry.cs:59
+-msgid "This value will affect how this album is sorted; if you enter 'Various Artists' then the album will located with other albums that start with 'V'."
+-msgstr "Η επιλογή αυτή θα επηρεάσει τον τρόπο με τον οποίο θα ταξινομηθεί αυτός ο δίσκος• αν εισάγετε 'Διάφοροι Καλλιτέχνες' τότε ο δίσκος θα τοποθετηθεί με τους υπόλοιπους δίσκους που ξεκινάνε με 'Δ'."
++msgid ""
++"This value will affect how this album is sorted; if you enter 'Various "
++"Artists' then the album will located with other albums that start with 'V'."
++msgstr ""
++"Η επιλογή αυτή θα επηρεάσει τον τρόπο με τον οποίο θα ταξινομηθεί αυτός ο "
++"δίσκος· αν εισάγετε 'Διάφοροι Καλλιτέχνες' τότε ο δίσκος θα τοποθετηθεί με "
++"τους υπόλοιπους δίσκους που ξεκινάνε με 'Δ'."
+ 
+ #: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/BasicTrackDetailsPage.cs:44
+ msgid "Basic Details"
+@@ -3484,25 +3640,26 @@ msgstr "Αριθμός _κομματιού:"
+ #. Catalog.GetString ("Automatically set disc number and count"),
+ #: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/BasicTrackDetailsPage.cs:166
+ msgid "Set all disc numbers and counts to these values"
+-msgstr "Ρυθμίστε όλους τους αριθμούς των δίσκων και τις μετρήσεις σε αυτές τις τιμές"
++msgstr ""
++"Ρυθμίστε όλους τους αριθμούς των δίσκων και τις μετρήσεις σε αυτές τις τιμές"
+ 
+ #: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/BasicTrackDetailsPage.cs:167
+ msgid "_Disc Number:"
+ msgstr "_Αριθμός δίσκου:"
+ 
+-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/BasicTrackDetailsPage.cs:188
++#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/BasicTrackDetailsPage.cs:196
+ msgid "Set all years to this value"
+ msgstr "Βάλτε σε όλα τα έτη αυτή τη τιμή"
+ 
+-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/BasicTrackDetailsPage.cs:189
++#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/BasicTrackDetailsPage.cs:197
+ msgid "_Year:"
+ msgstr "Έ_τος:"
+ 
+-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/BasicTrackDetailsPage.cs:196
++#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/BasicTrackDetailsPage.cs:204
+ msgid "Set all ratings to this value"
+ msgstr "Βάλτε σε όλες τις αξιολογήσεις αυτή τη τιμή"
+ 
+-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/BasicTrackDetailsPage.cs:197
++#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/BasicTrackDetailsPage.cs:205
+ msgid "_Rating:"
+ msgstr "_Αξιολόγηση:"
+ 
+@@ -3556,7 +3713,7 @@ msgstr "Βάλτε σε όλες τις άδειες αυτή την τιμή"
+ 
+ #: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/ExtraTrackDetailsPage.cs:101
+ msgid "_License URI:"
+-msgstr "_Άδεια URI"
++msgstr "Ά_δεια URI:"
+ 
+ #: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/ExtraTrackDetailsPage.cs:110
+ msgid "Set all comments to this value"
+@@ -3584,7 +3741,8 @@ msgstr "Ταξινόμηση"
+ 
+ #: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/SortingPage.cs:52
+ msgid "Set all sort track titles to this value"
+-msgstr "Ρυθμίστε όλες τις ταξινομημένες ονομασίες των κομματιών σε αυτή τη τιμή"
++msgstr ""
++"Ρυθμίστε όλες τις ταξινομημένες ονομασίες των κομματιών σε αυτή τη τιμή"
+ 
+ #: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/SortingPage.cs:53
+ msgid "Sort Track Title:"
+@@ -3592,7 +3750,8 @@ msgstr "Ταξινόμηση τίτλου κομματιού:"
+ 
+ #: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/SortingPage.cs:60
+ msgid "Set all sort track artists to this value"
+-msgstr "Ρυθμίστε όλες τις ταξινομημένες ονομασίες των καλλιτεχνών σε αυτή την τιμή"
++msgstr ""
++"Ρυθμίστε όλες τις ταξινομημένες ονομασίες των καλλιτεχνών σε αυτή την τιμή"
+ 
+ #: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/SortingPage.cs:61
+ msgid "Sort Track Artist:"
+@@ -3730,8 +3889,12 @@ msgid "Sync all field _values"
+ msgstr "Συγχρονίστε όλα τα πεδία _τιμών"
+ 
+ #: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:319
+-msgid "Apply the values of all common fields set for this track to all of the tracks selected in this editor"
+-msgstr "Εφαρμόστε τις τιμές όλων των κοινών πεδίων που έχουν ρυθμιστεί για αυτό το κομμάτι σε όλα τα επιλεγμένα κομμάτια του επεξεργαστή"
++msgid ""
++"Apply the values of all common fields set for this track to all of the "
++"tracks selected in this editor"
++msgstr ""
++"Εφαρμόστε τις τιμές όλων των κοινών πεδίων που έχουν ρυθμιστεί για αυτό το "
++"κομμάτι σε όλα τα επιλεγμένα κομμάτια του επεξεργαστή"
+ 
+ #: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:419
+ #, csharp-format
+@@ -3752,7 +3915,9 @@ msgstr "Κλείσιμο _χωρίς αποθήκευση"
+ #: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:753
+ #, csharp-format
+ msgid "If you don't save, changes from the last {0} will be permanently lost."
+-msgstr "Αν δεν αποθηκεύσετε, οι αλλαγές που έγιναν από το τελευταίο {0} θα χαθούν μόνιμα."
++msgstr ""
++"Αν δεν αποθηκεύσετε, οι αλλαγές που έγιναν από το τελευταίο {0} θα χαθούν "
++"μόνιμα."
+ 
+ #: ../src/Core/Banshee.ThickClient/Banshee.Gui/ViewActions.cs:62
+ msgid "_View"
+@@ -3780,7 +3945,7 @@ msgstr "_Πλήρης οθόνη"
+ 
+ #: ../src/Core/Banshee.ThickClient/Banshee.Gui/ViewActions.cs:83
+ msgid "Enter or leave fullscreen mode"
+-msgstr "Είσοδος  ή έξοδος από την κατάσταση λειτουργίας πλήρους οθόνης "
++msgstr "Είσοδος ή έξοδος από την κατάσταση λειτουργίας πλήρους οθόνης"
+ 
+ #: ../src/Core/Banshee.ThickClient/Banshee.Gui/ViewActions.cs:88
+ msgid "Show Cover _Art"
+@@ -3857,8 +4022,9 @@ msgstr "Αυτή η εργασία εκτελείται ακόμη. Θα θέλ
+ 
+ #: ../src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/UserJobTile.cs:144
+ #, csharp-format
+-msgid "The '{0}' operation is still performing work. Would you like to stop it?"
+-msgstr "Η εργασία '{0}' εκτελείται ακόμη. Θα θέλατε να τη διακόψετε; "
++msgid ""
++"The '{0}' operation is still performing work. Would you like to stop it?"
++msgstr "Η εργασία '{0}' εκτελείται ακόμη. Θα θέλατε να τη διακόψετε;"
+ 
+ #: ../src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/UserJobTile.cs:148
+ msgid "Continue"
+@@ -3871,7 +4037,7 @@ msgstr "Συνέχεια {0}"
+ 
+ #: ../src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/UserJobTile.cs:184
+ msgid "Stopping..."
+-msgstr "Γίνεται διακοπή…"
++msgstr "Γίνεται διακοπή..."
+ 
+ #: ../src/Core/Banshee.ThickClient/Banshee.Library.Gui/FileImportSource.cs:45
+ msgid "Import Files to Library"
+@@ -3891,7 +4057,7 @@ msgstr "Αρχεία"
+ 
+ #: ../src/Core/Banshee.ThickClient/Banshee.Library.Gui/FileImportSource.cs:63
+ msgid "C_hoose Files..."
+-msgstr "Ε_πιλογή αρχείων…"
++msgstr "Ε_πιλογή αρχείων..."
+ 
+ #: ../src/Core/Banshee.ThickClient/Banshee.Library.Gui/FolderImportSource.cs:43
+ msgid "Import Folders to Library"
+@@ -3907,15 +4073,19 @@ msgstr "Φάκελοι"
+ 
+ #: ../src/Core/Banshee.ThickClient/Banshee.Library.Gui/FolderImportSource.cs:57
+ msgid "C_hoose Folders..."
+-msgstr "Ε_πιλογή φακέλων…"
++msgstr "Ε_πιλογή φακέλων..."
+ 
+ #: ../src/Core/Banshee.ThickClient/Banshee.Library.Gui/ImportDialog.cs:73
+ msgid "<big><b>Import Media to Library</b></big>"
+ msgstr "<big><b>Εισαγωγή μέσων στη βιβλιοθήκη</b></big>"
+ 
+ #: ../src/Core/Banshee.ThickClient/Banshee.Library.Gui/ImportDialog.cs:79
+-msgid "Your media library is empty. You may import new music and videos into your library now, or choose to do so later."
+-msgstr "Η βιβλιοθήκη των πολυμέσων σας είναι κενή. Μπορείτε να εισαγάγετε μουσική και βίντεο στη βιβλιοθήκη σας τώρα, ή επιλέξτε να γίνει αργότερα."
++msgid ""
++"Your media library is empty. You may import new music and videos into your "
++"library now, or choose to do so later."
++msgstr ""
++"Η βιβλιοθήκη των πολυμέσων σας είναι κενή. Μπορείτε να εισαγάγετε μουσική "
++"και βίντεο στη βιβλιοθήκη σας τώρα, ή επιλέξτε να γίνει αργότερα."
+ 
+ #: ../src/Core/Banshee.ThickClient/Banshee.Library.Gui/ImportDialog.cs:89
+ msgid "Import _from:"
+@@ -3953,7 +4123,7 @@ msgstr "Εξαγωγή"
+ 
+ #: ../src/Core/Banshee.ThickClient/Banshee.Playlist.Gui/PlaylistExportDialog.cs:54
+ msgid "Select Format: "
+-msgstr "Επιλογή μορφής:"
++msgstr "Επιλογή μορφής: "
+ 
+ #: ../src/Core/Banshee.ThickClient/Banshee.Preferences.Gui/DefaultPreferenceWidgets.cs:104
+ msgid "Select library location"
+@@ -3977,7 +4147,7 @@ msgstr "Πηγή:"
+ 
+ #: ../src/Core/Banshee.ThickClient/Banshee.Preferences.Gui/PreferenceDialog.cs:55
+ msgid "Could not show preferences"
+-msgstr "Αδυναμία εμφάνισης προτιμήσεων "
++msgstr "Αδυναμία εμφάνισης προτιμήσεων"
+ 
+ #: ../src/Core/Banshee.ThickClient/Banshee.Preferences.Gui/PreferenceDialog.cs:56
+ msgid "The preferences service could not be found."
+@@ -3989,7 +4159,7 @@ msgstr "Νέα έξυπνη λίστα αναπαραγωγής"
+ 
+ #: ../src/Core/Banshee.ThickClient/Banshee.SmartPlaylist.Gui/Editor.cs:96
+ msgid "Playlist _Name:"
+-msgstr "_Όνομα λίστας αναπαραγωγής:"
++msgstr "Ό_νομα λίστας αναπαραγωγής:"
+ 
+ #: ../src/Core/Banshee.ThickClient/Banshee.SmartPlaylist.Gui/Editor.cs:108
+ msgid "Predefined Smart Playlists"
+@@ -4004,63 +4174,58 @@ msgid "Create and save"
+ msgstr "Δημιουργία και αποθήκευση"
+ 
+ #: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/CompositeTrackSourceContents.cs:96
+-#, fuzzy
+ #| msgid "Browser on Left"
+ msgid "Browser Content"
+-msgstr "Περιηγητής στα αριστερά"
++msgstr "Περιεχόμενο περιηγητή"
+ 
+ #: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/CompositeTrackSourceContents.cs:97
+ msgid "Configure the filters available in the browser"
+-msgstr ""
++msgstr "Ρύθμιση των διαθέσιμων φίλτρων στον περιηγητή"
+ 
+ #: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/CompositeTrackSourceContents.cs:102
+-#, fuzzy
+ #| msgid "Show this help"
+ msgid "Show Artist Filter"
+-msgstr "Εμφάνιση αυτής της βοήθειας"
++msgstr "Εμφάνιση καλλιτεχνικού φίλτρου"
+ 
+ #: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/CompositeTrackSourceContents.cs:103
+ msgid "Show a list of artists to filter by"
+-msgstr ""
++msgstr "Εμφάνιση μιας λίστας καλλιτεχνών για φιλτράρισμα από"
+ 
+ #: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/CompositeTrackSourceContents.cs:107
+-#| msgid "Sort Track Artist:"
+ msgid "Show all Artists"
+ msgstr "Προβολή όλων των καλλιτεχνών"
+ 
+ #: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/CompositeTrackSourceContents.cs:108
+-#, fuzzy
+ #| msgid "Set all track artists to this value"
+ msgid "Show all artists in the artist filter"
+-msgstr "Ορίστε για όλους τους καλλιτέχνες του κομματιού αυτή την τιμή"
++msgstr "Εμφάνιση όλων των καλλιτεχνών στο καλλιτεχνικό φίλτρο"
+ 
+ #: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/CompositeTrackSourceContents.cs:111
+-#, fuzzy
+ #| msgid "Sort Album Artist:"
+ msgid "Show Album Artists"
+-msgstr "Ταξινόμηση καλλιτέχνη δίσκου:"
++msgstr "Εμφάνιση συλλογών καλλιτεχνών"
+ 
+ #: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/CompositeTrackSourceContents.cs:112
+ msgid "Show only album artists, not artists with only single tracks"
+ msgstr ""
++"Εμφάνιση μόνο συλλογών καλλιτεχνών, όχι καλλιτεχνών με μεμονωμένα κομμάτια"
+ 
+ #: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/CompositeTrackSourceContents.cs:117
+-#, fuzzy
+ #| msgid "Show the next track"
+ msgid "Show Genre Filter"
+-msgstr "Εμφάνιση του επόμενου κομματιού"
++msgstr "Εμφάνιση είδους φίλτρου"
+ 
+ #: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/CompositeTrackSourceContents.cs:118
+ msgid "Show a list of genres to filter by"
+-msgstr ""
++msgstr "Εμφάνιση μιας λίστας ειδών για φιλτράρισμα"
+ 
+ #: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/CompositeTrackSourceContents.cs:122
+ msgid "Show Year Filter"
+-msgstr ""
++msgstr "Εμφάνιση φίλτρου έτους"
+ 
+ #: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/CompositeTrackSourceContents.cs:123
+ msgid "Show a list of years to filter by"
+-msgstr ""
++msgstr "Εμφάνιση μιας λίστας ετών για φιλτράρισμα"
+ 
+ #: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/CompositeTrackSourceContents.cs:228
+ #: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/InternetRadioSourceContents.cs:62
+@@ -4073,7 +4238,8 @@ msgstr "Περιηγητής στα αριστερά"
+ 
+ #: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/FilteredListSourceContents.cs:106
+ msgid "Show the artist/album browser to the left of the track list"
+-msgstr "Εμφάνιση του περιηγητή καλλιτέχνη/δίσκου στα αριστερά της λίστας κομματιών"
++msgstr ""
++"Εμφάνιση του περιηγητή καλλιτέχνη/δίσκου στα αριστερά της λίστας κομματιών"
+ 
+ #: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/FilteredListSourceContents.cs:109
+ msgid "Browser on Top"
+@@ -4092,20 +4258,22 @@ msgid "Show or hide the artist/album browser"
+ msgstr "Εμφάνιση ή απόκρυψη του περιηγητή καλλιτεχνών/δίσκων"
+ 
+ #: ../src/Core/Banshee.WebBrowser/Banshee.WebBrowser/NavigationControl.cs:156
+-msgid "This page is blocked because it is probably not the one you are looking for!"
++msgid ""
++"This page is blocked because it is probably not the one you are looking for!"
+ msgstr ""
++"Αυτή η σελίδα είναι φραγμένη, επειδή δεν είναι προφανώς αυτή που ψάχνετε!"
+ 
+ #. Translators: {0} is the URL of the web page that was requested
+ #: ../src/Core/Banshee.WebBrowser/Banshee.WebBrowser/NavigationControl.cs:158
+-#, fuzzy, csharp-format
++#, csharp-format
+ #| msgid "The specified resource is invalid."
+ msgid "The security certificate for {0} is invalid."
+-msgstr "Η καθορισμένη πηγή είναι άκυρη."
++msgstr "Το πιστοποιητικό ασφάλειας για το {0} είναι άκυρο."
+ 
+ #: ../src/Core/Banshee.WebBrowser/Banshee.WebSource/WebBrowserShell.cs:121
+ #, csharp-format
+ msgid "Loading {0}..."
+-msgstr "Φόρτωση {0}…"
++msgstr "Φόρτωση {0}..."
+ 
+ #: ../src/Core/Banshee.Widgets/Banshee.Widgets/DiscUsageDisplay.cs:189
+ msgid ""
+@@ -4130,24 +4298,12 @@ msgstr "Αδρανής"
+ #: ../src/Core/Banshee.Widgets/Banshee.Widgets/StreamPositionLabel.cs:151
+ #: ../src/Extensions/Banshee.AmazonMp3/Banshee.AmazonMp3/AmazonDownloadManager.cs:58
+ msgid "Contacting..."
+-msgstr "Επικοινωνία…"
++msgstr "Επικοινωνία..."
+ 
+ #: ../src/Core/Banshee.Widgets/Banshee.Widgets/StreamPositionLabel.cs:162
+ msgid "Buffering"
+ msgstr "Αποθήκευση στην ενδιάμεση μνήμη"
+ 
+-#: ../src/Core/Banshee.Widgets/Banshee.Widgets/VolumeButton.cs:96
+-msgid "Volume"
+-msgstr "Ένταση"
+-
+-#: ../src/Core/Banshee.Widgets/Banshee.Widgets/VolumeButton.cs:548
+-msgid "Muted"
+-msgstr "Σίγαση"
+-
+-#: ../src/Core/Banshee.Widgets/Banshee.Widgets/VolumeButton.cs:550
+-msgid "Full Volume"
+-msgstr "Μέγιστη ένταση"
+-
+ #: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:115
+ msgid "Device"
+ msgstr "Συσκευή"
+@@ -4184,29 +4340,29 @@ msgstr "Υποστηρίζει εξώφυλλο δίσκου"
+ msgid "Supports photos"
+ msgstr "Υποστηρίζει φωτογραφίες"
+ 
+-#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:463
++#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:466
+ msgid "Track duration is zero"
+ msgstr "Η διάρκεια του κομματιού είναι μηδέν"
+ 
+-#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:569
++#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:570
+ msgid "Syncing iPod"
+ msgstr "Συγχρονισμός του iPod"
+ 
+-#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:570
++#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:571
+ msgid "Preparing to synchronize..."
+-msgstr "Προετοιμασία για συγχρονισμό…"
++msgstr "Προετοιμασία για συγχρονισμό..."
+ 
+-#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:573
++#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:593
+ #, csharp-format
+ msgid "Adding track {0} of {1}"
+ msgstr "Προσθήκη κομματιού {0} από {1}"
+ 
+-#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:609
++#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:636
+ #, csharp-format
+ msgid "Removing track {0} of {1}"
+ msgstr "Απομάκρυνση κομματιού {0} από {1}"
+ 
+-#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:662
++#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:710
+ msgid "Writing media database"
+ msgstr "Εγγραφή σε βάση δεδομένων πολυμέσων"
+ 
+@@ -4224,50 +4380,60 @@ msgstr "Συσκευές"
+ msgid "Device Properties"
+ msgstr "Ιδιότητες συσκευής"
+ 
+-#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:203
++#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:201
+ msgid "Product"
+ msgstr "Προϊόν"
+ 
+-#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:204
++#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:202
+ msgid "Vendor"
+ msgstr "Πωλητής"
+ 
+-#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:287
++#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:292
+ #: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Data/PodcastSource.cs:141
+ #, csharp-format
+ msgid "Loading {0}"
+ msgstr "Φόρτωση {0}"
+ 
+-#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:381
++#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:386
+ #: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/ColumnCellYesNo.cs:37
+ msgid "Yes"
+ msgstr "Ναι"
+ 
+-#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:381
++#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:386
+ #: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/ColumnCellYesNo.cs:38
+ msgid "No"
+ msgstr "Όχι"
+ 
+-#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:402
++#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:407
+ #, csharp-format
+-msgid "The {0} format is not supported by the device, and no converter was found to convert it"
+-msgstr "Η μορφή {0} δεν υποστηρίζεται από τη συσκευή και δε βρέθηκε μετατροπέας για να γίνει μετατροπή "
++msgid ""
++"The {0} format is not supported by the device, and no converter was found to "
++"convert it"
++msgstr ""
++"Η μορφή {0} δεν υποστηρίζεται από τη συσκευή και δε βρέθηκε μετατροπέας για "
++"να γίνει μετατροπή"
+ 
+-#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:408
++#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:413
+ msgid "File format conversion support is not available"
+ msgstr "Δεν είναι διαθέσιμη η υπόστηριξη μετατροπής μορφής αρχείου"
+ 
+-#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:434
++#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:439
+ msgid "Error converting file"
+ msgstr "Σφάλμα μετατροπής αρχείου"
+ 
+ #: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSync.cs:135
+ msgid "Sync when first plugged in and when the libraries change"
+-msgstr "Αυτόματος συγχρονισμός της συσκευής όταν συνδέεται για πρώτη φορά και όταν αλλάζουν οι βιβλιοθήκες"
++msgstr ""
++"Αυτόματος συγχρονισμός της συσκευής όταν συνδέεται για πρώτη φορά και όταν "
++"αλλάζουν οι βιβλιοθήκες"
+ 
+ #: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSync.cs:136
+-msgid "Begin synchronizing the device as soon as the device is plugged in or the libraries change."
+-msgstr "Έναρξη συγχρονισμού της συσκευής μόλις η συσκευή έχει συνδεθεί ή οι βιβλιοθήκες έχουν αλλάξει."
++msgid ""
++"Begin synchronizing the device as soon as the device is plugged in or the "
++"libraries change."
++msgstr ""
++"Έναρξη συγχρονισμού της συσκευής μόλις η συσκευή έχει συνδεθεί ή οι "
++"βιβλιοθήκες έχουν αλλάξει."
+ 
+ #: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSync.cs:139
+ msgid "Sync Preferences"
+@@ -4289,7 +4455,7 @@ msgstr[1] "Η διαδικασία συγχρονισμού θα αφαιρέσ
+ msgid "Are you sure you want to continue?"
+ msgstr "Είστε σίγουρος ότι θέλετε να συνεχίσετε;"
+ 
+-#: ../src/Dap/Banshee.Dap/Banshee.Dap.Gui/DapActions.cs:118
++#: ../src/Dap/Banshee.Dap/Banshee.Dap.Gui/DapActions.cs:121
+ msgid "Remove tracks"
+ msgstr "Αφαίρεση κομματιών"
+ 
+@@ -4353,7 +4519,7 @@ msgstr "Συγχρονισμός ολόκληρης της βιβλιοθήκη
+ #: ../src/Dap/Banshee.Dap/Banshee.Dap.Gui/LibrarySyncOptions.cs:154
+ #, csharp-format
+ msgid "Sync from “{0}”"
+-msgstr "Συγχρονισμός από «{0}»"
++msgstr "Συγχρονισμός από “{0}”"
+ 
+ #: ../src/Dap/Banshee.Dap/Banshee.Dap.Gui/PurchasedMusicActions.cs:53
+ msgid "Import Purchased Music"
+@@ -4364,12 +4530,12 @@ msgstr "Εισαγωγή αγορασμένης μουσικής"
+ msgid "Disconnect"
+ msgstr "Αποσύνδεση"
+ 
+-#: ../src/Dap/Banshee.Dap/Banshee.Dap/RemovableSource.cs:108
++#: ../src/Dap/Banshee.Dap/Banshee.Dap/RemovableSource.cs:111
+ #, csharp-format
+ msgid "Disconnecting {0}..."
+-msgstr "Αποσύνδεση {0}…"
++msgstr "Αποσύνδεση {0}..."
+ 
+-#: ../src/Dap/Banshee.Dap/Banshee.Dap/RemovableSource.cs:115
++#: ../src/Dap/Banshee.Dap/Banshee.Dap/RemovableSource.cs:118
+ #, csharp-format
+ msgid "Could not disconnect {0}: {1}"
+ msgstr "Αδυναμία αποσύνδεσης {0}: {1}"
+@@ -4413,10 +4579,9 @@ msgid "Error Initializing MTP Device Support"
+ msgstr "Σφάλμα κατά την αρχικοποίηση της υποστήριξης συσκευών MTP"
+ 
+ #: ../src/Dap/Banshee.Dap.Mtp/Banshee.Dap.Mtp/MtpSource.cs:83
+-#, fuzzy
+ #| msgid "There was an error intializing MTP device support."
+ msgid "There was an error initializing MTP device support."
+-msgstr "Σφάλμα κατά την αρχικοποίηση της υποστήριξης συσκευών MTP"
++msgstr "Σφάλμα κατά την αρχικοποίηση της υποστήριξης συσκευών MTP."
+ 
+ #: ../src/Dap/Banshee.Dap.Mtp/Banshee.Dap.Mtp/MtpSource.cs:142
+ #: ../src/Hyena/Hyena.Gui/Hyena.Gui.Dialogs/VersionInformationDialog.cs:66
+@@ -4475,7 +4640,8 @@ msgstr "Χώρα"
+ 
+ #: ../src/Extensions/Banshee.AmazonMp3.Store/Banshee.AmazonMp3.Store/StoreSourcePreferences.cs:60
+ msgid "Which Amazon MP3 storefront to use by default."
+-msgstr "Ποια βιτρίνα του καταστήματος Amazon MP3 θα χρησιμοποιηθεί ως προεπιλογή."
++msgstr ""
++"Ποια βιτρίνα του καταστήματος Amazon MP3 θα χρησιμοποιηθεί ως προεπιλογή."
+ 
+ #: ../src/Extensions/Banshee.AmazonMp3.Store/Banshee.AmazonMp3.Store/StoreSourcePreferences.cs:90
+ msgid "Automatic (Geo IP detection)"
+@@ -4518,13 +4684,12 @@ msgstr "Άνοιγμα βιβλίου"
+ 
+ #: ../src/Extensions/Banshee.Audiobook/Banshee.Audiobook/Actions.cs:56
+ msgid "Merge Discs..."
+-msgstr "Συγχώνευση δίσκων…"
++msgstr "Συγχώνευση δίσκων..."
+ 
+ #: ../src/Extensions/Banshee.Audiobook/Banshee.Audiobook/Actions.cs:57
+-#, fuzzy
+ #| msgid "Audiobooks"
+ msgid "Go to Audiobooks"
+-msgstr "Ηχογραφημένα βιβλία"
++msgstr "Μετάβαση σε ηχητικά βιβλία"
+ 
+ #: ../src/Extensions/Banshee.Audiobook/Banshee.Audiobook/Actions.cs:61
+ #: ../src/Extensions/Banshee.Audiobook/Banshee.Audiobook/Actions.cs:65
+@@ -4545,8 +4710,13 @@ msgstr[0] "Συγχώνευση των {0} επιλεγμένων δίσκων 
+ msgstr[1] "Συγχώνευση των {0} επιλεγμένων δίσκων σε ένα βιβλίο;"
+ 
+ #: ../src/Extensions/Banshee.Audiobook/Banshee.Audiobook/Actions.cs:144
+-msgid "This will ensure the disc numbers are all set properly, and then set the author and book title for all tracks on all these discs to the values below"
+-msgstr "Αυτό θα εξασφαλίσει ότι οι αριθμοί των δίσκων είναι ορισμένοι σωστά, και μετά θα οριστεί ο συγγραφέας και ο τίτλος βιβλίου για όλα τα κομμάτια όλων αυτών των δίσκων στις παρακάτω τιμές"
++msgid ""
++"This will ensure the disc numbers are all set properly, and then set the "
++"author and book title for all tracks on all these discs to the values below"
++msgstr ""
++"Αυτό θα εξασφαλίσει ότι οι αριθμοί των δίσκων είναι ορισμένοι σωστά, και "
++"μετά θα οριστεί ο συγγραφέας και ο τίτλος βιβλίου για όλα τα κομμάτια όλων "
++"αυτών των δίσκων στις παρακάτω τιμές"
+ 
+ #: ../src/Extensions/Banshee.Audiobook/Banshee.Audiobook/Actions.cs:153
+ msgid "Author:"
+@@ -4589,7 +4759,7 @@ msgstr[1] "{0} βιβλία"
+ 
+ #: ../src/Extensions/Banshee.Audiobook/Banshee.Audiobook/AudiobookLibrarySource.cs:136
+ msgid "Audiobooks Folder"
+-msgstr "Φάκελος ηχογραφημένων βιβλίων (audiobooks)"
++msgstr "Φάκελος ηχογραφημένων βιβλίων"
+ 
+ #: ../src/Extensions/Banshee.Audiobook/Banshee.Audiobook/BookView.cs:114
+ msgid "Resume Playback"
+@@ -4613,7 +4783,8 @@ msgstr "Χ_τύπημα"
+ 
+ #: ../src/Extensions/Banshee.Bpm/Banshee.Bpm/BpmEntry.cs:112
+ msgid "Have Banshee attempt to auto-detect the BPM of this song"
+-msgstr "Αφήστε το Banshee να προσπαθήσει να ανιχνεύσει αυτόματα το BPM του τραγουδιού"
++msgstr ""
++"Αφήστε το Banshee να προσπαθήσει να ανιχνεύσει αυτόματα το BPM του τραγουδιού"
+ 
+ #: ../src/Extensions/Banshee.Bpm/Banshee.Bpm/BpmEntry.cs:114
+ msgid "Play this song"
+@@ -4621,15 +4792,21 @@ msgstr "Αναπαραγωγή αυτού του τραγουδιού"
+ 
+ #: ../src/Extensions/Banshee.Bpm/Banshee.Bpm/BpmEntry.cs:117
+ msgid "Tap this button to the beat to set the BPM for this song manually"
+-msgstr "Πατήστε αυτό το κουμπί στο ρυθμό ώστε να καθορίσετε χειροκίνητα τους χτύπους ανά λεπτό αυτού του τραγουδιού"
++msgstr ""
++"Πατήστε αυτό το κουμπί στο ρυθμό ώστε να καθορίσετε χειροκίνητα τους χτύπους "
++"ανά λεπτό αυτού του τραγουδιού"
+ 
+ #: ../src/Extensions/Banshee.Bpm/Banshee.Bpm/BpmService.cs:147
+ msgid "_Automatically detect BPM for all songs"
+ msgstr "_Αυτόματη ανίχνευση BPM για όλα τα τραγούδια"
+ 
+ #: ../src/Extensions/Banshee.Bpm/Banshee.Bpm/BpmService.cs:148
+-msgid "Detect beats per minute (BPM) for all songs that don't already have a value set"
+-msgstr "Ανιχνεύστε χτύπους ανά λεπτό (BPM) για όλα τα τραγούδια που δεν έχουν ήδη μία ρυθμισμένη τιμή"
++msgid ""
++"Detect beats per minute (BPM) for all songs that don't already have a value "
++"set"
++msgstr ""
++"Ανιχνεύστε χτύπους ανά λεπτό (BPM) για όλα τα τραγούδια που δεν έχουν ήδη "
++"μία ρυθμισμένη τιμή"
+ 
+ #: ../src/Extensions/Banshee.CoverArt/Banshee.CoverArt/CoverArtJob.cs:58
+ msgid "Downloading Cover Art"
+@@ -4658,13 +4835,19 @@ msgstr "Πίσω"
+ 
+ #: ../src/Extensions/Banshee.Daap/Banshee.Daap/DaapErrorView.cs:101
+ msgid ""
+-"iTunes® 7 introduced new compatibility issues and currently only works with other iTunes® 7 clients.\n"
++"iTunes® 7 introduced new compatibility issues and currently only works with "
++"other iTunes® 7 clients.\n"
+ "\n"
+-"No third-party clients can connect to iTunes® music shares anymore. This is an intentional limitation by Apple in iTunes® 7 and newer, we apologize for the unfortunate inconvenience."
++"No third-party clients can connect to iTunes® music shares anymore. This is "
++"an intentional limitation by Apple in iTunes® 7 and newer, we apologize for "
++"the unfortunate inconvenience."
+ msgstr ""
+-"Το iTunes® 7 εισήγαγε νέα ζητήματα συμβατότητας και αυτή τη στιγμή δουλεύει μόνο με άλλους πελάτες iTunes® 7.\n"
++"Το iTunes® 7 εισήγαγε νέα ζητήματα συμβατότητας και αυτή τη στιγμή δουλεύει "
++"μόνο με άλλους πελάτες iTunes® 7.\n"
+ "\n"
+-"Κανένα πρόγραμμα πελάτης τρίτων δεν μπορεί να συνδεθεί στη κοινόχρηστη μουσική του  iTunes® πια. Είναι ένας σκόπιμος περιορισμός από την Apple στο iTunes® 7 και σας ζητάμε συγγνώμη για την ατυχή αναστάτωση."
++"Κανένα πρόγραμμα πελάτης τρίτων δεν μπορεί να συνδεθεί στη κοινόχρηστη "
++"μουσική του iTunes® πια. Είναι ένας σκόπιμος περιορισμός από την Apple στο "
++"iTunes® 7 και σας ζητάμε συγγνώμη για την ατυχή αναστάτωση."
+ 
+ #: ../src/Extensions/Banshee.Daap/Banshee.Daap/DaapErrorView.cs:111
+ msgid "Common reasons for connection failures:"
+@@ -4722,11 +4905,11 @@ msgstr "Είσοδος"
+ msgid "Connecting to {0}"
+ msgstr "Σύνδεση στο {0}"
+ 
+-#: ../src/Extensions/Banshee.Daap/Banshee.Daap/DaapService.cs:185
++#: ../src/Extensions/Banshee.Daap/Banshee.Daap/DaapService.cs:186
+ msgid "Add Remote DAAP Server"
+ msgstr "Προσθήκη απομακρυσμένου εξυπηρετητή DAAP"
+ 
+-#: ../src/Extensions/Banshee.Daap/Banshee.Daap/DaapService.cs:186
++#: ../src/Extensions/Banshee.Daap/Banshee.Daap/DaapService.cs:187
+ msgid "Add a new remote DAAP server"
+ msgstr "Προσθήκη ενός νέου απομακρυσμένου DAAP εξυπηρετητή"
+ 
+@@ -4756,7 +4939,7 @@ msgstr "Άνοιγμα απομακρυσμένου DAAP εξυπηρετητή"
+ 
+ #: ../src/Extensions/Banshee.Daap/Banshee.Daap/OpenRemoteServer.cs:51
+ msgid "Enter server IP address and port:"
+-msgstr "Εισαγωγή  διεύθυνσης IP και θύρας εξυπηρετητή:"
++msgstr "Εισαγωγή διεύθυνσης IP και θύρας εξυπηρετητή:"
+ 
+ #: ../src/Extensions/Banshee.Emusic/Banshee.Emusic/DownloadManager/DownloadUserJob.cs:46
+ #: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/SearchView.cs:133
+@@ -4768,12 +4951,12 @@ msgstr "Μεταφορτώσεις"
+ 
+ #: ../src/Extensions/Banshee.Emusic/Banshee.Emusic/DownloadManager/DownloadUserJob.cs:50
+ msgid "Downloading eMusic Track(s)"
+-msgstr "Μεταφόρτωση κομματιού/ών eMusic"
++msgstr "Μεταφόρτωση κομματιών eMusic"
+ 
+ #: ../src/Extensions/Banshee.Emusic/Banshee.Emusic/DownloadManager/DownloadUserJob.cs:51
+ #: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/DownloadManager/DownloadUserJob.cs:51
+ msgid "Initializing..."
+-msgstr "Αρχικοποίηση…"
++msgstr "Αρχικοποίηση..."
+ 
+ #: ../src/Extensions/Banshee.Emusic/Banshee.Emusic/DownloadManager/DownloadUserJob.cs:52
+ msgid "Cancel all eMusic downloads?"
+@@ -4785,7 +4968,7 @@ msgstr "Ακύρωση όλων των μεταφορτώσεων από eMusic;
+ msgid "Transferring {0} file at {1} KB/s"
+ msgid_plural "Transferring {0} of {2} files at {1} KB/s"
+ msgstr[0] "Μεταφορά {0} αρχείου στα {1} KB/s"
+-msgstr[1] "Μεταφορά {0} από {2} αρχείων στα {1} KB/s"
++msgstr[1] "Μεταφορά {0} από {2} αρχεία στα {1} KB/s"
+ 
+ #: ../src/Extensions/Banshee.Emusic/Banshee.Emusic/DownloadManager/DownloadUserJob.cs:133
+ #: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/DownloadManager/DownloadUserJob.cs:133
+@@ -4795,7 +4978,7 @@ msgstr "Ακύρωση μεταφορτώσεων"
+ #: ../src/Extensions/Banshee.Emusic/Banshee.Emusic/DownloadManager/DownloadUserJob.cs:135
+ #: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/DownloadManager/DownloadUserJob.cs:135
+ msgid "Waiting for downloads to terminate..."
+-msgstr "Αναμονή για τερματισμό μεταφορτώσεων…"
++msgstr "Αναμονή για τερματισμό μεταφορτώσεων..."
+ 
+ #: ../src/Extensions/Banshee.Emusic/Banshee.Emusic/EmusicImport.cs:59
+ msgid "Import eMusic Downloads to Library"
+@@ -4851,20 +5034,30 @@ msgid "Duplicate Albums"
+ msgstr "Διπλοί δίσκοι"
+ 
+ #: ../src/Extensions/Banshee.Fixup/Banshee.Fixup/AlbumDuplicateSolver.cs:47
+-msgid "Displayed are albums that should likely be merged.  For each row, click the desired title to make it bold, or uncheck it to take no action."
+-msgstr "Οι προβαλλόμενοι είναι δίσκοι που πιθανότατα πρέπει να συγχωνευθούν. Για κάθε σειρά, πατήστε στον επιθυμητό τίτλο για να τον κάνετε έντονο, ή απο-επιλέξτε τον για να μη γίνει καμία ενέργεια."
++msgid ""
++"Displayed are albums that should likely be merged.  For each row, click the "
++"desired title to make it bold, or uncheck it to take no action."
++msgstr ""
++"Οι προβαλλόμενοι είναι δίσκοι που πιθανότατα πρέπει να συγχωνευθούν. Για "
++"κάθε σειρά, πατήστε στον επιθυμητό τίτλο για να τον κάνετε έντονο, ή "
++"αποεπιλέξτε τον για να μη γίνει καμία ενέργεια."
+ 
+ #: ../src/Extensions/Banshee.Fixup/Banshee.Fixup/ArtistDuplicateSolver.cs:46
+ msgid "Duplicate Artists"
+ msgstr "Διπλοί καλλιτέχνες"
+ 
+ #: ../src/Extensions/Banshee.Fixup/Banshee.Fixup/ArtistDuplicateSolver.cs:47
+-msgid "Displayed are artists that should likely be merged.  For each row, click the desired name to make it bold, or uncheck it to take no action."
+-msgstr "Εμφανίζονται καλλιτέχνες που θα έπρεπε πιθανόν να ενοποιηθούν. Για κάθε γραμμή, κάντε κλικ στο επιθυμητό όνομα για να το κάνετε έντονο ή αποεπιλέξτε το για να μη γίνει καμία ενέργεια."
++msgid ""
++"Displayed are artists that should likely be merged.  For each row, click the "
++"desired name to make it bold, or uncheck it to take no action."
++msgstr ""
++"Εμφανίζονται καλλιτέχνες που θα έπρεπε πιθανόν να ενοποιηθούν. Για κάθε "
++"γραμμή, κάντε κλικ στο επιθυμητό όνομα για να το κάνετε έντονο ή αποεπιλέξτε "
++"το για να μη γίνει καμία ενέργεια."
+ 
+ #: ../src/Extensions/Banshee.Fixup/Banshee.Fixup/FixActions.cs:50
+ msgid "Fix Music Metadata..."
+-msgstr "Διόρθωση Μεταδεδομένων Μουσικής…"
++msgstr "Διόρθωση Μεταδεδομένων Μουσικής..."
+ 
+ #: ../src/Extensions/Banshee.Fixup/Banshee.Fixup/FixSource.cs:48
+ msgid "Metadata Fixer"
+@@ -4883,12 +5076,17 @@ msgid "Duplicate Genres"
+ msgstr "Διπλά είδη"
+ 
+ #: ../src/Extensions/Banshee.Fixup/Banshee.Fixup/GenreDuplicateSolver.cs:47
+-msgid "Displayed are genres that should likely be merged.  For each row, click the desired genre to make it bold, or uncheck it to take no action."
+-msgstr "Εμφανίζονται είδη που θα έπρεπε πιθανόν να ενοποιηθούν. Για κάθε γραμμή, κάντε κλικ στο επιθυμητό είδος για να το κάνετε έντονο ή αποεπιλέξτε το για να μη γίνει καμία ενέργεια."
++msgid ""
++"Displayed are genres that should likely be merged.  For each row, click the "
++"desired genre to make it bold, or uncheck it to take no action."
++msgstr ""
++"Εμφανίζονται είδη που θα έπρεπε πιθανόν να ενοποιηθούν. Για κάθε γραμμή, "
++"κάντε κλικ στο επιθυμητό είδος για να το κάνετε έντονο ή αποεπιλέξτε το για "
++"να μη γίνει καμία ενέργεια."
+ 
+ #: ../src/Extensions/Banshee.Fixup/Banshee.Fixup/GenreDuplicateSolver.cs:77
+ msgid " and "
+-msgstr "και"
++msgstr " και "
+ 
+ #. Translators: These are articles that might be prefixed or suffixed
+ #. on artist names or album titles.  You can add as many as you need,
+@@ -4945,7 +5143,9 @@ msgstr "Λήψη λεπτομερειών αντικειμένου από το I
+ 
+ #: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/DetailsSource.cs:148
+ msgid "Timed out getting item details from the Internet Archive"
+-msgstr "Υπέρβαση χρονικού ορίου κατά την λήψη λεπτομερειών αντικειμένου από το Internet Archive"
++msgstr ""
++"Υπέρβαση χρονικού ορίου κατά την λήψη λεπτομερειών αντικειμένου από το "
++"Internet Archive"
+ 
+ #: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/DetailsSource.cs:149
+ #: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/SearchSource.cs:190
+@@ -5085,7 +5285,7 @@ msgstr "Προτιμώμενοι τύποι πολυμέσων"
+ 
+ #: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HomeSource.cs:122
+ msgid "_Audio"
+-msgstr "_Ήχος"
++msgstr "Ή_χος"
+ 
+ #: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HomeSource.cs:125
+ msgid "_Video"
+@@ -5098,7 +5298,7 @@ msgstr "_Κείμενο"
+ #: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HomeView.cs:100
+ #, csharp-format
+ msgid "Search..."
+-msgstr "Αναζήτηση…"
++msgstr "Αναζήτηση..."
+ 
+ #: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HomeView.cs:111
+ msgid "_Go"
+@@ -5162,13 +5362,20 @@ msgid "Library of Congress"
+ msgstr "Βιβλιοθήκη του Κογκρέσου"
+ 
+ #: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HomeView.cs:136
+-#| msgid "Sample"
+ msgid "Examples:"
+ msgstr "Παραδείγματα:"
+ 
+ #: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HomeView.cs:148
+-msgid "The Internet Archive, a 501(c)(3) non-profit, is building a digital library of Internet sites and other cultural artifacts in digital form. Like a paper library, we provide free access to researchers, historians, scholars, and the general public."
+-msgstr "Το Internet Archive, μια μη κερδοσκοπική οργάνωση του 501(c)(3), δομεί μια ψηφιακή βιβλιοθήκη ιστοσελίδων διαδικτύου και άλλων καλλιτεχνημάτων σε ψηφιακή μορφή. Όπως και μια παραδοσιακή βιβλιοθήκη, παρέχουμε ελεύθερη πρόσβαση σε ερευνητές, ιστορικούς, μελετητές και το ευρύ κοινό."
++msgid ""
++"The Internet Archive, a 501(c)(3) non-profit, is building a digital library "
++"of Internet sites and other cultural artifacts in digital form. Like a paper "
++"library, we provide free access to researchers, historians, scholars, and "
++"the general public."
++msgstr ""
++"Το Internet Archive, μια μη κερδοσκοπική οργάνωση του 501(c)(3), δομεί μια "
++"ψηφιακή βιβλιοθήκη ιστοσελίδων διαδικτύου και άλλων καλλιτεχνημάτων σε "
++"ψηφιακή μορφή. Όπως και μια παραδοσιακή βιβλιοθήκη, παρέχουμε ελεύθερη "
++"πρόσβαση σε ερευνητές, ιστορικούς, μελετητές και το ευρύ κοινό."
+ 
+ #: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HomeView.cs:151
+ msgid "Visit the Internet Archive online at archive.org"
+@@ -5207,8 +5414,8 @@ msgstr "Δεν βρέθηκαν αποτελέσματα."
+ #, csharp-format
+ msgid "Showing 1 match"
+ msgid_plural "Showing 1 to {0:N0} of {1:N0} total matches"
+-msgstr[0] "Προβάλλεται 1 αποτέλεσμα"
+-msgstr[1] "Προβάλλεται 1 έως {0:N0} από {1:N0} συνολικά αποτελεσμάτων"
++msgstr[0] "Προβάλλεται 1 συμφωνία"
++msgstr[1] "Προβάλλεται 1 έως {0:N0} από {1:N0} συνολικές συμφωνίες"
+ 
+ #: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/SearchSource.cs:189
+ msgid "Timed out searching the Internet Archive"
+@@ -5483,8 +5690,12 @@ msgid "Edit radio station"
+ msgstr "Επεξεργασία σταθμού ραδιοφώνου"
+ 
+ #: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/StationEditor.cs:97
+-msgid "Enter the Genre, Title and URL of the radio station you wish to add. A description is optional."
+-msgstr "Εισαγάγετε το είδος, ονομασία και το URL του ραδιοφωνικού σταθμού που θα επιθυμούσατε να προστεθεί. Η περιγραφή είναι προαιρετική."
++msgid ""
++"Enter the Genre, Title and URL of the radio station you wish to add. A "
++"description is optional."
++msgstr ""
++"Εισαγάγετε το είδος, ονομασία και το URL του ραδιοφωνικού σταθμού που θα "
++"επιθυμούσατε να προστεθεί. Η περιγραφή είναι προαιρετική."
+ 
+ #: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/StationEditor.cs:118
+ msgid "Station Genre:"
+@@ -5532,43 +5743,39 @@ msgstr "Επισκεφτείτε τη σελίδα προφίλ σας στο La
+ 
+ #: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:146
+ #: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmPreferences.cs:93
+-#, fuzzy
+ #| msgid "_Enable Song Reporting"
+ msgid "_Enable Song Reporting From Banshee"
+-msgstr "_Ενεργοποίηση αναφοράς τραγουδιού"
++msgstr "_Ενεργοποίηση αναφοράς τραγουδιού από το Banshee"
+ 
+ #: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:147
+-#, fuzzy
+ #| msgid "Enable song reporting"
+ msgid "Enable song reporting From Banshee"
+-msgstr "Ενεργοποίηση αναφοράς τραγουδιού"
++msgstr "Ενεργοποίηση αναφοράς τραγουδιού από το Banshee"
+ 
+ #: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:152
+ #: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmPreferences.cs:98
+-#, fuzzy
+ #| msgid "_Enable Song Reporting"
+ msgid "_Enable Song Reporting From Device"
+-msgstr "_Ενεργοποίηση αναφοράς τραγουδιού"
++msgstr "_Ενεργοποίηση αναφοράς τραγουδιού από συσκευή"
+ 
+ #: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:153
+-#, fuzzy
+ #| msgid "Enable song reporting"
+ msgid "Enable song reporting From Device"
+-msgstr "Ενεργοποίηση αναφοράς τραγουδιού"
++msgstr "Ενεργοποίηση αναφοράς τραγουδιού από συσκευή"
+ 
+ #: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:402
+ msgid "Scrobbling from device"
+-msgstr ""
++msgstr "Προτιμήσεις από συσκευή"
+ 
+ #: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:403
+ msgid "Scrobbling from device..."
+-msgstr ""
++msgstr "Προτιμήσεις από συσκευή..."
+ 
+ #: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:414
+-#, fuzzy, csharp-format
++#, csharp-format
+ #| msgid "Removing track {0} of {1}"
+ msgid "Processing track {0} of {1} ..."
+-msgstr "Απομάκρυνση κομματιού {0} από {1}"
++msgstr "Επεξεργασία κομματιού {0} από {1}..."
+ 
+ #: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmActions.cs:66
+ msgid "Connect"
+@@ -5668,8 +5875,12 @@ msgid "Sign up for Last.fm"
+ msgstr "Εγγραφείτε για το Last.fm"
+ 
+ #: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmPreferences.cs:262
+-msgid "Open Last.fm in a browser, giving you the option to authorize Banshee to work with your account"
+-msgstr "Άνοιγμα του Last.fm σε έναν περιηγητή, δίνοντάς σας την επιλογή να εξουσιοδοτήστε το Banshee για να δουλέψτε με το λογαριασμό σας"
++msgid ""
++"Open Last.fm in a browser, giving you the option to authorize Banshee to "
++"work with your account"
++msgstr ""
++"Άνοιγμα του Last.fm σε έναν περιηγητή, δίνοντάς σας την επιλογή να "
++"εξουσιοδοτήστε το Banshee για να δουλέψτε με το λογαριασμό σας"
+ 
+ #: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmPreferences.cs:273
+ #: ../src/Libraries/Lastfm.Gui/Lastfm.Gui/AccountLoginDialog.cs:49
+@@ -5677,10 +5888,11 @@ msgid "Log in to Last.fm"
+ msgstr "Συνδεθείτε στο Last.fm"
+ 
+ #: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmPreferences.cs:294
+-#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:294
+-#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:321
++#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:298
++#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:335
+ msgid "You need to allow Banshee to access your Last.fm account."
+-msgstr "Πρέπει να επιτρέψτε στο Banshee να έχει πρόσβαση στο λογαριασμό σας Last.fm"
++msgstr ""
++"Πρέπει να επιτρέψτε στο Banshee να έχει πρόσβαση στο λογαριασμό σας Last.fm."
+ 
+ #: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmPreferences.cs:304
+ msgid "Finish Logging In"
+@@ -5753,7 +5965,7 @@ msgstr "Άγνωστη ομοιότητα"
+ 
+ #: ../src/Extensions/Banshee.LastfmStreaming/Banshee.LastfmStreaming/LastfmStreamingActions.cs:59
+ msgid "_Add Station..."
+-msgstr "_Προσθήκη σταθμού.."
++msgstr "_Προσθήκη σταθμού..."
+ 
+ #: ../src/Extensions/Banshee.LastfmStreaming/Banshee.LastfmStreaming/LastfmStreamingActions.cs:60
+ msgid "Add a new Last.fm radio station"
+@@ -5825,7 +6037,7 @@ msgstr "Νέος σταθμός"
+ 
+ #: ../src/Extensions/Banshee.LastfmStreaming/Banshee.LastfmStreaming/StationEditor.cs:90
+ msgid "Station _Type:"
+-msgstr "_Τύπος σταθμού"
++msgstr "_Τύπος σταθμού:"
+ 
+ #: ../src/Extensions/Banshee.LastfmStreaming/Banshee.LastfmStreaming/StationSource.cs:58
+ msgid "Last.fm Station"
+@@ -5842,7 +6054,7 @@ msgstr "Διαγραφή του σταθμού Last.fm"
+ #: ../src/Extensions/Banshee.LastfmStreaming/Banshee.LastfmStreaming/StationSource.cs:239
+ #, csharp-format
+ msgid "Tuning Last.fm to {0}."
+-msgstr "Συντονισμός του  Last.fm σε {0}."
++msgstr "Συντονισμός του Last.fm σε {0}."
+ 
+ #. Translators: {0} is an error message sentence from RadioConnection.cs.
+ #: ../src/Extensions/Banshee.LastfmStreaming/Banshee.LastfmStreaming/StationSource.cs:249
+@@ -5994,7 +6206,8 @@ msgstr "Οδηγός Miro"
+ 
+ #: ../src/Extensions/Banshee.MiroGuide/Banshee.MiroGuide/MiroGuideSource.cs:97
+ msgid "Discover interesting podcasts in the Miro Guide podcast directory!"
+-msgstr "Ανακαλύψτε ενδιαφέρουσες φορητές εκπομπές στο Miro Guide podcast directory!"
++msgstr ""
++"Ανακαλύψτε ενδιαφέρουσες φορητές εκπομπές στο Miro Guide podcast directory!"
+ 
+ #: ../src/Extensions/Banshee.MiroGuide/Banshee.MiroGuide/MiroGuideSource.cs:100
+ msgid "Open Miro Guide"
+@@ -6008,6 +6221,11 @@ msgstr "Αναζήτηση φορητών εκπομπών (podcasts)"
+ msgid "Search for video podcasts"
+ msgstr "Αναζήτηση για φορητές εκπομπές βίντεο (Podcasts)"
+ 
++#: ../src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/NotificationAreaService.cs:132
++#: ../src/Extensions/Banshee.SoundMenu/Banshee.SoundMenu/SoundMenuService.cs:110
++msgid "_Close"
++msgstr "_Κλείσιμο"
++
+ #: ../src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/NotificationAreaService.cs:139
+ msgid "_Show Notifications"
+ msgstr "_Εμφάνιση ειδοποιήσεων"
+@@ -6021,8 +6239,12 @@ msgid "Still Running"
+ msgstr "Εκτελείται ακόμη"
+ 
+ #: ../src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/NotificationAreaService.cs:348
+-msgid "Banshee was closed to the notification area. Use the <i>Quit</i> option to end your session."
+-msgstr "Το Banshee έχει κλείσει στη περιοχή ειδοποιήσεων. Χρησιμοποιήστε την επιλογή <i>Έξοδος</i> για να τερματίσετε τη συνεδρία σας."
++msgid ""
++"Banshee was closed to the notification area. Use the <i>Quit</i> option to "
++"end your session."
++msgstr ""
++"Το Banshee έχει κλείσει στη περιοχή ειδοποιήσεων. Χρησιμοποιήστε την επιλογή "
++"<i>Έξοδος</i> για να τερματίσετε τη συνεδρία σας."
+ 
+ #: ../src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/NotificationAreaService.cs:483
+ #: ../src/Extensions/Banshee.SoundMenu/Banshee.SoundMenu/SoundMenuService.cs:326
+@@ -6055,12 +6277,14 @@ msgstr "Απλοποίηση"
+ 
+ #: ../src/Extensions/Banshee.NowPlaying/Banshee.NowPlaying/NowPlayingSource.cs:60
+ msgid "Hide/Show the source list, menu, toolbar, and status bar"
+-msgstr "Απόκρυψη/Εμφάνιση της λίστας πηγής, γραμμής μενού, γραμμής εργαλείων, και της μπάρας κατάστασης"
++msgstr ""
++"Απόκρυψη/Εμφάνιση της λίστας πηγής, γραμμής μενού, γραμμής εργαλείων, και "
++"της μπάρας κατάστασης"
+ 
+ #: ../src/Extensions/Banshee.OpticalDisc/Banshee.OpticalDisc.AudioCd/AudioCdDiscModel.cs:75
+ #: ../src/Extensions/Banshee.OpticalDisc/Banshee.OpticalDisc.AudioCd/AudioCdSource.cs:54
+ msgid "Audio CD"
+-msgstr "Ψηφιακός δίσκος (CD) ήχου"
++msgstr "CD ήχου"
+ 
+ #: ../src/Extensions/Banshee.OpticalDisc/Banshee.OpticalDisc.AudioCd/AudioCdDiscModel.cs:103
+ #, csharp-format
+@@ -6077,8 +6301,12 @@ msgstr "Αρχικοποίηση οδηγού"
+ 
+ #: ../src/Extensions/Banshee.OpticalDisc/Banshee.OpticalDisc.AudioCd/AudioCdRipper.cs:124
+ #, csharp-format
+-msgid "<i>{0}</i> is still being imported into the music library. Would you like to stop it?"
+-msgstr "<i>{0}</i> ακόμη εισάγεται στη βιβλιοθήκη μουσικής. Θα θέλατε να το διακόψετε;"
++msgid ""
++"<i>{0}</i> is still being imported into the music library. Would you like to "
++"stop it?"
++msgstr ""
++"<i>{0}</i> ακόμη εισάγεται στη βιβλιοθήκη μουσικής. Θα θέλατε να το "
++"διακόψετε;"
+ 
+ #: ../src/Extensions/Banshee.OpticalDisc/Banshee.OpticalDisc.AudioCd/AudioCdRipper.cs:254
+ msgid "Cannot Import CD"
+@@ -6098,11 +6326,15 @@ msgstr "_Εισαγωγή μορφής"
+ 
+ #: ../src/Extensions/Banshee.OpticalDisc/Banshee.OpticalDisc.AudioCd/AudioCdService.cs:114
+ msgid "_Automatically import audio CDs when inserted"
+-msgstr "_Αυτόματη εισαγωγή ψηφιακών δίσκων (CD) ήχου όταν εισάγονται"
++msgstr "_Αυτόματη εισαγωγή CDs ήχου όταν εισάγονται"
+ 
+ #: ../src/Extensions/Banshee.OpticalDisc/Banshee.OpticalDisc.AudioCd/AudioCdService.cs:115
+-msgid "When an audio CD is inserted, automatically begin importing it if metadata can be found and it is not already in the library."
+-msgstr "Όταν ένα CD (ψηφιακός δίσκος) ήχου εισάγεται, αυτόματη εκκίνηση της εισαγωγής του αν βρεθούν τα μεταδεδομένα και δεν είναι ήδη στην βιβλιοθήκη."
++msgid ""
++"When an audio CD is inserted, automatically begin importing it if metadata "
++"can be found and it is not already in the library."
++msgstr ""
++"Όταν ένα CD ήχου εισάγεται, αυτόματη εκκίνηση της εισαγωγής του αν βρεθούν "
++"τα μεταδεδομένα και δεν είναι ήδη στην βιβλιοθήκη."
+ 
+ #: ../src/Extensions/Banshee.OpticalDisc/Banshee.OpticalDisc.AudioCd/AudioCdService.cs:119
+ msgid "_Eject when done importing"
+@@ -6110,15 +6342,20 @@ msgstr "_Αποβολή όταν ολοκληρωθεί η εισαγωγή"
+ 
+ #: ../src/Extensions/Banshee.OpticalDisc/Banshee.OpticalDisc.AudioCd/AudioCdService.cs:120
+ msgid "When an audio CD has been imported, automatically eject it."
+-msgstr "Όταν ένας ηχητικός ψηφιακός δίσκος έχει εισαχθεί, να γίνει αυτόματη αποβολή. "
++msgstr "Όταν ένα CD ήχου έχει εισαχθεί, να γίνει αυτόματη αποβολή."
+ 
+ #: ../src/Extensions/Banshee.OpticalDisc/Banshee.OpticalDisc.AudioCd/AudioCdService.cs:123
+ msgid "Use error correction when importing"
+ msgstr "Χρήση της διόρθωσης σφάλματος κατά την εισαγωγή"
+ 
+ #: ../src/Extensions/Banshee.OpticalDisc/Banshee.OpticalDisc.AudioCd/AudioCdService.cs:124
+-msgid "Error correction tries to work around problem areas on a disc, such as surface scratches, but will slow down importing substantially."
+-msgstr "Η διόρθωση σφάλματος προσπαθεί να αντιμετωπίσει προβληματικές περιοχές του δίσκου, όπως χαράγματα στην επιφάνεια, αλλά αυτό θα καθυστερήσει την εισαγωγή σημαντικά."
++msgid ""
++"Error correction tries to work around problem areas on a disc, such as "
++"surface scratches, but will slow down importing substantially."
++msgstr ""
++"Η διόρθωση σφάλματος προσπαθεί να αντιμετωπίσει προβληματικές περιοχές του "
++"δίσκου, όπως χαράγματα στην επιφάνεια, αλλά αυτό θα καθυστερήσει την "
++"εισαγωγή σημαντικά."
+ 
+ #: ../src/Extensions/Banshee.OpticalDisc/Banshee.OpticalDisc.AudioCd/AudioCdService.cs:192
+ #: ../src/Extensions/Banshee.OpticalDisc/Banshee.OpticalDisc.AudioCd/AudioCdSource.cs:311
+@@ -6139,7 +6376,7 @@ msgstr "Δημιουργία αντιγράφου αυτού του CD ήχου"
+ 
+ #: ../src/Extensions/Banshee.OpticalDisc/Banshee.OpticalDisc.AudioCd/AudioCdSource.cs:113
+ msgid "Searching for track information..."
+-msgstr "Αναζήτηση για πληροφορίες κομματιού…"
++msgstr "Αναζήτηση για πληροφορίες κομματιού..."
+ 
+ #: ../src/Extensions/Banshee.OpticalDisc/Banshee.OpticalDisc.AudioCd/AudioCdSource.cs:146
+ msgid "Could not fetch track information"
+@@ -6147,7 +6384,9 @@ msgstr "Αδυναμία λήψης πληροφοριών κομματιού."
+ 
+ #: ../src/Extensions/Banshee.OpticalDisc/Banshee.OpticalDisc.AudioCd/AudioCdSource.cs:175
+ msgid "Automatic import off since this album is already in the Music Library."
+-msgstr "Αυτόματη παύση εισαγωγής από τη στιγμή που αυτό το άλμπουμ υπάρχει ήδη στη Βιβλιοθήκη Μουσικής."
++msgstr ""
++"Αυτόματη παύση εισαγωγής από τη στιγμή που αυτό το άλμπουμ υπάρχει ήδη στη "
++"Βιβλιοθήκη Μουσικής."
+ 
+ #: ../src/Extensions/Banshee.OpticalDisc/Banshee.OpticalDisc.AudioCd/AudioCdSource.cs:198
+ msgid "Could not import CD"
+@@ -6169,12 +6408,11 @@ msgstr "Αποβολή δίσκου"
+ #: ../src/Extensions/Banshee.OpticalDisc/Banshee.OpticalDisc.AudioCd/AudioCdSource.cs:310
+ #, csharp-format
+ msgid "Import ‟{0}”"
+-msgstr "Εισαγωγή «{0}»"
++msgstr "Εισαγωγή ‟{0}”"
+ 
+ #. Translators: {0} is the type of disc, "Audio CD" or "DVD"
+ #: ../src/Extensions/Banshee.OpticalDisc/Banshee.OpticalDisc/DiscSource.cs:154
+ #, csharp-format
+-#| msgid "Eject {0}"
+ msgid "Ejecting {0}..."
+ msgstr "Αποβολή {0}..."
+ 
+@@ -6189,10 +6427,9 @@ msgid "Go to Menu"
+ msgstr "Μετάβαση στο μενού"
+ 
+ #: ../src/Extensions/Banshee.OpticalDisc/Banshee.OpticalDisc.Dvd/DvdService.cs:92
+-#, fuzzy
+ #| msgid "Naviguate to menu"
+ msgid "Navigate to menu"
+-msgstr "Μεταβείτε στο μενού"
++msgstr "Περιήγηση στο μενού"
+ 
+ #: ../src/Extensions/Banshee.OpticalDisc/Banshee.OpticalDisc.Dvd/DvdSource.cs:38
+ msgid "DVD"
+@@ -6235,12 +6472,12 @@ msgstr "Εισαγωγή λιστών αναπαραγωγής"
+ #: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/ItunesPlayerImportDialogs.cs:120
+ #, csharp-format
+ msgid "Locate your \"{0}\" file..."
+-msgstr "Εντοπισμός του «{0}» αρχείου σας…"
++msgstr "Εντοπισμός του \"{0}\" αρχείου σας..."
+ 
+ #: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/ItunesPlayerImportDialogs.cs:138
+ #, csharp-format
+ msgid "Locate \"{0}\""
+-msgstr "Εντοπισμός «{0}»"
++msgstr "Εντοπισμός \"{0}\""
+ 
+ #: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/ItunesPlayerImportDialogs.cs:167
+ msgid "Locate iTunes Music Directory"
+@@ -6248,16 +6485,28 @@ msgstr "Εντοπισμός του iTunes Music Directory"
+ 
+ #: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/ItunesPlayerImportDialogs.cs:196
+ #, csharp-format
+-msgid "The iTunes library refers to your music directory as \"{0}\" but Banshee was not able to infer the location of this directory. Please locate it."
+-msgstr "Η βιβλιοθήκη του iTunes αναφέρει τον  κατάλογο της μουσικής σας ως «{0}» αλλά το Banshee δεν ήταν δυνατό να εντοπίσει την τοποθεσία αυτού του καταλόγου. Παρακαλώ εντοπίστε τον."
++msgid ""
++"The iTunes library refers to your music directory as \"{0}\" but Banshee was "
++"not able to infer the location of this directory. Please locate it."
++msgstr ""
++"Η βιβλιοθήκη του iTunes αναφέρει τον κατάλογο της μουσικής σας ως \"{0}\" αλλά "
++"το Banshee δεν ήταν δυνατό να εντοπίσει την τοποθεσία αυτού του καταλόγου. "
++"Παρακαλώ εντοπίστε τον."
+ 
+ #: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/ItunesPlayerImportSource.cs:74
+ msgid "iTunes Media Player"
+ msgstr "Αναπαραγωγέας πολυμέσων iTunes"
+ 
+ #: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/ItunesPlayerImportSource.cs:134
+-msgid "Banshee is not familiar with this version of the iTunes library format. Importing may or may not work as expected, or at all. Would you like to attempt to import anyway?"
+-msgstr "Το Banshee δεν είναι εξοικειωμένο με αυτή την έκδοση της μορφής της βιβλιοθήκης του iTunes. Η εισαγωγή μπορεί να δουλέψει ή να μη δουλέψει κατά το αναμενόμενο, ή και καθόλου. Θέλετε να γίνει προσπάθεια εισαγωγής έτσι και αλλιώς;"
++msgid ""
++"Banshee is not familiar with this version of the iTunes library format. "
++"Importing may or may not work as expected, or at all. Would you like to "
++"attempt to import anyway?"
++msgstr ""
++"Το Banshee δεν είναι εξοικειωμένο με αυτή την έκδοση της μορφής της "
++"βιβλιοθήκης του iTunes. Η εισαγωγή μπορεί να δουλέψει ή να μη δουλέψει κατά "
++"το αναμενόμενο, ή και καθόλου. Θέλετε να γίνει προσπάθεια εισαγωγής έτσι και "
++"αλλιώς;"
+ 
+ #: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/ItunesPlayerImportSource.cs:439
+ #: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/RhythmboxPlayerImportSource.cs:235
+@@ -6290,7 +6539,8 @@ msgstr "Αναπαραγωγή μετά"
+ 
+ #: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueActions.cs:58
+ msgid "Add selected songs after the currently playing track, album, or artist"
+-msgstr "Προσθήκη επιλεγμένων τραγουδιών μετά το τρέχον κομμάτι, δίσκο ή καλλιτέχνη"
++msgstr ""
++"Προσθήκη επιλεγμένων τραγουδιών μετά το τρέχον κομμάτι, δίσκο ή καλλιτέχνη"
+ 
+ #: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueActions.cs:62
+ msgid "Current Track"
+@@ -6298,7 +6548,9 @@ msgstr "Τρέχον κομμάτι"
+ 
+ #: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueActions.cs:63
+ msgid "Add selected songs to the play queue after the currently playing song"
+-msgstr "Προσθέστε τα επιλεγμένα τραγούδια στη σειρά αναπαραγωγής μετά το τραγούδι που αναπαράγεται τώρα"
++msgstr ""
++"Προσθέστε τα επιλεγμένα τραγούδια στη σειρά αναπαραγωγής μετά το τραγούδι "
++"που αναπαράγεται τώρα"
+ 
+ #: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueActions.cs:67
+ msgid "Current Album"
+@@ -6306,7 +6558,9 @@ msgstr "Τρέχων δίσκος"
+ 
+ #: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueActions.cs:68
+ msgid "Add selected songs to the play queue after the currently playing album"
+-msgstr "Προσθέστε τα επιλεγμένα τραγούδια στη σειρά αναπαραγωγής μετά το δίσκο που αναπαράγεται τώρα"
++msgstr ""
++"Προσθέστε τα επιλεγμένα τραγούδια στη σειρά αναπαραγωγής μετά το δίσκο που "
++"αναπαράγεται τώρα"
+ 
+ #: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueActions.cs:72
+ msgid "Current Artist"
+@@ -6314,7 +6568,9 @@ msgstr "Τρέχων καλλιτέχνης"
+ 
+ #: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueActions.cs:73
+ msgid "Add selected songs to the play queue after the currently playing artist"
+-msgstr "Προσθέστε τα επιλεγμένα τραγούδια στη σειρά αναπαραγωγής μετά τον καλλιτέχνη που αναπαράγεται τώρα"
++msgstr ""
++"Προσθέστε τα επιλεγμένα τραγούδια στη σειρά αναπαραγωγής μετά τον καλλιτέχνη "
++"που αναπαράγεται τώρα"
+ 
+ #: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueActions.cs:80
+ msgid "Refresh random tracks in the play queue"
+@@ -6322,7 +6578,8 @@ msgstr "Ανανέωση τυχαίων κομματιών στη σειρά α
+ 
+ #: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueActions.cs:85
+ msgid "Randomize the playback order of items in the play queue"
+-msgstr "Τυχαιοποίηση της σειράς αναπαραγωγής των αντικειμένων στη σειρά αναπαραγωγής"
++msgstr ""
++"Τυχαιοποίηση της σειράς αναπαραγωγής των αντικειμένων στη σειρά αναπαραγωγής"
+ 
+ #: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueActions.cs:89
+ msgid "Add More"
+@@ -6344,11 +6601,11 @@ msgstr "Καθαρισμός της σειράς αναπαραγωγής κατ
+ msgid "Remove From Play Queue"
+ msgstr "Αφαίρεση από τη σειρά αναπαραγωγής"
+ 
+-#: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueSource.cs:967
++#: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueSource.cs:965
+ msgid "Number of _played songs to show"
+ msgstr "Αριθμός _παιγμένων τραγουδιών προς εμφάνιση"
+ 
+-#: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueSource.cs:973
++#: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueSource.cs:971
+ msgid "Number of _upcoming songs to show"
+ msgstr "Αριθμός _επόμενων τραγουδιών προς εμφάνιση"
+ 
+@@ -6466,7 +6723,7 @@ msgstr "Έλεγχος όλων των podcasts για νέα επεισόδια
+ 
+ #: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastActions.cs:78
+ msgid "Add Podcast..."
+-msgstr "Προσθήκη φορητής εκπομπής (Podcast)…"
++msgstr "Προσθήκη φορητής εκπομπής (Podcast)..."
+ 
+ #: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastActions.cs:79
+ msgid "Subscribe to a new podcast"
+@@ -6541,8 +6798,12 @@ msgid "Check periodically for new episodes"
+ msgstr "Περιοδικός έλεγχος για νέα επεισόδια"
+ 
+ #: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastFeedPropertiesDialog.cs:106
+-msgid "If checked, Banshee will check every hour to see if this podcast has new episodes"
+-msgstr "Αν επιλεγεί το Banshee θα ελέγχει κάθε ώρα για νέα επεισόδια αυτής της φορητής εκπομπής"
++msgid ""
++"If checked, Banshee will check every hour to see if this podcast has new "
++"episodes"
++msgstr ""
++"Αν επιλεγεί το Banshee θα ελέγχει κάθε ώρα για νέα επεισόδια αυτής της "
++"φορητής εκπομπής"
+ 
+ #: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastFeedPropertiesDialog.cs:109
+ #: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastSubscribeDialog.cs:136
+@@ -6606,8 +6867,11 @@ msgid "Subscribe to New Podcast"
+ msgstr "Εγγραφή σε νέα φορητή εκπομπή (Podcast)"
+ 
+ #: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastSubscribeDialog.cs:103
+-msgid "Please enter the URL of the podcast to which you would like to subscribe."
+-msgstr "Παρακαλώ εισάγετε τη διεύθυνση URL της φορητής εκπομπής (podcast) στην οποία θα θέλατε να εγγραφείτε."
++msgid ""
++"Please enter the URL of the podcast to which you would like to subscribe."
++msgstr ""
++"Παρακαλώ εισάγετε τη διεύθυνση URL της φορητής εκπομπής (podcast) στην οποία "
++"θα θέλατε να εγγραφείτε."
+ 
+ #: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/SyncPreferenceComboBox.cs:41
+ msgid "Download all episodes"
+@@ -6676,7 +6940,6 @@ msgid "Track Preview"
+ msgstr "Προεπισκόπηση κομματιού"
+ 
+ #: ../src/Extensions/Banshee.UPnPClient/Banshee.UPnPClient/UPnPContainerSource.cs:39
+-#| msgid "Shared Music"
+ msgid "Shared Media"
+ msgstr "Κοινόχρηστα πολυμέσα"
+ 
+@@ -6691,12 +6954,12 @@ msgstr "Αποστολή από"
+ #: ../src/Extensions/Banshee.YouTube/Banshee.YouTube.Gui/VideoStreamTile.cs:233
+ #: ../src/Extensions/Banshee.YouTube/Banshee.YouTube.Gui/VideoStreamTile.cs:234
+ msgid "Play in Banshee..."
+-msgstr "Αναπαραγωγή στο Banshee…"
++msgstr "Αναπαραγωγή στο Banshee..."
+ 
+ #: ../src/Extensions/Banshee.YouTube/Banshee.YouTube.Gui/VideoStreamTile.cs:237
+ #: ../src/Extensions/Banshee.YouTube/Banshee.YouTube.Gui/VideoStreamTile.cs:238
+ msgid "Play in Web Browser..."
+-msgstr "Αναπαραγωγή στον περιηγητή ιστού…"
++msgstr "Αναπαραγωγή στον περιηγητή ιστού..."
+ 
+ #: ../src/Extensions/Banshee.YouTube/Banshee.YouTube/YouTubePane.cs:61
+ msgid "No videos found"
+@@ -6731,7 +6994,7 @@ msgstr "Λεπτομέρειες σφάλματος"
+ 
+ #: ../src/Hyena/Hyena.Gui/Hyena.Gui.Dialogs/ExceptionDialog.cs:136
+ msgid "An unhandled exception was thrown: "
+-msgstr "Μία μη αντιμετωπίσιμη εξαίρεση απορρίφθηκε:"
++msgstr "Μία μη αντιμετωπίσιμη εξαίρεση απορρίφθηκε: "
+ 
+ #: ../src/Hyena/Hyena.Gui/Hyena.Gui.Dialogs/VersionInformationDialog.cs:58
+ msgid "Assembly Version Information"
+@@ -6887,7 +7150,7 @@ msgstr "Σύνδεση στο λογαριασμό Last.fm"
+ 
+ #: ../src/Libraries/Lastfm.Gui/Lastfm.Gui/AccountLoginDialog.cs:79
+ msgid "Please enter your Last.fm account credentials."
+-msgstr "Παρακαλώ εισάγετε τα πιστοποιητικά του λογαριασμού σας στο Last.fm"
++msgstr "Παρακαλώ εισάγετε τα πιστοποιητικά του λογαριασμού σας στο Last.fm."
+ 
+ #: ../src/Libraries/Lastfm.Gui/Lastfm.Gui/AccountLoginDialog.cs:106
+ msgid "Save and Log In"
+@@ -6897,91 +7160,119 @@ msgstr "Αποθήκευση και είσοδος"
+ msgid "Authorize for Last.fm"
+ msgstr "Εξουσιοδότηση για το Last.fm"
+ 
+-#: ../src/Libraries/Lastfm/Lastfm/AudioscrobblerConnection.cs:450
+-msgid "Last.fm username is invalid or Banshee is not authorized to access your account."
+-msgstr "Το Last.fm όνομα χρήστη είναι άκυρο ή το Banshee δεν έχει εξουσιοδοτηθεί να έχει πρόσβαση στον λογαριασμό σας."
+-
+-#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:271
++#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:275
+ msgid "This service does not exist."
+ msgstr "Η υπηρεσία δεν υπάρχει."
+ 
+-#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:275
++#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:279
+ msgid "Stations are only available to paying Last.fm subscribers."
+-msgstr "Οι σταθμοί είναι διαθέσιμοι για αναπαραγωγή μόνο στους συνδρομητές του Last.fm"
++msgstr ""
++"Οι σταθμοί είναι διαθέσιμοι για αναπαραγωγή μόνο στους συνδρομητές του "
++"Last.fm."
+ 
+-#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:277
++#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:281
+ msgid "This station is not available."
+ msgstr "Αυτός ο σταθμός δεν είναι διαθέσιμος."
+ 
+-#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:279
++#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:283
+ msgid "The request is missing a required parameter."
+ msgstr "Το αίτημα δεν έχει μια απαιτούμενη παράμετρο."
+ 
+-#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:281
++#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:285
+ msgid "The specified resource is invalid."
+ msgstr "Η καθορισμένη πηγή είναι άκυρη."
+ 
+-#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:283
++#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:287
+ msgid "Server error, please try again later."
+ msgstr "Σφάλμα εξυπηρετητή, παρακαλώ προσπαθήστε ξανά αργότερα."
+ 
+-#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:285
++#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:289
+ msgid "Invalid authentication information, please re-authenticate."
+ msgstr "Άκυρες πληροφορίες εξουσιοδότησης, παρακαλώ εξουσιοδοτήστε ξανά."
+ 
+-#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:287
++#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:291
+ msgid "The API key used by this application is invalid."
+ msgstr "Το κλειδί API που χρησιμοποιείται από αυτή την εφαρμογή είναι άκυρο."
+ 
+-#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:289
+-msgid "The streaming system is offline for maintenance, please try again later."
+-msgstr "Το σύστημα ροής είναι εκτός σύνδεσης για συντήρηση, προσπαθήστε ξανά αργότερα."
++#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:293
++msgid ""
++"The streaming system is offline for maintenance, please try again later."
++msgstr ""
++"Το σύστημα ροής είναι εκτός σύνδεσης για συντήρηση, προσπαθήστε ξανά "
++"αργότερα."
+ 
+-#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:291
++#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:295
+ msgid "The method signature is invalid."
+ msgstr "Η υπογραφή της μεθόδου είναι άκυρη."
+ 
+-#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:296
++#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:300
+ msgid "There is not enough content to play this station."
+ msgstr "Δεν υπάρχει αρκετό περιεχόμενο για αναπαραγωγή του σταθμού."
+ 
+-#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:298
++#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:302
+ msgid "This group does not have enough members for radio."
+ msgstr "Αυτή η ομάδα δεν έχει αρκετά μέλη για ραδιόφωνο."
+ 
+-#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:300
++#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:304
+ msgid "This artist does not have enough fans for radio."
+ msgstr "Ο καλλιτέχνης δεν έχει πολλούς οπαδούς για ραδιόφωνο."
+ 
+-#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:302
++#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:306
+ msgid "There are not enough neighbours for this station."
+ msgstr "Δεν υπάρχουν αρκετοί γείτονες για αυτό το σταθμό."
+ 
+-#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:304
++#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:308
++msgid "This user is not allowed to listen to radio during peak usage"
++msgstr ""
++"Αυτός ο χρήστης δεν επιτρέπεται να ακούσει ραδιόφωνο κατά τη διάρκεια αιχμής"
++
++#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:310
++#| msgid "Stream location not found"
++msgid "Radio station not found"
++msgstr "Δε βρέθηκε ο ραδιοφωνικός σταθμός"
++
++#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:312
++msgid "This application is not allowed to make requests to the web services"
++msgstr ""
++"Αυτή η εφαρμογή δεν επιτρέπεται να υποβάλει αιτήματα στις υπηρεσίες ιστού"
++
++#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:314
++msgid "This type of request is no longer supported"
++msgstr "Αυτός ο τύπος αιτήματος δεν υποστηρίζεται πια"
++
++#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:316
++msgid ""
++"Your IP has made too many requests in a short period, exceeding our API "
++"guidelines"
++msgstr ""
++"Το IP σας έχει κάνει υπερβολικό αριθμό αιτημάτων σε σύντομη περίοδο, που "
++"υπερβαίνει τις οδηγίες του API μας"
++
++#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:318
+ msgid "There was an unknown error."
+ msgstr "Υπήρξε ένα άγνωστο σφάλμα."
+ 
+-#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:313
++#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:327
+ msgid "Not connected to Last.fm."
+-msgstr "Δεν συνδέθηκε στο  Last.fm."
++msgstr "Δεν συνδέθηκε στο Last.fm."
+ 
+-#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:315
++#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:329
+ msgid "Account details are needed before you can connect to Last.fm"
+ msgstr "Λεπτομέρειες λογαριασμού χρειάζονται πριν την σύνδεση σας στο Last.fm"
+ 
+-#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:317
++#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:331
+ msgid "No network connection detected."
+ msgstr "Δεν εντοπίστηκε σύνδεση δικτύου."
+ 
+-#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:319
++#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:333
+ msgid "Last.fm username is invalid."
+-msgstr "Άκυρο όνομα χρήστη του Last.fm"
++msgstr "Άκυρο όνομα χρήστη του Last.fm."
+ 
+-#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:323
++#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:337
+ msgid "Connecting to Last.fm."
+ msgstr "Γίνεται σύνδεση στο Last.fm."
+ 
+-#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:325
++#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:339
+ msgid "Connected to Last.fm."
+ msgstr "Συνδέθηκε στο Last.fm."
+ 
+@@ -6991,6 +7282,22 @@ msgstr "Συνδέθηκε στο Last.fm."
+ msgid "Unknown Podcast"
+ msgstr "Άγνωστη φορητή εκπομπή (Podcast)"
+ 
++#~ msgid "Volume"
++#~ msgstr "Ένταση"
++
++#~ msgid "Muted"
++#~ msgstr "Σίγαση"
++
++#~ msgid "Full Volume"
++#~ msgstr "Μέγιστη ένταση"
++
++#~ msgid ""
++#~ "Last.fm username is invalid or Banshee is not authorized to access your "
++#~ "account."
++#~ msgstr ""
++#~ "Το Last.fm όνομα χρήστη είναι άκυρο ή το Banshee δεν έχει εξουσιοδοτηθεί "
++#~ "να έχει πρόσβαση στον λογαριασμό σας."
++
+ #~ msgid "Write _metadata to files"
+ #~ msgstr "Εγγραφή _μεταδεδομένων σε αρχεία"
+ 
+diff --git a/po/es.po b/po/es.po
+index ad72f62..6176898 100644
+--- a/po/es.po
++++ b/po/es.po
+@@ -9,15 +9,15 @@
+ # Andrés Herrera <andres@usr.cl>, 2008.
+ # Jorge González <jorgegonz@svn.gnome.org>, 2007, 2008, 2009, 2010, 2011.
+ # Benjamín Valero Espinosa <benjavalero@gmail.com>, 2008, 2009, 2010, 2011, 2012.
+-# Daniel Mustieles <daniel.mustieles@gmail.com>, 2011, 2012.
++# Daniel Mustieles <daniel.mustieles@gmail.com>, 2011, 2012, 2013.
+ #
+ msgid ""
+ msgstr ""
+ "Project-Id-Version: banshee.master\n"
+ "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
+ "product=banshee&keywords=I18N+L10N&component=general\n"
+-"POT-Creation-Date: 2012-08-21 19:53+0000\n"
+-"PO-Revision-Date: 2012-08-25 12:06+0200\n"
++"POT-Creation-Date: 2013-10-13 21:45+0000\n"
++"PO-Revision-Date: 2013-10-15 17:05+0200\n"
+ "Last-Translator: Daniel Mustieles <daniel.mustieles@gmail.com>\n"
+ "Language-Team: Español <gnome-es-list@gnome.org>\n"
+ "Language: \n"
+@@ -25,7 +25,7 @@ msgstr ""
+ "Content-Type: text/plain; charset=UTF-8\n"
+ "Content-Transfer-Encoding: 8bit\n"
+ "X-Generator: Gtranslator 2.91.5\n"
+-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
++"Plural-Forms: nplurals=2; plural=(n!=1);\n"
+ 
+ #. ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice.addin.xml
+ #: ../data/addin-xml-strings.cs:8
+@@ -624,7 +624,7 @@ msgid "Audio Quality"
+ msgstr "Calidad del sonido"
+ 
+ #: ../data/desktop-files/common.desktop.in.h:1
+-#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:196
++#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:194
+ msgid "Media Player"
+ msgstr "Reproductor multimedia"
+ 
+@@ -640,6 +640,25 @@ msgstr "Reproductor multimedia Banshee"
+ msgid "Play and organize your media collection"
+ msgstr "Reproduzca y organice su colección multimedia"
+ 
++#. Writing GNOME below, instead of just "Linux", is inclusive of *BSD OSs
++#: ../data/banshee.appdata.xml.in.h:2
++msgid ""
++"Banshee is an open source multimedia management and playback application for "
++"GNOME, Mac and Windows."
++msgstr ""
++"Banshee es una aplicación de software libre para GNOME, Mac y Windows para "
++"gestionar y reproducir archivos multimedia."
++
++#: ../data/banshee.appdata.xml.in.h:3
++msgid ""
++"Play your music and videos. Stay entertained and up to date with podcasts "
++"and video podcasts. Sync your Android, iPod, and other devices. We think "
++"you'll love Banshee!"
++msgstr ""
++"Reproducir música y vídeos. Estar entretenido y actualizado con podcasts y "
++"podcasts de vídeo. Sincronizar su dispositivo Android, iPod y otros. ¡Seguro "
++"que le gustará Banshee!"
++
+ #: ../libbanshee/banshee-bpmdetector.c:202 ../libbanshee/banshee-ripper.c:270
+ #: ../src/Backends/Banshee.GStreamerSharp/Banshee.GStreamerSharp/AudioCdRipper.cs:240
+ msgid "Could not create pipeline"
+@@ -818,7 +837,6 @@ msgstr "No se pudo crear la tubería de codificación: {0}"
+ 
+ #. Translators: verb
+ #: ../src/Backends/Banshee.Osx/Banshee.OsxBackend/OsxFileChooserDialog.cs:66
+-#| msgid "_Import"
+ msgid "Import"
+ msgstr "Importar"
+ 
+@@ -932,8 +950,8 @@ msgstr "Opciones de control de reproducción"
+ msgid ""
+ "Play the next track, optionally restarting if the 'restart' value is set"
+ msgstr ""
+-"Reproduce la pista siguiente, reiniciando opcionalmente si el valor "
+-"«restart» está establecido"
++"Reproduce la pista siguiente, reiniciando opcionalmente si el valor «restart» "
++"está establecido"
+ 
+ #: ../src/Clients/Booter/Booter/Entry.cs:165
+ msgid ""
+@@ -1302,7 +1320,7 @@ msgid "Stream location not found"
+ msgstr "No se encontró la ubicación del flujo"
+ 
+ #: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:347
+-#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:339
++#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:344
+ msgid "File not found"
+ msgstr "No se encontró el archivo"
+ 
+@@ -1971,7 +1989,7 @@ msgstr "Eliminar la lista de reproducción"
+ #: ../src/Core/Banshee.ThickClient/Banshee.Gui/SourceActions.cs:176
+ #: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:135
+ #: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:462
+-#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/SourceView.cs:595
++#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/SourceView.cs:612
+ #: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/SourceView_DragAndDrop.cs:214
+ msgid "New Playlist"
+ msgstr "Lista de reproducción nueva"
+@@ -2575,7 +2593,7 @@ msgstr "drm"
+ #: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/StatisticsPage.cs:234
+ #: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/StatisticsPage.cs:236
+ #: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/StatisticsPage.cs:238
+-#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:400
++#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:405
+ msgid "Unknown"
+ msgstr "Desconocido"
+ 
+@@ -2799,7 +2817,7 @@ msgstr ""
+ #: ../src/Core/Banshee.ThickClient/Banshee.Collection.Gui/ColumnCellDiscAndCount.cs:40
+ #: ../src/Core/Banshee.ThickClient/Banshee.Collection.Gui/ColumnCellTrackAndCount.cs:40
+ #: ../src/Core/Banshee.Widgets/Banshee.Widgets/StreamPositionLabel.cs:174
+-#: ../src/Dap/Banshee.Dap/Banshee.Dap.Gui/DapPropertiesDialog.cs:148
++#: ../src/Dap/Banshee.Dap/Banshee.Dap.Gui/DapPropertiesDialog.cs:149
+ #, csharp-format
+ msgid "{0} of {1}"
+ msgstr "{0} de {1}"
+@@ -3610,19 +3628,19 @@ msgstr "Establecer todos los números de disco y totales a estos valores"
+ msgid "_Disc Number:"
+ msgstr "Número de di_sco:"
+ 
+-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/BasicTrackDetailsPage.cs:188
++#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/BasicTrackDetailsPage.cs:196
+ msgid "Set all years to this value"
+ msgstr "Establecer todos los años a este valor"
+ 
+-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/BasicTrackDetailsPage.cs:189
++#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/BasicTrackDetailsPage.cs:197
+ msgid "_Year:"
+ msgstr "A_ño:"
+ 
+-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/BasicTrackDetailsPage.cs:196
++#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/BasicTrackDetailsPage.cs:204
+ msgid "Set all ratings to this value"
+ msgstr "Establecer todas las valoraciones a este valor"
+ 
+-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/BasicTrackDetailsPage.cs:197
++#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/BasicTrackDetailsPage.cs:205
+ msgid "_Rating:"
+ msgstr "Valo_ración:"
+ 
+@@ -4291,29 +4309,29 @@ msgstr "Soporta portadas"
+ msgid "Supports photos"
+ msgstr "Soporta imágenes"
+ 
+-#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:465
++#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:466
+ msgid "Track duration is zero"
+ msgstr "La duración de la pista es cero"
+ 
+-#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:571
++#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:570
+ msgid "Syncing iPod"
+ msgstr "Sincronizando iPod"
+ 
+-#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:572
++#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:571
+ msgid "Preparing to synchronize..."
+ msgstr "Preparándose para sincronizar…"
+ 
+-#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:575
++#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:593
+ #, csharp-format
+ msgid "Adding track {0} of {1}"
+ msgstr "Añadiendo pista {0} de {1}"
+ 
+-#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:611
++#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:636
+ #, csharp-format
+ msgid "Removing track {0} of {1}"
+ msgstr "Quitando pista {0} de {1}"
+ 
+-#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:664
++#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:710
+ msgid "Writing media database"
+ msgstr "Escribiendo la base de datos multimedia"
+ 
+@@ -4331,31 +4349,31 @@ msgstr "Dispositivos"
+ msgid "Device Properties"
+ msgstr "Propiedades del dispositivo"
+ 
+-#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:203
++#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:201
+ msgid "Product"
+ msgstr "Producto"
+ 
+-#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:204
++#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:202
+ msgid "Vendor"
+ msgstr "Fabricante"
+ 
+-#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:287
++#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:292
+ #: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Data/PodcastSource.cs:141
+ #, csharp-format
+ msgid "Loading {0}"
+ msgstr "Cargando {0}"
+ 
+-#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:381
++#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:386
+ #: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/ColumnCellYesNo.cs:37
+ msgid "Yes"
+ msgstr "Sí"
+ 
+-#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:381
++#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:386
+ #: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/ColumnCellYesNo.cs:38
+ msgid "No"
+ msgstr "No"
+ 
+-#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:402
++#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:407
+ #, csharp-format
+ msgid ""
+ "The {0} format is not supported by the device, and no converter was found to "
+@@ -4364,12 +4382,12 @@ msgstr ""
+ "El formato {0} no está soportado por el dispositivo, y no se ha encontrado "
+ "ningún conversor para convertirlo."
+ 
+-#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:408
++#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:413
+ msgid "File format conversion support is not available"
+ msgstr ""
+ "El soporte para la conversión de formatos de archivo no está disponible"
+ 
+-#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:434
++#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:439
+ msgid "Error converting file"
+ msgstr "Error al convertir el archivo"
+ 
+@@ -4407,7 +4425,7 @@ msgstr[1] ""
+ msgid "Are you sure you want to continue?"
+ msgstr "¿Está seguro de que quiere continuar?"
+ 
+-#: ../src/Dap/Banshee.Dap/Banshee.Dap.Gui/DapActions.cs:118
++#: ../src/Dap/Banshee.Dap/Banshee.Dap.Gui/DapActions.cs:121
+ msgid "Remove tracks"
+ msgstr "Quitar pistas"
+ 
+@@ -4482,12 +4500,12 @@ msgstr "Importar música adquirida"
+ msgid "Disconnect"
+ msgstr "Desconectar"
+ 
+-#: ../src/Dap/Banshee.Dap/Banshee.Dap/RemovableSource.cs:108
++#: ../src/Dap/Banshee.Dap/Banshee.Dap/RemovableSource.cs:111
+ #, csharp-format
+ msgid "Disconnecting {0}..."
+ msgstr "Desconectando {0}…"
+ 
+-#: ../src/Dap/Banshee.Dap/Banshee.Dap/RemovableSource.cs:115
++#: ../src/Dap/Banshee.Dap/Banshee.Dap/RemovableSource.cs:118
+ #, csharp-format
+ msgid "Could not disconnect {0}: {1}"
+ msgstr "No se pudo desconectar {0}: {1}"
+@@ -4852,11 +4870,11 @@ msgstr "Iniciar sesión"
+ msgid "Connecting to {0}"
+ msgstr "Conectando a {0}"
+ 
+-#: ../src/Extensions/Banshee.Daap/Banshee.Daap/DaapService.cs:185
++#: ../src/Extensions/Banshee.Daap/Banshee.Daap/DaapService.cs:186
+ msgid "Add Remote DAAP Server"
+ msgstr "Añadir servidor DAAP remoto"
+ 
+-#: ../src/Extensions/Banshee.Daap/Banshee.Daap/DaapService.cs:186
++#: ../src/Extensions/Banshee.Daap/Banshee.Daap/DaapService.cs:187
+ msgid "Add a new remote DAAP server"
+ msgstr "Añadir un nuevo servidor DAAP remoto"
+ 
+@@ -6429,9 +6447,8 @@ msgid ""
+ "The iTunes library refers to your music directory as \"{0}\" but Banshee was "
+ "not able to infer the location of this directory. Please locate it."
+ msgstr ""
+-"La colección de iTunes indica que su carpeta de música es «{0}», pero "
+-"Banshee no ha podido deducir la ubicación de esta carpeta. Por favor, "
+-"localícela."
++"La colección de iTunes indica que su carpeta de música es «{0}», pero Banshee "
++"no ha podido deducir la ubicación de esta carpeta. Por favor, localícela."
+ 
+ #: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/ItunesPlayerImportSource.cs:74
+ msgid "iTunes Media Player"
+diff --git a/po/hu.po b/po/hu.po
+index 886ea20..991c800 100644
+--- a/po/hu.po
++++ b/po/hu.po
+@@ -4,20 +4,21 @@
+ #
+ # Kéménczy Kálmán <kkemenczy at novell dot com>, 2006.
+ # Gabor Kelemen <kelemeng at gnome dot hu>, 2006, 2007, 2008, 2009, 2010, 2011, 2012.
++# Balázs Úr <urbalazs at gmail dot com>, 2013.
+ msgid ""
+ msgstr ""
+ "Project-Id-Version: banshee master\n"
+ "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
+ "product=banshee&keywords=I18N+L10N&component=general\n"
+-"POT-Creation-Date: 2012-09-04 17:57+0000\n"
+-"PO-Revision-Date: 2012-09-20 15:05+0200\n"
+-"Last-Translator: Gabor Kelemen <kelemeng at gnome dot hu>\n"
++"POT-Creation-Date: 2013-10-13 00:11+0000\n"
++"PO-Revision-Date: 2013-10-13 13:17+0200\n"
++"Last-Translator: Balázs Úr <urbalazs at gmail dot com>\n"
+ "Language-Team: Hungarian <gnome-hu-list at gnome dot org>\n"
+ "Language: hu\n"
+ "MIME-Version: 1.0\n"
+ "Content-Type: text/plain; charset=UTF-8\n"
+ "Content-Transfer-Encoding: 8bit\n"
+-"X-Generator: Lokalize 1.4\n"
++"X-Generator: Lokalize 1.2\n"
+ "Plural-Forms:  nplurals=2; plural=(n != 1);\n"
+ 
+ #. ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice.addin.xml
+@@ -616,7 +617,7 @@ msgid "Audio Quality"
+ msgstr "Hangminőség"
+ 
+ #: ../data/desktop-files/common.desktop.in.h:1
+-#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:196
++#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:194
+ msgid "Media Player"
+ msgstr "Médialejátszó"
+ 
+@@ -632,6 +633,25 @@ msgstr "Banshee médialejátszó"
+ msgid "Play and organize your media collection"
+ msgstr "Médiagyűjteményének lejátszása és rendszerezése"
+ 
++#. Writing GNOME below, instead of just "Linux", is inclusive of *BSD OSs
++#: ../data/banshee.appdata.xml.in.h:2
++msgid ""
++"Banshee is an open source multimedia management and playback application for "
++"GNOME, Mac and Windows."
++msgstr ""
++"A Banshee egy nyílt forrású multimédia-kezelő és lejátszó alkalmazás GNOME, "
++"Mac és Windows platformokhoz."
++
++#: ../data/banshee.appdata.xml.in.h:3
++msgid ""
++"Play your music and videos. Stay entertained and up to date with podcasts "
++"and video podcasts. Sync your Android, iPod, and other devices. We think "
++"you'll love Banshee!"
++msgstr ""
++"Zenék és videók lejátszása. Szórakoztató és naprakész marad a podcastokkal és "
++"videó podcastokkal. Szinkronizál az Androiddal, iPoddal és más eszközökkel. "
++"Úgy gondoljuk, hogy imádni fogja a Banshee-t!"
++
+ #: ../libbanshee/banshee-bpmdetector.c:202 ../libbanshee/banshee-ripper.c:270
+ #: ../src/Backends/Banshee.GStreamerSharp/Banshee.GStreamerSharp/AudioCdRipper.cs:240
+ msgid "Could not create pipeline"
+@@ -810,7 +830,6 @@ msgstr "A kódoló adatcsatorna nem hozható létre: {0}"
+ 
+ #. Translators: verb
+ #: ../src/Backends/Banshee.Osx/Banshee.OsxBackend/OsxFileChooserDialog.cs:66
+-#| msgid "_Import"
+ msgid "Import"
+ msgstr "Importálás"
+ 
+@@ -1290,7 +1309,7 @@ msgid "Stream location not found"
+ msgstr "Az adatfolyam helye nem található"
+ 
+ #: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:347
+-#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:343
++#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:344
+ msgid "File not found"
+ msgstr "A fájl nem található"
+ 
+@@ -1596,7 +1615,6 @@ msgid "File Organization"
+ msgstr "Fájlrendszerezés"
+ 
+ #: ../src/Core/Banshee.Services/Banshee.Library/LibrarySource.cs:81
+-#| msgid "Co_py files to media folders when importing"
+ msgid "Co_py files to media folder when importing"
+ msgstr "_Fájlok másolása a médiamappába importáláskor"
+ 
+@@ -1955,7 +1973,7 @@ msgstr "Lejátszólista törlése"
+ #: ../src/Core/Banshee.ThickClient/Banshee.Gui/SourceActions.cs:176
+ #: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:135
+ #: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:462
+-#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/SourceView.cs:595
++#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/SourceView.cs:612
+ #: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/SourceView_DragAndDrop.cs:214
+ msgid "New Playlist"
+ msgstr "Új lejátszólista"
+@@ -2560,7 +2578,7 @@ msgstr "drm"
+ #: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/StatisticsPage.cs:234
+ #: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/StatisticsPage.cs:236
+ #: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/StatisticsPage.cs:238
+-#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:404
++#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:405
+ msgid "Unknown"
+ msgstr "Ismeretlen"
+ 
+@@ -2781,7 +2799,7 @@ msgstr ""
+ #: ../src/Core/Banshee.ThickClient/Banshee.Collection.Gui/ColumnCellDiscAndCount.cs:40
+ #: ../src/Core/Banshee.ThickClient/Banshee.Collection.Gui/ColumnCellTrackAndCount.cs:40
+ #: ../src/Core/Banshee.Widgets/Banshee.Widgets/StreamPositionLabel.cs:174
+-#: ../src/Dap/Banshee.Dap/Banshee.Dap.Gui/DapPropertiesDialog.cs:148
++#: ../src/Dap/Banshee.Dap/Banshee.Dap.Gui/DapPropertiesDialog.cs:149
+ #, csharp-format
+ msgid "{0} of {1}"
+ msgstr "{1}/{0}"
+@@ -2923,10 +2941,6 @@ msgstr "Kivételes multimédia-kezelés és -lejátszás"
+ 
+ #: ../src/Core/Banshee.ThickClient/Banshee.Gui.Dialogs/AboutDialog.cs:98
+ #, csharp-format
+-#| msgid ""
+-#| "Copyright © 2005–{0} Novell, Inc.\n"
+-#| "Copyright © 2005–{0} Others\n"
+-#| "Copyright © 2005 Aaron Bockover"
+ msgid ""
+ "Copyright © 2005–{0} Novell, Inc.\n"
+ "Copyright © 2005–{1} Others\n"
+@@ -3591,19 +3605,19 @@ msgstr "Minden lemezszám és darabszám beállítása erre az értékre"
+ msgid "_Disc Number:"
+ msgstr "_Lemezszám:"
+ 
+-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/BasicTrackDetailsPage.cs:188
++#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/BasicTrackDetailsPage.cs:196
+ msgid "Set all years to this value"
+ msgstr "Minden Év beállítása erre az értékre"
+ 
+-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/BasicTrackDetailsPage.cs:189
++#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/BasicTrackDetailsPage.cs:197
+ msgid "_Year:"
+ msgstr "É_v:"
+ 
+-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/BasicTrackDetailsPage.cs:196
++#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/BasicTrackDetailsPage.cs:204
+ msgid "Set all ratings to this value"
+ msgstr "Minden Értékelés beállítása erre az értékre"
+ 
+-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/BasicTrackDetailsPage.cs:197
++#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/BasicTrackDetailsPage.cs:205
+ msgid "_Rating:"
+ msgstr "É_rtékelés:"
+ 
+@@ -4269,29 +4283,29 @@ msgstr "Támogatja a borítókat"
+ msgid "Supports photos"
+ msgstr "Támogatja a fényképeket"
+ 
+-#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:465
++#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:466
+ msgid "Track duration is zero"
+ msgstr "A szám időtartama nulla"
+ 
+-#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:571
++#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:570
+ msgid "Syncing iPod"
+ msgstr "iPod szinkronizálása"
+ 
+-#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:572
++#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:571
+ msgid "Preparing to synchronize..."
+ msgstr "Szinkronizálás előkészítése…"
+ 
+-#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:575
++#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:593
+ #, csharp-format
+ msgid "Adding track {0} of {1}"
+ msgstr "{1}/{0} szám hozzáadása"
+ 
+-#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:611
++#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:636
+ #, csharp-format
+ msgid "Removing track {0} of {1}"
+ msgstr "{1}/{0} szám eltávolítása"
+ 
+-#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:664
++#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:710
+ msgid "Writing media database"
+ msgstr "Média-adatbázis írása"
+ 
+@@ -4309,31 +4323,31 @@ msgstr "Eszközök"
+ msgid "Device Properties"
+ msgstr "Eszköztulajdonságok"
+ 
+-#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:203
++#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:201
+ msgid "Product"
+ msgstr "Termék"
+ 
+-#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:204
++#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:202
+ msgid "Vendor"
+ msgstr "Gyártó"
+ 
+-#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:291
++#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:292
+ #: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Data/PodcastSource.cs:141
+ #, csharp-format
+ msgid "Loading {0}"
+ msgstr "{0} betöltése"
+ 
+-#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:385
++#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:386
+ #: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/ColumnCellYesNo.cs:37
+ msgid "Yes"
+ msgstr "Igen"
+ 
+-#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:385
++#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:386
+ #: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/ColumnCellYesNo.cs:38
+ msgid "No"
+ msgstr "Nem"
+ 
+-#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:406
++#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:407
+ #, csharp-format
+ msgid ""
+ "The {0} format is not supported by the device, and no converter was found to "
+@@ -4342,11 +4356,11 @@ msgstr ""
+ "Az eszköz nem támogatja a(z) {0} formátumot és nem található átalakító az "
+ "átalakításához."
+ 
+-#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:412
++#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:413
+ msgid "File format conversion support is not available"
+ msgstr "A fájlformátum-átalakítás nem érhető el"
+ 
+-#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:438
++#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:439
+ msgid "Error converting file"
+ msgstr "Hiba a fájl átalakításakor"
+ 
+@@ -4385,7 +4399,7 @@ msgstr[1] ""
+ msgid "Are you sure you want to continue?"
+ msgstr "Biztos, hogy folytatni kívánja?"
+ 
+-#: ../src/Dap/Banshee.Dap/Banshee.Dap.Gui/DapActions.cs:118
++#: ../src/Dap/Banshee.Dap/Banshee.Dap.Gui/DapActions.cs:121
+ msgid "Remove tracks"
+ msgstr "Számok eltávolítása"
+ 
+@@ -4460,12 +4474,12 @@ msgstr "Megvásárolt zene importálása"
+ msgid "Disconnect"
+ msgstr "Bontás"
+ 
+-#: ../src/Dap/Banshee.Dap/Banshee.Dap/RemovableSource.cs:108
++#: ../src/Dap/Banshee.Dap/Banshee.Dap/RemovableSource.cs:111
+ #, csharp-format
+ msgid "Disconnecting {0}..."
+ msgstr "{0} leválasztása…"
+ 
+-#: ../src/Dap/Banshee.Dap/Banshee.Dap/RemovableSource.cs:115
++#: ../src/Dap/Banshee.Dap/Banshee.Dap/RemovableSource.cs:118
+ #, csharp-format
+ msgid "Could not disconnect {0}: {1}"
+ msgstr "A(z) {0} nem választható le: {1}"
+@@ -4827,11 +4841,11 @@ msgstr "Bejelentkezés"
+ msgid "Connecting to {0}"
+ msgstr "Kapcsolódás: {0}"
+ 
+-#: ../src/Extensions/Banshee.Daap/Banshee.Daap/DaapService.cs:185
++#: ../src/Extensions/Banshee.Daap/Banshee.Daap/DaapService.cs:186
+ msgid "Add Remote DAAP Server"
+ msgstr "Távoli DAAP-kiszolgáló hozzáadása"
+ 
+-#: ../src/Extensions/Banshee.Daap/Banshee.Daap/DaapService.cs:186
++#: ../src/Extensions/Banshee.Daap/Banshee.Daap/DaapService.cs:187
+ msgid "Add a new remote DAAP server"
+ msgstr "Új távoli DAAP-kiszolgáló hozzáadása"
+ 
+@@ -5283,7 +5297,6 @@ msgid "Library of Congress"
+ msgstr "Kongresszusi könyvtár"
+ 
+ #: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HomeView.cs:136
+-#| msgid "Sample"
+ msgid "Examples:"
+ msgstr "Példák:"
+ 
+@@ -5666,23 +5679,19 @@ msgstr "Saját last.fm profiloldal meglátogatása"
+ 
+ #: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:146
+ #: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmPreferences.cs:93
+-#| msgid "_Enable Song Reporting"
+ msgid "_Enable Song Reporting From Banshee"
+ msgstr "Szá_mok jelentésének engedélyezése a Bansheeből"
+ 
+ #: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:147
+-#| msgid "Enable song reporting"
+ msgid "Enable song reporting From Banshee"
+ msgstr "Számok jelentésének engedélyezése a Bansheeből"
+ 
+ #: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:152
+ #: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmPreferences.cs:98
+-#| msgid "_Enable Song Reporting"
+ msgid "_Enable Song Reporting From Device"
+ msgstr "Szám_ok jelentésének engedélyezése az eszközről"
+ 
+ #: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:153
+-#| msgid "Enable song reporting"
+ msgid "Enable song reporting From Device"
+ msgstr "Számok jelentésének engedélyezése az eszközről"
+ 
+@@ -5696,7 +5705,6 @@ msgstr "Beküldés az eszközről…"
+ 
+ #: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:414
+ #, csharp-format
+-#| msgid "Removing track {0} of {1}"
+ msgid "Processing track {0} of {1} ..."
+ msgstr "{1}/{0} szám feldolgozása…"
+ 
+@@ -6332,7 +6340,6 @@ msgstr "„{0}” importálása"
+ #. Translators: {0} is the type of disc, "Audio CD" or "DVD"
+ #: ../src/Extensions/Banshee.OpticalDisc/Banshee.OpticalDisc/DiscSource.cs:154
+ #, csharp-format
+-#| msgid "Disconnecting {0}..."
+ msgid "Ejecting {0}..."
+ msgstr "{0} kiadása…"
+ 
+@@ -7138,7 +7145,6 @@ msgid "This user is not allowed to listen to radio during peak usage"
+ msgstr "Ez a felhasználó nem hallgathat rádiót csúcsidőben"
+ 
+ #: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:310
+-#| msgid "Stream location not found"
+ msgid "Radio station not found"
+ msgstr "A rádióállomás nem található"
+ 
+@@ -7155,8 +7161,8 @@ msgid ""
+ "Your IP has made too many requests in a short period, exceeding our API "
+ "guidelines"
+ msgstr ""
+-"Az IP-címe túl sok kérést küldött rövid idő alatt, meghaladva az "
+-"API-irányelveket"
++"Az IP-címe túl sok kérést küldött rövid idő alatt, meghaladva az API-"
++"irányelveket"
+ 
+ #: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:318
+ msgid "There was an unknown error."
+diff --git a/po/lv.po b/po/lv.po
+index 20f9456..6090d8d 100644
+--- a/po/lv.po
++++ b/po/lv.po
+@@ -2,25 +2,25 @@
+ # Copyright (C) 2007 THE PACKAGE'S COPYRIGHT HOLDER
+ # This file is distributed under the same license as the PACKAGE package.
+ #
+-# Raivis Dejus <orvils@gmail.com>, 2007.
+-# Rūdolfs Mazurs <rudolfs.mazurs@gmail.com>, 2011, 2012.
+ #
++# Raivis Dejus <orvils@gmail.com>, 2007.
++# Rūdolfs Mazurs <rudolfs.mazurs@gmail.com>, 2011, 2012, 2013.
+ msgid ""
+ msgstr ""
+ "Project-Id-Version: lv\n"
+ "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
+ "product=banshee&keywords=I18N+L10N&component=general\n"
+-"POT-Creation-Date: 2012-05-01 12:53+0000\n"
+-"PO-Revision-Date: 2012-05-27 15:22+0300\n"
++"POT-Creation-Date: 2013-10-07 20:24+0000\n"
++"PO-Revision-Date: 2013-10-08 00:56+0300\n"
+ "Last-Translator: Rūdolfs Mazurs <rudolfs.mazurs@gmail.com>\n"
+-"Language-Team: Latviešu <lata-l10n@googlegroups.com>\n"
++"Language-Team: Latvian <lata-l10n@googlegroups.com>\n"
++"Language: lv\n"
+ "MIME-Version: 1.0\n"
+ "Content-Type: text/plain; charset=UTF-8\n"
+ "Content-Transfer-Encoding: 8bit\n"
+ "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : "
+ "2);\n"
+-"X-Generator: Lokalize 1.2\n"
+-"Language: lv\n"
++"X-Generator: Lokalize 1.5\n"
+ 
+ #. ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice.addin.xml
+ #: ../data/addin-xml-strings.cs:8
+@@ -616,7 +616,7 @@ msgid "Audio Quality"
+ msgstr "Audio kvalitāte"
+ 
+ #: ../data/desktop-files/common.desktop.in.h:1
+-#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:193
++#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:194
+ msgid "Media Player"
+ msgstr "Mediju atskaņotājs"
+ 
+@@ -632,6 +632,25 @@ msgstr "Banshee mūzikas atskaņotājs"
+ msgid "Play and organize your media collection"
+ msgstr "Atskaņo un organizē mediju kolekciju"
+ 
++#. Writing GNOME below, instead of just "Linux", is inclusive of *BSD OSs
++#: ../data/banshee.appdata.xml.in.h:2
++msgid ""
++"Banshee is an open source multimedia management and playback application for "
++"GNOME, Mac and Windows."
++msgstr ""
++"Banshee ir atvērtā pirmkoda multimediju pārvaldības atskaņošanas lietotne "
++"GNOME, Mac un Windows vidē."
++
++#: ../data/banshee.appdata.xml.in.h:3
++msgid ""
++"Play your music and videos. Stay entertained and up to date with podcasts "
++"and video podcasts. Sync your Android, iPod, and other devices. We think "
++"you'll love Banshee!"
++msgstr ""
++"Atskaņojiet savu mūziku un video. Sekojiet līdzi jaunumiem ar audio un video "
++"podraidēm. Sinhronizējiet savas Android, iPod un citas ierīces. Domājam, ka "
++"jums patiks Banshee!"
++
+ #: ../libbanshee/banshee-bpmdetector.c:202 ../libbanshee/banshee-ripper.c:270
+ #: ../src/Backends/Banshee.GStreamerSharp/Banshee.GStreamerSharp/AudioCdRipper.cs:240
+ msgid "Could not create pipeline"
+@@ -759,18 +778,18 @@ msgstr "Neizdevās izveidot sitienu minūtē noteikšanas spraudni"
+ msgid "Could not initialize GStreamer library"
+ msgstr "Nevar inicializēt GStreamer bibliotēku"
+ 
+-#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:503
+-#: ../src/Backends/Banshee.GStreamerSharp/Banshee.GStreamerSharp/PlayerEngine.cs:553
++#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:504
++#: ../src/Backends/Banshee.GStreamerSharp/Banshee.GStreamerSharp/PlayerEngine.cs:555
+ msgid "Unknown Error"
+ msgstr "Nezināma kļūda"
+ 
+-#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:879
+-#: ../src/Backends/Banshee.GStreamerSharp/Banshee.GStreamerSharp/PlayerEngine.cs:978
++#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:880
++#: ../src/Backends/Banshee.GStreamerSharp/Banshee.GStreamerSharp/PlayerEngine.cs:980
+ msgid "_Enable ReplayGain correction"
+ msgstr "Aktivēt R_eplayGain kļūdu labošanu"
+ 
+-#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:880
+-#: ../src/Backends/Banshee.GStreamerSharp/Banshee.GStreamerSharp/PlayerEngine.cs:979
++#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:881
++#: ../src/Backends/Banshee.GStreamerSharp/Banshee.GStreamerSharp/PlayerEngine.cs:981
+ msgid ""
+ "For tracks that have ReplayGain data, automatically scale (normalize) "
+ "playback volume"
+@@ -778,11 +797,11 @@ msgstr ""
+ "Celiņiem, kuriem ir ReplayGain dati, automātiski mainīt (normalizēt) "
+ "atskaņošanas skaļumu"
+ 
+-#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:885
++#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:886
+ msgid "Enable _gapless playback"
+ msgstr "_Aktivēt atskaņošanu bez pauzēm"
+ 
+-#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:886
++#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:887
+ msgid ""
+ "Eliminate the small playback gap on track change. Useful for concept albums "
+ "and classical music"
+@@ -799,7 +818,7 @@ msgstr "Nevar izveidot transkodētāju"
+ msgid "Could not create encoder pipeline : {0}"
+ msgstr "Nevarēja izveidot iekodētāja konveijeru: {0}"
+ 
+-#: ../src/Backends/Banshee.GStreamerSharp/Banshee.GStreamerSharp/PlayerEngine.cs:800
++#: ../src/Backends/Banshee.GStreamerSharp/Banshee.GStreamerSharp/PlayerEngine.cs:802
+ msgid "GStreamer# 0.10"
+ msgstr "GStreamer# 0.10"
+ 
+@@ -808,19 +827,11 @@ msgstr "GStreamer# 0.10"
+ msgid "Could not create encoding pipeline : {0}"
+ msgstr "Nevarēja izveidot iekodēšanas konveijeru: {0}"
+ 
+-#: ../src/Backends/Banshee.Osx/Banshee.OsxBackend/OsxService.cs:91
+-#: ../src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/NotificationAreaService.cs:132
+-#: ../src/Extensions/Banshee.SoundMenu/Banshee.SoundMenu/SoundMenuService.cs:110
+-msgid "_Close"
+-msgstr "_Aizvērt"
+-
+-#: ../src/Backends/Banshee.Osx/Banshee.OsxBackend/OsxService.cs:92
+-#: ../src/Clients/Nereid/Nereid/PlayerInterface.cs:251
+-#: ../src/Extensions/Banshee.Fixup/Banshee.Fixup/FixSource.cs:79
+-#: ../src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/NotificationAreaService.cs:133
+-#: ../src/Extensions/Banshee.SoundMenu/Banshee.SoundMenu/SoundMenuService.cs:111
+-msgid "Close"
+-msgstr "Aizvērt"
++#. Translators: verb
++#: ../src/Backends/Banshee.Osx/Banshee.OsxBackend/OsxFileChooserDialog.cs:66
++#| msgid "_Import"
++msgid "Import"
++msgstr "Importēt"
+ 
+ #: ../src/Backends/Banshee.Windows/Banshee.Windows/VersionUpdater.cs:72
+ msgid "Can't check for updates"
+@@ -1223,6 +1234,13 @@ msgstr "atlicis {0}"
+ msgid "Play Song"
+ msgstr "Atskaņot dziesmu"
+ 
++#: ../src/Clients/Nereid/Nereid/PlayerInterface.cs:251
++#: ../src/Extensions/Banshee.Fixup/Banshee.Fixup/FixSource.cs:79
++#: ../src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/NotificationAreaService.cs:133
++#: ../src/Extensions/Banshee.SoundMenu/Banshee.SoundMenu/SoundMenuService.cs:111
++msgid "Close"
++msgstr "Aizvērt"
++
+ #. Translators: this is a verb (command), not a noun (things)
+ #: ../src/Clients/Nereid/Nereid/PlayerInterface.cs:472
+ msgid "Search"
+@@ -1290,7 +1308,7 @@ msgid "Stream location not found"
+ msgstr "Straumes vieta nav atrasta"
+ 
+ #: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:347
+-#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:328
++#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:344
+ msgid "File not found"
+ msgstr "Fails nav atrasts"
+ 
+@@ -1585,12 +1603,30 @@ msgstr "Vieglais roks"
+ msgid "Techno"
+ msgstr "Tehno"
+ 
+-#: ../src/Core/Banshee.Services/Banshee.Library/LibrarySource.cs:58
++#: ../src/Core/Banshee.Services/Banshee.Library/LibrarySource.cs:63
+ msgid "Remove From Library"
+ msgstr "Izņemt no fonotēkas"
+ 
++#: ../src/Core/Banshee.Services/Banshee.Library/LibrarySource.cs:77
++#: ../src/Core/Banshee.Services/Banshee.Sources/PrimarySource.cs:249
++msgid "File Organization"
++msgstr "Failu organizēšana"
++
++#: ../src/Core/Banshee.Services/Banshee.Library/LibrarySource.cs:81
++#| msgid "Co_py files to media folders when importing"
++msgid "Co_py files to media folder when importing"
++msgstr "Im_portējot kopēt datnes uz datu nesēja mapi"
++
++#: ../src/Core/Banshee.Services/Banshee.Library/LibrarySource.cs:87
++msgid "_Update file and folder names"
++msgstr "Atja_unināt failu un mapju nosaukumus"
++
++#: ../src/Core/Banshee.Services/Banshee.Library/LibrarySource.cs:88
++msgid "Rename files and folders according to media metadata"
++msgstr "Pārsaukt failus un mapes atbilstoši metadatiem"
++
+ #. Translators: {0} is the library name, eg 'Music Library' or 'Podcasts'
+-#: ../src/Core/Banshee.Services/Banshee.Library/LibrarySource.cs:121
++#: ../src/Core/Banshee.Services/Banshee.Library/LibrarySource.cs:167
+ #, csharp-format
+ msgid "{0} Folder"
+ msgstr "{0} mape"
+@@ -1667,16 +1703,16 @@ msgid "Search your music"
+ msgstr "Meklēt mūziku"
+ 
+ #. Misc section
+-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:80
+-#: ../src/Core/Banshee.Services/Banshee.Preferences/PreferenceService.cs:66
++#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:89
++#: ../src/Core/Banshee.Services/Banshee.Preferences/PreferenceService.cs:62
+ msgid "Miscellaneous"
+ msgstr "Dažādi"
+ 
+-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:83
++#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:92
+ msgid "_Sort an artist's albums by year, not title"
+ msgstr "_Kārtot izpildītāja albumus pēc gada, nevis nosaukuma"
+ 
+-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:93
++#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:102
+ #, csharp-format
+ msgid "{0} song"
+ msgid_plural "{0} songs"
+@@ -1684,91 +1720,91 @@ msgstr[0] "{0} dziesma"
+ msgstr[1] "{0} dziesmas"
+ msgstr[2] "{0} dziesmas"
+ 
+-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:114
++#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:131
+ msgid "Music Folder"
+ msgstr "Mūzikas mape"
+ 
+-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:119
+-#: ../src/Core/Banshee.Services/Banshee.Library/VideoLibrarySource.cs:95
++#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:136
++#: ../src/Core/Banshee.Services/Banshee.Library/VideoLibrarySource.cs:107
+ msgid "Favorites"
+ msgstr "Iecienītās"
+ 
+-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:120
++#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:137
+ msgid "Songs rated four and five stars"
+ msgstr "Dziesmas ar četrām un piecām zvaigznēm"
+ 
+-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:124
++#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:141
+ msgid "Recent Favorites"
+ msgstr "Nesen iecienītās"
+ 
+-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:125
++#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:142
+ msgid "Songs listened to often in the past week"
+ msgstr "Dziesmas, kas pēdējā nedēļā dzirdētas pārāk bieži"
+ 
+-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:129
++#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:146
+ #: ../src/Extensions/Banshee.InternetArchive/InternetArchive/Sort.cs:95
+ msgid "Recently Added"
+ msgstr "Nesen pievienotās"
+ 
+-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:130
++#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:147
+ msgid "Songs imported within the last week"
+ msgstr "Dziesmas, kas importētas pēdējā nedēļā"
+ 
+-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:134
++#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:151
+ msgid "Recently Played"
+ msgstr "Nesen atskaņotās"
+ 
+-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:135
++#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:152
+ msgid "Recently played songs"
+ msgstr "Nesen atskaņotās dziesmas"
+ 
+-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:139
++#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:156
+ msgid "Unheard"
+ msgstr "Nenoklausīts"
+ 
+-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:140
++#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:157
+ msgid "Songs that have not been played or skipped"
+ msgstr "Dziesmas, kuras nav atskaņotas, vai ir izlaistas"
+ 
+-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:147
++#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:164
+ msgid "Neglected Favorites"
+ msgstr "Novārtā atstāts iecienītās"
+ 
+-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:148
++#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:165
+ msgid "Favorites not played in over two months"
+ msgstr "Iecienītās, kas nav atskaņotas jau divus mēnešus"
+ 
+-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:152
++#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:169
+ msgid "Least Favorite"
+ msgstr "Mazāk iecienītās"
+ 
+-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:153
++#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:170
+ msgid "Songs rated one or two stars or that you have frequently skipped"
+ msgstr ""
+ "Dziesmas, kas ir vērtētas ar vienu vai divām zvaigznēm kuras jūs bieži "
+ "izlaižat"
+ 
+-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:157
++#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:174
+ msgid "700 MB of Favorites"
+ msgstr "700 MB ar iecienītajām"
+ 
+-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:158
++#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:175
+ msgid "A data CD worth of favorite songs"
+ msgstr "Datu CD ar iecienītajām dziesmām"
+ 
+-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:163
++#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:180
+ msgid "80 Minutes of Favorites"
+ msgstr "80 minūtes ar iecienītajām"
+ 
+-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:164
++#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:181
+ msgid "An audio CD worth of favorite songs"
+ msgstr "Audio CD ar iecienītajām dziesmām"
+ 
+-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:169
++#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:186
+ msgid "Unrated"
+ msgstr "Nenovērtētas"
+ 
+-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:170
++#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:187
+ msgid "Songs that haven't been rated"
+ msgstr "Dziesmas, kas nav novērtētas"
+ 
+@@ -1782,22 +1818,22 @@ msgid "Importing From {0}"
+ msgstr "Importē no {0}"
+ 
+ #. Catalog.GetString ("Video Library")
+-#: ../src/Core/Banshee.Services/Banshee.Library/VideoLibrarySource.cs:43
++#: ../src/Core/Banshee.Services/Banshee.Library/VideoLibrarySource.cs:44
+ #: ../src/Dap/Banshee.Dap/Banshee.Dap/VideoGroupSource.cs:38
+ msgid "Videos"
+ msgstr "Video"
+ 
+-#: ../src/Core/Banshee.Services/Banshee.Library/VideoLibrarySource.cs:48
++#: ../src/Core/Banshee.Services/Banshee.Library/VideoLibrarySource.cs:49
+ #: ../src/Extensions/Banshee.UPnPClient/Banshee.UPnPClient/UPnPVideoSource.cs:52
+ msgid "Search your videos"
+ msgstr "Meklēt video"
+ 
+-#: ../src/Core/Banshee.Services/Banshee.Library/VideoLibrarySource.cs:65
++#: ../src/Core/Banshee.Services/Banshee.Library/VideoLibrarySource.cs:66
+ #: ../src/Extensions/Banshee.UPnPClient/Banshee.UPnPClient/UPnPVideoSource.cs:69
+ msgid "Produced By"
+ msgstr "Producējis"
+ 
+-#: ../src/Core/Banshee.Services/Banshee.Library/VideoLibrarySource.cs:70
++#: ../src/Core/Banshee.Services/Banshee.Library/VideoLibrarySource.cs:78
+ #, csharp-format
+ msgid "{0} video"
+ msgid_plural "{0} videos"
+@@ -1805,19 +1841,19 @@ msgstr[0] "{0} video"
+ msgstr[1] "{0} video"
+ msgstr[2] "{0} video"
+ 
+-#: ../src/Core/Banshee.Services/Banshee.Library/VideoLibrarySource.cs:90
++#: ../src/Core/Banshee.Services/Banshee.Library/VideoLibrarySource.cs:102
+ msgid "Videos Folder"
+ msgstr "Video mape"
+ 
+-#: ../src/Core/Banshee.Services/Banshee.Library/VideoLibrarySource.cs:96
++#: ../src/Core/Banshee.Services/Banshee.Library/VideoLibrarySource.cs:108
+ msgid "Videos rated four and five stars"
+ msgstr "Video, kas novērtēti ar četrām un piecām zvaigznēm"
+ 
+-#: ../src/Core/Banshee.Services/Banshee.Library/VideoLibrarySource.cs:100
++#: ../src/Core/Banshee.Services/Banshee.Library/VideoLibrarySource.cs:112
+ msgid "Unwatched"
+ msgstr "Nenoskatīts"
+ 
+-#: ../src/Core/Banshee.Services/Banshee.Library/VideoLibrarySource.cs:101
++#: ../src/Core/Banshee.Services/Banshee.Library/VideoLibrarySource.cs:113
+ msgid "Videos that haven't been played yet"
+ msgstr "Video, kuri vēl nav atskaņoti"
+ 
+@@ -1892,14 +1928,6 @@ msgstr ""
+ "Aktivēt šo opciju, lai atskaņojumu skaiti starp fonotēku un atbalstītajiem "
+ "audio failiem būtu sinhroni."
+ 
+-#: ../src/Core/Banshee.Services/Banshee.Metadata/SaveTrackMetadataService.cs:67
+-msgid "_Update file and folder names"
+-msgstr "Atja_unināt failu un mapju nosaukumus"
+-
+-#: ../src/Core/Banshee.Services/Banshee.Metadata/SaveTrackMetadataService.cs:68
+-msgid "Rename files and folders according to media metadata"
+-msgstr "Pārsaukt failus un mapes atbilstoši metadatiem"
+-
+ #: ../src/Core/Banshee.Services/Banshee.Networking/Network.cs:52
+ msgid "There is no available network connection"
+ msgstr "Nav pieejams tīkla savienojums"
+@@ -1947,7 +1975,7 @@ msgstr "Dzēst repertuāru"
+ #: ../src/Core/Banshee.ThickClient/Banshee.Gui/SourceActions.cs:176
+ #: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:135
+ #: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:462
+-#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/SourceView.cs:595
++#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/SourceView.cs:612
+ #: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/SourceView_DragAndDrop.cs:214
+ msgid "New Playlist"
+ msgstr "Jauns repertuārs"
+@@ -1990,11 +2018,7 @@ msgstr "Paplašinājumi"
+ msgid "File Policies"
+ msgstr "Faila politikas"
+ 
+-#: ../src/Core/Banshee.Services/Banshee.Preferences/PreferenceService.cs:58
+-msgid "Co_py files to media folders when importing"
+-msgstr "Im_portējot kopēt failus uz datu nesēja mapēm"
+-
+-#: ../src/Core/Banshee.Services/Banshee.Preferences/PreferenceService.cs:70
++#: ../src/Core/Banshee.Services/Banshee.Preferences/PreferenceService.cs:66
+ msgid "Improve Banshee by sending anonymous usage data"
+ msgstr "Uzlabojiet Banshee, anonīmi sūtīt izmantošanas datus"
+ 
+@@ -2555,7 +2579,7 @@ msgstr "drm"
+ #: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/StatisticsPage.cs:234
+ #: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/StatisticsPage.cs:236
+ #: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/StatisticsPage.cs:238
+-#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:389
++#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:405
+ msgid "Unknown"
+ msgstr "Nezināms"
+ 
+@@ -2643,37 +2667,33 @@ msgstr "Kļūda"
+ msgid "Details"
+ msgstr "Sīkāka informācija"
+ 
+-#: ../src/Core/Banshee.Services/Banshee.Sources/PrimarySource.cs:156
++#: ../src/Core/Banshee.Services/Banshee.Sources/PrimarySource.cs:158
+ msgid "Errors"
+ msgstr "Kļūdas"
+ 
+-#: ../src/Core/Banshee.Services/Banshee.Sources/PrimarySource.cs:213
++#: ../src/Core/Banshee.Services/Banshee.Sources/PrimarySource.cs:215
+ msgid "Sort Playlists By"
+ msgstr "Kārtot repertuāru pēc"
+ 
+ #. Translators: this is a noun, referring to the harddisk
+-#: ../src/Core/Banshee.Services/Banshee.Sources/PrimarySource.cs:223
++#: ../src/Core/Banshee.Services/Banshee.Sources/PrimarySource.cs:225
+ msgid "Drive"
+ msgstr "Dzinis"
+ 
+-#: ../src/Core/Banshee.Services/Banshee.Sources/PrimarySource.cs:247
+-msgid "File Organization"
+-msgstr "Failu organizēšana"
+-
+-#: ../src/Core/Banshee.Services/Banshee.Sources/PrimarySource.cs:248
++#: ../src/Core/Banshee.Services/Banshee.Sources/PrimarySource.cs:250
+ msgid "Folder hie_rarchy"
+ msgstr "Mapes hie_rarhija"
+ 
+-#: ../src/Core/Banshee.Services/Banshee.Sources/PrimarySource.cs:249
++#: ../src/Core/Banshee.Services/Banshee.Sources/PrimarySource.cs:251
+ msgid "File _name"
+ msgstr "Faila _nosaukums"
+ 
+-#: ../src/Core/Banshee.Services/Banshee.Sources/PrimarySource.cs:701
++#: ../src/Core/Banshee.Services/Banshee.Sources/PrimarySource.cs:706
+ #, csharp-format
+ msgid "Adding {0} of {1} to {2}"
+ msgstr "Pievieno {0} no {1} pie {2}"
+ 
+-#: ../src/Core/Banshee.Services/Banshee.Sources/PrimarySource.cs:720
++#: ../src/Core/Banshee.Services/Banshee.Sources/PrimarySource.cs:725
+ #, csharp-format
+ msgid "Deleting {0} of {1} From {2}"
+ msgstr "Dzēš {0} no {1} no {2}"
+@@ -2785,7 +2805,7 @@ msgstr ""
+ #: ../src/Core/Banshee.ThickClient/Banshee.Collection.Gui/ColumnCellDiscAndCount.cs:40
+ #: ../src/Core/Banshee.ThickClient/Banshee.Collection.Gui/ColumnCellTrackAndCount.cs:40
+ #: ../src/Core/Banshee.Widgets/Banshee.Widgets/StreamPositionLabel.cs:174
+-#: ../src/Dap/Banshee.Dap/Banshee.Dap.Gui/DapPropertiesDialog.cs:148
++#: ../src/Dap/Banshee.Dap/Banshee.Dap.Gui/DapPropertiesDialog.cs:149
+ #, csharp-format
+ msgid "{0} of {1}"
+ msgstr "{0} no {1}"
+@@ -2927,10 +2947,6 @@ msgstr "Īpaša multimediju pārvaldība un atskaņošana"
+ 
+ #: ../src/Core/Banshee.ThickClient/Banshee.Gui.Dialogs/AboutDialog.cs:98
+ #, csharp-format
+-#| msgid ""
+-#| "Copyright © 2005–{0} Novell, Inc.\n"
+-#| "Copyright © 2005–{0} Others\n"
+-#| "Copyright © 2005 Aaron Bockover"
+ msgid ""
+ "Copyright © 2005–{0} Novell, Inc.\n"
+ "Copyright © 2005–{1} Others\n"
+@@ -2987,7 +3003,7 @@ msgid "Make Banshee the Default"
+ msgstr "Padarīt Banshee par noklusēto"
+ 
+ #. Translators: verb
+-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Dialogs/FileChooserDialog.cs:53
++#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Dialogs/GtkFileChooserDialog.cs:53
+ msgid "I_mport"
+ msgstr "I_mportēt"
+ 
+@@ -3595,19 +3611,19 @@ msgstr "Iestatīt visu disku numuru un skaitu uz šīm vērtībām"
+ msgid "_Disc Number:"
+ msgstr "_Diska nosaukums:"
+ 
+-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/BasicTrackDetailsPage.cs:188
++#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/BasicTrackDetailsPage.cs:196
+ msgid "Set all years to this value"
+ msgstr "Iestatīt visus gadus uz šo vērtību"
+ 
+-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/BasicTrackDetailsPage.cs:189
++#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/BasicTrackDetailsPage.cs:197
+ msgid "_Year:"
+ msgstr "_Gads:"
+ 
+-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/BasicTrackDetailsPage.cs:196
++#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/BasicTrackDetailsPage.cs:204
+ msgid "Set all ratings to this value"
+ msgstr "Iestatīt visus vērtējumus uz šo vērtību"
+ 
+-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/BasicTrackDetailsPage.cs:197
++#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/BasicTrackDetailsPage.cs:205
+ msgid "_Rating:"
+ msgstr "Vē_rtējums:"
+ 
+@@ -4204,7 +4220,6 @@ msgstr "Šī lapa ir bloķēta, jo tā visdrīzāk nav tā, ko jūs meklējat."
+ #. Translators: {0} is the URL of the web page that was requested
+ #: ../src/Core/Banshee.WebBrowser/Banshee.WebBrowser/NavigationControl.cs:158
+ #, csharp-format
+-#| msgid "The specified resource is invalid."
+ msgid "The security certificate for {0} is invalid."
+ msgstr "{0} drošības sertifikāts nav derīgs."
+ 
+@@ -4242,18 +4257,6 @@ msgstr "Sazinās ar..."
+ msgid "Buffering"
+ msgstr "Buferē"
+ 
+-#: ../src/Core/Banshee.Widgets/Banshee.Widgets/VolumeButton.cs:96
+-msgid "Volume"
+-msgstr "Skaļums"
+-
+-#: ../src/Core/Banshee.Widgets/Banshee.Widgets/VolumeButton.cs:548
+-msgid "Muted"
+-msgstr "Apklusināts"
+-
+-#: ../src/Core/Banshee.Widgets/Banshee.Widgets/VolumeButton.cs:550
+-msgid "Full Volume"
+-msgstr "Pilns skaļums"
+-
+ #: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:115
+ msgid "Device"
+ msgstr "Ierīce"
+@@ -4290,29 +4293,29 @@ msgstr "Atbalsta albumu vāciņus"
+ msgid "Supports photos"
+ msgstr "Atbalsta fotogrāfijas"
+ 
+-#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:463
++#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:466
+ msgid "Track duration is zero"
+ msgstr "Celiņa ilgums ir nulle"
+ 
+-#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:566
++#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:570
+ msgid "Syncing iPod"
+ msgstr "Sinhronizē iPod"
+ 
+-#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:567
++#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:571
+ msgid "Preparing to synchronize..."
+ msgstr "Gatavojas sinhronizēšanai..."
+ 
+-#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:570
++#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:593
+ #, csharp-format
+ msgid "Adding track {0} of {1}"
+ msgstr "Pievieno celiņu {0} no {1}"
+ 
+-#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:606
++#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:636
+ #, csharp-format
+ msgid "Removing track {0} of {1}"
+ msgstr "Izņem celiņu {0} no {1}"
+ 
+-#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:659
++#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:710
+ msgid "Writing media database"
+ msgstr "Raksta multimediju datubāzē"
+ 
+@@ -4326,35 +4329,35 @@ msgstr "Sinhronizē {0}"
+ msgid "Devices"
+ msgstr "Ierīces"
+ 
+-#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:176
++#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:179
+ msgid "Device Properties"
+ msgstr "Ierīču īpašības"
+ 
+-#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:200
++#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:201
+ msgid "Product"
+ msgstr "Produkts"
+ 
+-#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:201
++#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:202
+ msgid "Vendor"
+ msgstr "Ražotājs"
+ 
+-#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:284
++#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:292
+ #: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Data/PodcastSource.cs:141
+ #, csharp-format
+ msgid "Loading {0}"
+ msgstr "Ielādē {0}"
+ 
+-#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:370
++#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:386
+ #: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/ColumnCellYesNo.cs:37
+ msgid "Yes"
+ msgstr "Jā"
+ 
+-#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:370
++#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:386
+ #: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/ColumnCellYesNo.cs:38
+ msgid "No"
+ msgstr "Nē"
+ 
+-#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:391
++#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:407
+ #, csharp-format
+ msgid ""
+ "The {0} format is not supported by the device, and no converter was found to "
+@@ -4363,11 +4366,11 @@ msgstr ""
+ "Šī ierīce neatbalsta formātu {0}, un netika atrasts konvertētājs, lai to "
+ "pārveidotu"
+ 
+-#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:397
++#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:413
+ msgid "File format conversion support is not available"
+ msgstr "Nav pieejama failu formāta pārveidošana"
+ 
+-#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:423
++#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:439
+ msgid "Error converting file"
+ msgstr "Kļūda, pārveidojot failu"
+ 
+@@ -4405,7 +4408,7 @@ msgstr[2] "Sinhronizēšanas darbība no ierīces izņems {0} celiņus."
+ msgid "Are you sure you want to continue?"
+ msgstr "Vai tiešām vēlaties turpināt?"
+ 
+-#: ../src/Dap/Banshee.Dap/Banshee.Dap.Gui/DapActions.cs:118
++#: ../src/Dap/Banshee.Dap/Banshee.Dap.Gui/DapActions.cs:121
+ msgid "Remove tracks"
+ msgstr "Izņemt celiņus"
+ 
+@@ -4480,12 +4483,12 @@ msgstr "Importēt iegādāto mūziku"
+ msgid "Disconnect"
+ msgstr "Atvienot"
+ 
+-#: ../src/Dap/Banshee.Dap/Banshee.Dap/RemovableSource.cs:108
++#: ../src/Dap/Banshee.Dap/Banshee.Dap/RemovableSource.cs:111
+ #, csharp-format
+ msgid "Disconnecting {0}..."
+ msgstr "Atvieno {0}..."
+ 
+-#: ../src/Dap/Banshee.Dap/Banshee.Dap/RemovableSource.cs:115
++#: ../src/Dap/Banshee.Dap/Banshee.Dap/RemovableSource.cs:118
+ #, csharp-format
+ msgid "Could not disconnect {0}: {1}"
+ msgstr "Neizdevās atvienot {0}: {1}"
+@@ -4853,11 +4856,11 @@ msgstr "Pieteikšanās"
+ msgid "Connecting to {0}"
+ msgstr "Savienojas ar {0}"
+ 
+-#: ../src/Extensions/Banshee.Daap/Banshee.Daap/DaapService.cs:185
++#: ../src/Extensions/Banshee.Daap/Banshee.Daap/DaapService.cs:186
+ msgid "Add Remote DAAP Server"
+ msgstr "Pievienot attālinātu DAAP serveri"
+ 
+-#: ../src/Extensions/Banshee.Daap/Banshee.Daap/DaapService.cs:186
++#: ../src/Extensions/Banshee.Daap/Banshee.Daap/DaapService.cs:187
+ msgid "Add a new remote DAAP server"
+ msgstr "Pievienot jaunu attālinātu DAAP serveri"
+ 
+@@ -5311,7 +5314,6 @@ msgid "Library of Congress"
+ msgstr "Kongresa bibliotēka"
+ 
+ #: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HomeView.cs:136
+-#| msgid "Sample"
+ msgid "Examples:"
+ msgstr "Piemēri:"
+ 
+@@ -5695,28 +5697,23 @@ msgstr "Apmeklēt savu Last.fm profila lapu"
+ 
+ #: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:146
+ #: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmPreferences.cs:93
+-#| msgid "_Enable Song Reporting"
+ msgid "_Enable Song Reporting From Banshee"
+ msgstr "Aktivēt dzi_esmu ziņošanu no Banshee"
+ 
+ #: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:147
+-#| msgid "Enable song reporting"
+ msgid "Enable song reporting From Banshee"
+ msgstr "Aktivēt dziesmu ziņošanu no Banshee"
+ 
+ #: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:152
+ #: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmPreferences.cs:98
+-#| msgid "_Enable Song Reporting"
+ msgid "_Enable Song Reporting From Device"
+ msgstr "Aktivēt dzi_esmu ziņošanu no ierīces"
+ 
+ #: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:153
+-#| msgid "Enable song reporting"
+ msgid "Enable song reporting From Device"
+ msgstr "Aktivēt dziesmu ziņošanu no ierīces"
+ 
+ #: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:402
+-#| msgid "Song Playing on Device"
+ msgid "Scrobbling from device"
+ msgstr "Skroblē no ierīces"
+ 
+@@ -5726,7 +5723,6 @@ msgstr "Skroblē no ierīces..."
+ 
+ #: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:414
+ #, csharp-format
+-#| msgid "Removing track {0} of {1}"
+ msgid "Processing track {0} of {1} ..."
+ msgstr "Apstrādā celiņu {0} no {1} ..."
+ 
+@@ -5841,8 +5837,8 @@ msgid "Log in to Last.fm"
+ msgstr "Pieteikties Last.fm"
+ 
+ #: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmPreferences.cs:294
+-#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:294
+-#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:321
++#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:298
++#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:335
+ msgid "You need to allow Banshee to access your Last.fm account."
+ msgstr "Jums vajadzēs atļaut Banshee darboties ar jūsu Last.fm kontu."
+ 
+@@ -6173,6 +6169,11 @@ msgstr "Meklēt podraides"
+ msgid "Search for video podcasts"
+ msgstr "Meklēt video podraides"
+ 
++#: ../src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/NotificationAreaService.cs:132
++#: ../src/Extensions/Banshee.SoundMenu/Banshee.SoundMenu/SoundMenuService.cs:110
++msgid "_Close"
++msgstr "_Aizvērt"
++
+ #: ../src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/NotificationAreaService.cs:139
+ msgid "_Show Notifications"
+ msgstr "_Rādīt paziņojumus"
+@@ -6354,7 +6355,6 @@ msgstr "Importēt ‟{0}”"
+ #. Translators: {0} is the type of disc, "Audio CD" or "DVD"
+ #: ../src/Extensions/Banshee.OpticalDisc/Banshee.OpticalDisc/DiscSource.cs:154
+ #, csharp-format
+-#| msgid "Eject {0}"
+ msgid "Ejecting {0}..."
+ msgstr "Izgrūž {0}..."
+ 
+@@ -7100,99 +7100,117 @@ msgstr "Saglabāt un pieteikties"
+ msgid "Authorize for Last.fm"
+ msgstr "Autorizēties Last.fm"
+ 
+-#: ../src/Libraries/Lastfm/Lastfm/AudioscrobblerConnection.cs:450
+-msgid ""
+-"Last.fm username is invalid or Banshee is not authorized to access your "
+-"account."
+-msgstr ""
+-"Last.fm lietotājvārds ir nederīgs, vai arī Banshee nav autorizēts piekļūt "
+-"jūsu kontam."
+-
+-#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:271
++#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:275
+ msgid "This service does not exist."
+ msgstr "Serviss neeksistē."
+ 
+-#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:275
++#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:279
+ msgid "Stations are only available to paying Last.fm subscribers."
+ msgstr "Stacijas ir pieejamas tikai maksājošiem Last.fm abonentiem."
+ 
+-#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:277
++#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:281
+ msgid "This station is not available."
+ msgstr "Stacija nav pieejama."
+ 
+-#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:279
++#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:283
+ msgid "The request is missing a required parameter."
+ msgstr "Pieprasījumam pietrūkst nepieciešama parametra."
+ 
+-#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:281
++#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:285
+ msgid "The specified resource is invalid."
+ msgstr "Norādītais resurss nav derīgs."
+ 
+-#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:283
++#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:287
+ msgid "Server error, please try again later."
+ msgstr "Servera kļūda, lūdzu, mēģiniet vēlāk."
+ 
+-#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:285
++#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:289
+ msgid "Invalid authentication information, please re-authenticate."
+ msgstr ""
+ "Nederīga autentifikācijas informācija, lūdzu, autentificējieties vēlreiz."
+ 
+-#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:287
++#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:291
+ msgid "The API key used by this application is invalid."
+ msgstr "API atslēga, ko izmanto šī lietotne, nav derīga."
+ 
+-#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:289
++#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:293
+ msgid ""
+ "The streaming system is offline for maintenance, please try again later."
+ msgstr ""
+ "Straumēšanas sistēma nav pieejama uzkopšanas dēļ, lūdzu, mēģiniet atkal "
+ "vēlāk."
+ 
+-#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:291
++#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:295
+ msgid "The method signature is invalid."
+ msgstr "Metodes paraksts ir nederīgs."
+ 
+-#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:296
++#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:300
+ msgid "There is not enough content to play this station."
+ msgstr "Nepietiek satura, lai atskaņotu šo staciju."
+ 
+-#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:298
++#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:302
+ msgid "This group does not have enough members for radio."
+ msgstr "Šai grupai nav pietiekami daudz dalībnieku, lai veidotu radio."
+ 
+-#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:300
++#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:304
+ msgid "This artist does not have enough fans for radio."
+ msgstr "Šim izpildītājam nav pietiekami daudz fanu, lai veidotu radio."
+ 
+-#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:302
++#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:306
+ msgid "There are not enough neighbours for this station."
+ msgstr "Nepietiek kaimiņu, lai veidotu šo staciju."
+ 
+-#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:304
++#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:308
++msgid "This user is not allowed to listen to radio during peak usage"
++msgstr ""
++"Šim lietotājam nav atļaujas klausīties radio, kad ir vislielākā izmantošana"
++
++#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:310
++#| msgid "Stream location not found"
++msgid "Radio station not found"
++msgstr "Radio stacija nav atrasta"
++
++#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:312
++msgid "This application is not allowed to make requests to the web services"
++msgstr "Šai lietotnei nav atļauts veidot pieprasījumus tīmekļa servisiem"
++
++#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:314
++msgid "This type of request is no longer supported"
++msgstr "Šāda veida pieprasījuma veids vairs nav atbalstīts"
++
++#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:316
++msgid ""
++"Your IP has made too many requests in a short period, exceeding our API "
++"guidelines"
++msgstr ""
++"Jūsu IP adresei veica pārāk daudz pieprasījumu īsā periodā, pārsniedzot mūsu "
++"API vadlīnijas"
++
++#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:318
+ msgid "There was an unknown error."
+ msgstr "Gadījās nezināma kļūda."
+ 
+-#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:313
++#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:327
+ msgid "Not connected to Last.fm."
+ msgstr "Nav savienojuma ar Last.fm."
+ 
+-#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:315
++#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:329
+ msgid "Account details are needed before you can connect to Last.fm"
+ msgstr "Lai savienotos ar Last.fm, ir nepieciešami konta dati"
+ 
+-#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:317
++#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:331
+ msgid "No network connection detected."
+ msgstr "Nav atrasts tīkla savienojums."
+ 
+-#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:319
++#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:333
+ msgid "Last.fm username is invalid."
+ msgstr "Last.fm lietotājvārds ir nederīgs."
+ 
+-#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:323
++#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:337
+ msgid "Connecting to Last.fm."
+ msgstr "Savienojas ar Last.fm."
+ 
+-#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:325
++#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:339
+ msgid "Connected to Last.fm."
+ msgstr "Savienojies ar Last.fm."
+ 
+@@ -7202,6 +7220,22 @@ msgstr "Savienojies ar Last.fm."
+ msgid "Unknown Podcast"
+ msgstr "Nezināma podraide"
+ 
++#~ msgid "Volume"
++#~ msgstr "Skaļums"
++
++#~ msgid "Muted"
++#~ msgstr "Apklusināts"
++
++#~ msgid "Full Volume"
++#~ msgstr "Pilns skaļums"
++
++#~ msgid ""
++#~ "Last.fm username is invalid or Banshee is not authorized to access your "
++#~ "account."
++#~ msgstr ""
++#~ "Last.fm lietotājvārds ir nederīgs, vai arī Banshee nav autorizēts piekļūt "
++#~ "jūsu kontam."
++
+ #~ msgid "Dvd"
+ #~ msgstr "DVD"
+ 
+diff --git a/po/pl.po b/po/pl.po
+index 6707926..dd27afb 100644
+--- a/po/pl.po
++++ b/po/pl.po
+@@ -7,14 +7,14 @@
+ # Artur Flinta <aflinta@gmail.com>, 2007, 2008.
+ # Wadim Dziedzic <wdziedzic@aviary.pl>, 2008, 2009.
+ # Tomasz Dominikowski <tdominikowski@aviary.pl>, 2007, 2008, 2009.
+-# Piotr Drąg <piotrdrag@gmail.com>, 2009, 2010, 2012.
++# Piotr Drąg <piotrdrag@gmail.com>, 2009, 2010, 2012, 2013.
+ # Mateusz Kacprzak <mateusz.kacprzak@yandex.ru>, 2011, 2012.
+ msgid ""
+ msgstr ""
+ "Project-Id-Version: banshee\n"
+ "Report-Msgid-Bugs-To: \n"
+-"POT-Creation-Date: 2012-08-25 21:05+0200\n"
+-"PO-Revision-Date: 2012-08-25 21:28+0200\n"
++"POT-Creation-Date: 2013-10-03 17:38+0200\n"
++"PO-Revision-Date: 2013-10-03 17:39+0200\n"
+ "Last-Translator: Piotr Drąg <piotrdrag@gmail.com>\n"
+ "Language-Team: Polish <gnomepl@aviary.pl>\n"
+ "Language: pl\n"
+@@ -630,7 +630,7 @@ msgid "Audio Quality"
+ msgstr "Jakość dźwięku"
+ 
+ #: ../data/desktop-files/common.desktop.in.h:1
+-#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:196
++#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:194
+ msgid "Media Player"
+ msgstr "Odtwarzacz multimediów"
+ 
+@@ -646,6 +646,25 @@ msgstr "Odtwarzacz multimediów Banshee"
+ msgid "Play and organize your media collection"
+ msgstr "Odtwarzanie i organizowanie kolekcji multimediów"
+ 
++#. Writing GNOME below, instead of just "Linux", is inclusive of *BSD OSs
++#: ../data/banshee.appdata.xml.in.h:2
++msgid ""
++"Banshee is an open source multimedia management and playback application for "
++"GNOME, Mac and Windows."
++msgstr ""
++"Banshee to program open source do zarządzania i odtwarzania multimediów dla "
++"systemów GNOME, Mac i Windows."
++
++#: ../data/banshee.appdata.xml.in.h:3
++msgid ""
++"Play your music and videos. Stay entertained and up to date with podcasts "
++"and video podcasts. Sync your Android, iPod, and other devices. We think "
++"you'll love Banshee!"
++msgstr ""
++"Funkcje programu Banshee obejmują odtwarzanie muzyki i nagrań wideo, "
++"podcastów dźwiękowych i wideo oraz synchronizowanie kolekcji z urządzeniami "
++"Android, iPod i wieloma innymi."
++
+ #: ../libbanshee/banshee-bpmdetector.c:202 ../libbanshee/banshee-ripper.c:270
+ #: ../src/Backends/Banshee.GStreamerSharp/Banshee.GStreamerSharp/AudioCdRipper.cs:240
+ msgid "Could not create pipeline"
+@@ -1307,7 +1326,7 @@ msgid "Stream location not found"
+ msgstr "Nie odnaleziono położenia strumienia"
+ 
+ #: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:347
+-#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:343
++#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:344
+ msgid "File not found"
+ msgstr "Nie odnaleziono pliku"
+ 
+@@ -1977,7 +1996,7 @@ msgstr "Usuń listę odtwarzania"
+ #: ../src/Core/Banshee.ThickClient/Banshee.Gui/SourceActions.cs:176
+ #: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:135
+ #: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:462
+-#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/SourceView.cs:595
++#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/SourceView.cs:612
+ #: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/SourceView_DragAndDrop.cs:214
+ msgid "New Playlist"
+ msgstr "Nowa lista odtwarzania"
+@@ -2588,7 +2607,7 @@ msgstr "drm"
+ #: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/StatisticsPage.cs:234
+ #: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/StatisticsPage.cs:236
+ #: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/StatisticsPage.cs:238
+-#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:404
++#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:405
+ msgid "Unknown"
+ msgstr "Nieznana"
+ 
+@@ -2815,7 +2834,7 @@ msgstr ""
+ #: ../src/Core/Banshee.ThickClient/Banshee.Collection.Gui/ColumnCellDiscAndCount.cs:40
+ #: ../src/Core/Banshee.ThickClient/Banshee.Collection.Gui/ColumnCellTrackAndCount.cs:40
+ #: ../src/Core/Banshee.Widgets/Banshee.Widgets/StreamPositionLabel.cs:174
+-#: ../src/Dap/Banshee.Dap/Banshee.Dap.Gui/DapPropertiesDialog.cs:148
++#: ../src/Dap/Banshee.Dap/Banshee.Dap.Gui/DapPropertiesDialog.cs:149
+ #, csharp-format
+ msgid "{0} of {1}"
+ msgstr "{0} z {1}"
+@@ -3625,19 +3644,19 @@ msgstr "Ustawia wszystkie pola numeru płyty i numerów ścieżek na tę wartoś
+ msgid "_Disc Number:"
+ msgstr "_Numer płyty:"
+ 
+-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/BasicTrackDetailsPage.cs:188
++#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/BasicTrackDetailsPage.cs:196
+ msgid "Set all years to this value"
+ msgstr "Ustawia wszystkie pola lat na tę wartość"
+ 
+-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/BasicTrackDetailsPage.cs:189
++#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/BasicTrackDetailsPage.cs:197
+ msgid "_Year:"
+ msgstr "_Rok:"
+ 
+-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/BasicTrackDetailsPage.cs:196
++#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/BasicTrackDetailsPage.cs:204
+ msgid "Set all ratings to this value"
+ msgstr "Ustawia wszystkie oceny na tę wartość"
+ 
+-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/BasicTrackDetailsPage.cs:197
++#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/BasicTrackDetailsPage.cs:205
+ msgid "_Rating:"
+ msgstr "_Ocena:"
+ 
+@@ -4316,29 +4335,29 @@ msgstr "Obsługuje okładki"
+ msgid "Supports photos"
+ msgstr "Obsługuje zdjęcia"
+ 
+-#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:465
++#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:466
+ msgid "Track duration is zero"
+ msgstr "Długość ścieżki wynosi zero"
+ 
+-#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:571
++#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:570
+ msgid "Syncing iPod"
+ msgstr "Synchronizowanie odtwarzacza iPod"
+ 
+-#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:572
++#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:571
+ msgid "Preparing to synchronize..."
+ msgstr "Przygotowywanie do synchronizacji..."
+ 
+-#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:575
++#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:593
+ #, csharp-format
+ msgid "Adding track {0} of {1}"
+ msgstr "Dodawanie ścieżki {0} z {1}"
+ 
+-#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:611
++#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:636
+ #, csharp-format
+ msgid "Removing track {0} of {1}"
+ msgstr "Usuwanie ścieżki {0} z {1}"
+ 
+-#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:664
++#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:710
+ msgid "Writing media database"
+ msgstr "Zapisywanie bazy danych multimediów"
+ 
+@@ -4356,31 +4375,31 @@ msgstr "Urządzenia"
+ msgid "Device Properties"
+ msgstr "Właściwości urządzenia"
+ 
+-#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:203
++#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:201
+ msgid "Product"
+ msgstr "Produkt"
+ 
+-#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:204
++#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:202
+ msgid "Vendor"
+ msgstr "Producent"
+ 
+-#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:291
++#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:292
+ #: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Data/PodcastSource.cs:141
+ #, csharp-format
+ msgid "Loading {0}"
+ msgstr "Wczytywanie {0}"
+ 
+-#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:385
++#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:386
+ #: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/ColumnCellYesNo.cs:37
+ msgid "Yes"
+ msgstr "Tak"
+ 
+-#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:385
++#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:386
+ #: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/ColumnCellYesNo.cs:38
+ msgid "No"
+ msgstr "Nie"
+ 
+-#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:406
++#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:407
+ #, csharp-format
+ msgid ""
+ "The {0} format is not supported by the device, and no converter was found to "
+@@ -4389,11 +4408,11 @@ msgstr ""
+ "Format {0} nie jest obsługiwany przez to urządzenie i nie odnaleziono "
+ "konwertera do konwersji tego formatu"
+ 
+-#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:412
++#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:413
+ msgid "File format conversion support is not available"
+ msgstr "Konwersja formatu plików nie jest obsługiwana"
+ 
+-#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:438
++#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:439
+ msgid "Error converting file"
+ msgstr "Błąd podczas konwertowania pliku"
+ 
+@@ -4430,7 +4449,7 @@ msgstr[2] "Synchronizacja usunie {0} ścieżek z urządzenia."
+ msgid "Are you sure you want to continue?"
+ msgstr "Na pewno kontynuować?"
+ 
+-#: ../src/Dap/Banshee.Dap/Banshee.Dap.Gui/DapActions.cs:118
++#: ../src/Dap/Banshee.Dap/Banshee.Dap.Gui/DapActions.cs:121
+ msgid "Remove tracks"
+ msgstr "Usuń ścieżki"
+ 
+@@ -4505,12 +4524,12 @@ msgstr "Importowanie zakupionej muzyki"
+ msgid "Disconnect"
+ msgstr "Rozłącz"
+ 
+-#: ../src/Dap/Banshee.Dap/Banshee.Dap/RemovableSource.cs:108
++#: ../src/Dap/Banshee.Dap/Banshee.Dap/RemovableSource.cs:111
+ #, csharp-format
+ msgid "Disconnecting {0}..."
+ msgstr "Rozłączanie {0}..."
+ 
+-#: ../src/Dap/Banshee.Dap/Banshee.Dap/RemovableSource.cs:115
++#: ../src/Dap/Banshee.Dap/Banshee.Dap/RemovableSource.cs:118
+ #, csharp-format
+ msgid "Could not disconnect {0}: {1}"
+ msgstr "Nie można rozłączyć {0}: {1}"
+@@ -4876,11 +4895,11 @@ msgstr "Login"
+ msgid "Connecting to {0}"
+ msgstr "Łączenie z {0}"
+ 
+-#: ../src/Extensions/Banshee.Daap/Banshee.Daap/DaapService.cs:185
++#: ../src/Extensions/Banshee.Daap/Banshee.Daap/DaapService.cs:186
+ msgid "Add Remote DAAP Server"
+ msgstr "Dodaj zdalny serwer DAAP"
+ 
+-#: ../src/Extensions/Banshee.Daap/Banshee.Daap/DaapService.cs:186
++#: ../src/Extensions/Banshee.Daap/Banshee.Daap/DaapService.cs:187
+ msgid "Add a new remote DAAP server"
+ msgstr "Dodaj nowy zdalny serwer DAAP"
+ 
+@@ -6936,22 +6955,22 @@ msgstr "kliknięcie"
+ msgid "menu"
+ msgstr "menu"
+ 
+-#: ../src/Hyena/Hyena.Gui/Hyena.Data.Gui/ListView/ListView_Header.cs:612
++#: ../src/Hyena/Hyena.Gui/Hyena.Data.Gui/ListView/ListView_Header.cs:613
+ #, csharp-format
+ msgid "Hide <i>{0}</i>"
+ msgstr "Ukryj <i>{0}</i>"
+ 
+ #. Translators: {0} is substituted with the application name
+-#: ../src/Hyena/Hyena.Gui/Hyena.Gui.Dialogs/ExceptionDialog.cs:53
++#: ../src/Hyena/Hyena.Gui/Hyena.Gui.Dialogs/ExceptionDialog.cs:52
+ #, csharp-format
+ msgid "{0} Encountered a Fatal Error"
+ msgstr "{0} - Napotkano krytyczny błąd"
+ 
+-#: ../src/Hyena/Hyena.Gui/Hyena.Gui.Dialogs/ExceptionDialog.cs:92
++#: ../src/Hyena/Hyena.Gui/Hyena.Gui.Dialogs/ExceptionDialog.cs:91
+ msgid "Error Details"
+ msgstr "Szczegóły błędu"
+ 
+-#: ../src/Hyena/Hyena.Gui/Hyena.Gui.Dialogs/ExceptionDialog.cs:136
++#: ../src/Hyena/Hyena.Gui/Hyena.Gui.Dialogs/ExceptionDialog.cs:135
+ msgid "An unhandled exception was thrown: "
+ msgstr "Wystąpił nieobsługiwany wyjątek: "
+ 
+diff --git a/po/pt_BR.po b/po/pt_BR.po
+index 663566b..69bbacd 100644
+--- a/po/pt_BR.po
++++ b/po/pt_BR.po
+@@ -13,7 +13,7 @@
+ # Carlos Eduardo Moreira dos Santos <cems@cemshost.com.br>, 2008.
+ # Fábio Nogueira <deb-user-ba@ubuntu.com>, 2008.
+ # Amanda Magalhães <amandinha@comum.org>, 2010.
+-# Enrico Nicoletto <liverig@gmail.com>, 2010.
++# Enrico Nicoletto <liverig@gmail.com>, 2010, 2013.
+ # Pablo Garrido <pablo@pablogarrido.com.br>, 2010.
+ # Michel Recondo <michel@recondo.com.br>, 2008, 2010.
+ # Daniel S. Koda <danielskoda@gmail.com>, 2009, 2010.
+@@ -25,14 +25,15 @@
+ # filesink -> consumidor de arquivo
+ # scrobble   -> http://www.lastfm.com.br/help/faq?category=Scrobbling
+ # scrobbling -> http://www.lastfm.com.br/help/faq?category=Scrobbling
++#
+ msgid ""
+ msgstr ""
+ "Project-Id-Version: banshee help\n"
+ "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
+ "product=banshee&keywords=I18N+L10N&component=general\n"
+-"POT-Creation-Date: 2013-01-25 00:16+0000\n"
+-"PO-Revision-Date: 2013-02-12 18:05-0300\n"
+-"Last-Translator: Rafael Ferreira <rafael.f.f1@gmail.com>\n"
++"POT-Creation-Date: 2013-10-07 20:24+0000\n"
++"PO-Revision-Date: 2013-10-08 14:42-0300\n"
++"Last-Translator: Enrico Nicoletto <liverig@gmail.com>\n"
+ "Language-Team: Brazilian Portuguese <gnome-pt_br-list@gnome.org>\n"
+ "Language: pt_BR\n"
+ "MIME-Version: 1.0\n"
+@@ -654,6 +655,25 @@ msgstr "Reprodutor de mídia Banshee"
+ msgid "Play and organize your media collection"
+ msgstr "Reproduza e organize a sua coleção de mídia"
+ 
++#. Writing GNOME below, instead of just "Linux", is inclusive of *BSD OSs
++#: ../data/banshee.appdata.xml.in.h:2
++msgid ""
++"Banshee is an open source multimedia management and playback application for "
++"GNOME, Mac and Windows."
++msgstr ""
++"Banshee é um gerenciador de multimídia de código aberto e aplicativo de "
++"reprodução para o GNOME, Mac e Windows."
++
++#: ../data/banshee.appdata.xml.in.h:3
++msgid ""
++"Play your music and videos. Stay entertained and up to date with podcasts "
++"and video podcasts. Sync your Android, iPod, and other devices. We think "
++"you'll love Banshee!"
++msgstr ""
++"Reproduza suas músicas e vídeos. Fique entretido e mantenha-se atualizado "
++"com podcasts de áudio e video. Sincronize seu Android, iPod, e outros "
++"dispositivos. Acreditamos que você irá amar o Banshee!"
++
+ #: ../libbanshee/banshee-bpmdetector.c:202 ../libbanshee/banshee-ripper.c:270
+ #: ../src/Backends/Banshee.GStreamerSharp/Banshee.GStreamerSharp/AudioCdRipper.cs:240
+ msgid "Could not create pipeline"
+@@ -2809,7 +2829,7 @@ msgstr ""
+ #: ../src/Core/Banshee.ThickClient/Banshee.Collection.Gui/ColumnCellDiscAndCount.cs:40
+ #: ../src/Core/Banshee.ThickClient/Banshee.Collection.Gui/ColumnCellTrackAndCount.cs:40
+ #: ../src/Core/Banshee.Widgets/Banshee.Widgets/StreamPositionLabel.cs:174
+-#: ../src/Dap/Banshee.Dap/Banshee.Dap.Gui/DapPropertiesDialog.cs:148
++#: ../src/Dap/Banshee.Dap/Banshee.Dap.Gui/DapPropertiesDialog.cs:149
+ #, csharp-format
+ msgid "{0} of {1}"
+ msgstr "{0} de {1}"
+@@ -3106,16 +3126,6 @@ msgid "_Tools"
+ msgstr "Ferrame_ntas"
+ 
+ #: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:88
+-#, csharp-format
+-msgid "The rescan operation will remove one track from your music library."
+-msgid_plural ""
+-"The rescan operation will remove {0} tracks from your music library."
+-msgstr[0] ""
+-"A operação de varredura removerá uma faixa da sua biblioteca de músicas."
+-msgstr[1] ""
+-"A operação de varredura removerá {0} faixas da sua biblioteca de músicas."
+-
+-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:99
+ #: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HeaderFilters.cs:134
+ msgid "_Help"
+ msgstr "Aj_uda"
+@@ -4316,29 +4326,29 @@ msgstr "Suporta arte de capa"
+ msgid "Supports photos"
+ msgstr "Suporta fotos"
+ 
+-#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:462
++#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:466
+ msgid "Track duration is zero"
+ msgstr "A duração da faixa é zero"
+ 
+-#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:566
++#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:570
+ msgid "Syncing iPod"
+ msgstr "Sincronizando o iPod"
+ 
+-#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:567
++#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:571
+ msgid "Preparing to synchronize..."
+ msgstr "Preparando para sincroniar..."
+ 
+-#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:589
++#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:593
+ #, csharp-format
+ msgid "Adding track {0} of {1}"
+ msgstr "Adicionando faixa {0} de {1}"
+ 
+-#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:632
++#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:636
+ #, csharp-format
+ msgid "Removing track {0} of {1}"
+ msgstr "Removendo faixa {0} de {1}"
+ 
+-#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:706
++#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:710
+ msgid "Writing media database"
+ msgstr "Gravando o banco de dados de mídia"
+ 
+@@ -4506,12 +4516,12 @@ msgstr "Importar música comprada"
+ msgid "Disconnect"
+ msgstr "Desconectar"
+ 
+-#: ../src/Dap/Banshee.Dap/Banshee.Dap/RemovableSource.cs:108
++#: ../src/Dap/Banshee.Dap/Banshee.Dap/RemovableSource.cs:111
+ #, csharp-format
+ msgid "Disconnecting {0}..."
+ msgstr "Desconectando {0}..."
+ 
+-#: ../src/Dap/Banshee.Dap/Banshee.Dap/RemovableSource.cs:115
++#: ../src/Dap/Banshee.Dap/Banshee.Dap/RemovableSource.cs:118
+ #, csharp-format
+ msgid "Could not disconnect {0}: {1}"
+ msgstr "Não foi possível desconectar {0}: {1}"
+@@ -7236,6 +7246,14 @@ msgstr "Conectado ao Last.fm."
+ msgid "Unknown Podcast"
+ msgstr "Podcast desconhecido"
+ 
++#~ msgid "The rescan operation will remove one track from your music library."
++#~ msgid_plural ""
++#~ "The rescan operation will remove {0} tracks from your music library."
++#~ msgstr[0] ""
++#~ "A operação de varredura removerá uma faixa da sua biblioteca de músicas."
++#~ msgstr[1] ""
++#~ "A operação de varredura removerá {0} faixas da sua biblioteca de músicas."
++
+ #~ msgid "Volume"
+ #~ msgstr "Volume"
+ 
+diff --git a/po/sl.po b/po/sl.po
+index f13a1e9..774f98e 100644
+--- a/po/sl.po
++++ b/po/sl.po
+@@ -8,20 +8,20 @@
+ msgid ""
+ msgstr ""
+ "Project-Id-Version: banshee master\n"
+-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=banshee&keywords=I18N+L10N&component=general\n"
+-"POT-Creation-Date: 2012-08-26 13:25+0000\n"
+-"PO-Revision-Date: 2012-08-29 08:44+0100\n"
++"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
++"product=banshee&keywords=I18N+L10N&component=general\n"
++"POT-Creation-Date: 2013-10-13 00:11+0000\n"
++"PO-Revision-Date: 2013-10-13 23:42+0100\n"
+ "Last-Translator: Matej Urbančič <mateju@svn.gnome.org>\n"
+ "Language-Team: Slovenian GNOME Translation Team <gnome-si@googlegroups.com>\n"
+-"Language: \n"
++"Language: sl_SI\n"
+ "MIME-Version: 1.0\n"
+ "Content-Type: text/plain; charset=UTF-8\n"
+ "Content-Transfer-Encoding: 8bit\n"
+-"Plural-Forms: nplurals=4; plural=(n%100==1 ? 1 : n%100==2 ? 2 : n%100==3 || n%100==4 ? 3 : 0);\n"
++"Plural-Forms: nplurals=4; plural=(n%100==1 ? 1 : n%100==2 ? 2 : n%100==3 || n"
++"%100==4 ? 3 : 0);\n"
+ "X-Launchpad-Export-Date: 2011-04-11 06:24+0000\n"
+-"X-Generator: Launchpad (build 12757)\n"
+-"X-Poedit-Country: SLOVENIA\n"
+-"X-Poedit-Language: Slovenian\n"
++"X-Generator: Poedit 1.5.4\n"
+ "X-Poedit-SourceCharset: utf-8\n"
+ 
+ #. ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice.addin.xml
+@@ -33,10 +33,8 @@ msgstr "Podpora napravam Apple"
+ msgid "Support for most iPod/iPhone/iPad devices."
+ msgstr "Podpora napravam iPod/iPhone/iPad."
+ 
+-#: ../data/addin-xml-strings.cs:10
+-#: ../data/addin-xml-strings.cs:15
+-#: ../data/addin-xml-strings.cs:20
+-#: ../data/addin-xml-strings.cs:25
++#: ../data/addin-xml-strings.cs:10 ../data/addin-xml-strings.cs:15
++#: ../data/addin-xml-strings.cs:20 ../data/addin-xml-strings.cs:25
+ msgid "Device Support"
+ msgstr "Podpora napravam"
+ 
+@@ -55,8 +53,12 @@ msgid "Mass Storage Media Player Support"
+ msgstr "Podpora shramb predstavnih datotek"
+ 
+ #: ../data/addin-xml-strings.cs:19
+-msgid "Support for USB-drive based devices, including many iAudio devices and Android, Pre, and Galaxy phones."
+-msgstr "Podpora napravam USB, vključno s številnimi napravami iAudio in telefoni Android, Pre in Galaxy."
++msgid ""
++"Support for USB-drive based devices, including many iAudio devices and "
++"Android, Pre, and Galaxy phones."
++msgstr ""
++"Podpora napravam USB, vključno s številnimi napravami iAudio in telefoni "
++"Android, Pre in Galaxy."
+ 
+ #. ../src/Dap/Banshee.Dap.Mtp/Banshee.Dap.Mtp.addin.xml
+ #: ../data/addin-xml-strings.cs:23
+@@ -76,14 +78,10 @@ msgstr "Trgovina Amazon MP3"
+ msgid "Browse, search, and purchase music from the Amazon MP3 store."
+ msgstr "Brskanje, iskanje in nakup glasbe v trgovini Amazon MP3."
+ 
+-#: ../data/addin-xml-strings.cs:30
+-#: ../data/addin-xml-strings.cs:35
+-#: ../data/addin-xml-strings.cs:65
+-#: ../data/addin-xml-strings.cs:70
+-#: ../data/addin-xml-strings.cs:85
+-#: ../data/addin-xml-strings.cs:95
+-#: ../data/addin-xml-strings.cs:100
+-#: ../data/addin-xml-strings.cs:115
++#: ../data/addin-xml-strings.cs:30 ../data/addin-xml-strings.cs:35
++#: ../data/addin-xml-strings.cs:65 ../data/addin-xml-strings.cs:70
++#: ../data/addin-xml-strings.cs:85 ../data/addin-xml-strings.cs:95
++#: ../data/addin-xml-strings.cs:100 ../data/addin-xml-strings.cs:115
+ #: ../data/addin-xml-strings.cs:165
+ msgid "Online Sources"
+ msgstr "Spletni viri"
+@@ -106,12 +104,9 @@ msgstr "Knjižnica zvočnih knjig"
+ msgid "Organize audiobooks, lectures, etc."
+ msgstr "Urejanje zvočnih knjig, predavanj in drugih vrst posnetkov."
+ 
+-#: ../data/addin-xml-strings.cs:40
+-#: ../data/addin-xml-strings.cs:75
+-#: ../data/addin-xml-strings.cs:90
+-#: ../data/addin-xml-strings.cs:135
+-#: ../data/addin-xml-strings.cs:145
+-#: ../data/addin-xml-strings.cs:150
++#: ../data/addin-xml-strings.cs:40 ../data/addin-xml-strings.cs:75
++#: ../data/addin-xml-strings.cs:90 ../data/addin-xml-strings.cs:135
++#: ../data/addin-xml-strings.cs:145 ../data/addin-xml-strings.cs:150
+ msgid "Core"
+ msgstr "Jedro"
+ 
+@@ -122,22 +117,16 @@ msgstr "Skriptni programi Boo"
+ 
+ #: ../data/addin-xml-strings.cs:44
+ msgid "Customize and extend Banshee with Boo-language scripts."
+-msgstr "Prilagajanje in razširjanje predvajalnika Banshee s skriptami v jeziku Boo."
+-
+-#: ../data/addin-xml-strings.cs:45
+-#: ../data/addin-xml-strings.cs:50
+-#: ../data/addin-xml-strings.cs:55
+-#: ../data/addin-xml-strings.cs:60
+-#: ../data/addin-xml-strings.cs:80
+-#: ../data/addin-xml-strings.cs:105
+-#: ../data/addin-xml-strings.cs:110
+-#: ../data/addin-xml-strings.cs:120
+-#: ../data/addin-xml-strings.cs:125
+-#: ../data/addin-xml-strings.cs:130
+-#: ../data/addin-xml-strings.cs:140
+-#: ../data/addin-xml-strings.cs:155
+-#: ../data/addin-xml-strings.cs:160
+-#: ../data/addin-xml-strings.cs:170
++msgstr ""
++"Prilagajanje in razširjanje predvajalnika Banshee s skriptami v jeziku Boo."
++
++#: ../data/addin-xml-strings.cs:45 ../data/addin-xml-strings.cs:50
++#: ../data/addin-xml-strings.cs:55 ../data/addin-xml-strings.cs:60
++#: ../data/addin-xml-strings.cs:80 ../data/addin-xml-strings.cs:105
++#: ../data/addin-xml-strings.cs:110 ../data/addin-xml-strings.cs:120
++#: ../data/addin-xml-strings.cs:125 ../data/addin-xml-strings.cs:130
++#: ../data/addin-xml-strings.cs:140 ../data/addin-xml-strings.cs:155
++#: ../data/addin-xml-strings.cs:160 ../data/addin-xml-strings.cs:170
+ msgid "Utilities"
+ msgstr "Pripomočki"
+ 
+@@ -202,7 +191,9 @@ msgstr "Popravljanje metapodatkov"
+ 
+ #: ../data/addin-xml-strings.cs:79
+ msgid "Fix broken and missing metadata using bulk operations."
+-msgstr "Popravljanje pokvarjenih in manjkajočih metapodatkov z uporabo paketnih opravil."
++msgstr ""
++"Popravljanje pokvarjenih in manjkajočih metapodatkov z uporabo paketnih "
++"opravil."
+ 
+ #. ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive.addin.xml
+ #: ../data/addin-xml-strings.cs:83
+@@ -230,7 +221,9 @@ msgstr "Pošiljanje seznama predvajane glasbe Last.fm"
+ 
+ #: ../data/addin-xml-strings.cs:94
+ msgid "Last.fm scrobbling and context pane recommendations."
+-msgstr "Pošiljanje seznama predvajane glasbe Last.fm in priporočila vsebinskega pladnja."
++msgstr ""
++"Pošiljanje seznama predvajane glasbe Last.fm in priporočila vsebinskega "
++"pladnja."
+ 
+ #. ../src/Extensions/Banshee.LastfmStreaming/Banshee.LastfmStreaming.addin.xml
+ #: ../data/addin-xml-strings.cs:98
+@@ -256,8 +249,12 @@ msgid "Mini Mode"
+ msgstr "Enostavni vmesni"
+ 
+ #: ../data/addin-xml-strings.cs:109
+-msgid "Control Banshee through a small window with only playback controls and track information."
+-msgstr "Nadzor predvajalnika Banshee preko enostavnega vmesnika z nadzornikom predvajanja in nekaterimi podrobnostmi skladbe."
++msgid ""
++"Control Banshee through a small window with only playback controls and track "
++"information."
++msgstr ""
++"Nadzor predvajalnika Banshee preko enostavnega vmesnika z nadzornikom "
++"predvajanja in nekaterimi podrobnostmi skladbe."
+ 
+ #. ../src/Extensions/Banshee.MiroGuide/Banshee.MiroGuide.addin.xml
+ #: ../data/addin-xml-strings.cs:113
+@@ -302,7 +299,8 @@ msgstr "Podpora za DVD in zvočne nosilce CD"
+ 
+ #: ../data/addin-xml-strings.cs:134
+ msgid "Watch DVDs, listen to and rip Audio CDs."
+-msgstr "Ogled vsebine nosilcev DVD in poslušanje ter zajemanje zvočnih nosilcev CD."
++msgstr ""
++"Ogled vsebine nosilcev DVD in poslušanje ter zajemanje zvočnih nosilcev CD."
+ 
+ #. ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration.addin.xml
+ #: ../data/addin-xml-strings.cs:138
+@@ -335,7 +333,8 @@ msgstr "Podcasti"
+ 
+ #: ../data/addin-xml-strings.cs:149
+ msgid "Subscribe to podcasts and stream or download episodes."
+-msgstr "Naročilo na podcaste in pretakanje oziroma prejemanje posnetkov epizod."
++msgstr ""
++"Naročilo na podcaste in pretakanje oziroma prejemanje posnetkov epizod."
+ 
+ #. ../src/Extensions/Banshee.SoundMenu/Banshee.SoundMenu.addin.xml
+ #: ../data/addin-xml-strings.cs:153
+@@ -364,8 +363,11 @@ msgid "Ubuntu One Music Store"
+ msgstr "Glasbena trgovina Ubuntu One"
+ 
+ #: ../data/addin-xml-strings.cs:164
+-msgid "This extension grants access to the Ubuntu One Music Store, powered by 7digital."
+-msgstr "Podpora dostopa do glasbene trgovine Ubuntu One preko sistema 7digital."
++msgid ""
++"This extension grants access to the Ubuntu One Music Store, powered by "
++"7digital."
++msgstr ""
++"Podpora dostopa do glasbene trgovine Ubuntu One preko sistema 7digital."
+ 
+ #. ../src/Extensions/Banshee.UPnPClient/Banshee.UPnPClient.addin.xml
+ #: ../data/addin-xml-strings.cs:168
+@@ -373,8 +375,11 @@ msgid "UPnP Client"
+ msgstr "Odjemalec UPnp"
+ 
+ #: ../data/addin-xml-strings.cs:169
+-msgid "Browse and play music and videos shared over your local network using UPnP."
+-msgstr "Brskanje in poslušanje glasbe v souporabi preko krajevnega omrežja z uporabo UPnP."
++msgid ""
++"Browse and play music and videos shared over your local network using UPnP."
++msgstr ""
++"Brskanje in poslušanje glasbe v souporabi preko krajevnega omrežja z uporabo "
++"UPnP."
+ 
+ #. ../src/Extensions/Banshee.Wikipedia/Banshee.Wikipedia.addin.xml
+ #: ../data/addin-xml-strings.cs:173
+@@ -386,8 +391,7 @@ msgstr "Wikipedia"
+ msgid "View artist information from Wikipedia in the context pane."
+ msgstr "Prikaz podrobnosti izvajalca iz Wikipedije v vsebinskem pladnju."
+ 
+-#: ../data/addin-xml-strings.cs:175
+-#: ../data/addin-xml-strings.cs:180
++#: ../data/addin-xml-strings.cs:175 ../data/addin-xml-strings.cs:180
+ msgid "Context Pane"
+ msgstr "Vsebinski pladenj"
+ 
+@@ -399,15 +403,20 @@ msgstr "YouTube"
+ 
+ #: ../data/addin-xml-strings.cs:179
+ msgid "Show related YouTube videos in the context pane."
+-msgstr "Podpora sorodnim videoposnetkom spletišča YouTube v vsebinskem pladnju."
++msgstr ""
++"Podpora sorodnim videoposnetkom spletišča YouTube v vsebinskem pladnju."
+ 
+ #: ../data/audio-profiles/aac-novell.xml.in.h:1
+ msgid "AAC (Novell Encoder)"
+ msgstr "AAC (Nov kodirnik)"
+ 
+ #: ../data/audio-profiles/aac-novell.xml.in.h:2
+-msgid "Designed to be the successor of the MP3 format, AAC generally achieves better sound quality than MP3 at many bit rates."
+-msgstr "Zasnovan kot naslednik zapisa MP3. AAC v splošnem dosega boljšo kakovost zvoka kot MP3 pri številnih bitnih hitrostih."
++msgid ""
++"Designed to be the successor of the MP3 format, AAC generally achieves "
++"better sound quality than MP3 at many bit rates."
++msgstr ""
++"Zasnovan kot naslednik zapisa MP3. AAC v splošnem dosega boljšo kakovost "
++"zvoka kot MP3 pri številnih bitnih hitrostih."
+ 
+ #: ../data/audio-profiles/aac-novell.xml.in.h:3
+ #: ../data/audio-profiles/mp3-lame.xml.in.h:9
+@@ -458,8 +467,12 @@ msgid "Free Lossless Audio Codec"
+ msgstr "Brezplačni kodek za kodiranje brez zvočnih izgub (FLAC)"
+ 
+ #: ../data/audio-profiles/flac.xml.in.h:2
+-msgid "Free Lossless Audio Codec (FLAC) is an open source codec that compresses but does not degrade audio quality."
+-msgstr "Brezplačni kodek za kodiranje brez zvočnih izgub (FLAC) je odprtokodni kodek, ki zvok stisne, vendar ne poslabša njegove kakovosti."
++msgid ""
++"Free Lossless Audio Codec (FLAC) is an open source codec that compresses but "
++"does not degrade audio quality."
++msgstr ""
++"Brezplačni kodek za kodiranje brez zvočnih izgub (FLAC) je odprtokodni "
++"kodek, ki zvok stisne, vendar ne poslabša njegove kakovosti."
+ 
+ #: ../data/audio-profiles/mp3-lame.xml.in.h:1
+ msgid "MP3 (LAME Encoder)"
+@@ -467,8 +480,12 @@ msgstr "MP3 (kodirnik LAME)"
+ 
+ #: ../data/audio-profiles/mp3-lame.xml.in.h:2
+ #: ../data/audio-profiles/mp3-xing.xml.in.h:2
+-msgid "A proprietary and older, but also popular, lossy audio format that produces larger files at lower bitrates."
+-msgstr "Priljubljeni starejši zakonsko zaščiteni zvočni zapis, ki kodira zvok v večje datoteke s slabšo kakovostjo."
++msgid ""
++"A proprietary and older, but also popular, lossy audio format that produces "
++"larger files at lower bitrates."
++msgstr ""
++"Priljubljeni starejši zakonsko zaščiteni zvočni zapis, ki kodira zvok v "
++"večje datoteke s slabšo kakovostjo."
+ 
+ #: ../data/audio-profiles/mp3-lame.xml.in.h:3
+ msgid "Encoding Mode"
+@@ -509,8 +526,12 @@ msgid "Ogg Vorbis"
+ msgstr "Ogg Vorbis"
+ 
+ #: ../data/audio-profiles/vorbis.xml.in.h:2
+-msgid "Vorbis is an open source, lossy audio codec with high quality output at a lower file size than MP3."
+-msgstr "Vorbis je odprtokodni kodek za kodiranje izgubami, z visoko kakovostnim izhodom pri manjši velikosti datoteke kot MP3."
++msgid ""
++"Vorbis is an open source, lossy audio codec with high quality output at a "
++"lower file size than MP3."
++msgstr ""
++"Vorbis je odprtokodni kodek za kodiranje izgubami, z visoko kakovostnim "
++"izhodom pri manjši velikosti datoteke kot MP3."
+ 
+ #: ../data/audio-profiles/vorbis.xml.in.h:3
+ msgid "Audio quality"
+@@ -521,8 +542,13 @@ msgid "Wavpack"
+ msgstr "Wavpack"
+ 
+ #: ../data/audio-profiles/wavpack.xml.in.h:2
+-msgid "A fast and efficient open source audio format offering lossless and high-quality lossy encoding with great dynamic range."
+-msgstr "Hiter in učinkovit odprtokodni zvočni zapis, ki ponuja kodiranje brez zvočnih izgub in visoko kakovostno kodiranje z izgubami z velikim zvočnim razponom."
++msgid ""
++"A fast and efficient open source audio format offering lossless and high-"
++"quality lossy encoding with great dynamic range."
++msgstr ""
++"Hiter in učinkovit odprtokodni zvočni zapis, ki ponuja kodiranje brez "
++"zvočnih izgub in visoko kakovostno kodiranje z izgubami z velikim zvočnim "
++"razponom."
+ 
+ #: ../data/audio-profiles/wavpack.xml.in.h:3
+ msgid "Mode"
+@@ -569,16 +595,25 @@ msgid "Waveform PCM"
+ msgstr "Waveform PCM"
+ 
+ #: ../data/audio-profiles/wav.xml.in.h:2
+-msgid "WAV+PCM is a lossless format that holds uncompressed, raw pulse-code modulated (PCM) audio."
+-msgstr "Oblika zapisa WAV+PCM je kodirana brez zvočnih izgub in vsebuje nestisnjen, surov pulzirajoče-kodno moduliran (PCM) zvok."
++msgid ""
++"WAV+PCM is a lossless format that holds uncompressed, raw pulse-code "
++"modulated (PCM) audio."
++msgstr ""
++"Oblika zapisa WAV+PCM je kodirana brez zvočnih izgub in vsebuje nestisnjen, "
++"surov pulzirajoče-kodno moduliran (PCM) zvok."
+ 
+ #: ../data/audio-profiles/wma.xml.in.h:1
+ msgid "Windows Media Audio"
+ msgstr "Zvočna datoteka Windows Media"
+ 
+ #: ../data/audio-profiles/wma.xml.in.h:2
+-msgid "A proprietary lossy audio format with high quality output at a lower file size than MP3. A 96 kbps WMA is equivalent to a 128 kbps MP3."
+-msgstr "Zakonsko zaščiteni kodek za kodiranje z zvočnimi izgubami in z visoko kakovostnim izhod pri manjši velikosti datotek kot MP3. 96kbps WMA je enakovreden 128 kbps MP3."
++msgid ""
++"A proprietary lossy audio format with high quality output at a lower file "
++"size than MP3. A 96 kbps WMA is equivalent to a 128 kbps MP3."
++msgstr ""
++"Zakonsko zaščiteni kodek za kodiranje z zvočnimi izgubami in z visoko "
++"kakovostnim izhod pri manjši velikosti datotek kot MP3. 96kbps WMA je "
++"enakovreden 128 kbps MP3."
+ 
+ #: ../data/audio-profiles/wma.xml.in.h:3
+ msgid "Use a variable bitrate"
+@@ -589,7 +624,7 @@ msgid "Audio Quality"
+ msgstr "Kakovost zvoka"
+ 
+ #: ../data/desktop-files/common.desktop.in.h:1
+-#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:196
++#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:194
+ msgid "Media Player"
+ msgstr "Predstavni predvajalnik"
+ 
+@@ -605,8 +640,26 @@ msgstr "Predvajalnik Banshee"
+ msgid "Play and organize your media collection"
+ msgstr "Predvajanje in urejanje zbirke predstavnih datotek"
+ 
+-#: ../libbanshee/banshee-bpmdetector.c:202
+-#: ../libbanshee/banshee-ripper.c:270
++#. Writing GNOME below, instead of just "Linux", is inclusive of *BSD OSs
++#: ../data/banshee.appdata.xml.in.h:2
++msgid ""
++"Banshee is an open source multimedia management and playback application for "
++"GNOME, Mac and Windows."
++msgstr ""
++"Banshee je odprto-kodni program za upravljanje in predvajanje predstavnih "
++"vsebin v okoljih GNOME, Mac in Windows."
++
++#: ../data/banshee.appdata.xml.in.h:3
++msgid ""
++"Play your music and videos. Stay entertained and up to date with podcasts "
++"and video podcasts. Sync your Android, iPod, and other devices. We think "
++"you'll love Banshee!"
++msgstr ""
++"Predvajajte svojo glasbo in filme. Zabavajte se in ostanite v stiku s "
++"podcasti in video podcasti. Uskladite vsebine s svojim Androidom, iPodom in "
++"drugimi napravami. Menimo, da se boste v Banshee zaljubili!"
++
++#: ../libbanshee/banshee-bpmdetector.c:202 ../libbanshee/banshee-ripper.c:270
+ #: ../src/Backends/Banshee.GStreamerSharp/Banshee.GStreamerSharp/AudioCdRipper.cs:240
+ msgid "Could not create pipeline"
+ msgstr "Cevovoda ni mogoče ustvariti"
+@@ -636,8 +689,7 @@ msgid "Could not create fakesink plugin"
+ msgstr "Vstavka lažnega korita ni mogoče ustvariti"
+ 
+ #: ../libbanshee/banshee-bpmdetector.c:241
+-#: ../libbanshee/banshee-bpmdetector.c:250
+-#: ../libbanshee/banshee-ripper.c:311
++#: ../libbanshee/banshee-bpmdetector.c:250 ../libbanshee/banshee-ripper.c:311
+ #: ../src/Backends/Banshee.GStreamerSharp/Banshee.GStreamerSharp/AudioCdRipper.cs:281
+ msgid "Could not link pipeline elements"
+ msgstr "Predmetov cevovoda ni mogoče povezati"
+@@ -746,7 +798,9 @@ msgstr "_Omogoči popravek ReplayGain"
+ 
+ #: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:881
+ #: ../src/Backends/Banshee.GStreamerSharp/Banshee.GStreamerSharp/PlayerEngine.cs:981
+-msgid "For tracks that have ReplayGain data, automatically scale (normalize) playback volume"
++msgid ""
++"For tracks that have ReplayGain data, automatically scale (normalize) "
++"playback volume"
+ msgstr "Samodejno izravnaj glasnost predvajanja skladb s podatki ReplayGain"
+ 
+ #: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:886
+@@ -754,8 +808,12 @@ msgid "Enable _gapless playback"
+ msgstr "Omogoči predvajanje _brez premora"
+ 
+ #: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:887
+-msgid "Eliminate the small playback gap on track change. Useful for concept albums and classical music"
+-msgstr "Odstrani premor predvajanja ob spremembi skladbe. Uporabno za tematske albume in pri poslušanju klasične glasbe."
++msgid ""
++"Eliminate the small playback gap on track change. Useful for concept albums "
++"and classical music"
++msgstr ""
++"Odstrani premor predvajanja ob spremembi skladbe. Uporabno za tematske "
++"albume in pri poslušanju klasične glasbe."
+ 
+ #: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/Transcoder.cs:63
+ msgid "Could not create transcoder"
+@@ -785,8 +843,12 @@ msgid "Can't check for updates"
+ msgstr "Ni mogoče preveriti za posodobitve."
+ 
+ #: ../src/Backends/Banshee.Windows/Banshee.Windows/VersionUpdater.cs:73
+-msgid "We're currently not able to check if there's a new version available. Please try again later."
+-msgstr "Trenutno ni mogoče preveriti, če je na voljo nova različica. Poskusite znova kasneje."
++msgid ""
++"We're currently not able to check if there's a new version available. Please "
++"try again later."
++msgstr ""
++"Trenutno ni mogoče preveriti, če je na voljo nova različica. Poskusite znova "
++"kasneje."
+ 
+ #: ../src/Backends/Banshee.Windows/Banshee.Windows/VersionUpdater.cs:95
+ msgid "No update available"
+@@ -799,7 +861,9 @@ msgstr "Nameščena je zadnja različica predvajalnika Banshee."
+ #: ../src/Backends/Banshee.Windows/Banshee.Windows/VersionUpdater.cs:106
+ #, csharp-format
+ msgid "A new version of Banshee ({0}) is available.{1}Do you want to update?"
+-msgstr "Na voljo je nova različica predvajalnika Banshee ({0}). {1}Ali želite program posodobiti?"
++msgstr ""
++"Na voljo je nova različica predvajalnika Banshee ({0}). {1}Ali želite "
++"program posodobiti?"
+ 
+ #: ../src/Backends/Banshee.Windows/Banshee.Windows/VersionUpdater.cs:108
+ msgid "Banshee update available"
+@@ -826,8 +890,12 @@ msgstr "Prejem je spodletel. Poskusite ponovno kasneje."
+ 
+ #: ../src/Backends/Banshee.Windows/Banshee.Windows/VersionUpdater.cs:165
+ #, csharp-format
+-msgid "The update finished downloading.{0}Do you want to shutdown Banshee and run the installer?"
+-msgstr "Prejemanje posodobitve je končano. {0} Ali želite izklopiti Banshee in zagnati namestilnik?"
++msgid ""
++"The update finished downloading.{0}Do you want to shutdown Banshee and run "
++"the installer?"
++msgstr ""
++"Prejemanje posodobitve je končano. {0} Ali želite izklopiti Banshee in "
++"zagnati namestilnik?"
+ 
+ #: ../src/Backends/Banshee.Windows/Banshee.Windows/VersionUpdater.cs:167
+ msgid "Update finished downloading"
+@@ -878,16 +946,26 @@ msgid "Playback Control Options"
+ msgstr "Možnosti nadzora predvajanja"
+ 
+ #: ../src/Clients/Booter/Booter/Entry.cs:164
+-msgid "Play the next track, optionally restarting if the 'restart' value is set"
+-msgstr "Predvajanje naslednje skladbe, oziroma ponovno predvajanje trenutne, če je nastavljena vrednost 'restart'"
++msgid ""
++"Play the next track, optionally restarting if the 'restart' value is set"
++msgstr ""
++"Predvajanje naslednje skladbe, oziroma ponovno predvajanje trenutne, če je "
++"nastavljena vrednost 'restart'"
+ 
+ #: ../src/Clients/Booter/Booter/Entry.cs:165
+-msgid "Play the previous track, optionally restarting if the 'restart' value is set"
+-msgstr "Predvajanje predhodne skladbe, oziroma ponovno predvajanje, če je nastavljena vrednost 'restart'"
++msgid ""
++"Play the previous track, optionally restarting if the 'restart' value is set"
++msgstr ""
++"Predvajanje predhodne skladbe, oziroma ponovno predvajanje, če je "
++"nastavljena vrednost 'restart'"
+ 
+ #: ../src/Clients/Booter/Booter/Entry.cs:166
+-msgid "If the current song has been played longer than 4 seconds then restart it, otherwise the same as --previous"
+-msgstr "V primeru da je bila trenutna skladba predvajanja dlje kot 4 sekunde, ponovno predvajanje, drugače pa enako kot --previous"
++msgid ""
++"If the current song has been played longer than 4 seconds then restart it, "
++"otherwise the same as --previous"
++msgstr ""
++"V primeru da je bila trenutna skladba predvajanja dlje kot 4 sekunde, "
++"ponovno predvajanje, drugače pa enako kot --previous"
+ 
+ #: ../src/Clients/Booter/Booter/Entry.cs:167
+ msgid "Automatically start playing any tracks enqueued on the command line"
+@@ -910,12 +988,17 @@ msgid "Completely stop playback"
+ msgstr "Popolna zaustavitev predvajanja"
+ 
+ #: ../src/Clients/Booter/Booter/Entry.cs:173
+-msgid "Enable or disable playback stopping after the currently playing track (value should be either 'true' or 'false')"
+-msgstr "Omogoči ali onemogoči zaustavitev predvajanja po končanem predvajanju trenutno predvajanega posnetka (vrednost mora biti 'prav' ali 'napak')"
++msgid ""
++"Enable or disable playback stopping after the currently playing track (value "
++"should be either 'true' or 'false')"
++msgstr ""
++"Omogoči ali onemogoči zaustavitev predvajanja po končanem predvajanju "
++"trenutno predvajanega posnetka (vrednost mora biti 'prav' ali 'napak')"
+ 
+ #: ../src/Clients/Booter/Booter/Entry.cs:174
+ msgid "Set the playback volume (0-100), prefix with +/- for relative values"
+-msgstr "Nastavitev glasnosti predvajanja (0-100), predpona +/- za relativne vrednosti"
++msgstr ""
++"Nastavitev glasnosti predvajanja (0-100), predpona +/- za relativne vrednosti"
+ 
+ #: ../src/Clients/Booter/Booter/Entry.cs:175
+ msgid "Seek to a specific point (seconds, float)"
+@@ -1096,8 +1179,12 @@ msgid "Specify an alternate key, default is /apps/banshee-1/"
+ msgstr "Navadite dodaten ključ, privzet je /apps/banshee-1/"
+ 
+ #: ../src/Clients/Booter/Booter/Entry.cs:221
+-msgid "Optimize instance for running uninstalled; most notably, this will create an alternate Mono.Addins database in the working directory"
+-msgstr "Optimiziraj program za nenameščeno delovanje; možnost ustvari dodatno podatkovno zbirko vstavka Mono v delovni mapi"
++msgid ""
++"Optimize instance for running uninstalled; most notably, this will create an "
++"alternate Mono.Addins database in the working directory"
++msgstr ""
++"Optimiziraj program za nenameščeno delovanje; možnost ustvari dodatno "
++"podatkovno zbirko vstavka Mono v delovni mapi"
+ 
+ #: ../src/Clients/Booter/Booter/Entry.cs:223
+ msgid "Disable DBus support completely"
+@@ -1227,7 +1314,7 @@ msgid "Stream location not found"
+ msgstr "Mesta pretoka ni mogoče najti"
+ 
+ #: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:347
+-#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:343
++#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:344
+ msgid "File not found"
+ msgstr "Datoteke ni mogoče najti"
+ 
+@@ -1349,7 +1436,8 @@ msgstr "po izvajalcu"
+ 
+ #: ../src/Core/Banshee.Services/Banshee.Collection.Database/RandomByArtist.cs:52
+ msgid "Play all songs by an artist, then randomly choose another artist"
+-msgstr "Predvaja vse skladbe izvajalca, nato naključno izbere drugega izvajalca"
++msgstr ""
++"Predvaja vse skladbe izvajalca, nato naključno izbere drugega izvajalca"
+ 
+ #: ../src/Core/Banshee.Services/Banshee.Collection.Database/RandomByOff.cs:38
+ msgid "Shuffle _Off"
+@@ -1439,8 +1527,11 @@ msgid "Upgrading your Banshee Database"
+ msgstr "Nadgrajevanje podatkovne zbirke predvajalnika Banshee"
+ 
+ #: ../src/Core/Banshee.Services/Banshee.Database/BansheeDbFormatMigrator.cs:233
+-msgid "Please wait while your old Banshee database is migrated to the new format."
+-msgstr "Počakajte, da se stara podatkovna zbirka predvajalnika Banshee pretvori v novejšo različico."
++msgid ""
++"Please wait while your old Banshee database is migrated to the new format."
++msgstr ""
++"Počakajte, da se stara podatkovna zbirka predvajalnika Banshee pretvori v "
++"novejšo različico."
+ 
+ #: ../src/Core/Banshee.Services/Banshee.Database/BansheeDbFormatMigrator.cs:1416
+ msgid "Refreshing Metadata"
+@@ -1695,7 +1786,9 @@ msgstr "Najmanj priljubljeno"
+ 
+ #: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:170
+ msgid "Songs rated one or two stars or that you have frequently skipped"
+-msgstr "Skladbe, ki so bile ocenjene z eno ali dvema zvezdicama, ali pa ste jih pogosto preskočili"
++msgstr ""
++"Skladbe, ki so bile ocenjene z eno ali dvema zvezdicama, ali pa ste jih "
++"pogosto preskočili"
+ 
+ #: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:174
+ msgid "700 MB of Favorites"
+@@ -1776,8 +1869,12 @@ msgid "Default player engine"
+ msgstr "Privzeti programnik predvajalnika"
+ 
+ #: ../src/Core/Banshee.Services/Banshee.MediaEngine/PlayerEngineService.cs:108
+-msgid "No player engines were found. Please ensure Banshee has been cleanly installed."
+-msgstr "Programnikov predvajalnika ni mogoče najti. Prepričajte se, da je bil predvajalnik Banshee pravilno nameščen."
++msgid ""
++"No player engines were found. Please ensure Banshee has been cleanly "
++"installed."
++msgstr ""
++"Programnikov predvajalnika ni mogoče najti. Prepričajte se, da je bil "
++"predvajalnik Banshee pravilno nameščen."
+ 
+ #: ../src/Core/Banshee.Services/Banshee.MediaEngine/PlayerEngineService.cs:375
+ msgid "Problem with Player Engine"
+@@ -1793,8 +1890,11 @@ msgid "Initializing"
+ msgstr "Začenjanje"
+ 
+ #: ../src/Core/Banshee.Services/Banshee.MediaEngine/TranscoderService.cs:138
+-msgid "Files are currently being converted to another format. Would you like to stop this?"
+-msgstr "Datoteke se trenutno pretvarjajo v drugo vrsto. Ali želite to zaustaviti?"
++msgid ""
++"Files are currently being converted to another format. Would you like to "
++"stop this?"
++msgstr ""
++"Datoteke se trenutno pretvarjajo v drugo vrsto. Ali želite to zaustaviti?"
+ 
+ #: ../src/Core/Banshee.Services/Banshee.Metadata/SaveTrackMetadataJob.cs:52
+ msgid "Saving Metadata to File"
+@@ -1805,24 +1905,36 @@ msgid "Sync _metadata between library and files"
+ msgstr "Uskladi _metapodatke med knjižnico in datotekami"
+ 
+ #: ../src/Core/Banshee.Services/Banshee.Metadata/SaveTrackMetadataService.cs:50
+-msgid "Enable this option to have metadata in sync between your library and supported media files"
+-msgstr "Izbrana možnost omogoča usklajevanje metapodatkov med knjižnico in podprtimi zvočnimi datotekami"
++msgid ""
++"Enable this option to have metadata in sync between your library and "
++"supported media files"
++msgstr ""
++"Izbrana možnost omogoča usklajevanje metapodatkov med knjižnico in podprtimi "
++"zvočnimi datotekami"
+ 
+ #: ../src/Core/Banshee.Services/Banshee.Metadata/SaveTrackMetadataService.cs:55
+ msgid "Sync _ratings between library and files"
+ msgstr "Uskladi _ocene med knjižnico in datotekami"
+ 
+ #: ../src/Core/Banshee.Services/Banshee.Metadata/SaveTrackMetadataService.cs:56
+-msgid "Enable this option to have rating metadata synced between your library and supported audio files"
+-msgstr "Izbrana možnost omogoča usklajevanje metapodatkov ocen med knjižnico in podprtimi zvočnimi datotekami"
++msgid ""
++"Enable this option to have rating metadata synced between your library and "
++"supported audio files"
++msgstr ""
++"Izbrana možnost omogoča usklajevanje metapodatkov ocen med knjižnico in "
++"podprtimi zvočnimi datotekami"
+ 
+ #: ../src/Core/Banshee.Services/Banshee.Metadata/SaveTrackMetadataService.cs:61
+ msgid "Sync play counts between library and files"
+ msgstr "Uskladi _števec predvajanja med knjižnico in datotekami"
+ 
+ #: ../src/Core/Banshee.Services/Banshee.Metadata/SaveTrackMetadataService.cs:62
+-msgid "Enable this option to have playcount metadata synced between your library and supported audio files"
+-msgstr "Izbrana možnost omogoča usklajevanje metapodatkov števca predvajanja med knjižnico in podprtimi zvočnimi datotekami"
++msgid ""
++"Enable this option to have playcount metadata synced between your library "
++"and supported audio files"
++msgstr ""
++"Izbrana možnost omogoča usklajevanje metapodatkov števca predvajanja med "
++"knjižnico in podprtimi zvočnimi datotekami"
+ 
+ #: ../src/Core/Banshee.Services/Banshee.Networking/Network.cs:52
+ msgid "There is no available network connection"
+@@ -1841,8 +1953,12 @@ msgid "_Disable features requiring Internet access"
+ msgstr "_Onemogoči zmožnosti, ki zahtevajo medmrežni dostop"
+ 
+ #: ../src/Core/Banshee.Services/Banshee.Networking/Network.cs:160
+-msgid "Some features require a broadband Internet connection such as Last.fm or cover art fetching"
+-msgstr "Nekatere zmožnosti kot so Last.fm ali pridobivanje naslovnic zahtevajo širokopasovno medmrežno povezavo"
++msgid ""
++"Some features require a broadband Internet connection such as Last.fm or "
++"cover art fetching"
++msgstr ""
++"Nekatere zmožnosti kot so Last.fm ali pridobivanje naslovnic zahtevajo "
++"širokopasovno medmrežno povezavo"
+ 
+ #: ../src/Core/Banshee.Services/Banshee.Playlist/AbstractPlaylistSource.cs:153
+ msgid "Search this playlist"
+@@ -1867,7 +1983,7 @@ msgstr "Izbriši seznam predvajanja"
+ #: ../src/Core/Banshee.ThickClient/Banshee.Gui/SourceActions.cs:176
+ #: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:135
+ #: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:462
+-#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/SourceView.cs:595
++#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/SourceView.cs:612
+ #: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/SourceView_DragAndDrop.cs:214
+ msgid "New Playlist"
+ msgstr "Nov seznam predvajanja"
+@@ -1912,7 +2028,8 @@ msgstr "Upravljanje datotek"
+ 
+ #: ../src/Core/Banshee.Services/Banshee.Preferences/PreferenceService.cs:66
+ msgid "Improve Banshee by sending anonymous usage data"
+-msgstr "Izboljšajte predvajalnik Banshee s pošiljanjem brezimnih podatkov o uporabi"
++msgstr ""
++"Izboljšajte predvajalnik Banshee s pošiljanjem brezimnih podatkov o uporabi"
+ 
+ #: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:65
+ msgid "items"
+@@ -2471,7 +2588,7 @@ msgstr "drm"
+ #: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/StatisticsPage.cs:234
+ #: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/StatisticsPage.cs:236
+ #: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/StatisticsPage.cs:238
+-#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:404
++#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:405
+ msgid "Unknown"
+ msgstr "Neznano"
+ 
+@@ -2690,15 +2807,20 @@ msgid "Cannot Reorder While Sorted"
+ msgstr "Ni mogoče preurediti, medtem ko je razvrščeno"
+ 
+ #: ../src/Core/Banshee.ThickClient/Banshee.Collection.Gui/BaseTrackListView.cs:77
+-msgid "To put the playlist in manual sort mode, click the currently sorted column header until the sort arrow goes away."
+-msgstr "Za predstavitev seznama predvajanj v ročni način razvrščanja je treba klikniti glavo trenutno razvrščenega stolpca dokler puščica razvrščanja ne izgine."
++msgid ""
++"To put the playlist in manual sort mode, click the currently sorted column "
++"header until the sort arrow goes away."
++msgstr ""
++"Za predstavitev seznama predvajanj v ročni način razvrščanja je treba "
++"klikniti glavo trenutno razvrščenega stolpca dokler puščica razvrščanja ne "
++"izgine."
+ 
+ #. Translators: this is {disc number} of {disc count}
+ #. Translators: this is {track number} of {track count}
+ #: ../src/Core/Banshee.ThickClient/Banshee.Collection.Gui/ColumnCellDiscAndCount.cs:40
+ #: ../src/Core/Banshee.ThickClient/Banshee.Collection.Gui/ColumnCellTrackAndCount.cs:40
+ #: ../src/Core/Banshee.Widgets/Banshee.Widgets/StreamPositionLabel.cs:174
+-#: ../src/Dap/Banshee.Dap/Banshee.Dap.Gui/DapPropertiesDialog.cs:148
++#: ../src/Dap/Banshee.Dap/Banshee.Dap.Gui/DapPropertiesDialog.cs:149
+ #, csharp-format
+ msgid "{0} of {1}"
+ msgstr "{0} od {1}"
+@@ -2858,8 +2980,12 @@ msgid "Important tasks are running"
+ msgstr "Izvajajo se pomembne naloge"
+ 
+ #: ../src/Core/Banshee.ThickClient/Banshee.Gui.Dialogs/ConfirmShutdownDialog.cs:53
+-msgid "Closing Banshee now will cancel any currently running tasks. They cannot be resumed automatically the next time Banshee is run."
+-msgstr "Izhod iz programa Banshee bo prekinil vse trenutno dejavne naloge. Nalog ni mogoče samodejno nadaljevati ob naslednjem zagonu."
++msgid ""
++"Closing Banshee now will cancel any currently running tasks. They cannot be "
++"resumed automatically the next time Banshee is run."
++msgstr ""
++"Izhod iz programa Banshee bo prekinil vse trenutno dejavne naloge. Nalog ni "
++"mogoče samodejno nadaljevati ob naslednjem zagonu."
+ 
+ #: ../src/Core/Banshee.ThickClient/Banshee.Gui.Dialogs/ConfirmShutdownDialog.cs:60
+ msgid "Quit Anyway"
+@@ -2874,8 +3000,12 @@ msgid "Make Banshee the default media player?"
+ msgstr "Ali naj bo Banshee privzeti predvajalnik predstavnih datotek?"
+ 
+ #: ../src/Core/Banshee.ThickClient/Banshee.Gui.Dialogs/DefaultApplicationHelperDialog.cs:70
+-msgid "Currently another program is configured as the default media player.  Would you prefer Banshee to be the default?"
+-msgstr "Trenutno je kot privzeti predvajalnik predstavnih datotek nastavljen drug program. Ali želite nastaviti predvajalnik Banshee kot privzeti program?"
++msgid ""
++"Currently another program is configured as the default media player.  Would "
++"you prefer Banshee to be the default?"
++msgstr ""
++"Trenutno je kot privzeti predvajalnik predstavnih datotek nastavljen drug "
++"program. Ali želite nastaviti predvajalnik Banshee kot privzeti program?"
+ 
+ #: ../src/Core/Banshee.ThickClient/Banshee.Gui.Dialogs/DefaultApplicationHelperDialog.cs:72
+ #: ../src/Core/Banshee.ThickClient/Banshee.Gui/SourceActions.cs:443
+@@ -3311,7 +3441,8 @@ msgstr "Dodaj na _seznam predvajanja"
+ 
+ #: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:131
+ msgid "Append selected items to playlist or create new playlist from selection"
+-msgstr "Pripenjanje izbranih predmetov seznamu predvajanja ali ustvarjanje novega"
++msgstr ""
++"Pripenjanje izbranih predmetov seznamu predvajanja ali ustvarjanje novega"
+ 
+ #: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:136
+ msgid "Create new playlist from selected tracks"
+@@ -3393,11 +3524,15 @@ msgstr "Preverite, če lahko sistem dostopa do mesta skladbe."
+ #: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:607
+ #, csharp-format
+ msgid "Are you sure you want to permanently delete this item?"
+-msgid_plural "Are you sure you want to permanently delete the selected {0} items?"
+-msgstr[0] "Ali ste prepričani, da želite trajno izbrisati {0} izbranih predmetov?"
++msgid_plural ""
++"Are you sure you want to permanently delete the selected {0} items?"
++msgstr[0] ""
++"Ali ste prepričani, da želite trajno izbrisati {0} izbranih predmetov?"
+ msgstr[1] "Ali ste prepričani, da želite trajno izbrisati {0} izbran predmet?"
+-msgstr[2] "Ali ste prepričani, da želite trajno izbrisati {0} izbrana predmeta?"
+-msgstr[3] "Ali ste prepričani, da želite trajno izbrisati {0} izbrane predmete?"
++msgstr[2] ""
++"Ali ste prepričani, da želite trajno izbrisati {0} izbrana predmeta?"
++msgstr[3] ""
++"Ali ste prepričani, da želite trajno izbrisati {0} izbrane predmete?"
+ 
+ #: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:611
+ msgid "If you delete the selection, it will be permanently lost."
+@@ -3411,23 +3546,32 @@ msgstr "Odstranitev izbora iz {0}?"
+ #: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:617
+ #, csharp-format
+ msgid "Are you sure you want to remove the selected item from your {1}?"
+-msgid_plural "Are you sure you want to remove the selected {0} items from your {1}?"
+-msgstr[0] "Ali ste prepričani, da želite odstraniti {0} izbranih predmetov iz {1}?"
++msgid_plural ""
++"Are you sure you want to remove the selected {0} items from your {1}?"
++msgstr[0] ""
++"Ali ste prepričani, da želite odstraniti {0} izbranih predmetov iz {1}?"
+ msgstr[1] "Ali ste prepričani, da želite odstraniti {0} izbran predmet iz {1}?"
+-msgstr[2] "Ali ste prepričani, da želite odstraniti {0} izbrana predmeta iz {1}?"
+-msgstr[3] "Ali ste prepričani, da želite odstraniti {0} izbrane predmete iz {1}?"
++msgstr[2] ""
++"Ali ste prepričani, da želite odstraniti {0} izbrana predmeta iz {1}?"
++msgstr[3] ""
++"Ali ste prepričani, da želite odstraniti {0} izbrane predmete iz {1}?"
+ 
+ #: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/AlbumArtistEntry.cs:53
+ msgid "Com_pilation Album Artist:"
+ msgstr "Izvajalec _mešanega albuma:"
+ 
+ #: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/AlbumArtistEntry.cs:57
+-msgid "Check this if this track is part of an album with tracks by various artists"
++msgid ""
++"Check this if this track is part of an album with tracks by various artists"
+ msgstr "Preveri, če je ta skladba del albuma s skladbami različnih izvajalcev"
+ 
+ #: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/AlbumArtistEntry.cs:59
+-msgid "This value will affect how this album is sorted; if you enter 'Various Artists' then the album will located with other albums that start with 'V'."
+-msgstr "Ta vrednost bo vplivala na razvrščanje albuma; v primeru vnosa 'Različni izvajalci' se bo album nahajal skupaj z ostalimi albumi, ki se začnejo z 'R'."
++msgid ""
++"This value will affect how this album is sorted; if you enter 'Various "
++"Artists' then the album will located with other albums that start with 'V'."
++msgstr ""
++"Ta vrednost bo vplivala na razvrščanje albuma; v primeru vnosa 'Različni "
++"izvajalci' se bo album nahajal skupaj z ostalimi albumi, ki se začnejo z 'R'."
+ 
+ #: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/BasicTrackDetailsPage.cs:44
+ msgid "Basic Details"
+@@ -3488,19 +3632,19 @@ msgstr "Nastavi vse številke diskov in skupno število diskov na te vrednosti"
+ msgid "_Disc Number:"
+ msgstr "Številka _diska:"
+ 
+-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/BasicTrackDetailsPage.cs:188
++#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/BasicTrackDetailsPage.cs:196
+ msgid "Set all years to this value"
+ msgstr "Nastavi vse letnice izida na to vrednost"
+ 
+-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/BasicTrackDetailsPage.cs:189
++#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/BasicTrackDetailsPage.cs:197
+ msgid "_Year:"
+ msgstr "_Leto:"
+ 
+-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/BasicTrackDetailsPage.cs:196
++#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/BasicTrackDetailsPage.cs:204
+ msgid "Set all ratings to this value"
+ msgstr "Nastavi vse ocene na to vrednost"
+ 
+-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/BasicTrackDetailsPage.cs:197
++#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/BasicTrackDetailsPage.cs:205
+ msgid "_Rating:"
+ msgstr "_Ocena:"
+ 
+@@ -3728,8 +3872,12 @@ msgid "Sync all field _values"
+ msgstr "Usklajevanje vseh vrednosti _polj"
+ 
+ #: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:319
+-msgid "Apply the values of all common fields set for this track to all of the tracks selected in this editor"
+-msgstr "Uveljavi vrednosti vseh nastavljenih skupnih polj te skladbe za vse skladbe izbrane v urejevalniku"
++msgid ""
++"Apply the values of all common fields set for this track to all of the "
++"tracks selected in this editor"
++msgstr ""
++"Uveljavi vrednosti vseh nastavljenih skupnih polj te skladbe za vse skladbe "
++"izbrane v urejevalniku"
+ 
+ #: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:419
+ #, csharp-format
+@@ -3752,7 +3900,9 @@ msgstr "Zapri _brez shranjevanja"
+ #: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:753
+ #, csharp-format
+ msgid "If you don't save, changes from the last {0} will be permanently lost."
+-msgstr "V primeru, da datoteke ne shranite, bo zadnjih {0} sprememb trajno izgubljenih."
++msgstr ""
++"V primeru, da datoteke ne shranite, bo zadnjih {0} sprememb trajno "
++"izgubljenih."
+ 
+ #: ../src/Core/Banshee.ThickClient/Banshee.Gui/ViewActions.cs:62
+ msgid "_View"
+@@ -3857,7 +4007,8 @@ msgstr "Opravilo se vedno izvaja. Ali ga želite zaustaviti?"
+ 
+ #: ../src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/UserJobTile.cs:144
+ #, csharp-format
+-msgid "The '{0}' operation is still performing work. Would you like to stop it?"
++msgid ""
++"The '{0}' operation is still performing work. Would you like to stop it?"
+ msgstr "Opravilo  '{0}' je v teku. Ali ga želite zaustaviti?"
+ 
+ #: ../src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/UserJobTile.cs:148
+@@ -3914,8 +4065,12 @@ msgid "<big><b>Import Media to Library</b></big>"
+ msgstr "<big><b>Uvoz predstavnih datotek v knjižnico</b></big>"
+ 
+ #: ../src/Core/Banshee.ThickClient/Banshee.Library.Gui/ImportDialog.cs:79
+-msgid "Your media library is empty. You may import new music and videos into your library now, or choose to do so later."
+-msgstr "Knjižnica predstavnih datotek je prazna. Novo glasbo in video lahko v knjižnico uvozite takoj ali pa pozneje."
++msgid ""
++"Your media library is empty. You may import new music and videos into your "
++"library now, or choose to do so later."
++msgstr ""
++"Knjižnica predstavnih datotek je prazna. Novo glasbo in video lahko v "
++"knjižnico uvozite takoj ali pa pozneje."
+ 
+ #: ../src/Core/Banshee.ThickClient/Banshee.Library.Gui/ImportDialog.cs:89
+ msgid "Import _from:"
+@@ -4033,7 +4188,8 @@ msgstr "Pokaži izvajalce albuma"
+ 
+ #: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/CompositeTrackSourceContents.cs:112
+ msgid "Show only album artists, not artists with only single tracks"
+-msgstr "Pokaži le izvajalce albuma in ne tudi izvajalcev le posameznih posnetkov"
++msgstr ""
++"Pokaži le izvajalce albuma in ne tudi izvajalcev le posameznih posnetkov"
+ 
+ #: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/CompositeTrackSourceContents.cs:117
+ msgid "Show Genre Filter"
+@@ -4081,7 +4237,8 @@ msgid "Show or hide the artist/album browser"
+ msgstr "Prikaži ali skrij brskalnik izvajalcev/albumov"
+ 
+ #: ../src/Core/Banshee.WebBrowser/Banshee.WebBrowser/NavigationControl.cs:156
+-msgid "This page is blocked because it is probably not the one you are looking for!"
++msgid ""
++"This page is blocked because it is probably not the one you are looking for!"
+ msgstr "Stran je blokirana, ker najverjetneje ni stran, ki jo iščete."
+ 
+ #. Translators: {0} is the URL of the web page that was requested
+@@ -4160,29 +4317,29 @@ msgstr "Podpira ovitke"
+ msgid "Supports photos"
+ msgstr "Podpira fotografije"
+ 
+-#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:465
++#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:466
+ msgid "Track duration is zero"
+ msgstr "Trajanje skladbe je nič"
+ 
+-#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:571
++#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:570
+ msgid "Syncing iPod"
+ msgstr "Usklajevanje iPoda"
+ 
+-#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:572
++#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:571
+ msgid "Preparing to synchronize..."
+ msgstr "Pripravljanje na usklajevanje ..."
+ 
+-#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:575
++#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:593
+ #, csharp-format
+ msgid "Adding track {0} of {1}"
+ msgstr "Dodajanje skladbe {0} od {1}"
+ 
+-#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:611
++#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:636
+ #, csharp-format
+ msgid "Removing track {0} of {1}"
+ msgstr "Odstranjevanje skladbe {0} od {1}"
+ 
+-#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:664
++#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:710
+ msgid "Writing media database"
+ msgstr "Zapisovanje podatkovne zbirke predstavnih datotek"
+ 
+@@ -4200,40 +4357,44 @@ msgstr "Naprave"
+ msgid "Device Properties"
+ msgstr "Lastnosti naprave"
+ 
+-#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:203
++#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:201
+ msgid "Product"
+ msgstr "Izdelek"
+ 
+-#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:204
++#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:202
+ msgid "Vendor"
+ msgstr "Ponudnik"
+ 
+-#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:291
++#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:292
+ #: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Data/PodcastSource.cs:141
+ #, csharp-format
+ msgid "Loading {0}"
+ msgstr "Nalaganje {0}"
+ 
+-#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:385
++#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:386
+ #: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/ColumnCellYesNo.cs:37
+ msgid "Yes"
+ msgstr "Da"
+ 
+-#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:385
++#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:386
+ #: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/ColumnCellYesNo.cs:38
+ msgid "No"
+ msgstr "Ne"
+ 
+-#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:406
++#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:407
+ #, csharp-format
+-msgid "The {0} format is not supported by the device, and no converter was found to convert it"
+-msgstr "Naprava ne podpira vrste zapisa {0}, in ni mogoče najti pretvornika za njeno pretvarjanje"
++msgid ""
++"The {0} format is not supported by the device, and no converter was found to "
++"convert it"
++msgstr ""
++"Naprava ne podpira vrste zapisa {0}, in ni mogoče najti pretvornika za njeno "
++"pretvarjanje"
+ 
+-#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:412
++#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:413
+ msgid "File format conversion support is not available"
+ msgstr "Podpora za pretvorbo vrste datoteke ni na voljo"
+ 
+-#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:438
++#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:439
+ msgid "Error converting file"
+ msgstr "Napaka med pretvarjanjem datoteke"
+ 
+@@ -4242,8 +4403,12 @@ msgid "Sync when first plugged in and when the libraries change"
+ msgstr "Samodejno usklajevanje naprave ob prvem vklopu ali spremembi knjižnic"
+ 
+ #: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSync.cs:136
+-msgid "Begin synchronizing the device as soon as the device is plugged in or the libraries change."
+-msgstr "Začetek usklajevanja naprave takoj, ko je priklopljena ali se knjižnice spremenijo."
++msgid ""
++"Begin synchronizing the device as soon as the device is plugged in or the "
++"libraries change."
++msgstr ""
++"Začetek usklajevanja naprave takoj, ko je priklopljena ali se knjižnice "
++"spremenijo."
+ 
+ #: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSync.cs:139
+ msgid "Sync Preferences"
+@@ -4267,7 +4432,7 @@ msgstr[3] "Opravilo usklajevanja bo odstranilo {0} skladbe z naprave."
+ msgid "Are you sure you want to continue?"
+ msgstr "Ali ste prepričani, da želite nadaljevati?"
+ 
+-#: ../src/Dap/Banshee.Dap/Banshee.Dap.Gui/DapActions.cs:118
++#: ../src/Dap/Banshee.Dap/Banshee.Dap.Gui/DapActions.cs:121
+ msgid "Remove tracks"
+ msgstr "Odstrani skladbe"
+ 
+@@ -4342,12 +4507,12 @@ msgstr "Uvozi kupljeno glasbo"
+ msgid "Disconnect"
+ msgstr "Odklopi"
+ 
+-#: ../src/Dap/Banshee.Dap/Banshee.Dap/RemovableSource.cs:108
++#: ../src/Dap/Banshee.Dap/Banshee.Dap/RemovableSource.cs:111
+ #, csharp-format
+ msgid "Disconnecting {0}..."
+ msgstr "Odklapljanje {0} ..."
+ 
+-#: ../src/Dap/Banshee.Dap/Banshee.Dap/RemovableSource.cs:115
++#: ../src/Dap/Banshee.Dap/Banshee.Dap/RemovableSource.cs:118
+ #, csharp-format
+ msgid "Could not disconnect {0}: {1}"
+ msgstr "{0} ni bilo mogoče odklopiti: {1}"
+@@ -4524,8 +4689,12 @@ msgstr[2] "Združitev {0} izbranih diskov v eno knjigo?"
+ msgstr[3] "Združitev {0} izbranih diskov v eno knjigo?"
+ 
+ #: ../src/Extensions/Banshee.Audiobook/Banshee.Audiobook/Actions.cs:144
+-msgid "This will ensure the disc numbers are all set properly, and then set the author and book title for all tracks on all these discs to the values below"
+-msgstr "To bo zagotovilo pravilno nastavitev vseh števil diskov in nato nastavilo avtorja in naslov knjige na vrednosti spodaj za vse skladbe na teh diskih"
++msgid ""
++"This will ensure the disc numbers are all set properly, and then set the "
++"author and book title for all tracks on all these discs to the values below"
++msgstr ""
++"To bo zagotovilo pravilno nastavitev vseh števil diskov in nato nastavilo "
++"avtorja in naslov knjige na vrednosti spodaj za vse skladbe na teh diskih"
+ 
+ #: ../src/Extensions/Banshee.Audiobook/Banshee.Audiobook/Actions.cs:153
+ msgid "Author:"
+@@ -4609,8 +4778,12 @@ msgid "_Automatically detect BPM for all songs"
+ msgstr "_Samodejno zaznaj UNM za vse skladbe"
+ 
+ #: ../src/Extensions/Banshee.Bpm/Banshee.Bpm/BpmService.cs:148
+-msgid "Detect beats per minute (BPM) for all songs that don't already have a value set"
+-msgstr "Zaznavanje ritma preko podatkov o udarcih na minuto (UNM) za vse skladbe brez že določene vrednosti"
++msgid ""
++"Detect beats per minute (BPM) for all songs that don't already have a value "
++"set"
++msgstr ""
++"Zaznavanje ritma preko podatkov o udarcih na minuto (UNM) za vse skladbe "
++"brez že določene vrednosti"
+ 
+ #: ../src/Extensions/Banshee.CoverArt/Banshee.CoverArt/CoverArtJob.cs:58
+ msgid "Downloading Cover Art"
+@@ -4639,13 +4812,18 @@ msgstr "Nazaj"
+ 
+ #: ../src/Extensions/Banshee.Daap/Banshee.Daap/DaapErrorView.cs:101
+ msgid ""
+-"iTunes® 7 introduced new compatibility issues and currently only works with other iTunes® 7 clients.\n"
++"iTunes® 7 introduced new compatibility issues and currently only works with "
++"other iTunes® 7 clients.\n"
+ "\n"
+-"No third-party clients can connect to iTunes® music shares anymore. This is an intentional limitation by Apple in iTunes® 7 and newer, we apologize for the unfortunate inconvenience."
++"No third-party clients can connect to iTunes® music shares anymore. This is "
++"an intentional limitation by Apple in iTunes® 7 and newer, we apologize for "
++"the unfortunate inconvenience."
+ msgstr ""
+-"Z iTunes® 7 so se pojavile težave združljivosti. Trenutno iTunes® 7 delujejo le z ostalimi odjemalci  iTunes® 7.\n"
++"Z iTunes® 7 so se pojavile težave združljivosti. Trenutno iTunes® 7 delujejo "
++"le z ostalimi odjemalci  iTunes® 7.\n"
+ "\n"
+-"Odjemalci tretjih virov ne podpirajo povezav v iTunes® souporabo glasbe. To je namerna omejitev, ki jo je vpeljalo podjetje Apple v iTunes® 7."
++"Odjemalci tretjih virov ne podpirajo povezav v iTunes® souporabo glasbe. To "
++"je namerna omejitev, ki jo je vpeljalo podjetje Apple v iTunes® 7."
+ 
+ #: ../src/Extensions/Banshee.Daap/Banshee.Daap/DaapErrorView.cs:111
+ msgid "Common reasons for connection failures:"
+@@ -4703,11 +4881,11 @@ msgstr "Prijava"
+ msgid "Connecting to {0}"
+ msgstr "Povezovanje z {0}"
+ 
+-#: ../src/Extensions/Banshee.Daap/Banshee.Daap/DaapService.cs:185
++#: ../src/Extensions/Banshee.Daap/Banshee.Daap/DaapService.cs:186
+ msgid "Add Remote DAAP Server"
+ msgstr "Dodaj oddaljen strežnik DAAP"
+ 
+-#: ../src/Extensions/Banshee.Daap/Banshee.Daap/DaapService.cs:186
++#: ../src/Extensions/Banshee.Daap/Banshee.Daap/DaapService.cs:187
+ msgid "Add a new remote DAAP server"
+ msgstr "Doda nov oddaljen strežnik DAAP"
+ 
+@@ -4836,16 +5014,26 @@ msgid "Duplicate Albums"
+ msgstr "Podvojeni albumi"
+ 
+ #: ../src/Extensions/Banshee.Fixup/Banshee.Fixup/AlbumDuplicateSolver.cs:47
+-msgid "Displayed are albums that should likely be merged.  For each row, click the desired title to make it bold, or uncheck it to take no action."
+-msgstr "Prikazani so albumi, ki jih je verjetno treba združiti. Za vsako vrstico kliknite na želeno ime da postane krepko ali odstranite oznako, če ne želite storiti ničesar."
++msgid ""
++"Displayed are albums that should likely be merged.  For each row, click the "
++"desired title to make it bold, or uncheck it to take no action."
++msgstr ""
++"Prikazani so albumi, ki jih je verjetno treba združiti. Za vsako vrstico "
++"kliknite na želeno ime da postane krepko ali odstranite oznako, če ne želite "
++"storiti ničesar."
+ 
+ #: ../src/Extensions/Banshee.Fixup/Banshee.Fixup/ArtistDuplicateSolver.cs:46
+ msgid "Duplicate Artists"
+ msgstr "Podvojeni izvajalci"
+ 
+ #: ../src/Extensions/Banshee.Fixup/Banshee.Fixup/ArtistDuplicateSolver.cs:47
+-msgid "Displayed are artists that should likely be merged.  For each row, click the desired name to make it bold, or uncheck it to take no action."
+-msgstr "Prikazani so izvajalci, ki jih je verjetno treba združiti. Za vsako vrstico kliknite na želeno ime, da postane krepko ali odstranite oznako, če ne želite storiti ničesar."
++msgid ""
++"Displayed are artists that should likely be merged.  For each row, click the "
++"desired name to make it bold, or uncheck it to take no action."
++msgstr ""
++"Prikazani so izvajalci, ki jih je verjetno treba združiti. Za vsako vrstico "
++"kliknite na želeno ime, da postane krepko ali odstranite oznako, če ne "
++"želite storiti ničesar."
+ 
+ #: ../src/Extensions/Banshee.Fixup/Banshee.Fixup/FixActions.cs:50
+ msgid "Fix Music Metadata..."
+@@ -4868,8 +5056,13 @@ msgid "Duplicate Genres"
+ msgstr "Podvojene zvrsti"
+ 
+ #: ../src/Extensions/Banshee.Fixup/Banshee.Fixup/GenreDuplicateSolver.cs:47
+-msgid "Displayed are genres that should likely be merged.  For each row, click the desired genre to make it bold, or uncheck it to take no action."
+-msgstr "Prikazane so zvrsti, ki jih je verjetno treba združiti. Za vsako vrstico kliknite na želeno zvrst da postane krepka ali odstranite oznako, če ne želite storiti ničesar."
++msgid ""
++"Displayed are genres that should likely be merged.  For each row, click the "
++"desired genre to make it bold, or uncheck it to take no action."
++msgstr ""
++"Prikazane so zvrsti, ki jih je verjetno treba združiti. Za vsako vrstico "
++"kliknite na želeno zvrst da postane krepka ali odstranite oznako, če ne "
++"želite storiti ničesar."
+ 
+ #: ../src/Extensions/Banshee.Fixup/Banshee.Fixup/GenreDuplicateSolver.cs:77
+ msgid " and "
+@@ -5153,8 +5346,16 @@ msgid "Examples:"
+ msgstr "Primeri:"
+ 
+ #: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HomeView.cs:148
+-msgid "The Internet Archive, a 501(c)(3) non-profit, is building a digital library of Internet sites and other cultural artifacts in digital form. Like a paper library, we provide free access to researchers, historians, scholars, and the general public."
+-msgstr "Spletni arhiv, gradi digitalno knjižnico spletnih strani in drugih kulturnih značilnosti v digitalni obliki. Podobno kot papirnata knjižnica zagotavlja brezplačen dostop raziskovalcem, zgodovinarjem, učenjakom in splošni javnosti."
++msgid ""
++"The Internet Archive, a 501(c)(3) non-profit, is building a digital library "
++"of Internet sites and other cultural artifacts in digital form. Like a paper "
++"library, we provide free access to researchers, historians, scholars, and "
++"the general public."
++msgstr ""
++"Spletni arhiv, gradi digitalno knjižnico spletnih strani in drugih kulturnih "
++"značilnosti v digitalni obliki. Podobno kot papirnata knjižnica zagotavlja "
++"brezplačen dostop raziskovalcem, zgodovinarjem, učenjakom in splošni "
++"javnosti."
+ 
+ #: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HomeView.cs:151
+ msgid "Visit the Internet Archive online at archive.org"
+@@ -5473,8 +5674,11 @@ msgid "Edit radio station"
+ msgstr "Urejanje radijske postaje"
+ 
+ #: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/StationEditor.cs:97
+-msgid "Enter the Genre, Title and URL of the radio station you wish to add. A description is optional."
+-msgstr "Vnesite zvrst, naslov in URL radijske postaje za dodajanje. Opis je poljuben."
++msgid ""
++"Enter the Genre, Title and URL of the radio station you wish to add. A "
++"description is optional."
++msgstr ""
++"Vnesite zvrst, naslov in URL radijske postaje za dodajanje. Opis je poljuben."
+ 
+ #: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/StationEditor.cs:118
+ msgid "Station Genre:"
+@@ -5649,8 +5853,12 @@ msgid "Sign up for Last.fm"
+ msgstr "Vpis v Last.fm"
+ 
+ #: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmPreferences.cs:262
+-msgid "Open Last.fm in a browser, giving you the option to authorize Banshee to work with your account"
+-msgstr "Odpre Last.fm v brskalniku in vam ponudi možnost pooblastitve predvajalnika Banshee za delo z računom"
++msgid ""
++"Open Last.fm in a browser, giving you the option to authorize Banshee to "
++"work with your account"
++msgstr ""
++"Odpre Last.fm v brskalniku in vam ponudi možnost pooblastitve predvajalnika "
++"Banshee za delo z računom"
+ 
+ #: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmPreferences.cs:273
+ #: ../src/Libraries/Lastfm.Gui/Lastfm.Gui/AccountLoginDialog.cs:49
+@@ -5661,7 +5869,9 @@ msgstr "Prijava v Last.fm"
+ #: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:298
+ #: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:335
+ msgid "You need to allow Banshee to access your Last.fm account."
+-msgstr "Predvajalniku Banshee mora biti dodeljeno dovoljenje za dostop do računa Last.fm."
++msgstr ""
++"Predvajalniku Banshee mora biti dodeljeno dovoljenje za dostop do računa "
++"Last.fm."
+ 
+ #: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmPreferences.cs:304
+ msgid "Finish Logging In"
+@@ -6009,8 +6219,12 @@ msgid "Still Running"
+ msgstr "Še vedno teče"
+ 
+ #: ../src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/NotificationAreaService.cs:348
+-msgid "Banshee was closed to the notification area. Use the <i>Quit</i> option to end your session."
+-msgstr "Program Banshee je skrit v obvestilnem področju. Uporabite možnost <i>Končaj</i> za končanje programa."
++msgid ""
++"Banshee was closed to the notification area. Use the <i>Quit</i> option to "
++"end your session."
++msgstr ""
++"Program Banshee je skrit v obvestilnem področju. Uporabite možnost "
++"<i>Končaj</i> za končanje programa."
+ 
+ #: ../src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/NotificationAreaService.cs:483
+ #: ../src/Extensions/Banshee.SoundMenu/Banshee.SoundMenu/SoundMenuService.cs:326
+@@ -6065,7 +6279,9 @@ msgstr "Zaganjanje pogona"
+ 
+ #: ../src/Extensions/Banshee.OpticalDisc/Banshee.OpticalDisc.AudioCd/AudioCdRipper.cs:124
+ #, csharp-format
+-msgid "<i>{0}</i> is still being imported into the music library. Would you like to stop it?"
++msgid ""
++"<i>{0}</i> is still being imported into the music library. Would you like to "
++"stop it?"
+ msgstr "<i>{0}</i> se uvaža v knjižnico. Ali želite postopek prekiniti?"
+ 
+ #: ../src/Extensions/Banshee.OpticalDisc/Banshee.OpticalDisc.AudioCd/AudioCdRipper.cs:254
+@@ -6089,8 +6305,12 @@ msgid "_Automatically import audio CDs when inserted"
+ msgstr "_Samodejno uvažanje zvočnih CD-jev ob vstavitvi v pogon"
+ 
+ #: ../src/Extensions/Banshee.OpticalDisc/Banshee.OpticalDisc.AudioCd/AudioCdService.cs:115
+-msgid "When an audio CD is inserted, automatically begin importing it if metadata can be found and it is not already in the library."
+-msgstr "Ob vstavitvi v pogon začne samodejno uvažanje CD-ja, če je mogoče najti metapodatke in CD še ni na voljo v knjižnici."
++msgid ""
++"When an audio CD is inserted, automatically begin importing it if metadata "
++"can be found and it is not already in the library."
++msgstr ""
++"Ob vstavitvi v pogon začne samodejno uvažanje CD-ja, če je mogoče najti "
++"metapodatke in CD še ni na voljo v knjižnici."
+ 
+ #: ../src/Extensions/Banshee.OpticalDisc/Banshee.OpticalDisc.AudioCd/AudioCdService.cs:119
+ msgid "_Eject when done importing"
+@@ -6105,8 +6325,12 @@ msgid "Use error correction when importing"
+ msgstr "Ob uvažanju uporabi popravljanje napak"
+ 
+ #: ../src/Extensions/Banshee.OpticalDisc/Banshee.OpticalDisc.AudioCd/AudioCdService.cs:124
+-msgid "Error correction tries to work around problem areas on a disc, such as surface scratches, but will slow down importing substantially."
+-msgstr "Popravljanje napak poskuša zaobiti območja diska, ki so poškodovana, vendar močno upočasni delovanje in uvoz glasbe."
++msgid ""
++"Error correction tries to work around problem areas on a disc, such as "
++"surface scratches, but will slow down importing substantially."
++msgstr ""
++"Popravljanje napak poskuša zaobiti območja diska, ki so poškodovana, vendar "
++"močno upočasni delovanje in uvoz glasbe."
+ 
+ #: ../src/Extensions/Banshee.OpticalDisc/Banshee.OpticalDisc.AudioCd/AudioCdService.cs:192
+ #: ../src/Extensions/Banshee.OpticalDisc/Banshee.OpticalDisc.AudioCd/AudioCdSource.cs:311
+@@ -6135,7 +6359,8 @@ msgstr "Ni mogoče pridobiti podrobnosti skladbe"
+ 
+ #: ../src/Extensions/Banshee.OpticalDisc/Banshee.OpticalDisc.AudioCd/AudioCdSource.cs:175
+ msgid "Automatic import off since this album is already in the Music Library."
+-msgstr "Samodejno uvažanje je izključeno, ker je ta album že v glasbeni knjižnici."
++msgstr ""
++"Samodejno uvažanje je izključeno, ker je ta album že v glasbeni knjižnici."
+ 
+ #: ../src/Extensions/Banshee.OpticalDisc/Banshee.OpticalDisc.AudioCd/AudioCdSource.cs:198
+ msgid "Could not import CD"
+@@ -6233,16 +6458,26 @@ msgstr "Poišči mapo glasbe iTunes"
+ 
+ #: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/ItunesPlayerImportDialogs.cs:196
+ #, csharp-format
+-msgid "The iTunes library refers to your music directory as \"{0}\" but Banshee was not able to infer the location of this directory. Please locate it."
+-msgstr "Knjižnica iTunes mapo z glasbo imenuje \"{0}\", vendar mesta te mape ni mogoče najti. Določiti jo je treba ročno."
++msgid ""
++"The iTunes library refers to your music directory as \"{0}\" but Banshee was "
++"not able to infer the location of this directory. Please locate it."
++msgstr ""
++"Knjižnica iTunes mapo z glasbo imenuje \"{0}\", vendar mesta te mape ni "
++"mogoče najti. Določiti jo je treba ročno."
+ 
+ #: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/ItunesPlayerImportSource.cs:74
+ msgid "iTunes Media Player"
+ msgstr "Predvajalnik iTunes"
+ 
+ #: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/ItunesPlayerImportSource.cs:134
+-msgid "Banshee is not familiar with this version of the iTunes library format. Importing may or may not work as expected, or at all. Would you like to attempt to import anyway?"
+-msgstr "Predvajalnik Banshee ne pozna te različice zapisa knjižnice iTunes. Uvoz morda ne bo deloval po pričakovanjih ali pa sploh ne. Ali želite vseeno poskusiti z uvozom?"
++msgid ""
++"Banshee is not familiar with this version of the iTunes library format. "
++"Importing may or may not work as expected, or at all. Would you like to "
++"attempt to import anyway?"
++msgstr ""
++"Predvajalnik Banshee ne pozna te različice zapisa knjižnice iTunes. Uvoz "
++"morda ne bo deloval po pričakovanjih ali pa sploh ne. Ali želite vseeno "
++"poskusiti z uvozom?"
+ 
+ #: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/ItunesPlayerImportSource.cs:439
+ #: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/RhythmboxPlayerImportSource.cs:235
+@@ -6275,7 +6510,8 @@ msgstr "Predvajaj za"
+ 
+ #: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueActions.cs:58
+ msgid "Add selected songs after the currently playing track, album, or artist"
+-msgstr "Doda izbrane skladbe za trenutno predvajajočo se skladbo, album ali izvajalca"
++msgstr ""
++"Doda izbrane skladbe za trenutno predvajajočo se skladbo, album ali izvajalca"
+ 
+ #: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueActions.cs:62
+ msgid "Current Track"
+@@ -6283,7 +6519,9 @@ msgstr "Trenutna skladba"
+ 
+ #: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueActions.cs:63
+ msgid "Add selected songs to the play queue after the currently playing song"
+-msgstr "Doda izbrane skladbe v čakalno vrsto predvajanja za trenutno predvajajočo se skladbo"
++msgstr ""
++"Doda izbrane skladbe v čakalno vrsto predvajanja za trenutno predvajajočo se "
++"skladbo"
+ 
+ #: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueActions.cs:67
+ msgid "Current Album"
+@@ -6291,7 +6529,9 @@ msgstr "Trenutni album"
+ 
+ #: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueActions.cs:68
+ msgid "Add selected songs to the play queue after the currently playing album"
+-msgstr "Doda izbrane skladbe v čakalno vrsto predvajanja za trenutno predvajajoči se album"
++msgstr ""
++"Doda izbrane skladbe v čakalno vrsto predvajanja za trenutno predvajajoči se "
++"album"
+ 
+ #: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueActions.cs:72
+ msgid "Current Artist"
+@@ -6299,7 +6539,9 @@ msgstr "Trenutni izvajalec"
+ 
+ #: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueActions.cs:73
+ msgid "Add selected songs to the play queue after the currently playing artist"
+-msgstr "Doda izbrane skladbe v čakalno vrsto predvajanja za trenutno predvajanega izvajalca"
++msgstr ""
++"Doda izbrane skladbe v čakalno vrsto predvajanja za trenutno predvajanega "
++"izvajalca"
+ 
+ #: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueActions.cs:80
+ msgid "Refresh random tracks in the play queue"
+@@ -6307,7 +6549,9 @@ msgstr "Osvežitev naključnih skladb v čakalni vrsti predvajanja"
+ 
+ #: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueActions.cs:85
+ msgid "Randomize the playback order of items in the play queue"
+-msgstr "Naključno razporedi vrstni red predvajanja predmetov v čakalni vrsti predvajanja"
++msgstr ""
++"Naključno razporedi vrstni red predvajanja predmetov v čakalni vrsti "
++"predvajanja"
+ 
+ #: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueActions.cs:89
+ msgid "Add More"
+@@ -6530,8 +6774,12 @@ msgid "Check periodically for new episodes"
+ msgstr "Občasno preveri za nove epizode"
+ 
+ #: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastFeedPropertiesDialog.cs:106
+-msgid "If checked, Banshee will check every hour to see if this podcast has new episodes"
+-msgstr "Izbrana možnost določi, da predvajalnik Banshee vsako uro preveri ali so na podcastu na voljo nove epizode"
++msgid ""
++"If checked, Banshee will check every hour to see if this podcast has new "
++"episodes"
++msgstr ""
++"Izbrana možnost določi, da predvajalnik Banshee vsako uro preveri ali so na "
++"podcastu na voljo nove epizode"
+ 
+ #: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastFeedPropertiesDialog.cs:109
+ #: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastSubscribeDialog.cs:136
+@@ -6595,7 +6843,8 @@ msgid "Subscribe to New Podcast"
+ msgstr "Naročilo na nov podcast"
+ 
+ #: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastSubscribeDialog.cs:103
+-msgid "Please enter the URL of the podcast to which you would like to subscribe."
++msgid ""
++"Please enter the URL of the podcast to which you would like to subscribe."
+ msgstr "Vnesite URL podcasta, na katerega se želite naročiti."
+ 
+ #: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/SyncPreferenceComboBox.cs:41
+@@ -6922,7 +7171,8 @@ msgid "The API key used by this application is invalid."
+ msgstr "Ključ API programa ni veljaven."
+ 
+ #: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:293
+-msgid "The streaming system is offline for maintenance, please try again later."
++msgid ""
++"The streaming system is offline for maintenance, please try again later."
+ msgstr "Sistem pretoka ni na voljo zaradi vzdrževalnih del. Poskusite pozneje."
+ 
+ #: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:295
+@@ -6947,7 +7197,9 @@ msgstr "Za to postajo ni dovolj sosedov."
+ 
+ #: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:308
+ msgid "This user is not allowed to listen to radio during peak usage"
+-msgstr "Uporabniku ni dovoljeno poslušanje radijske postaje med največjimi obremenitvami povezave"
++msgstr ""
++"Uporabniku ni dovoljeno poslušanje radijske postaje med največjimi "
++"obremenitvami povezave"
+ 
+ #: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:310
+ msgid "Radio station not found"
+@@ -6962,8 +7214,12 @@ msgid "This type of request is no longer supported"
+ msgstr "Ta vrsta zahteve ni več podprta"
+ 
+ #: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:316
+-msgid "Your IP has made too many requests in a short period, exceeding our API guidelines"
+-msgstr "Z vašega naslova IP je bilo podanih preveč zahtev v zelo kratkem času, kar presega določila API."
++msgid ""
++"Your IP has made too many requests in a short period, exceeding our API "
++"guidelines"
++msgstr ""
++"Z vašega naslova IP je bilo podanih preveč zahtev v zelo kratkem času, kar "
++"presega določila API."
+ 
+ #: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:318
+ msgid "There was an unknown error."
+diff --git a/src/Backends/Banshee.Gio/Banshee.Hardware.Gio/LowLevel/RawVolume.cs b/src/Backends/Banshee.Gio/Banshee.Hardware.Gio/LowLevel/RawVolume.cs
+index 0ac09f9..5e8dc80 100644
+--- a/src/Backends/Banshee.Gio/Banshee.Hardware.Gio/LowLevel/RawVolume.cs
++++ b/src/Backends/Banshee.Gio/Banshee.Hardware.Gio/LowLevel/RawVolume.cs
+@@ -239,10 +239,15 @@ namespace Banshee.Hardware.Gio
+                 if (Volume.Drive == null) {
+                     return null;
+                 }
++
++                var device = Manager.GudevDeviceFromGioDrive (Volume.Drive);
++                if (device == null) {
++                    return null;
++                }
+                 return new RawBlockDevice (Volume.Drive,
+                                            Manager,
+                                            new GioDriveMetadetaSource (Volume.Drive),
+-                                           new UdevMetadataSource (Manager.GudevDeviceFromGioDrive (Volume.Drive)));
++                                           new UdevMetadataSource (device));
+             }
+         }
+ 
+diff --git a/src/Core/Banshee.Services/Banshee.Sources/PrimarySource.cs b/src/Core/Banshee.Services/Banshee.Sources/PrimarySource.cs
+index a1250ec..2d637ec 100644
+--- a/src/Core/Banshee.Services/Banshee.Sources/PrimarySource.cs
++++ b/src/Core/Banshee.Services/Banshee.Sources/PrimarySource.cs
+@@ -663,7 +663,7 @@ namespace Banshee.Sources
+             bool finished = false, notify = false;
+ 
+             lock (this) {
+-                add_track_job.Completed++;
++                AddTrackJob.Completed++;
+ 
+                 if (add_track_job.IsFinished) {
+                     finished = true;
+diff --git a/src/Core/Banshee.Services/Banshee.Sources/SourceManager.cs b/src/Core/Banshee.Services/Banshee.Sources/SourceManager.cs
+index bcb556d..395d451 100644
+--- a/src/Core/Banshee.Services/Banshee.Sources/SourceManager.cs
++++ b/src/Core/Banshee.Services/Banshee.Sources/SourceManager.cs
+@@ -100,11 +100,6 @@ namespace Banshee.Sources
+                     AddinManager.RemoveExtensionNodeHandler ("/Banshee/SourceManager/Source", OnExtensionChanged);
+                 } catch {}
+ 
+-                active_source = null;
+-                default_source = null;
+-                music_library = null;
+-                video_library = null;
+-
+                 // Do dispose extension sources
+                 foreach (Source source in extension_sources.Values) {
+                     RemoveSource (source, true);
+@@ -117,6 +112,11 @@ namespace Banshee.Sources
+ 
+                 sources.Clear ();
+                 extension_sources.Clear ();
++
++                active_source = null;
++                default_source = null;
++                music_library = null;
++                video_library = null;
+             }
+         }
+ 
+diff --git a/src/Core/Banshee.ThickClient/Banshee.Collection.Gui/ArtworkManager.cs b/src/Core/Banshee.ThickClient/Banshee.Collection.Gui/ArtworkManager.cs
+index 6e1aa47..d3da931 100644
+--- a/src/Core/Banshee.ThickClient/Banshee.Collection.Gui/ArtworkManager.cs
++++ b/src/Core/Banshee.ThickClient/Banshee.Collection.Gui/ArtworkManager.cs
+@@ -1,10 +1,12 @@
+ //
+ // ArtworkManager.cs
+ //
+-// Author:
++// Authors:
+ //   Aaron Bockover <abockover@novell.com>
++//   Andrés G. Aragoneses <knocte@gmail.com>
+ //
+ // Copyright (C) 2007-2008 Novell, Inc.
++// Copyright (C) 2013 Andrés G. Aragoneses
+ //
+ // Permission is hereby granted, free of charge, to any person obtaining
+ // a copy of this software and associated documentation files (the
+@@ -28,9 +30,6 @@
+ 
+ using System;
+ using System.Collections.Generic;
+-using System.Text.RegularExpressions;
+-
+-using Mono.Unix;
+ 
+ using Gdk;
+ 
+@@ -68,6 +67,11 @@ namespace Banshee.Collection.Gui
+ 
+         public ArtworkManager ()
+         {
++            Init ();
++        }
++
++        protected virtual void Init ()
++        {
+             AddCachedSize (36);
+             AddCachedSize (40);
+             AddCachedSize (42);
+@@ -122,13 +126,9 @@ namespace Banshee.Collection.Gui
+                 return surface;
+             }
+ 
+-            if (null_artwork_ids.Contains (id)) {
+-                return null;
+-            }
+-
+             Pixbuf pixbuf = LookupScalePixbuf (id, size);
+             if (pixbuf == null || pixbuf.Handle == IntPtr.Zero) {
+-                null_artwork_ids.Add (id);
++                // no need to add to null_artwork_ids here, LookupScalePixbuf already did it
+                 return null;
+             }
+ 
+@@ -165,6 +165,8 @@ namespace Banshee.Collection.Gui
+         public Pixbuf LookupScalePixbuf (string id, int size)
+         {
+             if (id == null || (size != 0 && size < 10)) {
++                // explicitly don't add this id into null_artwork_ids here,
++                // otherwise it would blacklist all other non-invalid sizes
+                 return null;
+             }
+ 
+@@ -232,6 +234,9 @@ namespace Banshee.Collection.Gui
+                     }
+ 
+                     DisposePixbuf (pixbuf);
++                    if (scaled_pixbuf == null || scaled_pixbuf.Handle == IntPtr.Zero) {
++                        null_artwork_ids.Add (id);
++                    }
+                     return scaled_pixbuf;
+                 } catch {}
+             }
+diff --git a/src/Core/Banshee.ThickClient/Banshee.Collection.Gui/Tests/ArtworkManagerTests.cs b/src/Core/Banshee.ThickClient/Banshee.Collection.Gui/Tests/ArtworkManagerTests.cs
+new file mode 100644
+index 0000000..e29658e
+--- /dev/null
++++ b/src/Core/Banshee.ThickClient/Banshee.Collection.Gui/Tests/ArtworkManagerTests.cs
+@@ -0,0 +1,102 @@
++//
++// ArtworkManagerTests.cs
++//
++// Author:
++//   Andrés G. Aragoneses <knocte@gmail.com>
++//
++// Copyright 2013 Andrés G. Aragoneses
++//
++// Permission is hereby granted, free of charge, to any person obtaining a copy
++// of this software and associated documentation files (the "Software"), to deal
++// in the Software without restriction, including without limitation the rights
++// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
++// copies of the Software, and to permit persons to whom the Software is
++// furnished to do so, subject to the following conditions:
++//
++// The above copyright notice and this permission notice shall be included in
++// all copies or substantial portions of the Software.
++//
++// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
++// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
++// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
++// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
++// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
++// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
++// THE SOFTWARE.
++
++#if ENABLE_TESTS
++
++using Banshee.Base;
++using Hyena.Tests;
++
++using NUnit.Framework;
++using System;
++using System.Linq;
++using System.Reflection;
++using System.IO;
++using Gdk;
++
++namespace Banshee.Collection.Gui.Tests
++{
++    class CustomArtworkManager : ArtworkManager
++    {
++        internal static int SizeTest = 36;
++        protected override void Init ()
++        {
++            AddCachedSize (SizeTest);
++        }
++    }
++
++    [TestFixture]
++    public class ArtworkManagerTests : TestBase
++    {
++        static string ExtractPngFromResource ()
++        {
++            var first_image = Assembly.GetExecutingAssembly ().GetManifestResourceNames ().Where (n => n.EndsWith (".png")).First ();
++            var temp_png = Path.Combine (Path.GetTempPath (), first_image);
++            Stream s = Assembly.GetExecutingAssembly ().GetManifestResourceStream (first_image);
++            using (FileStream file = new FileStream (temp_png, FileMode.Create)) {
++                byte[] b = new byte[s.Length + 1];
++                s.Read (b, 0, Convert.ToInt32 (s.Length));
++                file.Write (b, 0, Convert.ToInt32 (b.Length - 1));
++                file.Flush ();
++            }
++            return temp_png;
++        }
++
++        static ArtworkManagerTests ()
++        {
++            GLib.GType.Init ();
++            Mono.Addins.AddinManager.Initialize (BinDir);
++            Banshee.IO.Provider.SetProvider (new Banshee.IO.SystemIO.Provider ());
++        }
++
++        [Test]
++        public void TestSizePath ()
++        {
++            var png_file_path = ExtractPngFromResource ();
++            string jpg_file_path = null;
++
++            try {
++                var artist_album_id = CoverArtSpec.CreateArtistAlbumId ("Metallica", "Master Of Puppets");
++                jpg_file_path = CoverArtSpec.GetPathForSize (artist_album_id, CustomArtworkManager.SizeTest); // i.e.: /home/knocte/.cache/media-art/36/album-d33f25dbd7dfb4817a7e99f6bc2de49e.jpg"
++                var pixbuf = new Pixbuf (png_file_path);
++                pixbuf.Save (jpg_file_path, "jpeg");
++
++                var artwork_manager = new CustomArtworkManager ();
++                Assert.IsNull (artwork_manager.LookupScaleSurface (artist_album_id, 1, false),
++                               "Should have got null at the first request, with an invalid size");
++                Assert.IsNotNull (artwork_manager.LookupScaleSurface (artist_album_id, CustomArtworkManager.SizeTest, false),
++                                  "Null at the second request, was null cached incorrectly?");
++
++            } finally {
++                File.Delete (png_file_path);
++                if (File.Exists (jpg_file_path)) {
++                    File.Delete (jpg_file_path);
++                }
++            }
++        }
++    }
++}
++
++#endif
+\ No newline at end of file
+diff --git a/src/Core/Banshee.ThickClient/Makefile.am b/src/Core/Banshee.ThickClient/Makefile.am
+index bdcea43..ef2af92 100644
+--- a/src/Core/Banshee.ThickClient/Makefile.am
++++ b/src/Core/Banshee.ThickClient/Makefile.am
+@@ -35,6 +35,7 @@ SOURCES =  \
+ 	Banshee.Collection.Gui/QueryFilterView.cs \
+ 	Banshee.Collection.Gui/SearchableListView.cs \
+ 	Banshee.Collection.Gui/TerseTrackListView.cs \
++	Banshee.Collection.Gui/Tests/ArtworkManagerTests.cs \
+ 	Banshee.Collection.Gui/TrackFilterListView.cs \
+ 	Banshee.Collection.Gui/TrackListView.cs \
+ 	Banshee.Collection.Gui/XmlColumnController.cs \
+diff --git a/src/Dap/Banshee.Dap.Mtp/Banshee.Dap.Mtp/MtpSource.cs b/src/Dap/Banshee.Dap.Mtp/Banshee.Dap.Mtp/MtpSource.cs
+index 766f066..a9da82d 100644
+--- a/src/Dap/Banshee.Dap.Mtp/Banshee.Dap.Mtp/MtpSource.cs
++++ b/src/Dap/Banshee.Dap.Mtp/Banshee.Dap.Mtp/MtpSource.cs
+@@ -294,7 +294,7 @@ namespace Banshee.Dap.Mtp
+         private long bytes_used;
+         public override long BytesUsed {
+             get {
+-                if (Monitor.TryEnter (mtp_device)) {
++                if (mtp_device != null && Monitor.TryEnter (mtp_device)) {
+                     try {
+                         bytes_used = 0;
+                         foreach (DeviceStorage s in mtp_device.GetStorage ()) {
diff --git a/extra/baobab/PKGBUILD b/extra/baobab/PKGBUILD
index d683bc937..d8709b6f4 100644
--- a/extra/baobab/PKGBUILD
+++ b/extra/baobab/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 196017 2013-10-07 11:50:30Z jgc $
+# $Id: PKGBUILD 196589 2013-10-15 14:52:26Z heftig $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 
 pkgname=baobab
-pkgver=3.10
+pkgver=3.10.1
 pkgrel=1
 pkgdesc="A graphical directory tree analyzer"
 arch=(i686 x86_64 mips64el)
@@ -12,8 +12,8 @@ depends=('dconf' 'gtk3' 'gsettings-desktop-schemas' 'hicolor-icon-theme' 'deskto
 makedepends=('intltool' 'itstool' 'vala' 'gobject-introspection')
 groups=('gnome')
 install=$pkgname.install
-source=(http://download.gnome.org/sources/$pkgname/${pkgver}/$pkgname-$pkgver.tar.xz)
-sha256sums=('6f4e309073c3834f957b957b03d388fd89900a1622a001d238ad6105c6e303ee')
+source=(http://download.gnome.org/sources/$pkgname/${pkgver:0:4}/$pkgname-$pkgver.tar.xz)
+sha256sums=('23ce8e4847ce5f1c8230e757532d94c84e6e273d6ec8fca20eecaed5f96563f9')
 
 build() {
   cd "$pkgname-$pkgver"
diff --git a/extra/bijiben/PKGBUILD b/extra/bijiben/PKGBUILD
index 14d4171b9..bc81f14a9 100644
--- a/extra/bijiben/PKGBUILD
+++ b/extra/bijiben/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 196018 2013-10-07 11:50:31Z jgc $
+# $Id: PKGBUILD 196446 2013-10-13 21:34:11Z heftig $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 
 pkgname=bijiben
-pkgver=3.10.0
+pkgver=3.10.1
 pkgrel=1
 pkgdesc="Write out notes, every detail matters"
 arch=(i686 x86_64 mips64el)
@@ -11,9 +11,10 @@ license=(GPL)
 depends=(tracker clutter-gtk zeitgeist webkitgtk hicolor-icon-theme desktop-file-utils gnome-online-accounts)
 makedepends=(intltool itstool)
 options=(!emptydirs)
+groups=(gnome-extra)
 install=bijiben.install
 source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz)
-sha256sums=('82817151d7a69190944447bcc7cd12306160c2edce2d0e2ddbfd15ae2d2a6d10')
+sha256sums=('ad32057baa58bf236e8f04cf7746e0d917927f8af5c49cc5a0910fc0078f775c')
 
 build() {
   cd $pkgname-$pkgver
diff --git a/extra/bluefish/PKGBUILD b/extra/bluefish/PKGBUILD
index c2344bb12..15b134c32 100644
--- a/extra/bluefish/PKGBUILD
+++ b/extra/bluefish/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 177998 2013-02-12 22:00:51Z eric $
+# $Id: PKGBUILD 197875 2013-10-30 11:24:20Z allan $
 # Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgname=bluefish
@@ -11,7 +11,6 @@ license=('GPL3')
 depends=('gtk3' 'enchant' 'python2' 'desktop-file-utils' 'hicolor-icon-theme')
 makedepends=('gucharmap' 'intltool')
 optdepends=('gucharmap: for using the charmap plugin')
-options=('!libtool')
 install=bluefish.install
 source=(http://www.bennewitz.com/bluefish/stable/source/bluefish-${pkgver}.tar.bz2{,.sig})
 sha1sums=('b65310617b5fd525a8c57f7681e023f6f4496378'
diff --git a/extra/bluez/PKGBUILD b/extra/bluez/PKGBUILD
index 286957cf6..053ec0956 100644
--- a/extra/bluez/PKGBUILD
+++ b/extra/bluez/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 194652 2013-09-20 13:20:06Z tomegun $
+# $Id: PKGBUILD 197876 2013-10-30 11:24:44Z allan $
 # Maintainer: Tom Gundersen <teg@jklm.no>
 # Contributor: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Geoffroy Carrier <geoffroy@archlinux.org>
@@ -11,7 +11,6 @@ url="http://www.bluez.org/"
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL2')
 makedepends=('dbus' 'libical' 'systemd')
-options=(!libtool)
 source=("http://www.kernel.org/pub/linux/bluetooth/${pkgname}-${pkgver}.tar.bz2")
 
 build() {
diff --git a/extra/bluez4/PKGBUILD b/extra/bluez4/PKGBUILD
index 9246f0571..b780e75b8 100644
--- a/extra/bluez4/PKGBUILD
+++ b/extra/bluez4/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 188425 2013-06-13 21:55:41Z tomegun $
+# $Id: PKGBUILD 197877 2013-10-30 11:25:04Z allan $
 # Maintainer: Tom Gundersen <teg@jklm.no>
 # Contributor: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Geoffroy Carrier <geoffroy@archlinux.org>
@@ -21,7 +21,6 @@ optdepends=("gstreamer0.10-base: bluetooth GStreamer support"
             "pygobject: to run bluez-simple-agent"
             "libusb-compat: USB adapters support"
             "cups: CUPS backend")
-options=('!libtool')
 backup=(etc/bluetooth/{main,rfcomm,audio,network,input,serial}.conf
         etc/dbus-1/system.d/bluetooth.conf)
 source=("http://www.kernel.org/pub/linux/bluetooth/bluez-${pkgver}.tar.bz2")
diff --git a/extra/boost/PKGBUILD b/extra/boost/PKGBUILD
index 9a12edd1b..9cd056924 100644
--- a/extra/boost/PKGBUILD
+++ b/extra/boost/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 193196 2013-08-18 16:43:01Z svenstaro $
+# $Id: PKGBUILD 196738 2013-10-17 14:02:41Z andyrtr $
 # Maintainer: Stéphane Gaudreault <stephane@archlinux.org>
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 # Contributor: kevin <kevin@archlinux.org>
@@ -10,11 +10,11 @@ pkgbase=boost
 pkgname=('boost-libs' 'boost')
 pkgver=1.54.0
 _boostver=${pkgver//./_}
-pkgrel=3
+pkgrel=4
 url="http://www.boost.org/"
 arch=('i686' 'x86_64' 'mips64el')
 license=('custom')
-makedepends=('icu>=51.1' 'python' 'python2' 'bzip2' 'zlib' 'openmpi')
+makedepends=('icu>=52.1' 'python' 'python2' 'bzip2' 'zlib' 'openmpi')
 source=(http://downloads.sourceforge.net/${pkgbase}/${pkgbase}_${_boostver}.tar.gz
         boost-1.53.0-python3.patch
         boost-1.54.0-Fix-macro-for-int128-detection.patch
diff --git a/extra/brasero/PKGBUILD b/extra/brasero/PKGBUILD
index bb13ee15b..c9852bf20 100644
--- a/extra/brasero/PKGBUILD
+++ b/extra/brasero/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 196019 2013-10-07 11:50:33Z jgc $
+# $Id: PKGBUILD 197878 2013-10-30 11:25:26Z allan $
 # Maintainer: Allan McRae <allan@archlinux.org>
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: William Rea <sillywilly@gmail.com>
@@ -10,7 +10,7 @@ pkgdesc="A disc burning application for Gnome"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.gnome.org/projects/brasero"
 license=('GPL')
-options=('!libtool' '!emptydirs')
+options=('!emptydirs')
 depends=('gtk3' 'gst-plugins-good' 'totem-plparser' 'cdrkit' 'cdrdao' 'desktop-file-utils' 'hicolor-icon-theme' 'shared-mime-info'  'libcanberra' 'dvd+rw-tools' 'dconf' 'libsm' 'libtracker-sparql' 'libnotify')
 makedepends=('gtk-doc' 'yelp-tools' 'gnome-common' 'intltool' 'libburn' 'libisofs' 'libnautilus-extension' 'gobject-introspection' 'gconf' 'itstool' 'docbook-xsl')
 optdepends=('libburn: alternative back-end'
diff --git a/extra/brltty/PKGBUILD b/extra/brltty/PKGBUILD
index 29c1c5e1c..1c52e2dab 100644
--- a/extra/brltty/PKGBUILD
+++ b/extra/brltty/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 187859 2013-06-07 09:24:55Z tomegun $
+# $Id: PKGBUILD 196739 2013-10-17 14:02:42Z andyrtr $
 # Maintainer: Tom Gundersen <teg@jklm.no>
 # Contributor: Jan de Groot <jgc@archlinux.org>
 # Contributor: Giovanni Scafora <giovanni@archlinux.org>
 
 pkgname=brltty
 pkgver=4.5
-pkgrel=4
+pkgrel=5
 pkgdesc="Braille display driver for Linux/Unix"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://mielke.cc/brltty"
diff --git a/extra/bzflag/PKGBUILD b/extra/bzflag/PKGBUILD
index 6f14ef9af..2cc3e6832 100644
--- a/extra/bzflag/PKGBUILD
+++ b/extra/bzflag/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 191889 2013-08-01 06:53:23Z bpiotrowski $
+# $Id: PKGBUILD 197879 2013-10-30 11:25:53Z allan $
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
 # Contributor: Kevin Piche <kevin@archlinux.org>
 # Contributor: Damir Perisa <damir.perisa@bluewin.ch>
@@ -14,7 +14,6 @@ depends=('curl' 'glew' 'glu' 'sdl')
 source=("http://downloads.sourceforge.net/project/bzflag/bzflag%20source/${pkgver}/bzflag-${pkgver}.tar.bz2")
 sha1sums=('36c67c0734a1318b34b39ed0da49606e05ebd291')
 
-options=('!libtool')
 
 build() {
 	cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/c-ares/PKGBUILD b/extra/c-ares/PKGBUILD
index 9aaf872a8..85fc32064 100644
--- a/extra/c-ares/PKGBUILD
+++ b/extra/c-ares/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 185276 2013-05-12 20:05:21Z dreisner $
+# $Id: PKGBUILD 197883 2013-10-30 11:27:23Z allan $
 # Maintainer: Dave Reisner <dreisner@archlinux.org>
 # Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
 # Contributor: Jeff Mickey <jeff@archlinux.org>
@@ -6,13 +6,12 @@
 
 pkgname=c-ares
 pkgver=1.10.0
-pkgrel=1
+pkgrel=2
 pkgdesc='C library that performs DNS requests and name resolves asynchronously'
 arch=('i686' 'x86_64' 'mips64el')
 url='http://c-ares.haxx.se/'
 license=('custom')
 depends=('glibc')
-options=('!libtool')
 source=("http://c-ares.haxx.se/download/$pkgname-$pkgver.tar.gz"{,.asc}
         'LICENSE')
 md5sums=('1196067641411a75d3cbebe074fd36d8'
diff --git a/extra/cairo/PKGBUILD b/extra/cairo/PKGBUILD
index f7884e4cf..9d3b39a49 100644
--- a/extra/cairo/PKGBUILD
+++ b/extra/cairo/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 193704 2013-08-28 15:19:08Z andyrtr $
+# $Id: PKGBUILD 197880 2013-10-30 11:26:13Z allan $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: Brice Carpentier <brice@daknet.org>
 
@@ -17,7 +17,6 @@ makedepends=('mesa-libgl' 'librsvg' 'gtk2' 'poppler-glib' 'libspectre' 'gtk-doc'
 [ "$CARCH" != "mips64el" ] && makedepends+=('valgrind')
 provides=('cairo-xcb')
 replaces=('cairo-xcb')
-options=('!libtool')
 source=(http://cairographics.org/releases/$pkgname-$pkgver.tar.xz)
 sha1sums=('4f6e337d5d3edd7ea79d1426f575331552b003ec')
 
diff --git a/extra/cairomm/PKGBUILD b/extra/cairomm/PKGBUILD
index d390f9a82..abd82bff1 100644
--- a/extra/cairomm/PKGBUILD
+++ b/extra/cairomm/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 184363 2013-05-06 19:36:39Z foutrelis $
+# $Id: PKGBUILD 197881 2013-10-30 11:26:41Z allan $
 # Maintainer: Kevin <kevin@archlinux.org>
 # Contributor: criminy <criminy@gmail.com>
 
@@ -12,7 +12,7 @@ license=('LGPL' 'MPL')
 depends=('cairo' 'libsigc++')
 makedepends=('pkgconfig')
 source=(http://www.cairographics.org/releases/${pkgname}-${pkgver}.tar.gz)
-options=('!libtool' '!emptydirs')
+options=('!emptydirs')
 sha1sums=('f08bf8a331067f0d1e876523f07238fba6b26b99')
 
 build() {
diff --git a/extra/calligra/PKGBUILD b/extra/calligra/PKGBUILD
index 7af7bc8e7..412343469 100644
--- a/extra/calligra/PKGBUILD
+++ b/extra/calligra/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 196349 2013-10-12 06:13:09Z andrea $
+# $Id: PKGBUILD 196740 2013-10-17 14:02:44Z andyrtr $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Ronald van Haren <ronald.archlinux.org>
 
@@ -17,7 +17,7 @@ pkgname=('calligra-braindump'
          'calligra-sheets'
          'calligra-stage'
          'calligra-words')
-pkgver=2.7.3
+pkgver=2.7.4
 pkgrel=1
 arch=('i686' 'x86_64' 'mips64el')
 url='http://www.calligra-suite.org/'
@@ -29,7 +29,7 @@ makedepends=('cmake' 'automoc4' 'boost' 'kdepimlibs' 'eigen2' 'kdeedu-marble'
 [ "$CARCH" != "mips64el" ] && makedepends+=('vc')
 groups=('calligra')
 source=("http://download.kde.org/stable/${pkgbase}-${pkgver}/${pkgbase}-${pkgver}.tar.xz")
-md5sums=('35165d00f38eba5de575662cafe3bf0f')
+md5sums=('0a9368b4a134eaf7c9834d21097e5016')
 
 prepare() {
   mkdir build
diff --git a/extra/capseo/PKGBUILD b/extra/capseo/PKGBUILD
index 31722e2f1..627533c92 100644
--- a/extra/capseo/PKGBUILD
+++ b/extra/capseo/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 137732 2011-09-10 14:29:41Z pierre $
+# $Id: PKGBUILD 197882 2013-10-30 11:27:01Z allan $
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 
 pkgname=capseo
@@ -10,7 +10,6 @@ arch=('i686' 'x86_64' 'mips64el')
 url="http://dev.gentoo.org/~trapni/capseo/"
 license=('GPL2')
 depends=('libgl' 'gcc-libs')
-options=('!libtool')
 makedepends=('pkgconfig' 'mesa' 'libogg')
 source=("ftp://ftp.archlinux.org/other/capseo/${pkgname}-${pkgver}.tar.gz")
 md5sums=('bd869e8c9b1081e90a44567092ea8c5e')
diff --git a/extra/caribou/PKGBUILD b/extra/caribou/PKGBUILD
index ec409f8b9..c5d80400a 100644
--- a/extra/caribou/PKGBUILD
+++ b/extra/caribou/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 187111 2013-06-04 04:29:06Z heftig $
+# $Id: PKGBUILD 197884 2013-10-30 11:27:44Z allan $
 # Maintainer : Ionut Biru <ibiru@archlinux.org>
 # Contributor: Adam Hani Schakaki <krzd@krzd.net>
 
@@ -12,7 +12,7 @@ license=(LGPL)
 depends=(at-spi2-atk python2-atspi python2-gobject gtk3 libxklavier libgee clutter dconf)
 makedepends=(intltool docbook-xsl gtk2)
 install=caribou.install
-options=(!libtool !emptydirs)
+options=(!emptydirs)
 source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/0.4/$pkgname-$pkgver.tar.xz)
 sha256sums=('e4e81387a1a6875652b8ec9dede8573844fac274c8de9ad0416cf586a318f4f9')
 
diff --git a/extra/ccrtp/PKGBUILD b/extra/ccrtp/PKGBUILD
index dae0ee4d4..d74c9782c 100644
--- a/extra/ccrtp/PKGBUILD
+++ b/extra/ccrtp/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 184148 2013-05-02 19:39:49Z eric $
+# $Id: PKGBUILD 197587 2013-10-27 03:20:07Z eric $
 # Maintainer:
 # Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Jeff Mickey <jeff@archlinux.org>
@@ -6,17 +6,16 @@
 # Contributor: Alexander Rødseth <rodseth@gmail.com>
 
 pkgname=ccrtp
-pkgver=2.0.5
+pkgver=2.0.6
 pkgrel=1
 pkgdesc="An implementation of RTP, the real-time transport protocol from the IETF"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.gnu.org/software/ccrtp/"
 license=('GPL' 'custom')
 depends=('ucommon' 'libgcrypt')
-options=('!libtool')
 install=$pkgname.install
 source=("ftp://ftp.gnu.org/pub/gnu/$pkgname/$pkgname-$pkgver.tar.gz"{,.sig})
-md5sums=('7f462f6b31c68180a93f36b06944fef4'
+md5sums=('ca0a7a184b242d660d81caf6101a2c0c'
          'SKIP')
 
 build() {
diff --git a/extra/celt/PKGBUILD b/extra/celt/PKGBUILD
index 211d6015b..686dc5b58 100644
--- a/extra/celt/PKGBUILD
+++ b/extra/celt/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 176867 2013-02-02 03:18:42Z heftig $
+# $Id: PKGBUILD 197885 2013-10-30 11:28:05Z allan $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Contributor: Thomas Dziedzic < gostrc at gmail >
 # Contributor: Lauri Niskanen <ape@ape3000.com>
@@ -6,19 +6,18 @@
 
 pkgname=celt
 pkgver=0.11.3
-pkgrel=1
+pkgrel=2
 pkgdesc="Low-latency audio communication codec"
 arch=(i686 x86_64 mips64el)
 url="http://www.celt-codec.org/"
 license=(BSD)
 depends=(libogg)
-options=('!libtool')
 source=(http://downloads.us.xiph.org/releases/$pkgname/$pkgname-$pkgver.tar.gz)
 md5sums=('5511732a426cc42bf986ca79b5cdd02f')
 
 build() {
   cd $pkgname-$pkgver
-  ./configure --prefix=/usr --enable-custom-modes
+  ./configure --prefix=/usr --enable-custom-modes --disable-static
   make
 }
 
diff --git a/extra/celt0.5.1/PKGBUILD b/extra/celt0.5.1/PKGBUILD
index 6eab9ed40..6ee610cd6 100644
--- a/extra/celt0.5.1/PKGBUILD
+++ b/extra/celt0.5.1/PKGBUILD
@@ -5,13 +5,12 @@
 pkgname=celt0.5.1
 _basename=celt
 pkgver=0.5.1.3
-pkgrel=2
+pkgrel=3
 pkgdesc="Low-latency audio communication codec - SPICE version"
 arch=(i686 x86_64 mips64el)
 url="http://www.celt-codec.org"
 license=('BSD')
 depends=('libogg')
-options=('!libtool')
 source=(http://downloads.us.xiph.org/releases/celt/celt-$pkgver.tar.gz)
 md5sums=('67e7b5e45db57a6f1f0a6962f5ecb190')
 
diff --git a/extra/cfitsio/PKGBUILD b/extra/cfitsio/PKGBUILD
index 6c8c45481..b8629c086 100644
--- a/extra/cfitsio/PKGBUILD
+++ b/extra/cfitsio/PKGBUILD
@@ -1,19 +1,17 @@
-# $Id: PKGBUILD 189244 2013-07-01 10:04:11Z andrea $
+# $Id: PKGBUILD 197887 2013-10-30 11:28:50Z allan $
 # Maintainer:
 # Contributor: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Tobias Powalowski <tpowa@archlinux.org>
 
 pkgname=cfitsio
 pkgver=3.350
-pkgrel=1
+pkgrel=2
 pkgdesc="A library of C and Fortran subroutines for reading and writing data files in FITS (Flexible Image Transport System) data format"
 arch=('i686' 'x86_64' 'mips64el')
-url="http://heasarc.gsfc.nasa.gov/docs/software/fitsio/fitsio.html"
+url="http://heasarc.gsfc.nasa.gov/fitsio/"
 license=('custom')
-depends=('glibc')
-options=('!libtool')
 source=("ftp://heasarc.gsfc.nasa.gov/software/fitsio/c/${pkgname}${pkgver/./}.tar.gz")
-md5sums=('3e61f17731fe8db503b1b39873e4a8c4')
+sha1sums=('e928832708d6a5df21a1e17ae4a63036cab7c1b9')
 
 build() {
   cd ${pkgname}
diff --git a/extra/check/PKGBUILD b/extra/check/PKGBUILD
index a537d3991..990b189c2 100644
--- a/extra/check/PKGBUILD
+++ b/extra/check/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 183188 2013-04-18 16:03:52Z heftig $
+# $Id: PKGBUILD 197888 2013-10-30 11:29:14Z allan $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Contributor: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
 # Contributor: Jeremy Cowgar <jeremy@cowgar.com>
@@ -10,7 +10,6 @@ pkgdesc="A unit testing framework for C"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://check.sourceforge.net/"
 license=('LGPL')
-options=('!libtool')
 install=$pkgname.install
 source=(http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.gz)
 md5sums=('6d10a8efb9a683467b92b3bce97aeb30')
diff --git a/extra/cheese/PKGBUILD b/extra/cheese/PKGBUILD
index a01fa92da..0fbf85869 100644
--- a/extra/cheese/PKGBUILD
+++ b/extra/cheese/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 196020 2013-10-07 11:50:34Z jgc $
+# $Id: PKGBUILD 197889 2013-10-30 11:29:34Z allan $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Contributor: Jan de Groot <jgc@archlinux.org>
 
 pkgname=cheese
-pkgver=3.10.0
+pkgver=3.10.1
 pkgrel=1
 pkgdesc="Use your webcam to take photos and videos, apply fancy special effects and share the fun with others"
 arch=(i686 x86_64 'mips64el')
@@ -12,11 +12,11 @@ depends=('gtk3' 'gstreamer' 'gst-plugins-bad' 'gst-plugins-base' 'gst-plugins-go
 makedepends=('pkgconfig' 'intltool' 'gobject-introspection' 'itstool' 'vala')
 optdepends=('frei0r-plugins: More camera effects')
 groups=('gnome-extra')
-options=('!libtool' '!emptydirs')
+options=('!emptydirs')
 url="http://www.gnome.org/projects/cheese/"
 install=cheese.install
 source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('eb0d8ba5211a4fe804d540e16a7fb61f16c467e23b106370723c32731b6e620b')
+sha256sums=('ff2e89921eb6a1eec38b4cde69ee8d0dd48ebeb821715e0080f94aa4c1064cc4')
 
 build() {
   cd $pkgname-$pkgver
diff --git a/extra/chemtool/PKGBUILD b/extra/chemtool/PKGBUILD
index f667e0cc8..0fe76b3f0 100644
--- a/extra/chemtool/PKGBUILD
+++ b/extra/chemtool/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 149523 2012-02-08 11:37:54Z tpowa $
+# $Id: PKGBUILD 197890 2013-10-30 11:29:54Z allan $
 #Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 
 pkgname=chemtool
@@ -9,7 +9,6 @@ arch=(i686 x86_64 'mips64el')
 license=('GPL2')
 url="http://ruby.chemie.uni-freiburg.de/~martin/chemtool/chemtool.html"
 depends=('gtk2' 'desktop-file-utils')
-options=(!libtool)
 source=(http://ruby.chemie.uni-freiburg.de/~martin/${pkgname}/${pkgname}-${pkgver}.tar.gz chemtool.desktop)
 install=chemtool.install
 
diff --git a/extra/chmlib/PKGBUILD b/extra/chmlib/PKGBUILD
index d6f1992d8..52c7f82d1 100644
--- a/extra/chmlib/PKGBUILD
+++ b/extra/chmlib/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 143719 2011-11-28 16:57:25Z giovanni $
+# $Id: PKGBUILD 197891 2013-10-30 11:30:33Z allan $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Alexander 'dma147' Mieland <dma147@linux-stats.org>
 # Contributor: Simon Morgan <simon@16hz.net>
@@ -9,7 +9,6 @@ pkgrel=3.1
 pkgdesc="Library for dealing with Microsoft ITSS/CHM format files"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://morte.jedrea.com/~jedwin/projects/chmlib/"
-options=('!libtool')
 license=('LGPL')
 depends=('glibc')
 source=("http://morte.jedrea.com/~jedwin/projects/${pkgname}/${pkgname}-${pkgver}.tar.bz2"
diff --git a/extra/cinepaint/PKGBUILD b/extra/cinepaint/PKGBUILD
index 062225adf..a3e58d68e 100644
--- a/extra/cinepaint/PKGBUILD
+++ b/extra/cinepaint/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 184367 2013-05-06 19:36:51Z foutrelis $
+# $Id: PKGBUILD 197892 2013-10-30 11:30:55Z allan $
 # Maintainer: tobias [tobias.archlinux.org]
 # Contributor: tobias [tobias.justdreams.de]
 
@@ -14,7 +14,6 @@ makedepends=('python2' 'gutenprint>=5.2.9' 'optipng')
 optdepends=('python2: for python plug-ins' 
             'gutenprint: for print plug-ins'
             'ghostscript: for pdf plug-ins')
-options=('!libtool')
 install=cinepaint.install
 source=(http://downloads.sourceforge.net/project/cinepaint/CinePaint/CinePaint-${pkgver}/${pkgname}-${pkgver}.tgz
         LICENSE cinepaint-libpng15.patch cinepaint-missing-include.patch)
diff --git a/extra/clamav/PKGBUILD b/extra/clamav/PKGBUILD
index 496ec0b7d..aff1e1a05 100644
--- a/extra/clamav/PKGBUILD
+++ b/extra/clamav/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 194640 2013-09-20 02:05:29Z bisson $
+# $Id: PKGBUILD 197893 2013-10-30 11:31:17Z allan $
 # Contributor: Dale Blount <dale@archlinux.org>
 # Contributor: Gregor Ibic <gregor.ibic@intelicom.si>
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
@@ -9,7 +9,6 @@ pkgrel=1
 pkgdesc='Anti-virus toolkit for Unix'
 url='http://www.clamav.net/'
 license=('GPL')
-options=('!libtool')
 arch=('i686' 'x86_64' 'mips64el')
 depends=('bzip2' 'libltdl')
 backup=('etc/logrotate.d/clamav')
diff --git a/extra/claws-mail/PKGBUILD b/extra/claws-mail/PKGBUILD
new file mode 100644
index 000000000..30e2b588b
--- /dev/null
+++ b/extra/claws-mail/PKGBUILD
@@ -0,0 +1,73 @@
+# $Id: PKGBUILD 197894 2013-10-30 11:31:39Z allan $
+# Maintainer: Andreas Radke <andyrtr@archlinux.org>
+
+pkgname=claws-mail
+pkgver=3.9.2
+pkgrel=4
+pkgdesc="A GTK+ based e-mail client."
+arch=('i686' 'x86_64')
+license=('GPL3')
+url="http://www.claws-mail.org"
+depends=('gtk2' 'gnutls' 'startup-notification' 'enchant' 'gpgme' 'libetpan>=1.1-4' 
+         'libsm' 'dbus-glib' 'hicolor-icon-theme' 'desktop-file-utils')
+makedepends=('compface' 'spamassassin' 'bogofilter' 'valgrind' 
+             # dependencies for plugins
+             'libsoup' 'libgdata' 'webkitgtk2' 'libnotify' 'libcanberra' 'poppler-glib' 'pygtk') 
+             #'libchamplain' needed for geolocation plugin, disabled for now - most time it's not compatible with current gnome releases
+optdepends=('python2:           needed for some tools and python plugin'
+            'perl:              needed for some tools and perl plugin'
+            'spamassassin:      adds support for spamfiltering'
+            'bogofilter:        adds support for spamfiltering'
+            'libnotify:         for notification plugin'
+            'libcanberra:       for notification plugin'
+            'dbus:              for notification plugin'
+            'libxml2:           for gtkhtml2_viewer and rssyl plugins'
+            'curl:              for gtkhtml2_viewer, vcalendar, rssyl and spamreport plugins'
+            'libarchive:        for archive plugin and various other plugins'
+            'libytnef:          for tnef_parse plugin'
+            'webkitgtk2:        for the fancy webkit html plugin'
+            'libsoup:           for the fancy webkit html plugin'
+	        'libgdata:          for gdata plugin'
+	        'poppler-glib:      for pdf viewer plugin'
+	        'ghostscript:       for pdf viewer plugin')    
+replaces=('sylpheed-claws' 'claws-mail-extra-plugins')
+conflicts=('claws-mail-extra-plugins')
+provides=('claws')
+install=claws-mail.install
+source=(http://downloads.sourceforge.net/sourceforge/sylpheed-claws/${pkgname}-${pkgver}.tar.bz2{,.asc})
+md5sums=('90de2a265e65fbd9dffdbf428bb0ee28'
+         'SKIP')
+
+build() {
+  cd ${pkgname}-${pkgver}
+
+  # fixes for python2
+  export PYTHON="/usr/bin/python2"
+  sed -i 's@^#!.*python.*@#!/usr/bin/python2@' tools/*.py
+  sed -i 's:python -c:python2 -c:g' configure
+  
+  ./configure --prefix=/usr --disable-static \
+    --enable-enchant \
+    --enable-gnutls \
+    --enable-ldap \
+    --enable-crash-dialog \
+    --enable-pgpmime-plugin \
+    --enable-spamassassin-plugin \
+    --enable-bogofilter-plugin \
+    #--help
+  make
+}
+
+package() {
+  cd ${pkgname}-${pkgver}
+  make DESTDIR=${pkgdir} install
+
+  # build and install extra tools
+  cd tools
+  make
+   # all executables and .conf files ; only top directory
+  find -maxdepth 1 -type f -and -perm /111 -or -name '*.conf' | while read i ; do
+      install -D -m755 ${i} \
+        ${pkgdir}/usr/lib/claws-mail/tools/${i}
+  done
+}
diff --git a/nonprism/claws-mail-libre-nonprism/claws-mail.install b/extra/claws-mail/claws-mail.install
index 4d2f155d4..4d2f155d4 100644
--- a/nonprism/claws-mail-libre-nonprism/claws-mail.install
+++ b/extra/claws-mail/claws-mail.install
diff --git a/extra/cln/PKGBUILD b/extra/cln/PKGBUILD
index d3fe19f17..7e6c63cc7 100644
--- a/extra/cln/PKGBUILD
+++ b/extra/cln/PKGBUILD
@@ -1,16 +1,15 @@
-# $Id: PKGBUILD 191235 2013-07-22 00:17:17Z eric $
+# $Id: PKGBUILD 197218 2013-10-24 05:09:05Z eric $
 # Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgname=cln
 pkgver=1.3.3
-pkgrel=1
+pkgrel=2
 pkgdesc="Class library for numbers"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.ginac.de/CLN/"
 license=('GPL')
 [[ "${CARCH}" == 'mips64el' ]] || depends=('gmp')
 makedepends=('texlive-core')
-options=('!libtool')
 install=cln.install
 source=(http://www.ginac.de/CLN/${pkgname}-${pkgver}.tar.bz2)
 sha1sums=('11c56780eb83ed54f2ad1ecef7f0dc0f609c426d')
diff --git a/extra/clutter-gst/PKGBUILD b/extra/clutter-gst/PKGBUILD
index 8c585e8d4..3a9067696 100644
--- a/extra/clutter-gst/PKGBUILD
+++ b/extra/clutter-gst/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 196022 2013-10-07 11:50:36Z jgc $
+# $Id: PKGBUILD 197896 2013-10-30 11:32:22Z allan $
 # Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com>
 
 pkgname=clutter-gst
@@ -10,7 +10,6 @@ url="http://www.clutter-project.org/"
 license=(LGPL)
 depends=(clutter gst-plugins-base-libs libxdamage gst-plugins-bad)
 makedepends=(gobject-introspection)
-options=('!libtool')
 source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
 sha256sums=('cee6b0667c74a54fdf43f0ec7c1dc8ff0ffd1c594e0d43529de45048f8080a4d')
 
diff --git a/extra/clutter-gtk/PKGBUILD b/extra/clutter-gtk/PKGBUILD
index a8f647fd2..b58da6b09 100644
--- a/extra/clutter-gtk/PKGBUILD
+++ b/extra/clutter-gtk/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 196023 2013-10-07 11:50:36Z jgc $
+# $Id: PKGBUILD 197897 2013-10-30 11:32:46Z allan $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=clutter-gtk
@@ -7,7 +7,6 @@ pkgrel=4
 pkgdesc="GTK clutter widget"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://clutter-project.org/"
-options=('!libtool')
 license=('LGPL')
 depends=('clutter' 'gtk3')
 makedepends=('gobject-introspection')
diff --git a/extra/clutter/PKGBUILD b/extra/clutter/PKGBUILD
index 8444153f9..e5f5b8872 100644
--- a/extra/clutter/PKGBUILD
+++ b/extra/clutter/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 196021 2013-10-07 11:50:34Z jgc $
+# $Id: PKGBUILD 197895 2013-10-30 11:32:01Z allan $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: William Rea <sillywilly@gmail.com>
@@ -9,7 +9,6 @@ pkgrel=1
 pkgdesc="A GObject based library for creating fast, visually rich graphical user interfaces"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://clutter-project.org/"
-options=('!libtool')
 license=('LGPL')
 depends=('cogl' 'mesa' 'json-glib' 'atk' 'libxi' 'libxkbcommon' 'libevdev')
 makedepends=('gobject-introspection')
diff --git a/extra/cogl/PKGBUILD b/extra/cogl/PKGBUILD
index 86cdbef17..97fc0cb5a 100644
--- a/extra/cogl/PKGBUILD
+++ b/extra/cogl/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 196024 2013-10-07 11:50:37Z jgc $
+# $Id: PKGBUILD 197898 2013-10-30 11:33:08Z allan $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 
 pkgname=cogl
@@ -10,7 +10,7 @@ url="http://www.clutter-project.org/"
 license=('GPL2')
 depends=('libdrm' 'libxext' 'libxdamage' 'libxcomposite' 'gdk-pixbuf2' 'pango')
 makedepends=('mesa' 'gobject-introspection')
-options=(!libtool !emptydirs)
+options=(!emptydirs)
 source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
 sha256sums=('75c2c4636a050fda7ee8722ce3d9c618b08799ed92bbb72b4fdff3e73b096094')
 
diff --git a/extra/colord-gtk/PKGBUILD b/extra/colord-gtk/PKGBUILD
index 0cd7710ce..eb9cff85b 100644
--- a/extra/colord-gtk/PKGBUILD
+++ b/extra/colord-gtk/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 180561 2013-03-23 09:51:45Z heftig $
+# $Id: PKGBUILD 197900 2013-10-30 11:33:54Z allan $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Contributor: Ionut Biru <ibiru@archlinux.org>
 
@@ -12,7 +12,6 @@ license=('GPL2')
 depends=('lcms2' 'gtk3' 'colord')
 makedepends=('intltool' 'gobject-introspection' 'vala' 'gtk-doc')
 source=($url/releases/$pkgname-$pkgver.tar.xz)
-options=('!libtool')
 sha1sums=('ffb27568ff25860fbcc09cc32ba05469655b099d')
 
 build() {
diff --git a/extra/colord/PKGBUILD b/extra/colord/PKGBUILD
index af55ab055..8807045cd 100644
--- a/extra/colord/PKGBUILD
+++ b/extra/colord/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 191316 2013-07-23 14:05:15Z jgc $
+# $Id: PKGBUILD 197899 2013-10-30 11:33:33Z allan $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Contributor: Ionut Biru <ibiru@archlinux.org>
 
@@ -12,7 +12,6 @@ license=(GPL2)
 depends=(lcms2 libgusb polkit shared-color-profiles sqlite udev dconf dbus)
 makedepends=(intltool gobject-introspection vala docbook2x sane bash-completion)
 optdepends=('sane: UseSANE support [/etc/colord.conf]')
-options=('!libtool')
 install=colord.install
 backup=(etc/colord.conf)
 source=($url/releases/$pkgname-$pkgver.tar.xz
diff --git a/extra/compface/PKGBUILD b/extra/compface/PKGBUILD
index ce29bd930..2381162a9 100644
--- a/extra/compface/PKGBUILD
+++ b/extra/compface/PKGBUILD
@@ -1,28 +1,38 @@
-# $Id: PKGBUILD 137677 2011-09-10 11:50:26Z pierre $
-# Maintainer: simo <simo@archlinux.org> 
+# $Id: PKGBUILD 197085 2013-10-21 18:34:54Z andyrtr $
+# Maintainer: AndyRTR <andyrtr@archlinux.org>
+# Contributor: simo <simo@archlinux.org> 
 # Contributor: Manolis Tzanidakis
 
 pkgname=compface
 pkgver=1.5.2
-pkgrel=3.1
+pkgrel=4
 pkgdesc="Utils & libs to convert from/to X-Face format."
 arch=('i686' 'x86_64' 'mips64el')
 url="http://ftp.xemacs.org/pub/xemacs/aux/"
 license=('custom')
 depends=('glibc')
-source=("$url/$pkgname-$pkgver.tar.gz" 'LICENSE')
+source=($url/$pkgname-$pkgver.tar.gz
+        compface-1.5.2-build.patch
+        LICENSE)
 md5sums=('62f4f79c0861ad292ba3cf77b4c48319'
+         '25874b31f97a53f66ceed54f6b422515'
          '27a0d5a4d695e68b4d3eebe17db77189')
 
+prepare() {
+  cd $pkgname-$pkgver
+  patch -Np0 -i ${srcdir}/compface-1.5.2-build.patch
+}
+
 build() {
-  cd $srcdir/$pkgname-$pkgver
+  cd $pkgname-$pkgver
+  CFLAGS="$CFLAGS -fPIC"
   ./configure --prefix=/usr
   make
 }
 
 package() {
-  cd $srcdir/$pkgname-$pkgver
-  make BINDIR=$pkgdir/usr/bin LIBDIR=$pkgdir/usr/lib MANDIR=$pkgdir/usr/share/man \
-    INCLUDEDIR=$pkgdir/usr/include install
+  cd $pkgname-$pkgver
+  make DESTDIR="$pkgdir" STRIP=/bin/true install
+
   install -D -m644 ../LICENSE $pkgdir/usr/share/licenses/$pkgname/LICENSE
 }
diff --git a/extra/compface/compface-1.5.2-build.patch b/extra/compface/compface-1.5.2-build.patch
new file mode 100644
index 000000000..b86cdb881
--- /dev/null
+++ b/extra/compface/compface-1.5.2-build.patch
@@ -0,0 +1,82 @@
+o Build shared library, link tools against it
+o Make it possible to prevent stripping
+o Add DESTDIR support
+
+--- Makefile.in~	2005-10-04 15:59:49.000000000 +0300
++++ Makefile.in	2006-08-02 22:23:07.000000000 +0300
+@@ -15,6 +15,7 @@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_DATA    = @INSTALL_DATA@
+ SHELL           = /bin/sh
++STRIP           = strip
+ 
+ NAME		= compface
+ UNNAME		= uncompface
+@@ -25,6 +26,7 @@
+ UNEXECUTABLE	= $(BINDIR)/$(UNNAMEEXE)
+ LIBNAME		= lib$(NAME).a
+ LIBRARY		= $(LIBDIR)/$(LIBNAME)
++SHLIBNAME	= lib$(NAME).so
+ MAN1DIR		= $(MANDIR)/man1
+ MAN3DIR		= $(MANDIR)/man3
+ OBJECTS		= arith.o file.o compress.o gen.o uncompface.o
+@@ -45,11 +47,11 @@
+ 
+ all:		$(NAMEEXE) $(UNNAMEEXE)
+ 
+-$(NAMEEXE) :	cmain.o compface.o $(LIBNAME)
+-		$(CC) $(LDFLAGS) -o $@ cmain.o compface.o $(LIBNAME)
++$(NAMEEXE) :	cmain.o compface.o $(SHLIBNAME)
++		$(CC) $(LDFLAGS) -o $@ cmain.o compface.o -L. -l$(NAME)
+ 
+-$(UNNAMEEXE) :	uncmain.o $(LIBNAME)
+-		$(CC) $(LDFLAGS) -o $@ uncmain.o $(LIBNAME)
++$(UNNAMEEXE) :	uncmain.o $(SHLIBNAME)
++		$(CC) $(LDFLAGS) -o $@ uncmain.o -L. -l$(NAME)
+ 
+ $(LIBNAME) :	$(OBJECTS)
+ 		ar rc $(LIBNAME) $(OBJECTS)
+@@ -73,25 +75,28 @@
+ 		tar chzf `cat .fname`.tar.gz `cat .fname`
+ 		$(RM) -rf `cat .fname` .fname
+ 
+-install: 	$(NAMEEXE) $(UNNAMEEXE) $(LIBNAME)
+-		$(INSTALL_PROGRAM) -d $(BINDIR) $(LIBDIR) $(MAN1DIR) $(MAN3DIR) $(INCLUDEDIR)
+-		$(INSTALL_PROGRAM) $(srcdir)/$(NAMEEXE) $(EXECUTABLE) 
+-		-chmod 0755 $(EXECUTABLE)
+-		-strip $(EXECUTABLE)
+-		$(INSTALL_PROGRAM) $(srcdir)/$(UNNAMEEXE) $(UNEXECUTABLE)
+-		-chmod 0755 $(UNEXECUTABLE)
+-		-strip $(UNEXECUTABLE)
+-		$(INSTALL_DATA) $(srcdir)/$(NAME).1 $(MAN1DIR)/$(NAME).1
+-		cd $(MAN1DIR) && $(RM) ./$(UNNAME).1 && $(LN_S) $(NAME).1 $(UNNAME).1
+-		$(INSTALL_DATA) $(srcdir)/$(NAME).3 $(MAN3DIR)/$(NAME).3
+-		cd $(MAN3DIR) && $(RM) ./$(UNNAME).3 && $(LN_S) $(NAME).3 $(UNNAME).3
+-		for hdr in $(INSTALLHEADERS); do $(INSTALL_DATA) $(srcdir)/$${hdr} $(INCLUDEDIR)/$${hdr}; done
+-		$(INSTALL_DATA) $(srcdir)/$(LIBNAME) $(LIBRARY)
++install: 	$(NAMEEXE) $(UNNAMEEXE) $(SHLIBNAME)
++		$(INSTALL_PROGRAM) -d $(DESTDIR)$(BINDIR) $(DESTDIR)$(LIBDIR) $(DESTDIR)$(MAN1DIR) $(DESTDIR)$(MAN3DIR) $(DESTDIR)$(INCLUDEDIR)
++		$(INSTALL_PROGRAM) $(srcdir)/$(NAMEEXE) $(DESTDIR)$(EXECUTABLE) 
++		-$(STRIP) $(DESTDIR)$(EXECUTABLE)
++		$(INSTALL_PROGRAM) $(srcdir)/$(UNNAMEEXE) $(DESTDIR)$(UNEXECUTABLE)
++		-$(STRIP) $(DESTDIR)$(UNEXECUTABLE)
++		$(INSTALL_DATA) $(srcdir)/$(NAME).1 $(DESTDIR)$(MAN1DIR)/$(NAME).1
++		cd $(DESTDIR)$(MAN1DIR) && $(RM) ./$(UNNAME).1 && $(LN_S) $(NAME).1 $(UNNAME).1
++		$(INSTALL_DATA) $(srcdir)/$(NAME).3 $(DESTDIR)$(MAN3DIR)/$(NAME).3
++		cd $(DESTDIR)$(MAN3DIR) && $(RM) ./$(UNNAME).3 && $(LN_S) $(NAME).3 $(UNNAME).3
++		for hdr in $(INSTALLHEADERS); do $(INSTALL_DATA) $(srcdir)/$${hdr} $(DESTDIR)$(INCLUDEDIR)/$${hdr}; done
++		$(INSTALL_PROGRAM) $(srcdir)/$(SHLIBNAME) $(DESTDIR)$(LIBDIR)/$(SHLIBNAME).1.0.0
++		$(LN_S) $(SHLIBNAME).1.0.0 $(DESTDIR)$(LIBDIR)/$(SHLIBNAME).1
++		$(LN_S) $(SHLIBNAME).1 $(DESTDIR)$(LIBDIR)/$(SHLIBNAME)
+ 
+ shar :
+ 		shar.script $(OTHERS) $(HDRS) $(SOURCES) > $(NAME).sh
+ 		compress $(NAME).sh
+ 
++$(SHLIBNAME): $(OBJECTS)
++	$(CC) -shared -Wl,-soname,$(SHLIBNAME).1 $(LDFLAGS) -o $(SHLIBNAME) $(OBJECTS)
++
+ .c.o:
+ 	$(CC) -c $(CPPFLAGS) $(DEFS) $(CFLAGS) $<
+ 
+
diff --git a/extra/cppunit/PKGBUILD b/extra/cppunit/PKGBUILD
index 772af4111..f2cce9c14 100644
--- a/extra/cppunit/PKGBUILD
+++ b/extra/cppunit/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 167193 2012-09-27 15:30:04Z andyrtr $
+# $Id: PKGBUILD 197901 2013-10-30 11:34:14Z allan $
 # Maintainer: Stéphane Gaudreault <stephane@archlinux.org>
 # Contributor: Jeff 'codemac' Mickey <jeff@archlinux.org>
 
@@ -11,7 +11,7 @@ arch=('i686' 'x86_64' 'mips64el')
 url="http://www.freedesktop.org/wiki/Software/cppunit"
 license=('LGPL')
 depends=('sh' 'gcc-libs')
-options=('!libtool' '!emptydirs')
+options=('!emptydirs')
 source=(http://dev-www.libreoffice.org/src/${_hash}-${pkgname}-${pkgver}.tar.gz)
 md5sums=(${_hash})
 
diff --git a/extra/cups/PKGBUILD b/extra/cups/PKGBUILD
index 3163d2747..b96f9a7b6 100644
--- a/extra/cups/PKGBUILD
+++ b/extra/cups/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 196352 2013-10-12 07:52:54Z andyrtr $
+# $Id: PKGBUILD 197696 2013-10-28 15:56:36Z andyrtr $
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 
 pkgbase="cups"
 pkgname=('libcups' 'cups')
-pkgver=1.6.4
+pkgver=1.7.0
 pkgrel=1
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
@@ -11,7 +11,7 @@ url="http://www.cups.org/"
 makedepends=('libtiff>=4.0.0' 'libpng>=1.5.7' 'acl' 'pam' 'xdg-utils' 'krb5' 'gnutls>=2.8.3' 'cups-filters' 'bc'
              'colord' 'xinetd' 'gzip' 'autoconf' 'libusb' 'dbus-core' 'avahi'  'hicolor-icon-theme' 'systemd')
 source=(#http://mirror.easysw.com/pub/cups/${pkgver}/cups-${pkgver}-source.tar.bz2
-        http://www.cups.org/software/${pkgver}/cups-${pkgver}-source.tar.gz
+        http://www.cups.org/software/${pkgver}/cups-${pkgver}-source.tar.bz2
         cups.logrotate cups.pam
         # improve build and linking
         cups-no-export-ssllibs.patch
@@ -30,19 +30,19 @@ source=(#http://mirror.easysw.com/pub/cups/${pkgver}/cups-${pkgver}-source.tar.b
         cupsd-no-crash-on-avahi-threaded-poll-shutdown.patch
         get-ppd-file-for-statically-configured-ipp-shared-queues.patch
         ppd-poll-with-client-conf.patch)
-md5sums=('17c948b442dfdb3c53f5c8b7eaa1442f'
+md5sums=('5ab496a2ce27017fcdb3d7ec4818a75a'
          'f861b18f4446c43918c8643dcbbd7f6d'
          '96f82c38f3f540b53f3e5144900acf17'
          '3ba9e3410df1dc3015463d615ef91b3b'
          'cc4101beccb5ed6deb1c92707a575925'
          '90c30380d4c8cd48a908cfdadae1ea24'
-         'b4868b83f7f2d6ec24a1be76509379f0'
+         '555a1c71151ce990e176315b46e3de2f'
          'a2a88b3a3257c3b5fd3edcc169e6aca4'
          '8fe27d4248cacbc02824e7937cab4088'
          'df0c367c0022e3c7d8e01827e8a6c5e7'
          'f30c2a161caaf27854581507cde8cac6'
          '5117f65342fcc69c6a506529e4daca9e'
-         '9247e218eea94ebda0aebc8ee0e77db8'
+         '451609db34f95209d64c38474de27ce1'
          'cb58bf4e0b80eaee383712e5c84a1ab4'
          'b578bcd17949a7203237ba1e31f78ef9'
          '0becd6ab8782b97f19a02c1dc174c75e')
@@ -71,12 +71,12 @@ prepare() {
   patch -Np1 -i ${srcdir}/cups-dbus-utf8.patch
 
   # Fixed crash which sometimes happens on shutdown of the CUPS daemon, caused by a wrong shutdown sequence for shutting down the Avahi threaded poll.
-  patch -Np1 -i ${srcdir}/cupsd-no-crash-on-avahi-threaded-poll-shutdown.patch
+#  patch -Np1 -i ${srcdir}/cupsd-no-crash-on-avahi-threaded-poll-shutdown.patch
   # Applications could not get the PPD file for statically-configured IPP-shared print queues
   patch -Np1 -i ${srcdir}/get-ppd-file-for-statically-configured-ipp-shared-queues.patch
   # If an external server is used via client.conf and the DNS is inconsistent (ex: DNS gives "noname" for many IPs, reverse DNS gives one of these IPs
   # for "noname") local PPDs can get polled for print queues instead of the PPDs of the external server Bug: http://www.cups.org/str.php?L2763
-  patch -Np1 -i ${srcdir}/ppd-poll-with-client-conf.patch
+#  patch -Np1 -i ${srcdir}/ppd-poll-with-client-conf.patch
   # fix permissions on some files - alternative: cups-0755.patch by FC
   patch -Np0 -i ${srcdir}/cups-1.6.0-fix-install-perms.patch
   # move /var/run -> /run for pid file
@@ -200,7 +200,7 @@ optdepends=('xdg-utils: xdg .desktop file support')
   rm -v ${pkgdir}/usr/share/cups/banners/*
   rm -v ${pkgdir}/usr/share/cups/data/testprint
   # comment out all conversion rules which use any of the removed filters
-  perl -p -i -e 's:^(.*\s+bannertops\s*)$:#\1:' /usr/share/cups/mime/mime.convs
+  perl -p -i -e 's:^(.*\s+bannertops\s*)$:#\1:' $pkgdir/usr/share/cups/mime/mime.convs
 
   # Provide native service for arch-daemons generator
   ln -s cups.service "$pkgdir/usr/lib/systemd/system/cupsd.service"
diff --git a/extra/cups/cups-1.6.2-statedir.patch b/extra/cups/cups-1.6.2-statedir.patch
index 3e836657d..c44ebed07 100644
--- a/extra/cups/cups-1.6.2-statedir.patch
+++ b/extra/cups/cups-1.6.2-statedir.patch
@@ -1,12 +1,12 @@
 diff -ruN cups-1.6.2.orig/config-scripts/cups-directories.m4 cups-1.6.2/config-scripts/cups-directories.m4
 --- cups-1.6.2.orig/config-scripts/cups-directories.m4	2012-10-01 03:55:23.000000000 +0200
 +++ cups-1.6.2/config-scripts/cups-directories.m4	2013-04-02 00:11:41.000000000 +0200
-@@ -429,7 +429,7 @@
- 		;;
- 	*)
- 		# All others
--		CUPS_STATEDIR="$localstatedir/run/cups"
-+		CUPS_STATEDIR="/run/cups"
- 		;;
- esac
+@@ -420,7 +420,7 @@
+ 			;;
+ 		*)
+ 			# All others
+-			CUPS_STATEDIR="$localstatedir/run/cups"
++			CUPS_STATEDIR="/run/cups"
+ 			;;
+ 	esac])
  AC_DEFINE_UNQUOTED(CUPS_STATEDIR, "$CUPS_STATEDIR")
diff --git a/extra/cups/cups-systemd-socket.patch b/extra/cups/cups-systemd-socket.patch
index 83fabdb4f..cfbe93354 100644
--- a/extra/cups/cups-systemd-socket.patch
+++ b/extra/cups/cups-systemd-socket.patch
@@ -1,7 +1,7 @@
-diff -up cups-1.6b1/config.h.in.systemd-socket cups-1.6b1/config.h.in
---- cups-1.6b1/config.h.in.systemd-socket	2012-05-17 00:57:03.000000000 +0200
-+++ cups-1.6b1/config.h.in	2012-05-28 11:16:35.657250584 +0200
-@@ -506,6 +506,13 @@
+diff -up cups-1.7rc1/config.h.in.systemd-socket cups-1.7rc1/config.h.in
+--- cups-1.7rc1/config.h.in.systemd-socket	2013-05-29 13:51:34.000000000 +0200
++++ cups-1.7rc1/config.h.in	2013-07-12 11:16:53.257546263 +0200
+@@ -451,6 +451,13 @@
  
  
  /*
@@ -15,9 +15,9 @@ diff -up cups-1.6b1/config.h.in.systemd-socket cups-1.6b1/config.h.in
   * Various scripting languages...
   */
  
-diff -up cups-1.6b1/config-scripts/cups-systemd.m4.systemd-socket cups-1.6b1/config-scripts/cups-systemd.m4
---- cups-1.6b1/config-scripts/cups-systemd.m4.systemd-socket	2012-05-28 11:16:35.658250577 +0200
-+++ cups-1.6b1/config-scripts/cups-systemd.m4	2012-05-28 11:16:35.658250577 +0200
+diff -up cups-1.7rc1/config-scripts/cups-systemd.m4.systemd-socket cups-1.7rc1/config-scripts/cups-systemd.m4
+--- cups-1.7rc1/config-scripts/cups-systemd.m4.systemd-socket	2013-07-12 11:16:53.257546263 +0200
++++ cups-1.7rc1/config-scripts/cups-systemd.m4	2013-07-12 11:16:53.257546263 +0200
 @@ -0,0 +1,36 @@
 +dnl
 +dnl "$Id$"
@@ -55,9 +55,9 @@ diff -up cups-1.6b1/config-scripts/cups-systemd.m4.systemd-socket cups-1.6b1/con
 +dnl
 +dnl "$Id$"
 +dnl
-diff -up cups-1.6b1/configure.in.systemd-socket cups-1.6b1/configure.in
---- cups-1.6b1/configure.in.systemd-socket	2012-04-23 19:26:57.000000000 +0200
-+++ cups-1.6b1/configure.in	2012-05-28 11:16:35.658250577 +0200
+diff -up cups-1.7rc1/configure.in.systemd-socket cups-1.7rc1/configure.in
+--- cups-1.7rc1/configure.in.systemd-socket	2013-07-08 23:15:13.000000000 +0200
++++ cups-1.7rc1/configure.in	2013-07-12 11:16:53.257546263 +0200
 @@ -33,6 +33,7 @@ sinclude(config-scripts/cups-pam.m4)
  sinclude(config-scripts/cups-largefile.m4)
  sinclude(config-scripts/cups-dnssd.m4)
@@ -66,20 +66,20 @@ diff -up cups-1.6b1/configure.in.systemd-socket cups-1.6b1/configure.in
  sinclude(config-scripts/cups-defaults.m4)
  sinclude(config-scripts/cups-scripting.m4)
  
-@@ -66,6 +67,9 @@ AC_OUTPUT(Makedefs
+@@ -67,6 +68,9 @@ AC_OUTPUT(Makedefs
  	  conf/snmp.conf
  	  cups-config
  	  data/testprint
-+          data/cups.service
-+          data/cups.socket
-+          data/cups.path
++	  data/cups.service
++	  data/cups.socket
++	  data/cups.path
  	  desktop/cups.desktop
+ 	  doc/help/ref-cups-files-conf.html
  	  doc/help/ref-cupsd-conf.html
- 	  doc/help/standard.html
-diff -up cups-1.6b1/cups/usersys.c.systemd-socket cups-1.6b1/cups/usersys.c
---- cups-1.6b1/cups/usersys.c.systemd-socket	2012-04-23 19:26:57.000000000 +0200
-+++ cups-1.6b1/cups/usersys.c	2012-05-28 11:16:35.659250570 +0200
-@@ -975,7 +975,7 @@ cups_read_client_conf(
+diff -up cups-1.7rc1/cups/usersys.c.systemd-socket cups-1.7rc1/cups/usersys.c
+--- cups-1.7rc1/cups/usersys.c.systemd-socket	2013-07-10 16:08:39.000000000 +0200
++++ cups-1.7rc1/cups/usersys.c	2013-07-12 11:16:53.258546249 +0200
+@@ -1046,7 +1046,7 @@ cups_read_client_conf(
      struct stat	sockinfo;		/* Domain socket information */
  
      if (!stat(CUPS_DEFAULT_DOMAINSOCKET, &sockinfo) &&
@@ -88,9 +88,9 @@ diff -up cups-1.6b1/cups/usersys.c.systemd-socket cups-1.6b1/cups/usersys.c
        cups_server = CUPS_DEFAULT_DOMAINSOCKET;
      else
  #endif /* CUPS_DEFAULT_DOMAINSOCKET */
-diff -up cups-1.6b1/data/cups.path.in.systemd-socket cups-1.6b1/data/cups.path.in
---- cups-1.6b1/data/cups.path.in.systemd-socket	2012-05-28 11:16:35.659250570 +0200
-+++ cups-1.6b1/data/cups.path.in	2012-05-28 11:16:35.659250570 +0200
+diff -up cups-1.7rc1/data/cups.path.in.systemd-socket cups-1.7rc1/data/cups.path.in
+--- cups-1.7rc1/data/cups.path.in.systemd-socket	2013-07-12 11:16:53.258546249 +0200
++++ cups-1.7rc1/data/cups.path.in	2013-07-12 11:16:53.258546249 +0200
 @@ -0,0 +1,8 @@
 +[Unit]
 +Description=CUPS Printer Service Spool
@@ -100,9 +100,9 @@ diff -up cups-1.6b1/data/cups.path.in.systemd-socket cups-1.6b1/data/cups.path.i
 +
 +[Install]
 +WantedBy=multi-user.target
-diff -up cups-1.6b1/data/cups.service.in.systemd-socket cups-1.6b1/data/cups.service.in
---- cups-1.6b1/data/cups.service.in.systemd-socket	2012-05-28 11:16:35.659250570 +0200
-+++ cups-1.6b1/data/cups.service.in	2012-05-28 11:16:35.659250570 +0200
+diff -up cups-1.7rc1/data/cups.service.in.systemd-socket cups-1.7rc1/data/cups.service.in
+--- cups-1.7rc1/data/cups.service.in.systemd-socket	2013-07-12 11:16:53.258546249 +0200
++++ cups-1.7rc1/data/cups.service.in	2013-07-12 11:16:53.258546249 +0200
 @@ -0,0 +1,10 @@
 +[Unit]
 +Description=CUPS Printing Service
@@ -114,9 +114,9 @@ diff -up cups-1.6b1/data/cups.service.in.systemd-socket cups-1.6b1/data/cups.ser
 +[Install]
 +Also=cups.socket cups.path
 +WantedBy=printer.target
-diff -up cups-1.6b1/data/cups.socket.in.systemd-socket cups-1.6b1/data/cups.socket.in
---- cups-1.6b1/data/cups.socket.in.systemd-socket	2012-05-28 11:16:35.660250563 +0200
-+++ cups-1.6b1/data/cups.socket.in	2012-05-28 11:16:35.660250563 +0200
+diff -up cups-1.7rc1/data/cups.socket.in.systemd-socket cups-1.7rc1/data/cups.socket.in
+--- cups-1.7rc1/data/cups.socket.in.systemd-socket	2013-07-12 11:16:53.259546235 +0200
++++ cups-1.7rc1/data/cups.socket.in	2013-07-12 11:16:53.259546235 +0200
 @@ -0,0 +1,8 @@
 +[Unit]
 +Description=CUPS Printing Service Sockets
@@ -126,9 +126,9 @@ diff -up cups-1.6b1/data/cups.socket.in.systemd-socket cups-1.6b1/data/cups.sock
 +
 +[Install]
 +WantedBy=sockets.target
-diff -up cups-1.6b1/data/Makefile.systemd-socket cups-1.6b1/data/Makefile
---- cups-1.6b1/data/Makefile.systemd-socket	2011-08-27 11:23:01.000000000 +0200
-+++ cups-1.6b1/data/Makefile	2012-05-28 11:16:35.660250563 +0200
+diff -up cups-1.7rc1/data/Makefile.systemd-socket cups-1.7rc1/data/Makefile
+--- cups-1.7rc1/data/Makefile.systemd-socket	2013-05-29 13:51:34.000000000 +0200
++++ cups-1.7rc1/data/Makefile	2013-07-12 11:16:53.259546235 +0200
 @@ -100,6 +100,12 @@ install-data:
  		$(INSTALL_DATA) $$file $(DATADIR)/ppdc; \
  	done
@@ -152,10 +152,10 @@ diff -up cups-1.6b1/data/Makefile.systemd-socket cups-1.6b1/data/Makefile
  
  
  #
-diff -up cups-1.6b1/Makedefs.in.systemd-socket cups-1.6b1/Makedefs.in
---- cups-1.6b1/Makedefs.in.systemd-socket	2012-05-28 11:16:35.648250647 +0200
-+++ cups-1.6b1/Makedefs.in	2012-05-28 11:16:35.660250563 +0200
-@@ -134,11 +134,13 @@ CXXFLAGS	=	@CPPFLAGS@ @CXXFLAGS@
+diff -up cups-1.7rc1/Makedefs.in.systemd-socket cups-1.7rc1/Makedefs.in
+--- cups-1.7rc1/Makedefs.in.systemd-socket	2013-07-12 11:16:53.246546416 +0200
++++ cups-1.7rc1/Makedefs.in	2013-07-12 11:17:49.327768742 +0200
+@@ -134,6 +134,7 @@ CXXFLAGS	=	@CPPFLAGS@ @CXXFLAGS@
  CXXLIBS		=	@CXXLIBS@
  DBUS_NOTIFIER	=	@DBUS_NOTIFIER@
  DBUS_NOTIFIERLIBS =	@DBUS_NOTIFIERLIBS@
@@ -163,13 +163,15 @@ diff -up cups-1.6b1/Makedefs.in.systemd-socket cups-1.6b1/Makedefs.in
  DNSSD_BACKEND	=	@DNSSD_BACKEND@
  DSOFLAGS	=	-L../cups @DSOFLAGS@
  DSOLIBS		=	@DSOLIBS@ $(COMMONLIBS)
- DNSSDLIBS	=	@DNSSDLIBS@
+@@ -141,6 +142,7 @@ DNSSDLIBS	=	@DNSSDLIBS@
+ IPPFIND_BIN	=	@IPPFIND_BIN@
+ IPPFIND_MAN	=	@IPPFIND_MAN@
  LAUNCHDLIBS	=	@LAUNCHDLIBS@
 +SDLIBS		=	@SDLIBS@
  LDFLAGS		=	-L../cgi-bin -L../cups -L../filter -L../ppdc \
  			-L../scheduler @LDARCHFLAGS@ \
  			@LDFLAGS@ @RELROFLAGS@ @PIEFLAGS@ $(OPTIM)
-@@ -229,6 +231,7 @@ PAMFILE		=	@PAMFILE@
+@@ -231,6 +233,7 @@ PAMFILE		=	@PAMFILE@
  
  DEFAULT_LAUNCHD_CONF =	@DEFAULT_LAUNCHD_CONF@
  DBUSDIR		=	@DBUSDIR@
@@ -177,9 +179,9 @@ diff -up cups-1.6b1/Makedefs.in.systemd-socket cups-1.6b1/Makedefs.in
  
  
  #
-diff -up cups-1.6b1/scheduler/client.h.systemd-socket cups-1.6b1/scheduler/client.h
---- cups-1.6b1/scheduler/client.h.systemd-socket	2012-03-22 21:30:20.000000000 +0100
-+++ cups-1.6b1/scheduler/client.h	2012-05-28 11:16:35.661250556 +0200
+diff -up cups-1.7rc1/scheduler/client.h.systemd-socket cups-1.7rc1/scheduler/client.h
+--- cups-1.7rc1/scheduler/client.h.systemd-socket	2013-05-29 13:51:34.000000000 +0200
++++ cups-1.7rc1/scheduler/client.h	2013-07-12 11:16:53.260546222 +0200
 @@ -77,6 +77,9 @@ typedef struct
    int			fd;		/* File descriptor for this server */
    http_addr_t		address;	/* Bind address of socket */
@@ -190,9 +192,9 @@ diff -up cups-1.6b1/scheduler/client.h.systemd-socket cups-1.6b1/scheduler/clien
  } cupsd_listener_t;
  
  
-diff -up cups-1.6b1/scheduler/listen.c.systemd-socket cups-1.6b1/scheduler/listen.c
---- cups-1.6b1/scheduler/listen.c.systemd-socket	2011-04-16 01:38:13.000000000 +0200
-+++ cups-1.6b1/scheduler/listen.c	2012-05-28 11:16:35.661250556 +0200
+diff -up cups-1.7rc1/scheduler/listen.c.systemd-socket cups-1.7rc1/scheduler/listen.c
+--- cups-1.7rc1/scheduler/listen.c.systemd-socket	2013-05-29 13:51:34.000000000 +0200
++++ cups-1.7rc1/scheduler/listen.c	2013-07-12 11:16:53.260546222 +0200
 @@ -401,7 +401,11 @@ cupsdStopListening(void)
         lis;
         lis = (cupsd_listener_t *)cupsArrayNext(Listeners))
@@ -206,9 +208,9 @@ diff -up cups-1.6b1/scheduler/listen.c.systemd-socket cups-1.6b1/scheduler/liste
      {
  #ifdef WIN32
        closesocket(lis->fd);
-diff -up cups-1.6b1/scheduler/main.c.systemd-socket cups-1.6b1/scheduler/main.c
---- cups-1.6b1/scheduler/main.c.systemd-socket	2012-05-28 11:16:35.612250897 +0200
-+++ cups-1.6b1/scheduler/main.c	2012-05-28 12:49:32.698375139 +0200
+diff -up cups-1.7rc1/scheduler/main.c.systemd-socket cups-1.7rc1/scheduler/main.c
+--- cups-1.7rc1/scheduler/main.c.systemd-socket	2013-07-12 11:16:53.212546887 +0200
++++ cups-1.7rc1/scheduler/main.c	2013-07-12 11:16:53.261546208 +0200
 @@ -26,6 +26,8 @@
   *   launchd_checkin()     - Check-in with launchd and collect the listening
   *                           fds.
@@ -229,7 +231,7 @@ diff -up cups-1.6b1/scheduler/main.c.systemd-socket cups-1.6b1/scheduler/main.c
  #if defined(HAVE_MALLOC_H) && defined(HAVE_MALLINFO)
  #  include <malloc.h>
  #endif /* HAVE_MALLOC_H && HAVE_MALLINFO */
-@@ -78,6 +84,9 @@
+@@ -83,6 +89,9 @@
  static void		launchd_checkin(void);
  static void		launchd_checkout(void);
  #endif /* HAVE_LAUNCHD */
@@ -239,7 +241,7 @@ diff -up cups-1.6b1/scheduler/main.c.systemd-socket cups-1.6b1/scheduler/main.c
  static void		parent_handler(int sig);
  static void		process_children(void);
  static void		sigchld_handler(int sig);
-@@ -528,6 +537,13 @@ main(int  argc,				/* I - Number of comm
+@@ -574,6 +583,13 @@ main(int  argc,				/* I - Number of comm
    }
  #endif /* HAVE_LAUNCHD */
  
@@ -253,7 +255,7 @@ diff -up cups-1.6b1/scheduler/main.c.systemd-socket cups-1.6b1/scheduler/main.c
   /*
    * Startup the server...
    */
-@@ -738,6 +754,15 @@ main(int  argc,				/* I - Number of comm
+@@ -762,6 +778,15 @@ main(int  argc,				/* I - Number of comm
  	}
  #endif /* HAVE_LAUNCHD */
  
@@ -269,7 +271,7 @@ diff -up cups-1.6b1/scheduler/main.c.systemd-socket cups-1.6b1/scheduler/main.c
         /*
          * Startup the server...
          */
-@@ -1516,6 +1541,102 @@ launchd_checkout(void)
+@@ -1511,6 +1536,102 @@ launchd_checkout(void)
  }
  #endif /* HAVE_LAUNCHD */
  
@@ -372,10 +374,10 @@ diff -up cups-1.6b1/scheduler/main.c.systemd-socket cups-1.6b1/scheduler/main.c
  
  /*
   * 'parent_handler()' - Catch USR1/CHLD signals...
-diff -up cups-1.6b1/scheduler/Makefile.systemd-socket cups-1.6b1/scheduler/Makefile
---- cups-1.6b1/scheduler/Makefile.systemd-socket	2012-05-21 19:40:22.000000000 +0200
-+++ cups-1.6b1/scheduler/Makefile	2012-05-28 11:16:35.663250542 +0200
-@@ -371,7 +371,7 @@ cupsd:	$(CUPSDOBJS) $(LIBCUPSMIME) ../cu
+diff -up cups-1.7rc1/scheduler/Makefile.systemd-socket cups-1.7rc1/scheduler/Makefile
+--- cups-1.7rc1/scheduler/Makefile.systemd-socket	2013-05-29 13:51:34.000000000 +0200
++++ cups-1.7rc1/scheduler/Makefile	2013-07-12 11:16:53.261546208 +0200
+@@ -381,7 +381,7 @@ cupsd:	$(CUPSDOBJS) $(LIBCUPSMIME) ../cu
  	$(CC) $(LDFLAGS) -o cupsd $(CUPSDOBJS) -L. -lcupsmime \
  		$(LIBZ) $(SSLLIBS) $(LIBSLP) $(LIBLDAP) $(PAMLIBS) \
  		$(LIBPAPER) $(LIBMALLOC) $(SERVERLIBS) $(DNSSDLIBS) $(LIBS) \
@@ -384,7 +386,7 @@ diff -up cups-1.6b1/scheduler/Makefile.systemd-socket cups-1.6b1/scheduler/Makef
  
  cupsd-static:	$(CUPSDOBJS) libcupsmime.a ../cups/$(LIBCUPSSTATIC)
  	echo Linking $@...
-@@ -379,7 +379,7 @@ cupsd-static:	$(CUPSDOBJS) libcupsmime.a
+@@ -389,7 +389,7 @@ cupsd-static:	$(CUPSDOBJS) libcupsmime.a
  		$(LIBZ) $(SSLLIBS) $(LIBSLP) $(LIBLDAP) $(PAMLIBS) \
  		../cups/$(LIBCUPSSTATIC) $(COMMONLIBS) $(LIBZ) $(LIBPAPER) \
  		$(LIBMALLOC) $(SERVERLIBS) $(DNSSDLIBS) $(LIBGSSAPI) \
diff --git a/extra/cyrus-sasl/PKGBUILD b/extra/cyrus-sasl/PKGBUILD
index 4fdfe49ad..a43d07e81 100644
--- a/extra/cyrus-sasl/PKGBUILD
+++ b/extra/cyrus-sasl/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 195995 2013-10-07 10:32:45Z jgc $
+# $Id: PKGBUILD 197903 2013-10-30 11:35:00Z allan $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 # This package spans multiple repositories. 
@@ -13,7 +13,7 @@ pkgdesc="Cyrus Simple Authentication Service Layer (SASL) library"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://cyrusimap.web.cmu.edu/"
 license=('custom')
-options=('!makeflags' '!libtool')
+options=('!makeflags')
 makedepends=('postgresql-libs' 'libmariadbclient' 'libldap' 'krb5' 'openssl' 'sqlite2')
 source=(ftp://ftp.cyrusimap.org/cyrus-sasl/cyrus-sasl-${pkgver}.tar.gz
         cyrus-sasl-2.1.22-qa.patch
diff --git a/extra/dbus-c++/PKGBUILD b/extra/dbus-c++/PKGBUILD
index 4ce19ebfa..ab849d69c 100644
--- a/extra/dbus-c++/PKGBUILD
+++ b/extra/dbus-c++/PKGBUILD
@@ -12,7 +12,6 @@ arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 depends=('dbus>=1.2.0' 'glib2')
 makedepends=('autoconf' 'automake' 'libtool')
-options=('!libtool')
 source=("http://sourceforge.net/projects/dbus-cplusplus/files/dbus-c%2B%2B/$pkgver/libdbus-c%2B%2B-$pkgver.tar.gz"
 	      'gcc47.patch')
 md5sums=('e752116f523fa88ef041e63d3dee4de2'
diff --git a/extra/dbus-glib/PKGBUILD b/extra/dbus-glib/PKGBUILD
index 54f4b7bda..19d74d3f7 100644
--- a/extra/dbus-glib/PKGBUILD
+++ b/extra/dbus-glib/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 179955 2013-03-13 11:59:13Z jgc $
+# $Id: PKGBUILD 197905 2013-10-30 11:35:42Z allan $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=dbus-glib
@@ -10,7 +10,7 @@ license=('GPL')
 url="http://www.freedesktop.org/wiki/Software/DBusBindings"
 depends=('dbus-core' 'glib2')
 makedepends=('pkgconfig')
-options=('!libtool' '!emptydirs')
+options=('!emptydirs')
 source=(http://dbus.freedesktop.org/releases/${pkgname}/${pkgname}-${pkgver}.tar.gz)
 md5sums=('ad0920c7e3aad669163bb59171cf138e')
 
diff --git a/extra/dbus-python/PKGBUILD b/extra/dbus-python/PKGBUILD
index 58fdb28b5..a9cc0efe1 100644
--- a/extra/dbus-python/PKGBUILD
+++ b/extra/dbus-python/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 188645 2013-06-17 09:56:29Z jgc $
+# $Id: PKGBUILD 197906 2013-10-30 11:36:04Z allan $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgbase=dbus-python
@@ -10,7 +10,6 @@ arch=('i686' 'x86_64' 'mips64el')
 license=('GPL' 'LGPL')
 url="http://www.freedesktop.org/wiki/Software/DBusBindings"
 makedepends=('docutils' 'dbus-glib' 'python' 'python2')
-options=('!libtool')
 source=(http://dbus.freedesktop.org/releases/${pkgbase}/${pkgbase}-${pkgver}.tar.gz)
 md5sums=('b09cd2d1a057cc432ce944de3fc06bf7')
 
diff --git a/extra/devhelp/PKGBUILD b/extra/devhelp/PKGBUILD
index a2f70e87c..0e8d89453 100644
--- a/extra/devhelp/PKGBUILD
+++ b/extra/devhelp/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 196026 2013-10-07 11:50:39Z jgc $
+# $Id: PKGBUILD 197908 2013-10-30 11:36:47Z allan $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Contributor: Jan de Groot <jgc@archlinux.org>
 # Contributor: Link Dupont <link@subpop.net>
@@ -12,7 +12,7 @@ license=(GPL)
 url="http://live.gnome.org/devhelp/"
 depends=(webkitgtk hicolor-icon-theme)
 makedepends=(pkgconfig intltool python)
-options=('!libtool' '!emptydirs')
+options=('!emptydirs')
 install=devhelp.install
 groups=('gnome-extra')
 source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
diff --git a/extra/diffstat/PKGBUILD b/extra/diffstat/PKGBUILD
index 86349c855..0caa7aecf 100644
--- a/extra/diffstat/PKGBUILD
+++ b/extra/diffstat/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 183251 2013-04-19 14:34:26Z giovanni $
+# $Id: PKGBUILD 198590 2013-10-30 15:58:57Z giovanni $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Matthias-Christian Ott <matthias.christian.at.tiscali.de>
 
 pkgname=diffstat
-pkgver=1.57
+pkgver=1.58
 pkgrel=1
 pkgdesc="Display a histogram of diff changes"
 arch=('i686' 'x86_64' 'mips64el')
@@ -11,7 +11,7 @@ url="http://invisible-island.net/diffstat"
 depends=('glibc')
 license=('MIT')
 source=("ftp://invisible-island.net/${pkgname}/${pkgname}-${pkgver}.tgz")
-md5sums=('a70ae35e479ab91da7eb6023a4e9240a')
+md5sums=('6d6e13f7dcfe4db5da65c5175260ea47')
 
 build () {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/digikam/PKGBUILD b/extra/digikam/PKGBUILD
index 89ea54bca..72e6e9e6a 100644
--- a/extra/digikam/PKGBUILD
+++ b/extra/digikam/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 195970 2013-10-06 19:03:45Z ronald $
+# $Id: PKGBUILD 196619 2013-10-15 19:42:35Z ronald $
 # Maintainer: Ronald van Haren <ronald@archlinux.org>
 # Contributor: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Tobias Powalowski <tpowa@archlinux.org>
 
 pkgbase=digikam
 pkgname=('digikam' 'kipi-plugins' 'libkface' 'libkgeomap' 'libkvkontakte' 'libmediawiki')
-pkgver=3.4.0
+pkgver=3.5.0
 pkgrel=1
 pkgdesc="Digital photo management application for KDE"
 arch=('i686' 'x86_64' 'mips64el')
@@ -15,7 +15,7 @@ makedepends=('kdepimlibs' 'libkexiv2' 'libkdcraw' 'libkipi' 'libksane' 'liblqr'
              'kdeedu-marble' 'opencv' 'boost' 'libgpod' 'qjson' 'hugin' 'libgphoto2'
              'cmake' 'automoc4' 'doxygen' 'lensfun' 'qt-gstreamer' 'imagemagick')
 source=("http://download.kde.org/stable/${pkgname}/${pkgname}-${pkgver}.tar.bz2")
-sha1sums=('9ed0ef7a7eda8660edf44b1e89354f110e487373')
+sha1sums=('9e44fcf219312cbcbbaee0cc9a7f460a01769224')
 
 prepare() {
   mkdir build
diff --git a/extra/djvulibre/PKGBUILD b/extra/djvulibre/PKGBUILD
index 5bea5a600..c08cc767c 100644
--- a/extra/djvulibre/PKGBUILD
+++ b/extra/djvulibre/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 166638 2012-09-14 01:48:24Z bisson $
+# $Id: PKGBUILD 197909 2013-10-30 11:37:09Z allan $
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: mgushee
@@ -11,7 +11,6 @@ pkgdesc="Suite to create, manipulate and view DjVu ('déjà vu') documents"
 url='http://djvu.sourceforge.net/'
 arch=("i686" "x86_64" 'mips64el')
 license=('GPL2')
-options=('!libtool')
 makedepends=('librsvg')
 depends=('libtiff' 'hicolor-icon-theme')
 source=("http://downloads.sourceforge.net/project/djvu/DjVuLibre/${_major}/djvulibre-${pkgver}.tar.gz")
diff --git a/extra/dmapi/PKGBUILD b/extra/dmapi/PKGBUILD
index 43f43cc5f..482ff364a 100644
--- a/extra/dmapi/PKGBUILD
+++ b/extra/dmapi/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 175121 2013-01-14 07:38:26Z tpowa $
+# $Id: PKGBUILD 197910 2013-10-30 11:37:30Z allan $
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 
 pkgname=dmapi
 pkgver=2.2.12
-pkgrel=1
+pkgrel=2
 pkgdesc="Data migration API"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://oss.sgi.com/projects/xfs/"
@@ -13,7 +13,6 @@ makedepends=('xfsprogs')
 provides=('xfsdmapi')
 conflicts=('xfsdmapi')
 replaces=('xfsdmapi')
-options=('!libtool')
 source=("ftp://oss.sgi.com/projects/xfs/cmd_tars/$pkgname-$pkgver.tar.gz")
 
 build() {
diff --git a/extra/dnsmasq/0001-Fix-check-for-local-domains-in-CNAME-case.-Fixes-d56.patch b/extra/dnsmasq/0001-Fix-check-for-local-domains-in-CNAME-case.-Fixes-d56.patch
new file mode 100644
index 000000000..866b3e8d9
--- /dev/null
+++ b/extra/dnsmasq/0001-Fix-check-for-local-domains-in-CNAME-case.-Fixes-d56.patch
@@ -0,0 +1,49 @@
+From 7b174c250df2bc97b503fd03b9e473998676b1a6 Mon Sep 17 00:00:00 2001
+From: Simon Kelley <simon@thekelleys.org.uk>
+Date: Mon, 28 Oct 2013 13:14:03 +0000
+Subject: [PATCH] Fix check for local domains in CNAME case. Fixes
+ d56a604a9600c08d4a863527d549713c07f0186d
+
+---
+ src/cache.c   | 2 +-
+ src/rfc1035.c | 4 ++--
+ 2 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/src/cache.c b/src/cache.c
+index d99aba6..6c5f601 100644
+--- a/src/cache.c
++++ b/src/cache.c
+@@ -330,7 +330,7 @@ static int cache_scan_free(char *name, struct all_addr *addr, time_t now, unsign
+ 		 ((flags & crecp->flags & F_TYPE) || ((crecp->flags | flags) & F_CNAME)) &&
+ 		 hostname_isequal(cache_get_name(crecp), name))
+ 	  {
+-	    if (crecp->flags & (F_HOSTS | F_DHCP))
++	    if (crecp->flags & (F_HOSTS | F_DHCP | F_CONFIG))
+ 	      return 0;
+ 	    *up = crecp->hash_next;
+ 	    cache_unlink(crecp);
+diff --git a/src/rfc1035.c b/src/rfc1035.c
+index fc6d09c..ff97576 100644
+--- a/src/rfc1035.c
++++ b/src/rfc1035.c
+@@ -1221,7 +1221,7 @@ int check_for_local_domain(char *name, time_t now)
+   struct naptr *naptr;
+ 
+   if ((crecp = cache_find_by_name(NULL, name, now, F_IPV4 | F_IPV6 | F_CNAME)) &&
+-      (crecp->flags & (F_HOSTS | F_DHCP)))
++      (crecp->flags & (F_HOSTS | F_DHCP | F_CONFIG)))
+     return 1;
+   
+   for (naptr = daemon->naptr; naptr; naptr = naptr->next)
+@@ -1861,7 +1861,7 @@ size_t answer_request(struct dns_header *header, char *limit, size_t qlen,
+ 	  if (qtype == T_CNAME || qtype == T_ANY)
+ 	    {
+ 	      if ((crecp = cache_find_by_name(NULL, name, now, F_CNAME)) &&
+-		  (qtype == T_CNAME || (crecp->flags & (F_HOSTS | F_DHCP))))
++		  (qtype == T_CNAME || (crecp->flags & (F_HOSTS | F_DHCP | F_CONFIG))))
+ 		{
+ 		  ans = 1;
+ 		  if (!dryrun)
+-- 
+1.8.4.2
+
diff --git a/extra/dnsmasq/0001-Fix-failure-to-start-with-ENOTSOCK.patch b/extra/dnsmasq/0001-Fix-failure-to-start-with-ENOTSOCK.patch
deleted file mode 100644
index 99f084930..000000000
--- a/extra/dnsmasq/0001-Fix-failure-to-start-with-ENOTSOCK.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From cfcad42ff1ddee8e64d120f18016a654152d0215 Mon Sep 17 00:00:00 2001
-From: Simon Kelley <simon@thekelleys.org.uk>
-Date: Fri, 17 May 2013 11:32:03 +0100
-Subject: [PATCH] Fix failure to start with ENOTSOCK
-
----
- CHANGELOG     | 6 ++++++
- src/dnsmasq.c | 2 +-
- 2 files changed, 7 insertions(+), 1 deletion(-)
-
-diff --git a/src/dnsmasq.c b/src/dnsmasq.c
-index 43b8cb1..b0f984d 100644
---- a/src/dnsmasq.c
-+++ b/src/dnsmasq.c
-@@ -248,7 +248,7 @@ int main (int argc, char **argv)
- #endif
- 
- #if defined(HAVE_LINUX_NETWORK) && defined(HAVE_DHCP6)
--      if (daemon->dhcp6)
-+      if (daemon->doing_dhcp6)
- 	bindtodevice(daemon->dhcp6fd);
- #endif
-     }
--- 
-1.8.3.2
-
diff --git a/extra/dnsmasq/0001-Fix-wrong-size-in-memset-call.patch b/extra/dnsmasq/0001-Fix-wrong-size-in-memset-call.patch
deleted file mode 100644
index 05223cdb2..000000000
--- a/extra/dnsmasq/0001-Fix-wrong-size-in-memset-call.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 71aaad9f663efda7032e27c201a7025ff6332a2d Mon Sep 17 00:00:00 2001
-From: Simon Kelley <simon@thekelleys.org.uk>
-Date: Thu, 18 Apr 2013 09:47:49 +0100
-Subject: [PATCH] Fix wrong size in memset() call.
-
-Thanks to Dave Reisner.
----
- src/ipset.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/ipset.c b/src/ipset.c
-index a34ed96..f175fa4 100644
---- a/src/ipset.c
-+++ b/src/ipset.c
-@@ -110,7 +110,7 @@ static int new_add_to_ipset(const char *setname, const struct all_addr *ipaddr,
-       return -1;
-     }
-   
--  memset(buffer, 0, sizeof(buffer));
-+  memset(buffer, 0, BUFF_SZ);
- 
-   nlh = (struct nlmsghdr *)buffer;
-   nlh->nlmsg_len = NL_ALIGN(sizeof(struct nlmsghdr));
--- 
-1.8.2.1
-
diff --git a/extra/dnsmasq/PKGBUILD b/extra/dnsmasq/PKGBUILD
index 590be4a7a..77d3c138d 100644
--- a/extra/dnsmasq/PKGBUILD
+++ b/extra/dnsmasq/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 189772 2013-07-07 19:08:06Z dreisner $
+# $Id: PKGBUILD 198525 2013-10-30 15:23:36Z dreisner $
 # Maintainer: Dave Reisner <dreisner@archlinux.org>
 # Contributor: Paul Mattal <paul@archlinux.org>
 # Contributor: Tom Newsom <Jeepster@gmx.co.uk>
 
 pkgname=dnsmasq
-pkgver=2.66
+pkgver=2.67
 pkgrel=2
 pkgdesc="Lightweight, easy to configure DNS forwarder and DHCP server"
 url="http://www.thekelleys.org.uk/dnsmasq/doc.html"
@@ -14,28 +14,25 @@ depends=('glibc' 'dbus-core')
 install=$pkgname.install
 backup=('etc/dnsmasq.conf')
 source=("http://www.thekelleys.org.uk/$pkgname/$pkgname-$pkgver.tar.xz"
-        '0001-Fix-wrong-size-in-memset-call.patch'
-        '0001-Fix-failure-to-start-with-ENOTSOCK.patch'
+        '0001-Fix-check-for-local-domains-in-CNAME-case.-Fixes-d56.patch'
         'dnsmasq.service')
-md5sums=('cd1c70dd66d2e3ad02b66ca6af4ebf20'
-         '05ccefefde68ebdebce5e40d2b3c78be'
-         '98cc950a6b0482eb7e61969dafb4f764'
+md5sums=('3560068c6cc644a01924fa089a70bb9c'
+         '38bcc0c2b8dbc480e58a3478cae34bf6'
          '7ac45726cabef4145db40d758cc7fedf')
 
 prepare() {
   cd "$pkgname-$pkgver"
 
-  patch -Np1 <"$srcdir/0001-Fix-wrong-size-in-memset-call.patch"
-  patch -Np1 <"$srcdir/0001-Fix-failure-to-start-with-ENOTSOCK.patch"
+  # link against dbus. this ugliness is needed to ensure that the
+  # compile time opts report properly on startup. yuck.
+  sed -i '/^#ifdef DNSMASQ_COMPILE_OPTS/ i#define HAVE_DBUS' src/config.h
+
+  patch -Np1 <"$srcdir/0001-Fix-check-for-local-domains-in-CNAME-case.-Fixes-d56.patch"
 }
 
 build() {
   cd "$pkgname-$pkgver"
 
-  # link against dbus. this ugliness is needed to ensure that the
-  # compile time opts report properly on startup. yuck.
-  sed -i '/^#ifdef DNSMASQ_COMPILE_OPTS/ i#define HAVE_DBUS' src/config.h
-
   make "CFLAGS=$CPPFLAGS $CFLAGS" "LDFLAGS=$LDFLAGS"
 }
 
diff --git a/extra/dotconf/PKGBUILD b/extra/dotconf/PKGBUILD
index dbc7803df..276907d41 100644
--- a/extra/dotconf/PKGBUILD
+++ b/extra/dotconf/PKGBUILD
@@ -1,29 +1,27 @@
-# $Id: PKGBUILD 149587 2012-02-08 15:12:44Z andrea $
+# $Id: PKGBUILD 197652 2013-10-27 18:25:32Z eric $
 # Maintainer:
 # Contributor: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Chris Brannon <cmbrannon@cox.net>
 
 pkgname=dotconf
 pkgver=1.3
-pkgrel=3.1
+pkgrel=4
 pkgdesc='A C library for parsing configuration files'
-url="https://github.com/williamh/dotconf"
 arch=('i686' 'x86_64' 'mips64el')
-depends=('glibc')
-makedepends=('pkgconfig' 'findutils')
+url="https://github.com/williamh/dotconf"
 license=('LGPL2.1')
+depends=('glibc')
 source=(${pkgname}-${pkgver}.tar.gz::"https://github.com/williamh/${pkgname}/tarball/v${pkgver}")
 md5sums=('36bfdde245072fc2f4f5766b7db97c45')
-options=('!libtool')
 
 build() {
-  cd "${srcdir}"/williamh-${pkgname}-4cd7b3a
+  cd williamh-${pkgname}-4cd7b3a
   autoreconf -i
   ./configure --prefix=/usr
   make
 }
 
 package() {
-  cd "${srcdir}"/williamh-${pkgname}-4cd7b3a
+  cd williamh-${pkgname}-4cd7b3a
   make DESTDIR="${pkgdir}" install
 }
diff --git a/extra/dovecot/PKGBUILD b/extra/dovecot/PKGBUILD
index a69f783e9..3460f6d90 100644
--- a/extra/dovecot/PKGBUILD
+++ b/extra/dovecot/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 195140 2013-09-25 15:41:44Z andyrtr $
+# $Id: PKGBUILD 198783 2013-11-04 13:57:54Z andyrtr $
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 # Contributor: Paul Mattal <paul@mattal.com>
 # Contributor: Federico Quagliata (quaqo) <quaqo@despammed.com>
@@ -8,28 +8,27 @@
 # --->>> remember to rebuild/bump pigeonhole in one step <<<---
 
 pkgname=dovecot
-pkgver=2.2.6
+pkgver=2.2.7
 pkgrel=1
 pkgdesc="An IMAP and POP3 server written with security primarily in mind"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://dovecot.org/"
 license=("LGPL")
-depends=('krb5' 'openssl' 'sqlite>=3.7.5' 'libmariadbclient'
-        'postgresql-libs>=9.0.3' 'bzip2' 'expat' 'curl')
-makedepends=('pam>=1.1.1' 'libcap>=2.19' 'libldap>=2.4.22' 'clucene')
+depends=('krb5' 'openssl' 'sqlite' 'libmariadbclient'
+        'postgresql-libs' 'bzip2' 'expat' 'curl')
+makedepends=('pam' 'libcap' 'libldap' 'clucene')
 optdepends=('libldap: ldap plugin'
            'clucene: alternative FTS indexer')
 provides=('imap-server' 'pop3-server')
-options=('!libtool')
 install=$pkgname.install
 source=(http://dovecot.org/releases/2.2/${pkgname}-${pkgver}.tar.gz{,.sig}
         dovecot.tmpfilesd)
-md5sums=('db65988ef2e6889dd8b49c132b21fc8f'
+md5sums=('d2c7c83acc21f3dcab652868d40522e0'
          'SKIP'
          '342a28251d40f983c98c0d1f1bf3d07d')
 
 build() {
-  cd ${srcdir}/$pkgname-$pkgver
+  cd $pkgname-$pkgver
 
   # fix build with recent clucene (FC)
 #  sed -i '/DEFAULT_INCLUDES *=/s|$| '"$(pkg-config --cflags libclucene-core)|" src/plugins/fts-lucene/Makefile.in
@@ -63,12 +62,12 @@ build() {
 }
 
 check() {
-  cd "$srcdir/$pkgname-$pkgver"
+  cd $pkgname-$pkgver
   make -k check
 }
 
 package() {
-  cd ${srcdir}/$pkgname-$pkgver
+  cd $pkgname-$pkgver
   make DESTDIR=${pkgdir} install
 
   # install example conf files and ssl.conf
diff --git a/extra/dssi/PKGBUILD b/extra/dssi/PKGBUILD
index ba3691e76..c67d67d7a 100644
--- a/extra/dssi/PKGBUILD
+++ b/extra/dssi/PKGBUILD
@@ -1,19 +1,18 @@
-# $Id: PKGBUILD 196279 2013-10-10 13:13:50Z schiv $
+# $Id: PKGBUILD 197528 2013-10-26 14:48:17Z schiv $
 # Maintainer: Ray Rashif <schiv@archlinux.org>
 # Contributor: damir <damir@archlinux.org>
 # Contributor: Pajaro
 
 pkgname=dssi
 pkgver=1.1.1
-pkgrel=4
+pkgrel=5
 pkgdesc="An API for audio processing plugins & softsynths with UIs"
 arch=(i686 x86_64 'mips64el')
 url="http://dssi.sourceforge.net/"
 license=('LGPL' 'BSD' 'custom')
-depends=('liblo' 'jack')
+depends=('liblo>=1:0.26' 'liblo<1:0.27' 'jack')
 makedepends=('ladspa' 'qt4')
 optdepends=('qt4: example plugins')
-options=('!libtool')
 source=("http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz"
         'license.txt')
 md5sums=('619ab73c883b02dc37ddb37001591f8b'
diff --git a/extra/e_dbus/PKGBUILD b/extra/e_dbus/PKGBUILD
index 4501c3f87..6f7a0c80e 100644
--- a/extra/e_dbus/PKGBUILD
+++ b/extra/e_dbus/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 193666 2013-08-26 20:17:24Z ronald $
+# $Id: PKGBUILD 197914 2013-10-30 11:39:08Z allan $
 # Maintainer: Ronald van Haren <ronald@archlinux.org>
 # Contributor: Gustavo Sverzut Barbieri <barbieri@gmail.com>
 
@@ -10,7 +10,7 @@ arch=('i686' 'x86_64' 'mips64el')
 url="http://www.enlightenment.org"
 license=('BSD')
 depends=('ecore' 'dbus-core')
-options=('!libtool' '!emptydirs')
+options=('!emptydirs')
 source=(http://download.enlightenment.org/releases/$pkgname-$pkgver.tar.gz)
 sha1sums=('726b2c4259e8818921ce0c27a3d452d414255975')
 
diff --git a/extra/eclipse/PKGBUILD b/extra/eclipse/PKGBUILD
index 99cb155ef..97b79178d 100644
--- a/extra/eclipse/PKGBUILD
+++ b/extra/eclipse/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 191838 2013-07-31 09:34:14Z ioni $
+# $Id: PKGBUILD 198727 2013-11-02 10:00:23Z ioni $
 # Maintainer : Ionut Biru <ibiru@archlinux.org>
 # Contributor: Paul Mattal <paul@archlinux.org>
 # Contributor: Andrew Wright <andreww@photism.org>
@@ -6,37 +6,39 @@
 # Contributor: Marco Crosio <marco.crosio@gmail.com>
 
 pkgname=eclipse
-pkgver=4.3
-pkgrel=1
-_date=201306052000
+pkgver=4.3.1
+pkgrel=2
+_date=201309111000
 pkgdesc="An IDE for Java and other languages"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://eclipse.org"
 depends=('java-environment' 'gtk2' 'unzip' 'webkitgtk2' 'libxtst')
 install=${pkgname}.install
 makedepends=('zip')
-license=("EPL/1.1")
+license=("EPL/1.0")
 source=("ftp://ftp.osuosl.org/pub/eclipse/eclipse/downloads/drops4/R-$pkgver-${_date}/$pkgname-SDK-$pkgver-linux-gtk.tar.gz"
 	 'eclipse.sh' 'eclipse.desktop' 'eclipse.svg')
-md5sums=('8046626198b529c2e292022c39c18262'
+md5sums=('04880311281ff9de71a7d1def630b29e'
          '7ea99a30fbaf06ec29261541b8eb1e23'
          'ba2cf02c48e6e35bfe3685401c26bb5b'
          '77cff7543ccf7e177cb6667f5a20ce19')
 [ "$CARCH" = "x86_64" ] && source[0]="ftp://ftp.osuosl.org/pub/eclipse/eclipse/downloads/drops4/R-$pkgver-${_date}/$pkgname-SDK-$pkgver-linux-gtk-$CARCH.tar.gz"
-[ "$CARCH" = "x86_64" ] && md5sums[0]='8dba840856c5ca38b3c08ebac9a47cb8'
+[ "$CARCH" = "x86_64" ] && md5sums[0]='61e44d550751d3b176fbe56dd0f75060'
 
 package() {
   # install eclipse
-  install -m755 -d "$pkgdir/usr/share"
+  install -m755 -d "$pkgdir/usr/share/licenses/eclipse/"
   mv eclipse "$pkgdir/usr/share/"
 
   # install misc
   install -d $pkgdir/usr/bin $pkgdir/usr/share/applications \
-    $pkgdir/usr/share/icons/hicolor/{16x16,32x32,48x48,256x256}/apps
+    $pkgdir/usr/share/icons/hicolor/apps
   install -m755 eclipse.sh "$pkgdir/usr/bin/eclipse"
   install -m644 eclipse.desktop "$pkgdir/usr/share/applications/"
   # install icon
   install -Dm644 "$srcdir"/eclipse.svg \
     "$pkgdir"/usr/share/icons/hicolor/scalable/apps/eclipse.svg
   sed -i "s|#!/usr/bin/python|#!/usr/bin/python2|" "$pkgdir"/usr/share/eclipse/plugins/org.apache.ant_1.8.4.v201303080030/bin/runant.py
+
+  mv $pkgdir/usr/share/eclipse/epl-v10.html "$pkgdir/usr/share/licenses/eclipse/epl-v10.html"
 }
diff --git a/extra/ecore/PKGBUILD b/extra/ecore/PKGBUILD
index 810132ac2..45142b428 100644
--- a/extra/ecore/PKGBUILD
+++ b/extra/ecore/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 193658 2013-08-26 20:14:53Z ronald $
+# $Id: PKGBUILD 197913 2013-10-30 11:38:44Z allan $
 # Maintainer: Ronald van Haren <ronald@archlinux.org>
 # Contributor: Gustavo Sverzut Barbieri <barbieri@gmail.com>
 
@@ -12,7 +12,7 @@ license=('BSD')
 depends=('eina' 'evas' 'glib2' 'libxp' 'curl' 'libxss' 'libxtst'
   'libxcomposite' 'libxrandr' 'libxinerama' 'libxcursor')
 makedepends=('subversion')
-options=('!libtool' '!emptydirs')
+options=('!emptydirs')
 source=(http://download.enlightenment.org/releases/$pkgname-$pkgver.tar.gz)
 sha1sums=('8b8c88a211cb80bb19284560d8d481979ae0c111')
 
diff --git a/extra/edje/PKGBUILD b/extra/edje/PKGBUILD
index a2c20b2cf..5e3bd5201 100644
--- a/extra/edje/PKGBUILD
+++ b/extra/edje/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 193662 2013-08-26 20:16:08Z ronald $
+# $Id: PKGBUILD 197915 2013-10-30 11:39:30Z allan $
 # Maintainer: Ronald van Haren <ronald@archlinux.org>
 # Contributor: Gustavo Sverzut Barbieri <barbieri@gmail.com>
 
@@ -12,7 +12,7 @@ license=('BSD')
 depends=('eina' 'ecore' 'evas' 'eio' 'lua' 'shared-mime-info' 'embryo')
 optdepends=('python2: inkscape2edc')
 install=edje.install
-options=('!libtool' '!emptydirs')
+options=('!emptydirs')
 source=(http://download.enlightenment.org/releases/$pkgname-$pkgver.tar.gz)
 sha1sums=('3fbff1d0b8473a0498ccee44745cf6609d73005e')
 
diff --git a/extra/eet/PKGBUILD b/extra/eet/PKGBUILD
index 0d8042cc9..0ae8c9a15 100644
--- a/extra/eet/PKGBUILD
+++ b/extra/eet/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 193655 2013-08-26 20:13:56Z ronald $
+# $Id: PKGBUILD 197916 2013-10-30 11:39:51Z allan $
 # Maintainer: Ronald van Haren <ronald.archlinux.org>
 # Contributor: Ronald van Haren <ronald.archlinux.org>
 
@@ -10,7 +10,6 @@ arch=('i686' 'x86_64' 'mips64el')
 url="http://www.enlightenment.org"
 license=('BSD')
 depends=('libjpeg>=7' 'openssl' 'eina')
-options=(!libtool)
 source=(http://download.enlightenment.org/releases/$pkgname-$pkgver.tar.gz)
 sha1sums=('d68e17fb155954c7d524cdba98244c09ae511513')
 
diff --git a/extra/eeze/PKGBUILD b/extra/eeze/PKGBUILD
index 99dc2bbc4..065670409 100644
--- a/extra/eeze/PKGBUILD
+++ b/extra/eeze/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 193660 2013-08-26 20:15:37Z ronald $
+# $Id: PKGBUILD 197917 2013-10-30 11:40:11Z allan $
 # Maintainer: Ronald van Haren <ronald@archlinux.org>
 # Contributor: Gustavo Sverzut Barbieri <barbieri@gmail.com>
 
@@ -10,7 +10,7 @@ arch=('i686' 'x86_64' 'mips64el')
 url="http://www.enlightenment.org"
 license=('BSD')
 depends=('ecore' 'eina' 'udev')
-options=('!libtool' '!emptydirs')
+options=('!emptydirs')
 source=(http://download.enlightenment.org/releases/$pkgname-$pkgver.tar.gz)
 sha1sums=('86a552cbdbbb7e8d968083b2c2429e0df60a6a68')
 
diff --git a/extra/efreet/PKGBUILD b/extra/efreet/PKGBUILD
index 63a0ab43e..05acd07e9 100644
--- a/extra/efreet/PKGBUILD
+++ b/extra/efreet/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 193665 2013-08-26 20:17:07Z ronald $
+# $Id: PKGBUILD 197918 2013-10-30 11:40:35Z allan $
 # Maintainer: Ronald van Haren <ronald@archlinux.org>
 # Contributor: Gustavo Sverzut Barbieri <barbieri@gmail.com>
 
@@ -10,7 +10,7 @@ arch=('i686' 'x86_64' 'mips64el')
 url="http://www.enlightenment.org"
 license=('BSD')
 depends=('eina' 'ecore' 'e_dbus')
-options=('!libtool' '!emptydirs')
+options=('!emptydirs')
 source=(http://download.enlightenment.org/releases/$pkgname-$pkgver.tar.gz)
 sha1sums=('5981bf49149366b15618050af3a65d6cf145c827')
 
diff --git a/extra/eina/PKGBUILD b/extra/eina/PKGBUILD
index c3f3288ae..d5ed2d79b 100644
--- a/extra/eina/PKGBUILD
+++ b/extra/eina/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 193654 2013-08-26 20:13:37Z ronald $
+# $Id: PKGBUILD 197919 2013-10-30 11:40:55Z allan $
 # Maintainer: Ronald van Haren <ronald.archlinux.org>
 # Contributor: Ronald van Haren <ronald.archlinux.org>
 
@@ -10,7 +10,7 @@ arch=('i686' 'x86_64' 'mips64el')
 url="http://www.enlightenment.org"
 license=('LGPL2.1')
 depends=('glibc')
-options=('!libtool' '!emptydirs')
+options=('!emptydirs')
 source=(http://download.enlightenment.org/releases/$pkgname-$pkgver.tar.gz)
 sha1sums=('f655b2691d3976fdc2cfe116166e790c1b8bc90d')
 
diff --git a/extra/eio/PKGBUILD b/extra/eio/PKGBUILD
index 5c1c387c6..92a99628b 100644
--- a/extra/eio/PKGBUILD
+++ b/extra/eio/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 193659 2013-08-26 20:15:22Z ronald $
+# $Id: PKGBUILD 197920 2013-10-30 11:41:16Z allan $
 # Maintainer: Ronald van Haren <ronald@archlinux.org>
 # Contributor: Gustavo Sverzut Barbieri <barbieri@gmail.com>
 
@@ -10,7 +10,7 @@ arch=('i686' 'x86_64' 'mips64el')
 url="http://www.enlightenment.org"
 license=('BSD')
 depends=('ecore')
-options=('!libtool' '!emptydirs')
+options=('!emptydirs')
 source=(http://download.enlightenment.org/releases/$pkgname-$pkgver.tar.gz)
 sha1sums=('75425d2ddd6ddc7a7f668e4f92c43e9d72d057ed')
 
diff --git a/extra/ekiga/PKGBUILD b/extra/ekiga/PKGBUILD
index a2c0f7f81..a01acdab7 100644
--- a/extra/ekiga/PKGBUILD
+++ b/extra/ekiga/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 196027 2013-10-07 11:50:40Z jgc $
+# $Id: PKGBUILD 197921 2013-10-30 11:41:41Z allan $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: Tom K <tomk@runbox.com>
 
 pkgname=ekiga
 pkgver=4.0.1
-pkgrel=6
+pkgrel=7
 pkgdesc="VOIP/Videoconferencing app with full SIP and H.323 support (GnomeMeeting expanded and renamed)"
 url="http://www.ekiga.org"
 license=(GPL)
diff --git a/extra/elementary/PKGBUILD b/extra/elementary/PKGBUILD
index a7cddd47f..80c30a3fa 100644
--- a/extra/elementary/PKGBUILD
+++ b/extra/elementary/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 193667 2013-08-26 20:17:40Z ronald $
+# $Id: PKGBUILD 197922 2013-10-30 11:42:01Z allan $
 # Maintainer: Ronald van Haren <ronald@archlinux.org>
 # Contributor: Gustavo Sverzut Barbieri <barbieri@gmail.com>
 
@@ -10,7 +10,7 @@ arch=('i686' 'x86_64' 'mips64el')
 url="http://www.enlightenment.org"
 license=('BSD')
 depends=('edje' 'e_dbus' 'efreet' 'ethumb' 'eio')
-options=('!libtool' '!emptydirs')
+options=('!emptydirs')
 source=(http://download.enlightenment.org/releases/$pkgname-$pkgver.tar.gz)
 sha1sums=('5cae29bd8310691fbf459ce9132264dcef8338ed')
 
diff --git a/extra/elfutils/PKGBUILD b/extra/elfutils/PKGBUILD
index ef98832e7..9dbfe8f1c 100644
--- a/extra/elfutils/PKGBUILD
+++ b/extra/elfutils/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 194689 2013-09-22 08:17:23Z lcarlier $
+# $Id: PKGBUILD 198810 2013-11-05 15:59:03Z lcarlier $
 # Maintainer: Stéphane Gaudreault <stephane@archlinux.org>
 # Contributor: Andrej Gelenberg <andrej.gelenberg@udo.edu>
 
 pkgname=elfutils
-pkgver=0.156
+pkgver=0.157
 pkgrel=1
 pkgdesc="Libraries and utilities to handle ELF object files and DWARF debugging information"
 arch=('i686' 'x86_64' 'mips64el')
@@ -14,7 +14,8 @@ provides=('libelf')
 replaces=('libelf')
 conflicts=('libelf')
 source=(https://fedorahosted.org/releases/e/l/elfutils/${pkgver}/elfutils-${pkgver}.tar.bz2{,.sig})
-sha1sums=('48b30828eb0fb47787e45d80db05c05bbe0eaa76'
+options=('staticlibs')
+sha1sums=('5e3767206c7f1b3bcfe33bce99fe09686ef165d2'
           'SKIP')
 
 build() {
@@ -36,4 +37,6 @@ package() {
   cd ${pkgname}-${pkgver}
 
   make DESTDIR="${pkgdir}" install
+  
+  rm "${pkgdir}"/usr/lib/lib{asm,dw,elf}.a
 }
diff --git a/extra/embryo/PKGBUILD b/extra/embryo/PKGBUILD
index 84aa31786..9b48b5e78 100644
--- a/extra/embryo/PKGBUILD
+++ b/extra/embryo/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 193661 2013-08-26 20:15:52Z ronald $
+# $Id: PKGBUILD 197923 2013-10-30 11:42:21Z allan $
 # Maintainer: Ronald van Haren <ronald.archlinux.org>
 # Contributor: Ronald van Haren <ronald.archlinux.org>
 
@@ -10,7 +10,6 @@ arch=('i686' 'x86_64' 'mips64el')
 url="http://www.enlightenment.org"
 license=('BSD')
 depends=('glibc' 'eina')
-options=('!libtool')
 source=(http://download.enlightenment.org/releases/$pkgname-$pkgver.tar.gz)
 sha1sums=('879c0dd75de6c402707da4981716a2b7c1dab618')
 
diff --git a/extra/emotion/PKGBUILD b/extra/emotion/PKGBUILD
index d7bad45d8..ae347ffb3 100644
--- a/extra/emotion/PKGBUILD
+++ b/extra/emotion/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 193663 2013-08-26 20:16:34Z ronald $
+# $Id: PKGBUILD 197924 2013-10-30 11:42:43Z allan $
 # Maintainer: Ronald van Haren <ronald@archlinux.org>
 # Contributor: Gustavo Sverzut Barbieri <barbieri@gmail.com>
 
@@ -10,7 +10,7 @@ arch=('i686' 'x86_64' 'mips64el')
 url="http://www.enlightenment.org"
 license=('BSD')
 depends=('gstreamer0.10' 'edje' 'eeze')
-options=('!libtool' '!emptydirs')
+options=('!emptydirs')
 source=(http://download.enlightenment.org/releases/$pkgname-$pkgver.tar.gz)
 sha1sums=('a0f9ddbd6b26a69de2fc6958327da1497bd2f420')
 
diff --git a/extra/empathy/PKGBUILD b/extra/empathy/PKGBUILD
index 40fd956d0..64b0f1f80 100644
--- a/extra/empathy/PKGBUILD
+++ b/extra/empathy/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 196028 2013-10-07 11:50:41Z jgc $
+# $Id: PKGBUILD 197925 2013-10-30 11:43:04Z allan $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 
 pkgname=empathy
-pkgver=3.10.0
+pkgver=3.10.1
 pkgrel=1
 pkgdesc="A GNOME instant messaging client using the Telepathy framework."
 arch=('i686' 'x86_64' 'mips64el')
@@ -15,11 +15,11 @@ optdepends=('telepathy-gabble: XMPP/Jabber support'
             'telepathy-salut: Link-local XMPP support'
             'telepathy-rakia: SIP support'
             'telepathy-haze: libpurple support')
-options=('!libtool' '!makeflags')
+options=('!makeflags')
 groups=(gnome)
 install=empathy.install
 source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('5580bdba9faec0518b3328d5dc23f03dc0cf25ccf6c14902f306838c23d5918f')
+sha256sums=('a5d96f1a408613b885fc254d8b6f33fceae01e212d2370cc77444d66fa945054')
 
 build() {
   cd $pkgname-$pkgver
diff --git a/extra/enca/PKGBUILD b/extra/enca/PKGBUILD
index cc45732a9..7445eab26 100644
--- a/extra/enca/PKGBUILD
+++ b/extra/enca/PKGBUILD
@@ -1,18 +1,18 @@
-# $Id: PKGBUILD 174764 2013-01-07 09:30:41Z giovanni $
+# $Id: PKGBUILD 197926 2013-10-30 11:43:24Z allan $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Filip Dvorak <fila@pruda.com>
 
 pkgname=enca
-pkgver=1.14
-pkgrel=1.1
+pkgver=1.15
+pkgrel=1
 pkgdesc="Charset analyser and converter"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://cihar.com/software/enca/"
-options=('!libtool')
 license=('GPL')
 depends=('recode')
+options=('!docs')
 source=("http://dl.cihar.com/${pkgname}/${pkgname}-${pkgver}.tar.bz2")
-md5sums=('03792f25aed003d3ea33b3ce1be1f256')
+md5sums=('fef132969d26e649719eae08297a4a52')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/enchant/PKGBUILD b/extra/enchant/PKGBUILD
index 2bcd50d25..113890c6a 100644
--- a/extra/enchant/PKGBUILD
+++ b/extra/enchant/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 139539 2011-10-03 12:17:06Z jgc $
+# $Id: PKGBUILD 197928 2013-10-30 11:43:45Z allan $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: dorphell <dorphell@archlinux.org>
 
@@ -10,7 +10,6 @@ arch=('i686' 'x86_64' 'mips64el')
 url="http://www.abisource.com/enchant/"
 license=('LGPL')
 depends=('aspell' 'dbus-glib' 'hunspell' 'hspell')
-options=('!libtool')
 source=("http://www.abisource.com/downloads/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.gz")
 md5sums=('de11011aff801dc61042828041fb59c7')
 
diff --git a/extra/enlightenment/PKGBUILD b/extra/enlightenment/PKGBUILD
index fdb45581b..e69f6ea91 100644
--- a/extra/enlightenment/PKGBUILD
+++ b/extra/enlightenment/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 182782 2013-04-15 06:46:47Z eric $
+# $Id: PKGBUILD 197929 2013-10-30 11:44:06Z allan $
 # Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgname=enlightenment
@@ -11,7 +11,6 @@ url="http://www.enlightenment.org"
 license=('BSD' 'custom')
 depends=('libxinerama' 'imlib2' 'perl' 'pango' 'libxcomposite' \
          'libxrandr' 'libpulse')
-options=('!libtool')
 source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/e16-${pkgver}.tar.gz \
         http://downloads.sourceforge.net/enlightenment/e16-themes-${_themever}.tar.gz)
 sha1sums=('bcb74385fb6d0732f735f27264ae02b539d136c9'
diff --git a/extra/enlightenment17/PKGBUILD b/extra/enlightenment17/PKGBUILD
index 6a7f4d476..9715abd4c 100644
--- a/extra/enlightenment17/PKGBUILD
+++ b/extra/enlightenment17/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 193683 2013-08-27 18:28:14Z ronald $
+# $Id: PKGBUILD 197930 2013-10-30 11:44:27Z allan $
 # Maintainer: Ronald van Haren <ronald@archlinux.org>
 # Contributor: Gustavo Sverzut Barbieri <barbieri@gmail.com>
 
@@ -16,7 +16,7 @@ depends=('alsa-lib' 'pam' 'shared-mime-info' 'hicolor-icon-theme'
 optdepends=('connman: network module')
 provides=('notification-daemon' 'e')
 backup=('etc/enlightenment/sysactions.conf')
-options=('!libtool' '!emptydirs')
+options=('!emptydirs')
 install=enlightenment17.install
 source=(http://download.enlightenment.org/releases/$_pkgname-$pkgver.tar.gz
   'e-applications.menu' 'quickstart.patch' 'sysactions_systemd.patch' 
diff --git a/extra/eog-plugins/PKGBUILD b/extra/eog-plugins/PKGBUILD
index 35a0946c0..6b94f92ca 100644
--- a/extra/eog-plugins/PKGBUILD
+++ b/extra/eog-plugins/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 196030 2013-10-07 11:50:43Z jgc $
+# $Id: PKGBUILD 197932 2013-10-30 11:45:30Z allan $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 
 pkgname=eog-plugins
-pkgver=3.10.0
+pkgver=3.10.1
 pkgrel=1
 pkgdesc="Plugins for Eye of Gnome"
 arch=('i686' 'x86_64' 'mips64el')
@@ -11,9 +11,8 @@ license=('GPL2')
 depends=('eog' 'libchamplain' 'libgdata')
 makedepends=('intltool')
 install=eog-plugins.install
-options=('!libtool')
 source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('0e6699c45181264e87f34a6eb03deeadfd5d73e35995772b7afc803e8218906d')
+sha256sums=('d5b32c49dbf1e0b6cf56c9fdc6c19186c92e98d92b71aa98805491e2bb2f8e12')
 
 build() {
   cd $pkgname-$pkgver
diff --git a/extra/eog/PKGBUILD b/extra/eog/PKGBUILD
index 43e05dd2d..00c11aefe 100644
--- a/extra/eog/PKGBUILD
+++ b/extra/eog/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 196029 2013-10-07 11:50:42Z jgc $
+# $Id: PKGBUILD 197931 2013-10-30 11:44:48Z allan $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Contributor: Jan de Groot <jgc@archlinux.org>
 
 pkgname=eog
-pkgver=3.10.0
+pkgver=3.10.1
 pkgrel=1
 pkgdesc="Eye of Gnome: An image viewing and cataloging program"
 arch=(i686 x86_64 mips64el)
@@ -12,10 +12,10 @@ depends=(gnome-desktop libexif lcms2 desktop-file-utils exempi libpeas librsvg g
 makedepends=(gtk-doc intltool itstool)
 install=eog.install
 groups=(gnome)
-options=('!emptydirs' '!libtool')
+options=('!emptydirs')
 url="http://www.gnome.org"
 source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('d449abfba8ac460b9d9af17778a0f2ffed5c983e74232596b807c3a99f11a1da')
+sha256sums=('16ab5da862d4474c12d0e8062e577ad70c7e1c790a44a3931cd78bf84ebd5ec6')
 
 build() {
   cd "$pkgname-$pkgver"
diff --git a/extra/epplet-base/PKGBUILD b/extra/epplet-base/PKGBUILD
index 8399f5ec4..083a8fa44 100644
--- a/extra/epplet-base/PKGBUILD
+++ b/extra/epplet-base/PKGBUILD
@@ -1,26 +1,25 @@
-# $Id: PKGBUILD 167952 2012-10-04 04:50:04Z eric $
+# $Id: PKGBUILD 197233 2013-10-24 13:10:07Z eric $
 # Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgname=epplet-base
 pkgver=0.14
-pkgrel=1
+pkgrel=2
 pkgdesc="Addon plugins for the enlightenment windowmanager"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.enlightenment.org"
 license=('GPL')
 depends=('imlib2' 'libcdaudio' 'libgl')
 makedepends=('mesa')
-options=('!libtool')
 source=(http://downloads.sourceforge.net/sourceforge/enlightenment/epplets-${pkgver}.tar.gz)
 sha1sums=('ddecad7c22771bc50565f76c36ae334f952388aa')
 
 build() {
-  cd "${srcdir}/epplets-${pkgver}"
+  cd epplets-${pkgver}
   ./configure --prefix=/usr
   make
 }
 
 package() {
-  cd "${srcdir}/epplets-${pkgver}"
+  cd epplets-${pkgver}
   make DESTDIR="${pkgdir}" install
 }
diff --git a/extra/ethtool/PKGBUILD b/extra/ethtool/PKGBUILD
index 583bd60c7..35654aaf2 100644
--- a/extra/ethtool/PKGBUILD
+++ b/extra/ethtool/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 191825 2013-07-31 08:49:27Z ioni $
+# $Id: PKGBUILD 196480 2013-10-14 08:50:55Z ioni $
 # Maintainer : Ionut Biru <ibiru@archlinux.org>
 # Contributor: Paul Mattal <paul@archlinux.org>
 # Contributor: Martin Kemp <mdkemp@elys.com>
 
 pkgname=ethtool
-pkgver=3.10
+pkgver=3.11
 pkgrel=1
 epoch=1
 pkgdesc="Utility for controlling network drivers and hardware"
@@ -13,7 +13,7 @@ url="http://www.kernel.org/pub/software/network/ethtool/"
 license=('GPL')
 depends=('glibc')
 source=(http://www.kernel.org/pub/software/network/$pkgname/$pkgname-$pkgver.tar.xz)
-md5sums=('d1930df6e70a5204e8154a9911992be4')
+md5sums=('5f3a0ed1b3510ca0695db0b4debdd292')
 
 build() {
     cd $pkgname-$pkgver
diff --git a/extra/ethumb/PKGBUILD b/extra/ethumb/PKGBUILD
index 88c758ca8..e6f9309a6 100644
--- a/extra/ethumb/PKGBUILD
+++ b/extra/ethumb/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 193664 2013-08-26 20:16:51Z ronald $
+# $Id: PKGBUILD 197934 2013-10-30 11:46:11Z allan $
 # Maintainer: Ronald van Haren <ronald@archlinux.org>
 # Contributor: Gustavo Sverzut Barbieri <barbieri@gmail.com>
 
@@ -10,7 +10,7 @@ arch=('i686' 'x86_64' 'mips64el')
 url="http://www.enlightenment.org"
 license=('BSD')
 depends=('libexif' 'e_dbus'  'emotion')
-options=('!libtool' '!emptydirs')
+options=('!emptydirs')
 source=(http://download.enlightenment.org/releases/$pkgname-$pkgver.tar.gz)
 sha1sums=('c19b5d8abbf79aa4df1c5523829ece751dc3c268')
 
diff --git a/extra/evas/PKGBUILD b/extra/evas/PKGBUILD
index 3bffdbe40..1beefb331 100644
--- a/extra/evas/PKGBUILD
+++ b/extra/evas/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 193657 2013-08-26 20:14:26Z ronald $
+# $Id: PKGBUILD 197935 2013-10-30 11:46:36Z allan $
 # Maintainer: Ronald van Haren <ronald@archlinux.org>
 # Contributor: Gustavo Sverzut Barbieri <barbieri@gmail.com>
 
@@ -11,7 +11,7 @@ url="http://www.enlightenment.org"
 license=('BSD')
 depends=('eet' 'giflib' 'libpng' 'libjpeg' 'libxrender' 'mesa'
   'fribidi' 'fontconfig' 'freetype2' 'harfbuzz' 'evas_generic_loaders')
-options=('!libtool' '!emptydirs')
+options=('!emptydirs')
 source=(http://download.enlightenment.org/releases/$pkgname-$pkgver.tar.gz)
 sha1sums=('ce71de058896e80c8f1822d967a6dcee01a1c9ac')
 
diff --git a/extra/evas_generic_loaders/PKGBUILD b/extra/evas_generic_loaders/PKGBUILD
index 6bfe01592..1885129e4 100644
--- a/extra/evas_generic_loaders/PKGBUILD
+++ b/extra/evas_generic_loaders/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 193656 2013-08-26 20:14:12Z ronald $
+# $Id: PKGBUILD 197936 2013-10-30 11:47:00Z allan $
 # Maintainer: Ronald van Haren <ronald@archlinux.org>
 # Contributor: Gustavo Sverzut Barbieri <barbieri@gmail.com>
 
@@ -10,7 +10,7 @@ arch=('i686' 'x86_64' 'mips64el')
 url="http://www.enlightenment.org"
 license=('BSD')
 depends=('librsvg' 'gstreamer0.10-base' 'poppler' 'libraw' 'libspectre' 'eina')
-options=('!libtool' '!emptydirs')
+options=('!emptydirs')
 source=(http://download.enlightenment.org/releases/$pkgname-$pkgver.tar.gz)
 sha1sums=('fe08848b794621e6695cd0df86b465412b0037fa')
 
diff --git a/extra/eventlog/PKGBUILD b/extra/eventlog/PKGBUILD
index b4594a617..951679a98 100644
--- a/extra/eventlog/PKGBUILD
+++ b/extra/eventlog/PKGBUILD
@@ -1,17 +1,16 @@
-# $Id: PKGBUILD 170165 2012-11-04 01:36:23Z dreisner $
+# $Id: PKGBUILD 197937 2013-10-30 11:47:22Z allan $
 # Maintainer:
 # Contributor: Eric Belanger <eric@archlinux.org>
 # Contributor: Judd Vinet <jvinet@zeroflux.org>
 
 pkgname=eventlog
 pkgver=0.2.12
-pkgrel=3.1
+pkgrel=4
 pkgdesc="API to format and send structured log messages"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.balabit.com/support/community/products/"
 license=('BSD')
 depends=('glibc')
-options=('!libtool')
 changelog=ChangeLog
 source=("http://www.balabit.com/downloads/files/${pkgname}/${pkgver%.*}/${pkgname}_${pkgver}.tar.gz")
 sha1sums=('3e35a634e7de029ab9d36995a085bfcb00ed6a4d')
diff --git a/extra/evince/PKGBUILD b/extra/evince/PKGBUILD
index 230f99612..12c82c9d1 100644
--- a/extra/evince/PKGBUILD
+++ b/extra/evince/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 196032 2013-10-07 11:50:46Z jgc $
+# $Id: PKGBUILD 197938 2013-10-30 11:47:43Z allan $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=evince
@@ -17,7 +17,7 @@ optdepends=('texlive-bin: DVI support'
             'unrar: cbr compressed comic books')
 groups=(gnome)
 install=evince.install
-options=('!libtool' '!emptydirs')
+options=('!emptydirs')
 source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
 sha256sums=('495e855af3f071277d79be97a36bf39938d13d09530e80412fed4b7c0b1bdd3e')
 
diff --git a/extra/evolution-data-server/PKGBUILD b/extra/evolution-data-server/PKGBUILD
index 70e175b5d..15d1fa5f1 100644
--- a/extra/evolution-data-server/PKGBUILD
+++ b/extra/evolution-data-server/PKGBUILD
@@ -1,19 +1,18 @@
-# $Id: PKGBUILD 196034 2013-10-07 11:50:48Z jgc $
+# $Id: PKGBUILD 197940 2013-10-30 11:48:24Z allan $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=evolution-data-server
-pkgver=3.10.0
+pkgver=3.10.1
 pkgrel=1
 pkgdesc="Centralized access to appointments and contacts"
 arch=('i686' 'x86_64' 'mips64el')
 depends=(gnome-online-accounts nss krb5 libgweather libical db libgdata)
 makedepends=(intltool gperf gobject-introspection vala python2)
-options=('!libtool')
 install=$pkgname.install
 url="http://www.gnome.org"
 license=(GPL)
 source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('1c47a0e138e9a5ed630d6e3ab30761e74e5f26ed7bbc31debfe76c2bac058b27')
+sha256sums=('a6b5acbd21767b685d58ebfd4c152baa693387f5654fb738b3645ee39e82f9f5')
 
 build() {
   cd "$pkgname-$pkgver"
diff --git a/extra/evolution-data-server/fix-google-2fa-1.patch b/extra/evolution-data-server/fix-google-2fa-1.patch
deleted file mode 100644
index 530996898..000000000
--- a/extra/evolution-data-server/fix-google-2fa-1.patch
+++ /dev/null
@@ -1,402 +0,0 @@
-From fa0d18fcf2d8084d2a41f24f50f689eed8e3e241 Mon Sep 17 00:00:00 2001
-From: Matthew Barnes <mbarnes@redhat.com>
-Date: Tue, 09 Jul 2013 18:23:04 +0000
-Subject: Add ESoupAuthBearer.
-
-SoupAuth subclass for use with OAuth 2.0 HTTP authentication.
-
-See http://tools.ietf.org/html/rfc6750
-
-EBackends should use e_source_get_oauth2_access_token() to obtain
-the access token and token expiry for an ESource, then pass them to
-e_soup_auth_bearer_set_access_token().
----
-diff --git a/docs/reference/libebackend/libebackend-docs.xml b/docs/reference/libebackend/libebackend-docs.xml
-index fa9ab92..f54d3d6 100644
---- a/docs/reference/libebackend/libebackend-docs.xml
-+++ b/docs/reference/libebackend/libebackend-docs.xml
-@@ -34,6 +34,7 @@
-     <title>Miscellaneous Utilities</title>
-     <xi:include href="xml/e-file-cache.xml"/>
-     <xi:include href="xml/e-db3-utils.xml"/>
-+    <xi:include href="xml/e-soup-auth-bearer.xml"/>
-     <xi:include href="xml/e-sqlite3-vfs.xml"/>
-     <xi:include href="xml/e-user-prompter.xml"/>
-     <xi:include href="xml/e-user-prompter-server.xml"/>
-diff --git a/docs/reference/libebackend/libebackend-sections.txt b/docs/reference/libebackend/libebackend-sections.txt
-index 6c604bf..189f002 100644
---- a/docs/reference/libebackend/libebackend-sections.txt
-+++ b/docs/reference/libebackend/libebackend-sections.txt
-@@ -397,6 +397,24 @@ EServerSideSourcePrivate
- </SECTION>
- 
- <SECTION>
-+<FILE>e-soup-auth-bearer</FILE>
-+<TITLE>ESoupAuthBearer</TITLE>
-+ESoupAuthBearer
-+e_soup_auth_bearer_set_access_token
-+<SUBSECTION Standard>
-+E_SOUP_AUTH_BEARER
-+E_IS_SOUP_AUTH_BEARER
-+E_TYPE_SOUP_AUTH_BEARER
-+E_SOUP_AUTH_BEARER_CLASS
-+E_IS_SOUP_AUTH_BEARER_CLASS
-+E_SOUP_AUTH_BEARER_GET_CLASS
-+ESoupAuthBearerClass
-+e_soup_auth_bearer_get_type
-+<SUBSECTION Private>
-+ESoupAuthBearerPrivate
-+</SECTION>
-+
-+<SECTION>
- <FILE>e-source-registry-server</FILE>
- <TITLE>ESourceRegistryServer</TITLE>
- E_SOURCE_REGISTRY_SERVER_OBJECT_PATH
-diff --git a/docs/reference/libebackend/libebackend.types b/docs/reference/libebackend/libebackend.types
-index aeb38dc..1d7fe96 100644
---- a/docs/reference/libebackend/libebackend.types
-+++ b/docs/reference/libebackend/libebackend.types
-@@ -15,6 +15,7 @@ e_module_get_type
- e_oauth2_support_get_type
- e_offline_listener_get_type
- e_server_side_source_get_type
-+e_soup_auth_bearer_get_type
- e_source_registry_server_get_type
- e_user_prompter_get_type
- e_user_prompter_server_get_type
-diff --git a/libebackend/Makefile.am b/libebackend/Makefile.am
-index c77b470..783732e 100644
---- a/libebackend/Makefile.am
-+++ b/libebackend/Makefile.am
-@@ -35,6 +35,7 @@ libebackend_1_2_la_CPPFLAGS = \
- 	$(E_BACKEND_CFLAGS)					\
- 	$(GCR_BASE_CFLAGS)					\
- 	$(GIO_UNIX_CFLAGS)					\
-+	$(SOUP_CFLAGS)						\
- 	$(CODE_COVERAGE_CFLAGS)					\
- 	$(NULL)
- 
-@@ -56,6 +57,7 @@ libebackend_1_2_la_SOURCES =		\
- 	e-db3-utils.c			\
- 	e-module.c			\
- 	e-server-side-source.c		\
-+	e-soup-auth-bearer.c		\
- 	e-source-registry-server.c	\
- 	e-sqlite3-vfs.c			\
- 	e-user-prompter.c		\
-@@ -71,6 +73,7 @@ libebackend_1_2_la_LIBADD = 				\
- 	$(SQLITE3_LIBS)					\
- 	$(GCR_BASE_LIBS)				\
- 	$(GIO_UNIX_LIBS)				\
-+	$(SOUP_LIBS)					\
- 	$(DB_LIBS)
- 
- libebackend_1_2_la_LDFLAGS = \
-@@ -100,6 +103,7 @@ libebackendinclude_HEADERS =		\
- 	e-dbhash.h			\
- 	e-module.h			\
- 	e-server-side-source.h		\
-+	e-soup-auth-bearer.h		\
- 	e-source-registry-server.h	\
- 	e-sqlite3-vfs.h			\
- 	e-user-prompter.h		\
-diff --git a/libebackend/e-soup-auth-bearer.c b/libebackend/e-soup-auth-bearer.c
-new file mode 100644
-index 0000000..1d5f804
---- /dev/null
-+++ b/libebackend/e-soup-auth-bearer.c
-@@ -0,0 +1,196 @@
-+/*
-+ * e-soup-auth-bearer.c
-+ *
-+ * This program 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) version 3.
-+ *
-+ * This program 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 the program; if not, see <http://www.gnu.org/licenses/>
-+ *
-+ */
-+
-+/**
-+ * SECTION: e-soup-auth-bearer
-+ * @include: libebackend/libebackend.h
-+ * @short_description: OAuth 2.0 support for libsoup
-+ *
-+ * #ESoupAuthBearer adds libsoup support for the use of bearer tokens in
-+ * HTTP requests to access OAuth 2.0 protected resources, as defined in
-+ * <ulink url="http://tools.ietf.org/html/rfc6750">RFC 6750</ulink>.
-+ *
-+ * An #EBackend should integrate #ESoupAuthBearer first by adding it as a
-+ * feature to a #SoupSession's #SoupAuthManager, then from a #SoupSession
-+ * #SoupSession::authenticate handler call e_source_get_oauth2_access_token()
-+ * and pass the results to e_soup_auth_bearer_set_access_token().
-+ **/
-+
-+#include "e-soup-auth-bearer.h"
-+
-+#include <time.h>
-+
-+#define E_SOUP_AUTH_BEARER_GET_PRIVATE(obj) \
-+	(G_TYPE_INSTANCE_GET_PRIVATE \
-+	((obj), E_TYPE_SOUP_AUTH_BEARER, ESoupAuthBearerPrivate))
-+
-+#define AUTH_STRENGTH 1
-+
-+#define EXPIRY_INVALID ((time_t) -1)
-+
-+struct _ESoupAuthBearerPrivate {
-+	gchar *access_token;
-+	time_t expiry;
-+};
-+
-+G_DEFINE_TYPE (
-+	ESoupAuthBearer,
-+	e_soup_auth_bearer,
-+	SOUP_TYPE_AUTH)
-+
-+static gboolean
-+e_soup_auth_bearer_is_expired (ESoupAuthBearer *bearer)
-+{
-+	gboolean expired = FALSE;
-+
-+	if (bearer->priv->expiry != EXPIRY_INVALID)
-+		expired = (bearer->priv->expiry < time (NULL));
-+
-+	return expired;
-+}
-+
-+static void
-+e_soup_auth_bearer_finalize (GObject *object)
-+{
-+	ESoupAuthBearerPrivate *priv;
-+
-+	priv = E_SOUP_AUTH_BEARER_GET_PRIVATE (object);
-+
-+	g_free (priv->access_token);
-+
-+	/* Chain up to parent's finalize() method. */
-+	G_OBJECT_CLASS (e_soup_auth_bearer_parent_class)->finalize (object);
-+}
-+
-+static gboolean
-+e_soup_auth_bearer_update (SoupAuth *auth,
-+                           SoupMessage *message,
-+                           GHashTable *auth_header)
-+{
-+	/* XXX Not sure what to do here.  Discard the access token? */
-+
-+	return TRUE;
-+}
-+
-+static GSList *
-+e_soup_auth_bearer_get_protection_space (SoupAuth *auth,
-+                                         SoupURI *source_uri)
-+{
-+	/* XXX Not sure what to do here.  Need to return something. */
-+
-+	return g_slist_prepend (NULL, g_strdup (""));
-+}
-+
-+static gboolean
-+e_soup_auth_bearer_is_authenticated (SoupAuth *auth)
-+{
-+	ESoupAuthBearer *bearer;
-+	gboolean authenticated = FALSE;
-+
-+	bearer = E_SOUP_AUTH_BEARER (auth);
-+
-+	if (!e_soup_auth_bearer_is_expired (bearer))
-+		authenticated = (bearer->priv->access_token != NULL);
-+
-+	return authenticated;
-+}
-+
-+static gchar *
-+e_soup_auth_bearer_get_authorization (SoupAuth *auth,
-+                                      SoupMessage *message)
-+{
-+	ESoupAuthBearer *bearer;
-+
-+	bearer = E_SOUP_AUTH_BEARER (auth);
-+
-+	return g_strdup_printf ("Bearer %s", bearer->priv->access_token);
-+}
-+
-+static void
-+e_soup_auth_bearer_class_init (ESoupAuthBearerClass *class)
-+{
-+	GObjectClass *object_class;
-+	SoupAuthClass *auth_class;
-+
-+	g_type_class_add_private (class, sizeof (ESoupAuthBearerPrivate));
-+
-+	/* Keep the "e" prefix on private methods
-+	 * so we don't step on libsoup's namespace. */
-+
-+	object_class = G_OBJECT_CLASS (class);
-+	object_class->finalize = e_soup_auth_bearer_finalize;
-+
-+	auth_class = SOUP_AUTH_CLASS (class);
-+	auth_class->scheme_name = "Bearer";
-+	auth_class->strength = AUTH_STRENGTH;
-+	auth_class->update = e_soup_auth_bearer_update;
-+	auth_class->get_protection_space = e_soup_auth_bearer_get_protection_space;
-+	auth_class->is_authenticated = e_soup_auth_bearer_is_authenticated;
-+	auth_class->get_authorization = e_soup_auth_bearer_get_authorization;
-+}
-+
-+static void
-+e_soup_auth_bearer_init (ESoupAuthBearer *bearer)
-+{
-+	bearer->priv = E_SOUP_AUTH_BEARER_GET_PRIVATE (bearer);
-+	bearer->priv->expiry = EXPIRY_INVALID;
-+}
-+
-+/**
-+ * e_soup_auth_bearer_set_access_token:
-+ * @bearer: an #ESoupAuthBearer
-+ * @access_token: an OAuth 2.0 access token
-+ * @expires_in_seconds: expiry for @access_token, or 0 if unknown
-+ *
-+ * This function is analogous to soup_auth_authenticate() for "Basic" HTTP
-+ * authentication, except it takes an OAuth 2.0 access token instead of a
-+ * username and password.
-+ *
-+ * If @expires_in_seconds is greater than zero, soup_auth_is_authenticated()
-+ * will return %FALSE after the given number of seconds have elapsed.
-+ *
-+ * Since: 3.10
-+ **/
-+void
-+e_soup_auth_bearer_set_access_token (ESoupAuthBearer *bearer,
-+                                     const gchar *access_token,
-+                                     gint expires_in_seconds)
-+{
-+	gboolean was_authenticated;
-+	gboolean now_authenticated;
-+
-+	g_return_if_fail (E_IS_SOUP_AUTH_BEARER (bearer));
-+
-+	was_authenticated = soup_auth_is_authenticated (SOUP_AUTH (bearer));
-+
-+	g_free (bearer->priv->access_token);
-+	bearer->priv->access_token = g_strdup (access_token);
-+
-+	if (expires_in_seconds > 0)
-+		bearer->priv->expiry = time (NULL) + expires_in_seconds;
-+	else
-+		bearer->priv->expiry = EXPIRY_INVALID;
-+
-+	now_authenticated = soup_auth_is_authenticated (SOUP_AUTH (bearer));
-+
-+	if (was_authenticated != now_authenticated)
-+		g_object_notify (
-+			G_OBJECT (bearer),
-+			SOUP_AUTH_IS_AUTHENTICATED);
-+}
-+
-diff --git a/libebackend/e-soup-auth-bearer.h b/libebackend/e-soup-auth-bearer.h
-new file mode 100644
-index 0000000..83746a4
---- /dev/null
-+++ b/libebackend/e-soup-auth-bearer.h
-@@ -0,0 +1,79 @@
-+/*
-+ * e-soup-auth-bearer.h
-+ *
-+ * This program 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) version 3.
-+ *
-+ * This program 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 the program; if not, see <http://www.gnu.org/licenses/>
-+ *
-+ */
-+
-+#if !defined (__LIBEBACKEND_H_INSIDE__) && !defined (LIBEBACKEND_COMPILATION)
-+#error "Only <libebackend/libebackend.h> should be included directly."
-+#endif
-+
-+#ifndef E_SOUP_AUTH_BEARER_H
-+#define E_SOUP_AUTH_BEARER_H
-+
-+#include <libsoup/soup.h>
-+
-+/* Standard GObject macros */
-+#define E_TYPE_SOUP_AUTH_BEARER \
-+	(e_soup_auth_bearer_get_type ())
-+#define E_SOUP_AUTH_BEARER(obj) \
-+	(G_TYPE_CHECK_INSTANCE_CAST \
-+	((obj), E_TYPE_SOUP_AUTH_BEARER, ESoupAuthBearer))
-+#define E_SOUP_AUTH_BEARER_CLASS(cls) \
-+	(G_TYPE_CHECK_CLASS_CAST \
-+	((cls), E_TYPE_SOUP_AUTH_BEARER, ESoupAuthBearerClass))
-+#define E_IS_SOUP_AUTH_BEARER(obj) \
-+	(G_TYPE_CHECK_INSTANCE_TYPE \
-+	((obj), E_TYPE_SOUP_AUTH_BEARER))
-+#define E_IS_SOUP_AUTH_BEARER_CLASS(cls) \
-+	(G_TYPE_CHECK_CLASS_TYPE \
-+	((cls), E_TYPE_SOUP_AUTH_BEARER))
-+#define E_SOUP_AUTH_BEARER_GET_CLASS(obj) \
-+	(G_TYPE_INSTANCE_GET_CLASS \
-+	((obj), E_TYPE_SOUP_AUTH_BEARER, ESoupAuthBearerClass))
-+
-+G_BEGIN_DECLS
-+
-+typedef struct _ESoupAuthBearer ESoupAuthBearer;
-+typedef struct _ESoupAuthBearerClass ESoupAuthBearerClass;
-+typedef struct _ESoupAuthBearerPrivate ESoupAuthBearerPrivate;
-+
-+/**
-+ * ESoupAuthBearer:
-+ *
-+ * Contains only private data that should be read and manipulated using the
-+ * functions below.
-+ *
-+ * Since: 3.10
-+ **/
-+struct _ESoupAuthBearer {
-+	SoupAuth parent;
-+	ESoupAuthBearerPrivate *priv;
-+};
-+
-+struct _ESoupAuthBearerClass {
-+	SoupAuthClass parent_class;
-+};
-+
-+GType		e_soup_auth_bearer_get_type	(void) G_GNUC_CONST;
-+void		e_soup_auth_bearer_set_access_token
-+						(ESoupAuthBearer *bearer,
-+						 const gchar *access_token,
-+						 gint expires_in_seconds);
-+
-+G_END_DECLS
-+
-+#endif /* E_SOUP_AUTH_BEARER_H */
-+
-diff --git a/libebackend/libebackend.h b/libebackend/libebackend.h
-index f7f0157..0aac5d4 100644
---- a/libebackend/libebackend.h
-+++ b/libebackend/libebackend.h
-@@ -42,6 +42,7 @@
- #include <libebackend/e-oauth2-support.h>
- #include <libebackend/e-offline-listener.h>
- #include <libebackend/e-server-side-source.h>
-+#include <libebackend/e-soup-auth-bearer.h>
- #include <libebackend/e-source-registry-server.h>
- #include <libebackend/e-sqlite3-vfs.h>
- #include <libebackend/e-user-prompter.h>
-
diff --git a/extra/evolution-data-server/fix-google-2fa-2.patch b/extra/evolution-data-server/fix-google-2fa-2.patch
deleted file mode 100644
index d178cd0af..000000000
--- a/extra/evolution-data-server/fix-google-2fa-2.patch
+++ /dev/null
@@ -1,86 +0,0 @@
-From 54e876d3fc25ec59c58beda915a8c9d1f8d5f101 Mon Sep 17 00:00:00 2001
-From: Matthew Barnes <mbarnes@redhat.com>
-Date: Tue, 09 Jul 2013 21:06:16 +0000
-Subject: CalDAV: Add support for OAuth 2.0 authentication.
-
----
-diff --git a/calendar/backends/caldav/e-cal-backend-caldav.c b/calendar/backends/caldav/e-cal-backend-caldav.c
-index 58c70b6..58f0654 100644
---- a/calendar/backends/caldav/e-cal-backend-caldav.c
-+++ b/calendar/backends/caldav/e-cal-backend-caldav.c
-@@ -968,6 +968,32 @@ parse_propfind_response (SoupMessage *message,
- /* Authentication helpers for libsoup */
- 
- static void
-+soup_authenticate_bearer (SoupSession *session,
-+                          SoupMessage *message,
-+                          SoupAuth *auth,
-+                          ESource *source)
-+{
-+	gchar *access_token = NULL;
-+	gint expires_in_seconds = -1;
-+	GError *local_error = NULL;
-+
-+	e_source_get_oauth2_access_token_sync (
-+		source, NULL, &access_token,
-+		&expires_in_seconds, &local_error);
-+
-+	e_soup_auth_bearer_set_access_token (
-+		E_SOUP_AUTH_BEARER (auth),
-+		access_token, expires_in_seconds);
-+
-+	if (local_error != NULL) {
-+		g_warning ("%s: %s", G_STRFUNC, local_error->message);
-+		g_error_free (local_error);
-+	}
-+
-+	g_free (access_token);
-+}
-+
-+static void
- soup_authenticate (SoupSession *session,
-                    SoupMessage *msg,
-                    SoupAuth *auth,
-@@ -985,8 +1011,14 @@ soup_authenticate (SoupSession *session,
- 	extension_name = E_SOURCE_EXTENSION_AUTHENTICATION;
- 	auth_extension = e_source_get_extension (source, extension_name);
- 
-+	if (retrying)
-+		return;
-+
-+	if (E_IS_SOUP_AUTH_BEARER (auth)) {
-+		soup_authenticate_bearer (session, msg, auth, source);
-+
- 	/* do not send same password twice, but keep it for later use */
--	if (!retrying && cbdav->priv->password != NULL) {
-+	} else if (cbdav->priv->password != NULL) {
- 		gchar *user;
- 
- 		user = e_source_authentication_dup_user (auth_extension);
-@@ -5194,6 +5226,8 @@ cal_backend_caldav_constructed (GObject *object)
- static void
- e_cal_backend_caldav_init (ECalBackendCalDAV *cbdav)
- {
-+	SoupSessionFeature *feature;
-+
- 	cbdav->priv = E_CAL_BACKEND_CALDAV_GET_PRIVATE (cbdav);
- 	cbdav->priv->session = soup_session_sync_new ();
- 	g_object_set (
-@@ -5203,6 +5237,16 @@ e_cal_backend_caldav_init (ECalBackendCalDAV *cbdav)
- 		SOUP_SESSION_SSL_USE_SYSTEM_CA_FILE, TRUE,
- 		NULL);
- 
-+	/* XXX SoupAuthManager is public API as of libsoup 2.42, but
-+	 *     this isn't worth bumping our libsoup requirement over.
-+	 *     So get the SoupAuthManager GType by its type name. */
-+	feature = soup_session_get_feature (
-+		cbdav->priv->session,
-+		g_type_from_name ("SoupAuthManager"));
-+
-+	/* Add the "Bearer" auth type to support OAuth 2.0. */
-+	soup_session_feature_add_feature (feature, E_TYPE_SOUP_AUTH_BEARER);
-+
- 	cbdav->priv->proxy = e_proxy_new ();
- 	e_proxy_setup_proxy (cbdav->priv->proxy);
- 	g_signal_connect (cbdav->priv->proxy, "changed", G_CALLBACK (proxy_settings_changed), cbdav->priv);
-
diff --git a/extra/evolution-data-server/fix-google-2fa-3.patch b/extra/evolution-data-server/fix-google-2fa-3.patch
deleted file mode 100644
index a5c6ca324..000000000
--- a/extra/evolution-data-server/fix-google-2fa-3.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From cc9fb7d15ce3983fc36487d2856e5fd14b341725 Mon Sep 17 00:00:00 2001
-From: Matthew Barnes <mbarnes@redhat.com>
-Date: Tue, 09 Jul 2013 15:49:09 +0000
-Subject: google: Minor module cleanups.
-
----
-diff --git a/modules/google-backend/module-google-backend.c b/modules/google-backend/module-google-backend.c
-index d5684bb..cbd7bd2 100644
---- a/modules/google-backend/module-google-backend.c
-+++ b/modules/google-backend/module-google-backend.c
-@@ -100,19 +100,17 @@ google_backend_contacts_update_auth_method (ESource *source)
- 	EOAuth2Support *oauth2_support;
- 	ESourceAuthentication *extension;
- 	const gchar *extension_name;
--
--	extension_name = E_SOURCE_EXTENSION_AUTHENTICATION;
--	extension = e_source_get_extension (source, extension_name);
-+	const gchar *method;
- 
- 	oauth2_support = e_server_side_source_ref_oauth2_support (
- 		E_SERVER_SIDE_SOURCE (source));
--	if (oauth2_support != NULL) {
--		e_source_authentication_set_method (extension, "OAuth2");
--		g_object_unref (oauth2_support);
--		return;
--	}
- 
--	e_source_authentication_set_method (extension, "ClientLogin");
-+	extension_name = E_SOURCE_EXTENSION_AUTHENTICATION;
-+	extension = e_source_get_extension (source, extension_name);
-+	method = (oauth2_support != NULL) ? "OAuth2" : "ClientLogin";
-+	e_source_authentication_set_method (extension, method);
-+
-+	g_clear_object (&oauth2_support);
- }
- 
- static void
-@@ -178,7 +176,8 @@ google_backend_add_calendar (ECollectionBackend *backend)
- 
- 		g_get_current_time (&today_tv);
- 		today = g_time_val_to_iso8601 (&today_tv);
--		e_source_alarms_set_last_notified (E_SOURCE_ALARMS (extension), today);
-+		e_source_alarms_set_last_notified (
-+			E_SOURCE_ALARMS (extension), today);
- 		g_free (today);
- 	}
- 
-
diff --git a/extra/evolution-data-server/fix-google-2fa-4.patch b/extra/evolution-data-server/fix-google-2fa-4.patch
deleted file mode 100644
index 26b64763e..000000000
--- a/extra/evolution-data-server/fix-google-2fa-4.patch
+++ /dev/null
@@ -1,159 +0,0 @@
-From 13afda757c4ba8d558eaa64853849f2ad00a9806 Mon Sep 17 00:00:00 2001
-From: Matthew Barnes <mbarnes@redhat.com>
-Date: Tue, 09 Jul 2013 15:42:17 +0000
-Subject: google: Use CalDAV v2 if OAuth 2.0 support is available.
-
----
-diff --git a/modules/google-backend/module-google-backend.c b/modules/google-backend/module-google-backend.c
-index cbd7bd2..4ded74d 100644
---- a/modules/google-backend/module-google-backend.c
-+++ b/modules/google-backend/module-google-backend.c
-@@ -45,10 +45,16 @@
- 
- /* Calendar Configuration Details */
- #define GOOGLE_CALENDAR_BACKEND_NAME	"caldav"
--#define GOOGLE_CALENDAR_HOST		"www.google.com"
--#define GOOGLE_CALENDAR_CALDAV_PATH	"/calendar/dav/%s/events"
- #define GOOGLE_CALENDAR_RESOURCE_ID	"Calendar"
- 
-+/* CalDAV v1 Configuration Details */
-+#define GOOGLE_CALDAV_V1_HOST		"www.google.com"
-+#define GOOGLE_CALDAV_V1_PATH		"/calendar/dav/%s/events"
-+
-+/* CalDAV v2 Configuration Details */
-+#define GOOGLE_CALDAV_V2_HOST		"apidata.googleusercontent.com"
-+#define GOOGLE_CALDAV_V2_PATH		"/caldav/v2/%s/events"
-+
- /* Contacts Configuration Details */
- #define GOOGLE_CONTACTS_BACKEND_NAME	"google"
- #define GOOGLE_CONTACTS_HOST		"www.google.com"
-@@ -95,6 +101,52 @@ G_DEFINE_DYNAMIC_TYPE (
- 	E_TYPE_COLLECTION_BACKEND_FACTORY)
- 
- static void
-+google_backend_calendar_update_auth_method (ESource *source)
-+{
-+	EOAuth2Support *oauth2_support;
-+	ESourceAuthentication *auth_extension;
-+	ESourceWebdav *webdav_extension;
-+	const gchar *extension_name;
-+	const gchar *host;
-+	const gchar *method;
-+	const gchar *path_format;
-+	gchar *path;
-+	gchar *user;
-+
-+	oauth2_support = e_server_side_source_ref_oauth2_support (
-+		E_SERVER_SIDE_SOURCE (source));
-+
-+	/* The host name and WebDAV resource path depend on the
-+	 * authentication method used, so update those here too. */
-+
-+	if (oauth2_support != NULL) {
-+		method = "OAuth2";
-+		host = GOOGLE_CALDAV_V2_HOST;
-+		path_format = GOOGLE_CALDAV_V2_PATH;
-+	} else {
-+		method = "plain/password";
-+		host = GOOGLE_CALDAV_V1_HOST;
-+		path_format = GOOGLE_CALDAV_V1_PATH;
-+	}
-+
-+	extension_name = E_SOURCE_EXTENSION_AUTHENTICATION;
-+	auth_extension = e_source_get_extension (source, extension_name);
-+	e_source_authentication_set_host (auth_extension, host);
-+	e_source_authentication_set_method (auth_extension, method);
-+
-+	extension_name = E_SOURCE_EXTENSION_WEBDAV_BACKEND;
-+	webdav_extension = e_source_get_extension (source, extension_name);
-+
-+	user = e_source_authentication_dup_user (auth_extension);
-+	path = g_strdup_printf (path_format, (user != NULL) ? user : "");
-+	e_source_webdav_set_resource_path (webdav_extension, path);
-+	g_free (path);
-+	g_free (user);
-+
-+	g_clear_object (&oauth2_support);
-+}
-+
-+static void
- google_backend_contacts_update_auth_method (ESource *source)
- {
- 	EOAuth2Support *oauth2_support;
-@@ -123,14 +175,16 @@ google_backend_add_calendar (ECollectionBackend *backend)
- 	ESourceCollection *collection_extension;
- 	const gchar *backend_name;
- 	const gchar *extension_name;
--	const gchar *identity;
- 	const gchar *resource_id;
--	gchar *path;
- 
- 	/* FIXME As a future enhancement, we should query Google
- 	 *       for a list of user calendars and add them to the
- 	 *       collection with matching display names and colors. */
- 
-+	/* NOTE: Host name and WebDAV resource path are set in
-+	 *       google_backend_calendar_update_auth_method(),
-+	 *       since they depend on the auth method used. */
-+
- 	collection_source = e_backend_get_source (E_BACKEND (backend));
- 
- 	resource_id = GOOGLE_CALENDAR_RESOURCE_ID;
-@@ -153,15 +207,15 @@ google_backend_add_calendar (ECollectionBackend *backend)
- 	extension_name = E_SOURCE_EXTENSION_AUTHENTICATION;
- 	extension = e_source_get_extension (source, extension_name);
- 
--	e_source_authentication_set_host (
--		E_SOURCE_AUTHENTICATION (extension),
--		GOOGLE_CALENDAR_HOST);
--
- 	g_object_bind_property (
- 		collection_extension, "identity",
- 		extension, "user",
- 		G_BINDING_SYNC_CREATE);
- 
-+	/* Make sure the WebDAV resource path is up-to-date, since
-+	 * it's built from the "user" property that we just set. */
-+	google_backend_calendar_update_auth_method (source);
-+
- 	extension_name = E_SOURCE_EXTENSION_SECURITY;
- 	extension = e_source_get_extension (source, extension_name);
- 
-@@ -181,15 +235,6 @@ google_backend_add_calendar (ECollectionBackend *backend)
- 		g_free (today);
- 	}
- 
--	extension_name = E_SOURCE_EXTENSION_WEBDAV_BACKEND;
--	extension = e_source_get_extension (source, extension_name);
--
--	identity = e_source_collection_get_identity (collection_extension);
--	path = g_strdup_printf (GOOGLE_CALENDAR_CALDAV_PATH, identity);
--	e_source_webdav_set_resource_path (
--		E_SOURCE_WEBDAV (extension), path);
--	g_free (path);
--
- 	server = e_collection_backend_ref_server (backend);
- 	e_source_registry_server_add_source (server, source);
- 	g_object_unref (server);
-@@ -336,6 +381,20 @@ google_backend_child_added (ECollectionBackend *backend,
- 				collection_identity);
- 	}
- 
-+	/* Keep the calendar authentication method up-to-date.
-+	 *
-+	 * XXX Not using a property binding here in case I end up adding
-+	 *     other "support" interfaces which influence authentication.
-+	 *     Many-to-one property bindinds tend not to work so well. */
-+	extension_name = E_SOURCE_EXTENSION_CALENDAR;
-+	if (e_source_has_extension (child_source, extension_name)) {
-+		google_backend_calendar_update_auth_method (child_source);
-+		g_signal_connect (
-+			child_source, "notify::oauth2-support",
-+			G_CALLBACK (google_backend_calendar_update_auth_method),
-+			NULL);
-+	}
-+
- 	/* Keep the contacts authentication method up-to-date.
- 	 *
- 	 * XXX Not using a property binding here in case I end up adding
-
diff --git a/extra/evolution-ews/PKGBUILD b/extra/evolution-ews/PKGBUILD
index b34f53475..c84f46812 100644
--- a/extra/evolution-ews/PKGBUILD
+++ b/extra/evolution-ews/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 196035 2013-10-07 11:50:49Z jgc $
+# $Id: PKGBUILD 197941 2013-10-30 11:48:53Z allan $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 
 pkgname=evolution-ews
-pkgver=3.10.0
+pkgver=3.10.1
 pkgrel=1
 pkgdesc="MS Exchange integration through Exchange Web Services"
 arch=('i686' 'x86_64' 'mips64el')
@@ -10,9 +10,9 @@ license=('LGPL2.1')
 url="http://www.gnome.org"
 depends=('evolution-data-server' 'gtkhtml4' 'libmspack')
 makedepends=('intltool' 'evolution')
-options=('!libtool' '!emptydirs')
+options=('!emptydirs')
 source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('689ad1908d750a6004ee7ce997543a1b5481849aafeb923edebe3f766efa4b46')
+sha256sums=('018bf22f5fd88bb80f88c8f1feb696c7a7c216ab1367b7b50d02b4e313d858c9')
 
 build() {
   cd $pkgname-$pkgver
diff --git a/extra/evolution/PKGBUILD b/extra/evolution/PKGBUILD
index 9b4e30122..0f9db43df 100644
--- a/extra/evolution/PKGBUILD
+++ b/extra/evolution/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 196033 2013-10-07 11:50:47Z jgc $
+# $Id: PKGBUILD 197939 2013-10-30 11:48:04Z allan $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Contributor: Jan de Groot <jgc@archlinux.org>
 
 pkgname=evolution
-pkgver=3.10.0
+pkgver=3.10.1
 pkgrel=1
 pkgdesc="Manage your email, contacts and schedule"
 arch=('i686' 'x86_64' 'mips64el')
@@ -15,11 +15,11 @@ optdepends=('bogofilter: possible junk filter plugin'
             'spamassassin: possible junk filter plugin'
             'highlight: text highlight plugin')
 groups=('gnome-extra')
-options=('!libtool' '!emptydirs')
+options=('!emptydirs')
 install=evolution.install
 url=http://www.gnome.org/projects/evolution/
 source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver:0:4}/$pkgname-$pkgver.tar.xz)
-sha256sums=('e64fabc07e1126b80ef8354411d8232aee6e45cfece040a99d494d77df040064')
+sha256sums=('da1aacab365f27feed74cb89d03c2f4847fef7c5370d0fd84b04ab24ada83546')
 
 build() {
   cd $pkgname-$pkgver
diff --git a/extra/exempi/PKGBUILD b/extra/exempi/PKGBUILD
index b866cae93..d0623d04b 100644
--- a/extra/exempi/PKGBUILD
+++ b/extra/exempi/PKGBUILD
@@ -3,21 +3,20 @@
 
 pkgname=exempi
 pkgver=2.2.1
-pkgrel=1
+pkgrel=2
 pkgdesc="A library to parse XMP metadata"
 arch=(i686 x86_64 'mips64el')
 url="http://libopenraw.freedesktop.org/wiki/Exempi"
 license=('custom:BSD')
 depends=('gcc-libs' 'expat' 'zlib')
 makedepends=('boost')
-options=(!libtool)
 source=(http://libopenraw.freedesktop.org/download/$pkgname-$pkgver.tar.bz2{,.asc})
 md5sums=('0f8e5832299224684a65847eedf8d1e4'
          'SKIP')
 
 build() {
   cd $pkgname-$pkgver
-  ./configure --prefix=/usr
+  ./configure --prefix=/usr --disable-static
   make
 }
 
diff --git a/extra/exiv2/PKGBUILD b/extra/exiv2/PKGBUILD
index a9a05e49e..4fea3a69d 100644
--- a/extra/exiv2/PKGBUILD
+++ b/extra/exiv2/PKGBUILD
@@ -1,15 +1,14 @@
-#$Id: PKGBUILD 164832 2012-08-06 23:07:10Z andrea $
+#$Id: PKGBUILD 197943 2013-10-30 11:49:33Z allan $
 # Maintainer: tobias <tobias@arhlinux.org>
 
 pkgname=exiv2
 pkgver=0.23
-pkgrel=1.1
+pkgrel=2
 pkgdesc="Exif and Iptc metadata manipulation library and tools"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://exiv2.org"
 license=('GPL')
 depends=('gcc-libs' 'zlib' 'expat')
-options=('!libtool')
 source=("http://www.exiv2.org/${pkgname}-${pkgver}.tar.gz")
 sha1sums=('5f342bf642477526f41add11d6ee7787cdcd639f')
 
diff --git a/extra/exo/PKGBUILD b/extra/exo/PKGBUILD
index 25fafd531..99fc2a808 100644
--- a/extra/exo/PKGBUILD
+++ b/extra/exo/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 173898 2012-12-27 13:10:52Z foutrelis $
+# $Id: PKGBUILD 197944 2013-10-30 11:49:55Z allan $
 # Maintainer: Evangelos Foutras <evangelos@foutrelis.com>
 # Contributor: tobias <tobias funnychar archlinux.org>
 # Contributor: Aurelien Foret <orelien@chez.com>
@@ -14,7 +14,6 @@ groups=('xfce4')
 depends=('libxfce4ui' 'gtk2' 'hicolor-icon-theme' )
 makedepends=('perl-uri' 'intltool' 'gtk-doc' 'xorg-iceauth')
 optdepends=('perl-uri: for mail-compose helper script')
-options=('!libtool')
 install=$pkgname.install
 source=(http://archive.xfce.org/src/xfce/$pkgname/0.10/$pkgname-$pkgver.tar.bz2)
 sha256sums=('b385828bf8a38204da3254b57fdfa25a72694495aa189fabd5040f707eec76ce')
diff --git a/extra/f-spot/PKGBUILD b/extra/f-spot/PKGBUILD
index 6b846e191..2d985f4b5 100644
--- a/extra/f-spot/PKGBUILD
+++ b/extra/f-spot/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 143780 2011-11-29 08:49:53Z ibiru $
+# $Id: PKGBUILD 197965 2013-10-30 11:58:02Z allan $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: Kritoke <kritoke@nospam.gmail.com>
 # Contributor: György Balló <ballogy@freestart.hu>
@@ -12,7 +12,6 @@ arch=(i686 x86_64)
 license=('GPL')
 depends=('mono-addins' 'gnome-sharp' 'ndesk-dbus-glib' 'lcms' 'gnome-keyring-sharp' 'flickrnet' 'libgphoto2' 'desktop-file-utils' 'hicolor-icon-theme' 'xdg-utils' 'libunique')
 makedepends=('intltool' 'gnome-doc-utils' 'gnome-screensaver')
-options=('!libtool')
 install=$pkgname.install
 source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2
         mono-2.8.patch
diff --git a/extra/f2fs-tools/PKGBUILD b/extra/f2fs-tools/PKGBUILD
index 4efad1040..fb2646183 100644
--- a/extra/f2fs-tools/PKGBUILD
+++ b/extra/f2fs-tools/PKGBUILD
@@ -1,19 +1,18 @@
-# $Id: PKGBUILD 186280 2013-05-23 15:59:36Z tpowa $
+# $Id: PKGBUILD 197945 2013-10-30 11:50:17Z allan $
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 # Contributor: Christian Hesse <mail@eworm.de>
 
 pkgname=f2fs-tools
-pkgver=1.1.0_130404
+pkgver=1.2.0
 pkgrel=1
 pkgdesc="Tools for Flash-Friendly File System (F2FS)"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://sourceforge.net/projects/f2fs-tools/"
 depends=('util-linux')
 license=('GPL')
-#source=('http://git.kernel.org/cgit/linux/kernel/git/jaegeuk/f2fs-tools.git/snapshot/f2fs-tools-1.1.0.tar.gz')
-source=("ftp://ftp.archlinux.org/other/packages/$pkgname/$pkgname-$pkgver.tar.bz2")
-md5sums=('0bb44c174a2da2a7dd1216cc46b4612c')
-options=(!libtool)
+source=('http://git.kernel.org/cgit/linux/kernel/git/jaegeuk/f2fs-tools.git/snapshot/f2fs-tools-1.2.0.tar.gz')
+#source=("ftp://ftp.archlinux.org/other/packages/$pkgname/$pkgname-$pkgver.tar.bz2")
+md5sums=('d27ad7cd56f6001f7e1d508d85eef195')
 
 build() {
 	cd "${pkgname}-${pkgver}"
@@ -28,4 +27,3 @@ package() {
 
 	make DESTDIR="${pkgdir}/" sbindir=/usr/bin install
 }
-
diff --git a/extra/faad2/LICENSE b/extra/faad2/LICENSE
deleted file mode 100644
index a16abf6e3..000000000
--- a/extra/faad2/LICENSE
+++ /dev/null
@@ -1,42 +0,0 @@
-__________
-COPYRIGHTS
-
-For FAAD2 the following license applies:
-
-******************************************************************************
-** FAAD2 - Freeware Advanced Audio (AAC) Decoder including SBR decoding
-** Copyright (C) 2003-2005 M. Bakker, Nero AG, http://www.nero.com
-**
-** This program is free software; you can redistribute it and/or modify
-** it under the terms of the GNU General Public License as published by
-** the Free Software Foundation; either version 2 of the License, or
-** (at your option) any later version.
-**
-** This program 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 General Public License for more details.
-**
-** You should have received a copy of the GNU General Public License
-** along with this program; if not, write to the Free Software
-** Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-**
-** Any non-GPL usage of this software or parts of this software is strictly
-** forbidden.
-**
-** The "appropriate copyright message" mentioned in section 2c of the GPLv2
-** must read: "Code from FAAD2 is copyright (c) Nero AG, www.nero.com"
-**
-** Commercial non-GPL licensing of this software is possible.
-** For more info contact Nero AG through Mpeg4AAClicense@nero.com.
-******************************************************************************
-
-
-Please note that the use of this software may require the payment of
-patent royalties. You need to consider this issue before you start
-building derivative works. We are not warranting or indemnifying you in
-any way for patent royalities! YOU ARE SOLELY RESPONSIBLE FOR YOUR OWN
-ACTIONS!
-
-
-______
diff --git a/extra/faad2/PKGBUILD b/extra/faad2/PKGBUILD
index 6c051bddc..08c5cdf06 100644
--- a/extra/faad2/PKGBUILD
+++ b/extra/faad2/PKGBUILD
@@ -1,29 +1,39 @@
-# $Id: PKGBUILD 149405 2012-02-07 15:27:21Z eric $
+# $Id: PKGBUILD 197236 2013-10-24 15:27:20Z eric $
 # Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgname=faad2
 pkgver=2.7
-pkgrel=3.2
+pkgrel=4
 pkgdesc="ISO AAC audio decoder"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.audiocoding.com/"
-license=('custom:GPL')
+license=('GPL')
 depends=('glibc')
-options=('!libtool' '!makeflags')
-source=(http://downloads.sourceforge.net/sourceforge/faac/${pkgname}-${pkgver}.tar.bz2 LICENSE)
+options=('!makeflags')
+source=(http://downloads.sourceforge.net/sourceforge/faac/${pkgname}-${pkgver}.tar.bz2
+        faad2-2.7-libmp4ff-install-mp4ff_int_types_h.patch
+	faad2-2.7-libmp4ff-shared-lib.patch
+	faad2-2.7-man1_MANS.patch)
 sha1sums=('b0e80481d27ae9faf9e46c8c8dfb617a0adb91b5'
-          '00edd9b30d8d5098b5e91c03c595d96a3bbe56fd')
+          '1cf28cfd32dbae6cc484b149fd6adfea33506544'
+          '247658aa795cd6d44a153fae8c5cb62e427f3ecf'
+          '4b548a08f7611a5f4f395c7c1d4cef5e37368af2')
+
+prepare() {
+  cd ${pkgname}-${pkgver}
+  patch -p1 -i "${srcdir}/faad2-2.7-libmp4ff-shared-lib.patch"
+  patch -p0 -i "${srcdir}/faad2-2.7-libmp4ff-install-mp4ff_int_types_h.patch"
+  patch -p1 -i "${srcdir}/faad2-2.7-man1_MANS.patch"
+  autoreconf --force --install
+}
 
 build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+  cd ${pkgname}-${pkgver}
   ./configure --prefix=/usr
   make CFLAGS="${CFLAGS} -fPIC"
 }
 
 package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" manmdir=/usr/share/man/man1 install
-  mv "${pkgdir}/usr/share/man/man1/faad.man" "${pkgdir}/usr/share/man/man1/faad.1"
-  install -D -m644 common/mp4ff/mp4ff_int_types.h "${pkgdir}/usr/include/mp4ff_int_types.h"
-  install -D -m644 "${srcdir}/LICENSE"  "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+  cd ${pkgname}-${pkgver}
+  make DESTDIR="${pkgdir}" install
 }
diff --git a/extra/faad2/faad2-2.7-libmp4ff-install-mp4ff_int_types_h.patch b/extra/faad2/faad2-2.7-libmp4ff-install-mp4ff_int_types_h.patch
new file mode 100644
index 000000000..5d39cad95
--- /dev/null
+++ b/extra/faad2/faad2-2.7-libmp4ff-install-mp4ff_int_types_h.patch
@@ -0,0 +1,13 @@
+Install mp4ff_int_types.h for mythmusic.
+
+http://bugs.gentoo.org/275008
+
+--- common/mp4ff/Makefile.am
++++ common/mp4ff/Makefile.am
+@@ -1,5 +1,5 @@
+ lib_LTLIBRARIES = libmp4ff.la
+-include_HEADERS = mp4ff.h mp4ffint.h
++include_HEADERS = mp4ff.h mp4ffint.h mp4ff_int_types.h
+ 
+ AM_CFLAGS = -DUSE_TAGGING=1
+ 
diff --git a/extra/faad2/faad2-2.7-libmp4ff-shared-lib.patch b/extra/faad2/faad2-2.7-libmp4ff-shared-lib.patch
new file mode 100644
index 000000000..56a131192
--- /dev/null
+++ b/extra/faad2/faad2-2.7-libmp4ff-shared-lib.patch
@@ -0,0 +1,29 @@
+Ripped from Debian
+
+Patch to create a shared lib for libmp4ff.
+
+--- a/common/mp4ff/Makefile.am
++++ b/common/mp4ff/Makefile.am
+@@ -1,7 +1,8 @@
+-lib_LIBRARIES = libmp4ff.a
++lib_LTLIBRARIES = libmp4ff.la
+ include_HEADERS = mp4ff.h mp4ffint.h
+ 
+-libmp4ff_a_CFLAGS = -DUSE_TAGGING=1
++AM_CFLAGS = -DUSE_TAGGING=1
+ 
+-libmp4ff_a_SOURCES = mp4ff.c mp4atom.c mp4meta.c mp4sample.c mp4util.c \
++libmp4ff_la_LDFLAGS = -version-info 0:0:0
++libmp4ff_la_SOURCES = mp4ff.c mp4atom.c mp4meta.c mp4sample.c mp4util.c \
+ 		     mp4tagupdate.c mp4ff.h mp4ffint.h mp4ff_int_types.h
+--- a/frontend/Makefile.am
++++ b/frontend/Makefile.am
+@@ -5,7 +5,7 @@
+ 	   -I$(top_srcdir)/common/mp4ff
+ 
+ faad_LDADD = $(top_builddir)/libfaad/libfaad.la \
+-	     $(top_builddir)/common/mp4ff/libmp4ff.a
++	     $(top_builddir)/common/mp4ff/libmp4ff.la
+ 
+ faad_SOURCES = main.c \
+ 	       audio.c audio.h \
diff --git a/extra/faad2/faad2-2.7-man1_MANS.patch b/extra/faad2/faad2-2.7-man1_MANS.patch
new file mode 100644
index 000000000..9c1ddb01b
--- /dev/null
+++ b/extra/faad2/faad2-2.7-man1_MANS.patch
@@ -0,0 +1,10 @@
+diff -ur faad2-2.7.orig/frontend/Makefile.am faad2-2.7/frontend/Makefile.am
+--- faad2-2.7.orig/frontend/Makefile.am	2009-02-06 18:03:37.000000000 +0200
++++ faad2-2.7/frontend/Makefile.am	2009-07-20 20:27:29.000000000 +0300
+@@ -1,5 +1,5 @@
+ bin_PROGRAMS = faad
+-man_MANS = faad.man
++man1_MANS = faad.man
+ 
+ INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/common/faad \
+ 	   -I$(top_srcdir)/common/mp4ff
diff --git a/extra/fakechroot/PKGBUILD b/extra/fakechroot/PKGBUILD
index 98740f86e..a02a6ff44 100644
--- a/extra/fakechroot/PKGBUILD
+++ b/extra/fakechroot/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 185194 2013-05-12 04:33:49Z allan $
+# $Id: PKGBUILD 197946 2013-10-30 11:50:42Z allan $
 # Maintainer : Allan McRae <allan@archlinux.org>
 # Contributor: Aaron Griffin <aaron@archlinux.org>
 
@@ -9,7 +9,6 @@ pkgdesc="Gives a fake chroot environment"
 arch=('i686' 'x86_64' 'mips64el')
 url="https://github.com/fakechroot/fakechroot/wiki"
 license=('LGPL')
-options=('!libtool')
 install=fakechroot.install
 source=(https://github.com/downloads/fakechroot/fakechroot/fakechroot-${pkgver}.tar.gz)
 md5sums=('3ea5efb76664e787450e0cfcefc1b807')
diff --git a/extra/farstream-0.1/PKGBUILD b/extra/farstream-0.1/PKGBUILD
index 1bf9a3dfb..b1ee8f8fc 100644
--- a/extra/farstream-0.1/PKGBUILD
+++ b/extra/farstream-0.1/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 174741 2013-01-05 21:31:32Z foutrelis $
+# $Id: PKGBUILD 197948 2013-10-30 11:51:24Z allan $
 # Maintainer: Evangelos Foutras <evangelos@foutrelis.com>
 # Contributor: Ionut Biru <ibiru@archlinux.org>
 
@@ -13,7 +13,6 @@ license=('LGPL2.1')
 depends=('libnice' 'gstreamer0.10-base' 'gstreamer0.10-bad-plugins'
          'gstreamer0.10-good' 'gstreamer0.10-ffmpeg')
 makedepends=('gobject-introspection' 'gstreamer0.10-python' 'python2-gobject2')
-options=('!libtool')
 source=(http://freedesktop.org/software/$_pkgname/releases/$_pkgname/$_pkgname-$pkgver.tar.gz
         farstream-0.1.2-prefer-vp8.patch
         farstream-0.1.2-introspection-tag-order.patch)
diff --git a/extra/farstream/PKGBUILD b/extra/farstream/PKGBUILD
index 4b57a7256..68c067bec 100644
--- a/extra/farstream/PKGBUILD
+++ b/extra/farstream/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 183166 2013-04-18 07:35:04Z eric $
+# $Id: PKGBUILD 197947 2013-10-30 11:51:03Z allan $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 
 pkgname=farstream
@@ -13,7 +13,6 @@ makedepends=('gobject-introspection')
 optdepends=('gst-plugins-good' 'gst-plugins-bad')
 conflicts=('farsight2')
 replaces=('farsight2')
-options=(!libtool)
 source=(http://freedesktop.org/software/$pkgname/releases/$pkgname/$pkgname-$pkgver.tar.gz{,.asc})
 md5sums=('a8971167068b69a6933d3eaaeb9ab448'
          'SKIP')
diff --git a/extra/fcgi/PKGBUILD b/extra/fcgi/PKGBUILD
index 53c6a04c1..73ebbfe42 100644
--- a/extra/fcgi/PKGBUILD
+++ b/extra/fcgi/PKGBUILD
@@ -1,25 +1,33 @@
-# $Id: PKGBUILD 173924 2012-12-28 05:30:53Z pierre $
+# $Id: PKGBUILD 197174 2013-10-23 13:52:02Z pierre $
 # Maintainer: tobias <tobias@justdreams.de>
 # Modified by: eliott <eliott@cactuswax.net>
 # Original by Benjamin Andresen, klapmuetz [at] gmail [dot] com
 
 pkgname=fcgi
 pkgver=2.4.0
-pkgrel=8
+pkgrel=9
 depends=('gcc-libs')
-pkgdesc="FASTCgi(fcgi) islanguage independent, high performant extension to CGI"
+pkgdesc="FASTCgi (fcgi) is a language independent, high performant extension to CGI"
 arch=('i686' 'x86_64' 'mips64el')
 license=('custom')
-options=('!libtool' '!makeflags')
+options=('!makeflags')
 url="http://www.fastcgi.com"
 source=("http://www.fastcgi.com/dist/${pkgname}-${pkgver}.tar.gz"
         'gcc44-fix-include.patch')
 md5sums=('d15060a813b91383a9f3c66faf84867e'
          'a8028462163755f3ce457a5c641f237b')
 
-build() {
+prepare() {
   cd "${srcdir}/${pkgname}-${pkgver}"
   patch -p1 -i "${srcdir}/gcc44-fix-include.patch"
+  libtoolize --force
+  aclocal
+  autoconf
+  automake --foreign
+}
+
+build() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
   ./configure --prefix=/usr --build=$CHOST
   make
 }
diff --git a/extra/ffcall/PKGBUILD b/extra/ffcall/PKGBUILD
index c105e93fe..cdb920c8a 100644
--- a/extra/ffcall/PKGBUILD
+++ b/extra/ffcall/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 128452 2011-06-24 01:23:15Z eric $
+# $Id: PKGBUILD 197949 2013-10-30 11:51:49Z allan $
 # Maintainer: Vesa Kaihlavirta <vegai@iki.fi>
 # Contributor: Michael Baehr <usemike@spamblocked.com>
 
@@ -9,7 +9,7 @@ pkgdesc="C library for implementing foreign function calls in embedded interpret
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.gnu.org/software/libffcall/"
 license=('GPL2')
-options=('!libtool' '!makeflags')
+options=('!makeflags')
 source=(http://www.haible.de/bruno/gnu/${pkgname}-${pkgver}.tar.gz
         mipsn32.patch)
 md5sums=('2db95007e901f3bc2ae7e5a9fe9ebea4'
diff --git a/extra/ffmpeg-compat/PKGBUILD b/extra/ffmpeg-compat/PKGBUILD
index 53b1a5ccc..21e3a623b 100644
--- a/extra/ffmpeg-compat/PKGBUILD
+++ b/extra/ffmpeg-compat/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 193811 2013-09-02 08:57:55Z bpiotrowski $
+# $Id: PKGBUILD 197753 2013-10-29 18:00:31Z bpiotrowski $
 # Maintainer:  Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer:  Bartłomiej Piotrowski <nospam@bpiotrowski.pl>
 # Contributor: Ionut Biru <ibiru@archlinux.org>
@@ -6,8 +6,8 @@
 # Contributor: Paul Mattal <paul@archlinux.org>
 
 pkgname=ffmpeg-compat
-pkgver=0.10.8
-pkgrel=4
+pkgver=0.10.9
+pkgrel=1
 epoch=1
 pkgdesc='Complete and free Internet live audio and video broadcasting solution for Linux/Unix'
 arch=('i686' 'x86_64' 'mips64el')
@@ -24,7 +24,7 @@ if [ "$CARCH" != "mips64el" ]; then
   makedepends=('libvdpau' 'yasm')
 fi
 source=(http://ffmpeg.org/releases/ffmpeg-$pkgver.tar.bz2)
-sha256sums=('2e371088a71656be41b4ff70ae7e80a1d88c5149d6209013c9cce4b84278cbc8')
+sha256sums=('1d0cc2dd539faefe47554935ea4e4f6aa779d0896b3e722d595aa5abe2304cf9')
 
 build() {
   cd ffmpeg-$pkgver
diff --git a/extra/ffmpeg/PKGBUILD b/extra/ffmpeg/PKGBUILD
index c533c25eb..e9d34e53f 100644
--- a/extra/ffmpeg/PKGBUILD
+++ b/extra/ffmpeg/PKGBUILD
@@ -1,15 +1,16 @@
-# $Id: PKGBUILD 196252 2013-10-09 20:32:23Z bpiotrowski $
-# Maintainer : Ionut Biru <ibiru@archlinux.org>
+# $Id: PKGBUILD 198639 2013-10-31 16:28:32Z bpiotrowski $
+# Maintainer:  Ionut Biru <ibiru@archlinux.org>
+# Maintainer:  Bartłomiej Piotrowski <nospam@bpiotrowski.pl>
 # Contributor: Tom Newsom <Jeepster@gmx.co.uk>
 # Contributor: Paul Mattal <paul@archlinux.org>
 
 pkgname=ffmpeg
-pkgver=2.0.2
+pkgver=2.1
 pkgrel=2
 epoch=1
-pkgdesc="Complete and free Internet live audio and video broadcasting solution for Linux/Unix"
+pkgdesc='Complete and free Internet live audio and video broadcasting solution'
 arch=('i686' 'x86_64' 'mips64el')
-url="http://ffmpeg.org/"
+url='http://ffmpeg.org/'
 license=('GPL')
 depends=(
       'alsa-lib' 'bzip2' 'fontconfig' 'gnutls' 'gsm' 'lame' 'libass'
@@ -21,8 +22,15 @@ if [ "${CARCH}" != "mips64el" ]; then
     depends+=('libva')
     makedepends=('yasm' 'libvdpau')
 fi
-source=(http://ffmpeg.org/releases/$pkgname-$pkgver.tar.bz2)
-sha256sums=('986f63dc0785f473b1832d0eead502e39c9706fbe7f9677bbea0dad6fe0fab4a')
+source=(http://ffmpeg.org/releases/$pkgname-$pkgver.tar.bz2
+        ffmpeg-2.1-avformat-http.fix-cookies.patch)
+sha256sums=('926603fd974e9b38071a5cfc6fd0d93857801d1968145dfce7fdc627ab1d68df'
+            '0168bc6f77115ef6f3bd428b1b05a1543d0dd53d8d74c15a24879b119ce8655c')
+
+prepare() {
+  cd $pkgname-$pkgver
+  patch -p1 -i ../ffmpeg-2.1-avformat-http.fix-cookies.patch
+}
 
 build() {
   cd $pkgname-$pkgver
@@ -81,7 +89,7 @@ build() {
 package() {
   cd $pkgname-$pkgver
   make DESTDIR="$pkgdir" install install-man
-  install -D -m755 tools/qt-faststart "$pkgdir/usr/bin/qt-faststart"
+  install -D -m755 tools/qt-faststart "$pkgdir"/usr/bin/qt-faststart
 }
 
 # vim:set ts=2 sw=2 et:
diff --git a/extra/ffmpeg/ffmpeg-2.1-avformat-http.fix-cookies.patch b/extra/ffmpeg/ffmpeg-2.1-avformat-http.fix-cookies.patch
new file mode 100644
index 000000000..7c826a3b8
--- /dev/null
+++ b/extra/ffmpeg/ffmpeg-2.1-avformat-http.fix-cookies.patch
@@ -0,0 +1,28 @@
+From b73900b8a6c0a23e63e84a5eed0a5b9b3ffe1198 Mon Sep 17 00:00:00 2001
+From: Michael Niedermayer <michaelni@gmx.at>
+Date: Thu, 31 Oct 2013 01:42:13 +0100
+Subject: [PATCH] avformat/http: fix cookies
+
+Fixes Ticket3096
+
+Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
+---
+ libavformat/http.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/libavformat/http.c b/libavformat/http.c
+index c5b5c53..9be1181 100644
+--- a/libavformat/http.c
++++ b/libavformat/http.c
+@@ -95,7 +95,7 @@ static const AVOption options[] = {
+ {"multiple_requests", "use persistent connections", OFFSET(multiple_requests), AV_OPT_TYPE_INT, {.i64 = 0}, 0, 1, D|E },
+ {"post_data", "set custom HTTP post data", OFFSET(post_data), AV_OPT_TYPE_BINARY, .flags = D|E },
+ {"mime_type", "set MIME type", OFFSET(mime_type), AV_OPT_TYPE_STRING, {0}, 0, 0, 0 },
+-{"cookies", "set cookies to be sent in applicable future requests, use newline delimited Set-Cookie HTTP field value syntax", OFFSET(cookies), AV_OPT_TYPE_STRING, {0}, 0, 0, 0 },
++{"cookies", "set cookies to be sent in applicable future requests, use newline delimited Set-Cookie HTTP field value syntax", OFFSET(cookies), AV_OPT_TYPE_STRING, {0}, 0, 0, D },
+ {"icy", "request ICY metadata", OFFSET(icy), AV_OPT_TYPE_INT, {.i64 = 0}, 0, 1, D },
+ {"icy_metadata_headers", "return ICY metadata headers", OFFSET(icy_metadata_headers), AV_OPT_TYPE_STRING, {0}, 0, 0, 0 },
+ {"icy_metadata_packet", "return current ICY metadata packet", OFFSET(icy_metadata_packet), AV_OPT_TYPE_STRING, {0}, 0, 0, 0 },
+-- 
+1.8.4.1
+
diff --git a/extra/ffmpegthumbnailer/PKGBUILD b/extra/ffmpegthumbnailer/PKGBUILD
index d95df37f3..14bb59444 100644
--- a/extra/ffmpegthumbnailer/PKGBUILD
+++ b/extra/ffmpegthumbnailer/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 191893 2013-08-01 06:53:26Z bpiotrowski $
+# $Id: PKGBUILD 197950 2013-10-30 11:52:15Z allan $
 # Maintainer: Ronald van Haren <ronald.archlinux.org>
 # Contributor: boromil@gmail.com
 
@@ -13,7 +13,6 @@ depends=('ffmpeg' 'libjpeg' 'libpng')
 optdepends=('gvfs: support for gio uris')
 source=("http://ffmpegthumbnailer.googlecode.com/files/$pkgname-$pkgver.tar.gz"
         "ffmpegthumbnailer-2.0.8-memcpy.patch")
-options=('!libtool')
 sha1sums=('2c54ca16efd953f46547e22799cfc40bd9c24533'
           'c23ef173f98c928fcacacd6e6060dab2e56f1239')
 
diff --git a/extra/fftw/PKGBUILD b/extra/fftw/PKGBUILD
index 67a9365a0..c6d7cd64e 100644
--- a/extra/fftw/PKGBUILD
+++ b/extra/fftw/PKGBUILD
@@ -1,17 +1,16 @@
-# $Id: PKGBUILD 176986 2013-02-03 11:04:50Z allan $
+# $Id: PKGBUILD 197299 2013-10-25 01:41:11Z allan $
 # Maintainer: Ronald van Haren <ronald.archlinux.org>
 # Contributor: damir <damir@archlinux.org>
 
 pkgname=fftw
 pkgver=3.3.3
-pkgrel=1
+pkgrel=2
 pkgdesc="A library for computing the discrete Fourier transform (DFT)"
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL2')
 url="http://www.fftw.org/"
 depends=('glibc' 'bash')
 makedepends=('gcc-fortran')
-options=('!libtool')
 source=("http://www.fftw.org/${pkgname}-${pkgver}.tar.gz")
 install=fftw.install
 sha1sums=('11487180928d05746d431ebe7a176b52fe205cf9')
diff --git a/extra/five-or-more/PKGBUILD b/extra/five-or-more/PKGBUILD
index 9eab21392..a52abf81b 100644
--- a/extra/five-or-more/PKGBUILD
+++ b/extra/five-or-more/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 196387 2013-10-12 16:51:58Z heftig $
+# $Id: PKGBUILD 197952 2013-10-30 11:52:58Z allan $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Contributor: Jan de Groot <jgc@archlinux.org>
 
@@ -12,7 +12,7 @@ depends=('desktop-file-utils' 'hicolor-icon-theme' 'gtk3' 'librsvg')
 makedepends=('intltool' 'itstool' 'gobject-introspection')
 conflicts=('gnome-games')
 replaces=('gnome-games')
-options=('!emptydirs' '!libtool')
+options=('!emptydirs')
 install=five-or-more.install
 url="https://live.gnome.org/Five%20or%20more"
 groups=('gnome-extra')
diff --git a/extra/flac/PKGBUILD b/extra/flac/PKGBUILD
index 6c8f47393..be8f995bc 100644
--- a/extra/flac/PKGBUILD
+++ b/extra/flac/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 186549 2013-05-28 18:39:02Z eric $
+# $Id: PKGBUILD 197953 2013-10-30 11:53:19Z allan $
 # Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgbase=flac
@@ -11,7 +11,7 @@ license=('BSD' 'GPL')
 depends=('libogg')
 makedepends=('doxygen')
 [ "$CARCH" = "mips64el" ] || makedepends+=('nasm' 'xmms')
-options=('!libtool' '!makeflags')
+options=('!makeflags')
 source=(http://downloads.xiph.org/releases/flac/${pkgbase}-${pkgver}.tar.xz)
 sha1sums=('a136e5748f8fb1e6c524c75000a765fc63bb7b1b')
 
@@ -29,7 +29,7 @@ check() {
 package_flac() {
   pkgdesc="Free Lossless Audio Codec"
   [ "$CARCH" = "mips64el" ] || optdepends=('xmms: for using the xmms plugin')
-  options=('!libtool' '!docs')
+  options=('!docs')
 
   cd ${pkgbase}-${pkgver}
   make DESTDIR="${pkgdir}" install
diff --git a/extra/fltk/PKGBUILD b/extra/fltk/PKGBUILD
index 2eb654e93..27f5dfeef 100644
--- a/extra/fltk/PKGBUILD
+++ b/extra/fltk/PKGBUILD
@@ -1,14 +1,14 @@
-# $Id: PKGBUILD 194347 2013-09-14 08:19:54Z bpiotrowski $
+# $Id: PKGBUILD 197654 2013-10-27 19:10:51Z eric $
 # Maintainer:
 
 pkgbase=fltk
 pkgname=('fltk' 'fltk-docs' 'fltk-games')
 pkgver=1.3.2
-pkgrel=3
+pkgrel=4
 arch=('i686' 'x86_64' 'mips64el')
 license=('custom:LGPL')
 url="http://www.fltk.org/"
-makedepends=('mesa' 'glu' 'doxygen' 'libjpeg' 'libpng' 'libxft' 'libxinerama' \
+makedepends=('mesa' 'glu' 'doxygen' 'libjpeg' 'libxft' 'libxinerama' \
              'alsa-lib' 'desktop-file-utils' 'libxcursor')
 source=(http://fltk.org/pub/fltk/$pkgver/fltk-$pkgver-source.tar.gz
         tigervnc.patch)
@@ -16,44 +16,41 @@ md5sums=('9f7e707d4fb7a5a76f0f9b73ff70623d'
          '9efdf03a449d7639b6da493cb0972bba')
 
 prepare() {
-  cd "$srcdir/$pkgbase-$pkgver"
+  cd $pkgbase-$pkgver
   patch -Np1 -i ../tigervnc.patch
 }
 
 build() {
-  cd "$srcdir/$pkgbase-$pkgver"
+  cd $pkgbase-$pkgver
   sed -i -e 's/$(LINKFLTK)/$(LINKSHARED)/' \
          -e 's/$(LINKFLTKIMG)/$(LINKSHARED)/' test/Makefile
   ./configure --prefix=/usr --enable-threads --enable-xft --enable-shared
   make
-  cd documentation
-  make html
+  make -C documentation html
 }
 
 package_fltk() {
   pkgdesc="Graphical user interface toolkit for X"
-  depends=('libjpeg' 'libpng' 'libxft' 'libxinerama' 'hicolor-icon-theme' \
+  depends=('libjpeg' 'libxft' 'libxinerama' 'hicolor-icon-theme' \
            'desktop-file-utils' 'xdg-utils' 'libxcursor')
   options=('!docs')
   install=fltk.install
 
-  cd "$srcdir/$pkgbase-$pkgver"
+  cd $pkgbase-$pkgver
   make DESTDIR="$pkgdir" install
-  (cd fluid; make DESTDIR="$pkgdir" install install-linux)
-  chmod 644 "$pkgdir"/usr/lib/*.a
+  make DESTDIR="$pkgdir" -C fluid install install-linux
   install -D -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
 }
 
 package_fltk-docs() {
   pkgdesc="Graphical user interface toolkit for X (documentation)"
 
-  cd "$srcdir/$pkgbase-$pkgver/documentation"
+  cd $pkgbase-$pkgver/documentation
   install -d "$pkgdir"/usr/share/doc/fltk/
   for _file in html/* ; do
     install -m644 $_file "$pkgdir"/usr/share/doc/fltk/
   done
-  cd ../test
-  make DESTDIR="$pkgdir" install
+  make DESTDIR="$pkgdir" -C ../test install
   install -D -m644 ../COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
 }
 
@@ -62,8 +59,8 @@ package_fltk-games() {
   depends=('alsa-lib' 'fltk')
   install=fltk-games.install
 
-  cd "$srcdir/$pkgbase-$pkgver/test"
+  cd $pkgbase-$pkgver/test
   make DESTDIR="$pkgdir" install-linux
-  (cd ../documentation;  make DESTDIR="$pkgdir" install-linux)
+  make DESTDIR="$pkgdir" -C ../documentation install-linux
   install -D -m644 ../COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
 }
diff --git a/extra/folks/PKGBUILD b/extra/folks/PKGBUILD
index 3c29f888b..8f269c030 100644
--- a/extra/folks/PKGBUILD
+++ b/extra/folks/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 196038 2013-10-07 11:50:52Z jgc $
+# $Id: PKGBUILD 197954 2013-10-30 11:53:55Z allan $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 
 pkgname=folks
@@ -11,7 +11,7 @@ license=(LGPL2.1)
 depends=(telepathy-glib libgee libxml2 evolution-data-server zeitgeist libtracker-sparql)
 makedepends=(gobject-introspection intltool vala)
 install=folks.install
-options=('!libtool' '!emptydirs')
+options=('!emptydirs')
 source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
 sha256sums=('924c440f16a8c9b0d0d832588fa77a1553fa2a5d2659c4c7d3178a7ef42222af')
 
diff --git a/extra/fontconfig/29-replace-bitmap-fonts.conf b/extra/fontconfig/29-replace-bitmap-fonts.conf
deleted file mode 100644
index 391ffef94..000000000
--- a/extra/fontconfig/29-replace-bitmap-fonts.conf
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
-<fontconfig>
-  <!-- Prefer Microsoft versions of PostScript fonts, as these typically render a lot better on-screen 
-       30-metric-aliases.conf will then also add the free clones of these fonts -->
-  <alias binding="same">
-    <family>Helvetica</family>
-    <prefer><family>Arial</family></prefer>
-  </alias>
-  <alias binding="same">
-    <family>Times</family>
-    <prefer><family>Times New Roman</family></prefer>
-  </alias>
-  <alias binding="same">
-    <family>Courier</family>
-    <prefer><family>Courier New</family></prefer>
-  </alias>
-</fontconfig>
diff --git a/extra/fontconfig/PKGBUILD b/extra/fontconfig/PKGBUILD
index 95fca93c5..fccc475e1 100644
--- a/extra/fontconfig/PKGBUILD
+++ b/extra/fontconfig/PKGBUILD
@@ -1,26 +1,23 @@
-# $Id: PKGBUILD 193795 2013-09-01 09:03:59Z andyrtr $
+# $Id: PKGBUILD 197955 2013-10-30 11:54:17Z allan $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=fontconfig
-pkgver=2.10.95
+pkgver=2.11.0
 pkgrel=1
 pkgdesc="A library for configuring and customizing font access"
 arch=(i686 x86_64 'mips64el')
 url="http://www.fontconfig.org/release/"
 license=('custom')
 depends=('expat' 'freetype2')
-options=('!libtool')
 install=fontconfig.install
-source=(http://www.fontconfig.org/release/$pkgname-$pkgver.tar.bz2
-        29-replace-bitmap-fonts.conf)
-sha256sums=('abc0ecb9fb083d8705c140c8c0d13cc294c56faa1fee0e31e3f3eb98062a5e7b'
-            '2325c478783659e8fce79f5754119934d6ce21f81552f878b740c7b18f9fe0d6')
+source=(http://www.fontconfig.org/release/$pkgname-$pkgver.tar.bz2)
+sha256sums=('cb0e0ef6f03bc8568e95653840bb07d5859dc89d7ce2cade9d94fcccf8c1a467')
 
   # a nice page to test font matching:
   # http://zipcon.net/~swhite/docs/computers/browsers/fonttest.html
 
 build() {
-  cd "$srcdir/$pkgname-$pkgver"
+  cd $pkgname-$pkgver
 
   # make sure there's no rpath trouble and sane .so versioning - FC and Gentoo do this as well
   libtoolize -f
@@ -38,19 +35,12 @@ build() {
 }
 
 check() {
-  cd "$srcdir/$pkgname-$pkgver"
+  cd $pkgname-$pkgver
   make -k check
 }
 
 package() {
-  cd "$srcdir/$pkgname-$pkgver"
+  cd $pkgname-$pkgver
   make DESTDIR="$pkgdir" install
-
-  install -m644 "$srcdir/29-replace-bitmap-fonts.conf" "$pkgdir/etc/fonts/conf.avail"
-  ln -s ../conf.avail/29-replace-bitmap-fonts.conf \
-    "$pkgdir/etc/fonts/conf.d/29-replace-bitmap-fonts.conf"
-
-  #Install license
-  install -m755 -d "$pkgdir/usr/share/licenses/$pkgname"
-  install -m644 COPYING "$pkgdir/usr/share/licenses/$pkgname"
+  install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING"
 }
diff --git a/extra/fontforge/PKGBUILD b/extra/fontforge/PKGBUILD
index 9f842e358..d9d7e8f8f 100644
--- a/extra/fontforge/PKGBUILD
+++ b/extra/fontforge/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 191917 2013-08-01 06:59:46Z bpiotrowski $
+# $Id: PKGBUILD 197956 2013-10-30 11:54:42Z allan $
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
 # Contributor: Eric Belanger <eric@archlinux.org>
 # Contributor: William Rea <sillywilly@gmail.com>
@@ -20,7 +20,7 @@ sha1sums=('b520f532b48e557c177dffa29120225066cc4e84'
 # git clone git://fontforge.git.sourceforge.net/gitroot/fontforge/fontforge; cd fontforge; git archive --prefix=${pkgname}-${pkgver}/ master | xz > ../${pkgname}-${pkgver}.tar.xz
 # source=("ftp://ftp.archlinux.org/other/${pkgname}/${pkgname}-${pkgver}.tar.xz")
 
-options=('!libtool' '!makeflags')
+options=('!makeflags')
 install=install
 
 prepare() {
diff --git a/extra/four-in-a-row/PKGBUILD b/extra/four-in-a-row/PKGBUILD
index a30310c95..691e2544d 100644
--- a/extra/four-in-a-row/PKGBUILD
+++ b/extra/four-in-a-row/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 196384 2013-10-12 16:45:33Z heftig $
+# $Id: PKGBUILD 197957 2013-10-30 11:55:03Z allan $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Contributor: Jan de Groot <jgc@archlinux.org>
 
@@ -12,7 +12,7 @@ depends=('desktop-file-utils' 'hicolor-icon-theme' 'gtk3' 'libcanberra' 'librsvg
 makedepends=('intltool' 'itstool' 'gobject-introspection')
 conflicts=('gnome-games')
 replaces=('gnome-games')
-options=('!emptydirs' '!libtool')
+options=('!emptydirs')
 install=four-in-a-row.install
 url="https://live.gnome.org/Four-in-a-row"
 groups=('gnome-extra')
diff --git a/extra/fprintd/PKGBUILD b/extra/fprintd/PKGBUILD
index 4939cb539..41643bd3d 100644
--- a/extra/fprintd/PKGBUILD
+++ b/extra/fprintd/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 193153 2013-08-17 10:25:30Z heftig $
+# $Id: PKGBUILD 197958 2013-10-30 11:55:25Z allan $
 # Maintainer:
 # Contributor: Nikolay Rysev <mad.f3ka@gmail.com>
 
@@ -12,7 +12,6 @@ license=(GPL)
 depends=(libfprint dbus-glib polkit)
 makedepends=(intltool gtk-doc)
 groups=(fprint)
-options=(!libtool)
 _snap=V_${pkgver//./_}
 source=(http://people.freedesktop.org/~hadess/$pkgname-$pkgver.tar.xz
         pod.patch)
diff --git a/extra/freealut/PKGBUILD b/extra/freealut/PKGBUILD
index cfcc9c583..342ce65a7 100644
--- a/extra/freealut/PKGBUILD
+++ b/extra/freealut/PKGBUILD
@@ -1,22 +1,21 @@
-# $Id: PKGBUILD 137589 2011-09-09 23:35:10Z allan $ 
+# $Id: PKGBUILD 197959 2013-10-30 11:55:45Z allan $ 
 # Maintainer:
 # Contributor: Arkamririon <Arkamririon@gmx.net>
 
 pkgname=freealut
 pkgver=1.1.0
-pkgrel=4.1
+pkgrel=5
 pkgdesc="OpenAL Utility Toolkit (ALUT)"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.openal.org"
 license=("LGPL")
 depends=('openal')
-options=('!libtool')
-source=(http://connect.creativelabs.com/openal/Downloads/ALUT/$pkgname-$pkgver.tar.gz)
+source=(http://pkgs.fedoraproject.org/repo/pkgs/freealut/freealut-1.1.0.tar.gz/e089b28a0267faabdb6c079ee173664a/freealut-1.1.0.tar.gz)
 md5sums=('e089b28a0267faabdb6c079ee173664a')
 
 build() {
   cd $srcdir/$pkgname-$pkgver
-  ./configure --prefix=/usr 
+  ./configure --prefix=/usr  --disable-static
   make
 }
 
diff --git a/extra/freeciv/PKGBUILD b/extra/freeciv/PKGBUILD
index ea18bbfa6..71710857b 100644
--- a/extra/freeciv/PKGBUILD
+++ b/extra/freeciv/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 194398 2013-09-16 01:46:20Z eric $
+# $Id: PKGBUILD 197960 2013-10-30 11:56:07Z allan $
 # Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgname=freeciv
@@ -10,7 +10,7 @@ url="http://www.freeciv.org/"
 license=('GPL')
 depends=('gtk2' 'sdl_mixer' 'hicolor-icon-theme' 'lua51' 'sqlite' 'curl' 'libltdl')
 backup=('etc/freeciv/database.lua')
-options=('!libtool' '!staticlibs')
+options=('!staticlibs')
 install=freeciv.install
 source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.bz2)
 sha1sums=('4a3537dc050bd69002794c832b74f5af972da25e')
diff --git a/extra/freeglut/PKGBUILD b/extra/freeglut/PKGBUILD
index ad99ff035..76bba89a5 100644
--- a/extra/freeglut/PKGBUILD
+++ b/extra/freeglut/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 182877 2013-04-15 22:13:33Z heftig $
+# $Id: PKGBUILD 197961 2013-10-30 11:56:33Z allan $
 # Maintainer: Eric Belanger <eric@archlinux.org>
 # Contributor: Tom Newsom <Jeepster@gmx.co.uk>
 
@@ -14,7 +14,6 @@ makedepends=('mesa' 'glu' 'libxxf86vm')
 replaces=('glut')
 provides=('glut')
 conflicts=('glut')
-options=('!libtool')
 source=(http://downloads.sourceforge.net/freeglut/${pkgname}-${pkgver}.tar.gz)
 md5sums=('918ffbddcffbac83c218bc52355b6d5a')
 sha1sums=('7330b622481e2226c0c9f6d2e72febe96b03f9c4')
diff --git a/extra/freetds/PKGBUILD b/extra/freetds/PKGBUILD
index 5c044f9ce..80c6a9e89 100644
--- a/extra/freetds/PKGBUILD
+++ b/extra/freetds/PKGBUILD
@@ -1,15 +1,15 @@
-# $Id: PKGBUILD 11362 2010-02-09 23:57:26Z dgriffiths $
+# $Id: PKGBUILD 197962 2013-10-30 11:56:55Z allan $
+# Maintainer:
 # Contributor: Aaron Malone <aaron@munge.net>
 
 pkgname=freetds
 pkgver=0.91
-pkgrel=2.1
+pkgrel=3
 pkgdesc='Library for accessing Sybase and MS SQL Server databases'
 url='http://www.freetds.org'
 arch=('i686' 'x86_64' 'mips64el')
 license=('LGPL')
 depends=('unixodbc')
-options=('!libtool')
 backup=('etc/freetds/freetds.conf'
         'etc/freetds/locales.conf'
         'etc/freetds/pool.conf')
diff --git a/extra/freetype2/PKGBUILD b/extra/freetype2/PKGBUILD
index 449b04e68..427b4b39c 100644
--- a/extra/freetype2/PKGBUILD
+++ b/extra/freetype2/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 196343 2013-10-11 16:51:57Z heftig $
+# $Id: PKGBUILD 197963 2013-10-30 11:57:18Z allan $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=freetype2
@@ -9,7 +9,6 @@ arch=(i686 x86_64 'mips64el')
 license=('GPL')
 url="http://freetype.sourceforge.net"
 depends=('zlib' 'bzip2' 'sh' 'libpng')
-options=('!libtool')
 source=(http://downloads.sourceforge.net/sourceforge/freetype/freetype-${pkgver}.tar.bz2
         freetype-2.2.1-enable-valid.patch
         freetype-2.3.0-enable-spr.patch
diff --git a/extra/fribidi/PKGBUILD b/extra/fribidi/PKGBUILD
index 09e6e56cb..09d9671f7 100644
--- a/extra/fribidi/PKGBUILD
+++ b/extra/fribidi/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 173837 2012-12-24 18:38:45Z giovanni $
+# $Id: PKGBUILD 197964 2013-10-30 11:57:39Z allan $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Nezmer <Nezmer@gmail.com>
 
@@ -10,7 +10,6 @@ arch=('i686' 'x86_64' 'mips64el')
 license=('LGPL')
 url="http://fribidi.org"
 depends=('glibc')
-options=('!libtool')
 source=("http://fribidi.org/download/${pkgname}-${pkgver}.tar.bz2")
 md5sums=('925bafb97afee8a2fc2d0470c072a155')
 
diff --git a/extra/ftgl/PKGBUILD b/extra/ftgl/PKGBUILD
index 56828e183..7044d5c11 100644
--- a/extra/ftgl/PKGBUILD
+++ b/extra/ftgl/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 171289 2012-11-16 23:57:52Z allan $
+# $Id: PKGBUILD 197966 2013-10-30 11:58:23Z allan $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Contributor: Alexander Baldeck <alexander@archlinux.org>
 # Contributor: tobias <tobias@archlinux.org>
@@ -13,7 +13,6 @@ url="http://ftgl.wiki.sourceforge.net/"
 license=('MIT')
 depends=('freetype2' 'glu')
 makedepends=('doxygen' 'mesa')
-options=('!libtool')
 source=("http://downloads.sourceforge.net/$pkgname/$pkgname-$_pkgver.tar.bz2")
 md5sums=('c7879018cde844059495b3029b0b6503')
 
diff --git a/extra/fuse/PKGBUILD b/extra/fuse/PKGBUILD
index e508223e3..c7968d633 100644
--- a/extra/fuse/PKGBUILD
+++ b/extra/fuse/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 191856 2013-07-31 16:26:31Z bpiotrowski $
+# $Id: PKGBUILD 197300 2013-10-25 01:41:17Z allan $
 # Maintainer: Ronald van Haren <ronald.archlinux.org>
 # Contributor: Tom Gundersen <teg@jklm.no>
 # Contributor: Mark Rosenstand <mark@archlinux.org>
 
 pkgname=fuse
 pkgver=2.9.3
-pkgrel=1
+pkgrel=2
 pkgdesc="A library that makes it possible to implement a filesystem in a userspace program."
 arch=('i686' 'x86_64' 'mips64el')
 url="http://fuse.sourceforge.net/"
@@ -15,7 +15,6 @@ makedepends=('pkg-config')
 backup=(etc/fuse.conf)
 source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz
 	'fuse.conf')
-options=(!libtool)
 sha1sums=('94bd1974a9f2173ac3c2cf122f9fa3c35996b88e'
           '3b42e37a741d4651099225987dc40e7f02a716ad')
 
diff --git a/extra/gamin/0001-Poll-files-on-nfs4.patch b/extra/gamin/0001-Poll-files-on-nfs4.patch
new file mode 100644
index 000000000..f776732c8
--- /dev/null
+++ b/extra/gamin/0001-Poll-files-on-nfs4.patch
@@ -0,0 +1,27 @@
+From b92b17ecced6df463da73d6de566740cf5cd00d4 Mon Sep 17 00:00:00 2001
+From: Marek Kasik <mkasik@redhat.com>
+Date: Fri, 1 Feb 2013 15:19:58 +0100
+Subject: [PATCH 1/2] Poll files on nfs4
+
+Add nfs4 among polled filesystems.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=693006
+---
+ server/gam_fs.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/server/gam_fs.c b/server/gam_fs.c
+index c8ca704..143a603 100644
+--- a/server/gam_fs.c
++++ b/server/gam_fs.c
+@@ -178,6 +178,7 @@ gam_fs_init (void)
+ 		gam_fs_set ("reiserfs", GFS_MT_DEFAULT, 0);
+ 		gam_fs_set ("novfs", GFS_MT_POLL, 30);
+ 		gam_fs_set ("nfs", GFS_MT_POLL, 5);
++		gam_fs_set ("nfs4", GFS_MT_POLL, 5);
+ 		if (stat("/etc/mtab", &mtab_sbuf) != 0)
+ 		{
+ 			GAM_DEBUG(DEBUG_INFO, "Could not stat /etc/mtab\n");
+-- 
+1.8.1.2
+
diff --git a/extra/gamin/PKGBUILD b/extra/gamin/PKGBUILD
index f3bcff3a3..d7e4e96a4 100644
--- a/extra/gamin/PKGBUILD
+++ b/extra/gamin/PKGBUILD
@@ -1,46 +1,53 @@
-# $Id: PKGBUILD 30749 2010-10-20 11:18:33Z schuay $
+# $Id: PKGBUILD 197968 2013-10-30 11:59:10Z allan $
 # Maintainer:
 # Contributor: Abhishek Dasgupta <abhidg@gmail.com>
 # Contributor: Pulphix <crimea.v@libero.it>
 
 pkgname=gamin
 pkgver=0.1.10
-pkgrel=7
+pkgrel=8
 pkgdesc='File and directory monitoring system defined to be a subset of the FAM (File Alteration Monitor)'
 url='http://www.gnome.org/~veillard/gamin'
 license=('GPL')
 arch=('i686' 'x86_64' 'mips64el')
 depends=('glib2')
 makedepends=('python2')
-options=('libtool')
-optdepends=('python2: for the python module.')
+optdepends=('python2: for the python module')
 provides=('fam')
 conflicts=('fam')
-source=("http://www.gnome.org/~veillard/${pkgname}/sources/${pkgname}-${pkgver}.tar.gz"
+source=("$url/sources/${pkgname}-${pkgver}.tar.gz"
         'fix-deprecated-const.patch'
-        '18_gam_server_deadlocks.patch')
+        '18_gam_server_deadlocks.patch'
+        '0001-Poll-files-on-nfs4.patch')
 md5sums=('b4ec549e57da470c04edd5ec2876a028'
          'f679aeb48fe9dd376c8828cc9b6941ab'
-         '4784359a3206bfa3c0dce1c23468f87f')
+         '4784359a3206bfa3c0dce1c23468f87f'
+         '6711cd0b1e8d2ad038c5761715d084a5')
 
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
+prepare() {
+  cd $pkgname-$pkgver
 
   # https://bugs.archlinux.org/task/33642
-  patch -p1 -i "${srcdir}"/18_gam_server_deadlocks.patch
+  patch -Np1 -i ../18_gam_server_deadlocks.patch
 
-  patch -p1 -i "${srcdir}"/fix-deprecated-const.patch
+  patch -Np1 -i ../fix-deprecated-const.patch
+  patch -Np1 -i ../0001-Poll-files-on-nfs4.patch
 
   # python 2
   sed -i 's_#!/usr/bin/env python_#!/usr/bin/env python2_' python/gamin.py
+}
 
+build() {
+  cd $pkgname-$pkgver
   ./configure --prefix=/usr --disable-static --with-threads \
     --disable-debug-api --disable-debug --libexecdir=/usr/lib/gamin \
     --with-python=/usr/bin/python2
   make
 }
+
 package() {
-  cd "$srcdir/$pkgname-$pkgver"
+  cd $pkgname-$pkgver
   make DESTDIR="$pkgdir" install
 }
+
 # vim:set ts=2 sw=2 et:
diff --git a/extra/garcon/PKGBUILD b/extra/garcon/PKGBUILD
index 3369aa8b0..e241bccf7 100644
--- a/extra/garcon/PKGBUILD
+++ b/extra/garcon/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 184284 2013-05-05 17:44:23Z foutrelis $
+# $Id: PKGBUILD 197969 2013-10-30 11:59:30Z allan $
 # Maintainer: Evangelos Foutras <evangelos@foutrelis.com>
 # Contributor: Xavier Devlamynck <magicrhesus@ouranos.be>
 
@@ -13,7 +13,7 @@ groups=('xfce4')
 depends=('glib2' 'libxfce4util')
 makedepends=('pkgconfig' 'intltool' 'xfce4-dev-tools')
 replaces=('libxfce4menu')
-options=('!libtool' '!makeflags')
+options=('!makeflags')
 source=(http://archive.xfce.org/src/xfce/garcon/0.2/garcon-$pkgver.tar.bz2)
 sha256sums=('48b644b8b2ffe597974e2526ca1a5d2d7da6a09c2d434f008dec80e9152701f7')
 
diff --git a/extra/gc/PKGBUILD b/extra/gc/PKGBUILD
index a12e2d245..c3b8bc407 100644
--- a/extra/gc/PKGBUILD
+++ b/extra/gc/PKGBUILD
@@ -1,22 +1,21 @@
-# $Id: PKGBUILD 165647 2012-08-28 07:31:01Z jgc $
+# $Id: PKGBUILD 197970 2013-10-30 11:59:52Z allan $
 # Maintainer: Daniel Isenmann <daniel [at] archlinux.org>
 # Contributor: dorphell <dorphell@gmx.net>
 
 pkgname=gc
 pkgver=7.2.d
-pkgrel=1.1
+pkgrel=2
 pkgdesc="A garbage collector for C and C++"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.hpl.hp.com/personal/Hans_Boehm/gc/"
 license=('GPL')
 source=("http://www.hpl.hp.com/personal/Hans_Boehm/gc/gc_source/${pkgname}-7.2d.tar.gz")
 depends=('gcc-libs')
-options=('!libtool')
 md5sums=('91340b28c61753a789eb6077675d87d2')
 
 build() {
   cd "${srcdir}/${pkgname}-7.2"
-  ./configure --prefix=/usr --enable-cplusplus
+  ./configure --prefix=/usr --enable-cplusplus --disable-static
   make
 }
 
diff --git a/extra/gconf/PKGBUILD b/extra/gconf/PKGBUILD
index a6212af02..6c77fbf2d 100644
--- a/extra/gconf/PKGBUILD
+++ b/extra/gconf/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 195892 2013-10-03 19:08:22Z jgc $
+# $Id: PKGBUILD 197971 2013-10-30 12:00:18Z allan $
 # Maintainer:  Jan de Groot <jan@archlinux.org>
 
 pkgname=gconf
@@ -9,7 +9,6 @@ arch=(i686 x86_64 'mips64el')
 license=('LGPL')
 depends=('libxml2' 'polkit' 'libldap' 'dbus-glib')
 makedepends=('intltool' 'gtk-doc' 'gobject-introspection')
-options=('!libtool')
 install=gconf.install
 url="http://www.gnome.org"
 source=(http://ftp.gnome.org/pub/gnome/sources/GConf/3.2/GConf-$pkgver.tar.xz
diff --git a/extra/gconfmm/PKGBUILD b/extra/gconfmm/PKGBUILD
index 35a710493..9b5dd3801 100644
--- a/extra/gconfmm/PKGBUILD
+++ b/extra/gconfmm/PKGBUILD
@@ -1,4 +1,4 @@
-#$Id: PKGBUILD 150479 2012-02-18 03:02:14Z allan $
+#$Id: PKGBUILD 197972 2013-10-30 12:00:43Z allan $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: Kritoke <typeolinux@yahoo.com>
 
@@ -10,7 +10,6 @@ arch=('i686' 'x86_64' 'mips64el')
 url="http://gtkmm.sourceforge.net/"
 license=('LGPL')
 makedepends=('pkgconfig' 'gtkmm' 'glibmm-docs' 'gconf' 'glibmm')
-options=('!libtool')
 source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/2.28/${pkgname}-${pkgver}.tar.xz)
 sha256sums=('d7bd2d29c1a87b85329547fb29a0eca52d944e60699982152775002e24c09228')
 
diff --git a/extra/gcr/PKGBUILD b/extra/gcr/PKGBUILD
index 37826ce6b..bec772cdc 100644
--- a/extra/gcr/PKGBUILD
+++ b/extra/gcr/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 196040 2013-10-07 11:50:55Z jgc $
+# $Id: PKGBUILD 197973 2013-10-30 12:01:04Z allan $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 
 pkgname=gcr
-pkgver=3.10.0
+pkgver=3.10.1
 pkgrel=1
 pkgdesc="A library for bits of crypto UI and parsing"
 arch=(i686 x86_64 mips64el)
@@ -10,11 +10,10 @@ url="http://www.gnome.org"
 license=('GPL2')
 depends=('dconf' 'desktop-file-utils' 'gtk3' 'hicolor-icon-theme' 'libgcrypt')
 makedepends=('intltool' 'gobject-introspection' 'python')
-options=(!libtool)
 install=gcr.install
 source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz
         10-gcr.conf)
-sha256sums=('b689c679b244c1f47d773002c33dadc4111cddeb05bc2f3651826893fd43ff1b'
+sha256sums=('006f4f5a54be00418346f28eac2b53f3e640e9c6aa389808cf846f861438645b'
             '5f2eda7175ae9f23ee0e09d2beceb24fd2f6daafd7bddfcc1c1f5a3734eb60fc')
 
 build() {
diff --git a/extra/gd/PKGBUILD b/extra/gd/PKGBUILD
index b4c267986..31e399f19 100644
--- a/extra/gd/PKGBUILD
+++ b/extra/gd/PKGBUILD
@@ -1,16 +1,15 @@
-# $Id: PKGBUILD 189861 2013-07-10 07:26:52Z bpiotrowski $
+# $Id: PKGBUILD 197974 2013-10-30 12:01:24Z allan $
 # Maintainer: Eric Belanger <eric@archlinux.org>
 
 pkgname=gd
 pkgver=2.1.0
-pkgrel=1
+pkgrel=2
 pkgdesc="Library for the dynamic creation of images by programmers"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.libgd.org/"
 license=('custom')
 depends=('libpng' 'fontconfig' 'libjpeg')
 optdepends=('perl: bdftogd script')
-options=('!libtool')
 source=(https://bitbucket.org/libgd/gd-libgd/downloads/libgd-${pkgver}.tar.xz)
 md5sums=('03588159bf4faab9079849c8d709acc6')
 
diff --git a/extra/gdb/PKGBUILD b/extra/gdb/PKGBUILD
index 2c323008e..b59a1b6b8 100644
--- a/extra/gdb/PKGBUILD
+++ b/extra/gdb/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 193781 2013-08-31 05:34:23Z allan $
+# $Id: PKGBUILD 197975 2013-10-30 12:01:45Z allan $
 # Maintainer: Allan McRae <allan@archlinux.org>
 # Contributor: Jan de Groot <jgc@archlinux.org>
 
@@ -12,7 +12,6 @@ license=('GPL3')
 depends=('ncurses' 'expat' 'python2')
 makedepends=('texinfo')
 backup=('etc/gdb/gdbinit')
-options=('!libtool')
 install=gdb.install
 source=(http://ftp.gnu.org/gnu/gdb/${pkgname}-${pkgver}.tar.bz2{,.sig})
 md5sums=('fbc4dab4181e6e9937075b43a4ce2732'
diff --git a/extra/gdk-pixbuf2/PKGBUILD b/extra/gdk-pixbuf2/PKGBUILD
index 921a6a886..5021d5086 100644
--- a/extra/gdk-pixbuf2/PKGBUILD
+++ b/extra/gdk-pixbuf2/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 196041 2013-10-07 11:50:57Z jgc $
+# $Id: PKGBUILD 197976 2013-10-30 12:02:05Z allan $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 
 pkgname=gdk-pixbuf2
@@ -10,7 +10,6 @@ url="http://www.gtk.org/"
 license=('LGPL2.1')
 depends=('glib2' 'libpng' 'libtiff' 'libjpeg' 'libx11' 'jasper')
 makedepends=('gtk-doc' 'gobject-introspection')
-options=('!libtool')
 install=gdk-pixbuf2.install
 source=(http://download.gnome.org/sources/gdk-pixbuf/${pkgver%.*}/gdk-pixbuf-$pkgver.tar.xz)
 sha256sums=('4a73600525621283a14436c5f873c1126c4feafcb07d24a746f13215e2caa658')
diff --git a/extra/gdl/PKGBUILD b/extra/gdl/PKGBUILD
index b7d18400a..4dc6a359e 100644
--- a/extra/gdl/PKGBUILD
+++ b/extra/gdl/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 196042 2013-10-07 11:50:58Z jgc $
+# $Id: PKGBUILD 197977 2013-10-30 12:02:25Z allan $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=gdl
@@ -10,7 +10,6 @@ license=('GPL')
 url="http://www.gnome.org/"
 depends=('gtk3')
 makedepends=('gtk-doc' 'intltool' 'gobject-introspection')
-options=('!libtool')
 source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
 sha256sums=('4e0d6f66115ba3b0f3cd2495d8a95c6714d701f89d556bb691bd0c0a62a1c760')
 
diff --git a/extra/gdm/PKGBUILD b/extra/gdm/PKGBUILD
index 74e04e1d9..41160df16 100644
--- a/extra/gdm/PKGBUILD
+++ b/extra/gdm/PKGBUILD
@@ -1,22 +1,21 @@
-# $Id: PKGBUILD 196043 2013-10-07 11:50:59Z jgc $
+# $Id: PKGBUILD 197978 2013-10-30 12:02:48Z allan $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgbase=gdm
 pkgname=(gdm libgdm)
-pkgver=3.10.0
+pkgver=3.10.0.1
 pkgrel=1
 pkgdesc="Gnome Display Manager"
 arch=('i686' 'x86_64' 'mips64el')
 license=(GPL)
 url="http://www.gnome.org"
-options=('!libtool')
 depends=(gnome-shell gnome-session upower xorg-xrdb xorg-server xorg-xhost)
 makedepends=(itstool intltool yelp-tools gobject-introspection)
 checkdepends=('check')
-source=(http://ftp.gnome.org/pub/gnome/sources/$pkgbase/${pkgver%.*}/$pkgbase-$pkgver.tar.xz
+source=(http://ftp.gnome.org/pub/gnome/sources/$pkgbase/${pkgver:0:4}/$pkgbase-$pkgver.tar.xz
         fix_external_program_directories.patch arch-pam.patch)
-sha256sums=('bb04600298f5be795f0d0bfea40bbd9bf78f95a44c5caeda4d0cc6a05207318c'
+sha256sums=('549a42009af9c79a4e07632e405dcb71ba2e876e766cff02471511ad641b6ae7'
             'a878680734e35c1d66252cbcfe678c3961b5ff0fa16302f8796a5e7e65ffe4a2'
             'b5c225784c3107564cb9685e41dfecdb20b8ea2415905c4119c96748c4e68003')
 
diff --git a/extra/gdome2/PKGBUILD b/extra/gdome2/PKGBUILD
index 276d4b04e..d710cfbeb 100644
--- a/extra/gdome2/PKGBUILD
+++ b/extra/gdome2/PKGBUILD
@@ -1,18 +1,25 @@
-# $Id: PKGBUILD 150508 2012-02-18 11:44:22Z pierre $
+# $Id: PKGBUILD 197759 2013-10-29 18:43:37Z eric $
 # Maintainer:
 # Contributor: Jan de Groot <jgc@archlinux.org>
 
 pkgname=gdome2
 pkgver=0.8.1
-pkgrel=4.1
+pkgrel=5
 pkgdesc="Gnome DOM Engine"
-url="http://gdome2.cs.unibo.it/"
 arch=('i686' 'x86_64' 'mips64el')
+url="http://gdome2.cs.unibo.it/"
 license=('LGPL')
 depends=('libxml2' 'glib2')
-options=(!libtool)
-source=("http://gdome2.cs.unibo.it/tarball/${pkgname}-${pkgver}.tar.gz")
-md5sums=('bfc114e59eec50cbda8e4ece751ff022')
+source=("http://gdome2.cs.unibo.it/tarball/${pkgname}-${pkgver}.tar.gz"
+        gdome2-0.8.1-libxml2.patch)
+md5sums=('bfc114e59eec50cbda8e4ece751ff022'
+         'bde155107f30bf65d441adf70efc3c00')
+
+prepare() {
+  cd ${pkgname}-${pkgver}
+  patch -p0 -i "${srcdir}/gdome2-0.8.1-libxml2.patch"
+}
+
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
@@ -32,6 +39,6 @@ check() {
 
 
 package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+  cd ${pkgname}-${pkgver}
   make DESTDIR="${pkgdir}" install
 }
diff --git a/extra/gdome2/gdome2-0.8.1-libxml2.patch b/extra/gdome2/gdome2-0.8.1-libxml2.patch
new file mode 100644
index 000000000..bf493bc22
--- /dev/null
+++ b/extra/gdome2/gdome2-0.8.1-libxml2.patch
@@ -0,0 +1,18 @@
+Patch by Harris Landgarten.
+
+The patch was submitted on bug 448236, following the announcement on
+https://mail.gnome.org/archives/xml/2012-August/msg00005.html
+--- libgdome/gdomecore/gdome-xml-documentt.c.orig	2003-07-13 06:47:54.000000000 -0400
++++ libgdome/gdomecore/gdome-xml-documentt.c	2012-12-23 08:57:23.000000000 -0500
+@@ -342,7 +342,11 @@
+ 	}
+ 	xmlNodeDumpOutput (out_buff, NULL, (xmlNode *)is, 0, 0, NULL);
+ 	xmlOutputBufferFlush(out_buff);
++#if LIBXML_VERSION < 20900
+ 	ret = g_strndup (out_buff->buffer->content, out_buff->buffer->use);
++#else
++	ret = g_strndup (xmlBufContent(out_buff->buffer), xmlBufUse(out_buff->buffer));
++#endif
+ 	(void)xmlOutputBufferClose(out_buff);
+ 
+ 	return gdome_xml_str_mkref_own (ret);
diff --git a/extra/gedit/PKGBUILD b/extra/gedit/PKGBUILD
index 9c2795a24..e728e4de0 100644
--- a/extra/gedit/PKGBUILD
+++ b/extra/gedit/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 196044 2013-10-07 11:51:01Z jgc $
+# $Id: PKGBUILD 197979 2013-10-30 12:03:10Z allan $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Contributor: Jan de Groot <jgc@archlinux.org>
 
 pkgname=gedit
-pkgver=3.10.0
+pkgver=3.10.1
 pkgrel=1
 pkgdesc="A text editor for GNOME"
 arch=(i686 x86_64 mips64el)
@@ -12,11 +12,11 @@ depends=(gtksourceview3 gsettings-desktop-schemas libpeas enchant iso-codes libs
 makedepends=(yelp-tools intltool zeitgeist)
 optdepends=('zeitgeist: Zeitgeist plugin')
 groups=(gnome-extra)
-options=('!libtool' '!emptydirs')
+options=('!emptydirs')
 url="http://www.gnome.org"
 install=gedit.install
 source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('4c20049ccee2198468edaf20fba9dbd44e3baf50bd304700b4f24257571cdca5')
+sha256sums=('2d2e931661c2c2f9ea76cb581fe0eb09d65925b06a57ee7e20cbecb49474cab7')
 
 build() {
   cd $pkgname-$pkgver
diff --git a/extra/gegl/PKGBUILD b/extra/gegl/PKGBUILD
index fb8eaea94..a970ac006 100644
--- a/extra/gegl/PKGBUILD
+++ b/extra/gegl/PKGBUILD
@@ -1,42 +1,55 @@
-# $Id: PKGBUILD 191894 2013-08-01 06:53:27Z bpiotrowski $
+# $Id: PKGBUILD 197980 2013-10-30 12:03:32Z allan $
 # Maintainer: Daniel Isenmann <daniel@archlinux.org>
 
 pkgname=gegl
 pkgver=0.2.0
-pkgrel=9
+pkgrel=10
 pkgdesc="Graph based image processing framework"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.gegl.org/"
 license=('GPL3' 'LGPL3')
-depends=('babl' 'gtk2')
+depends=('babl' 'gtk2' 'libspiro')
 makedepends=('intltool' 'ruby' 'lua' 'openexr' 'ffmpeg' 'librsvg' 'jasper' 'exiv2')
-optdepends=('openexr: for using the openexr plugin' \
-            'ffmpeg: for using the ffmpeg plugin' \
-            'librsvg: for using the svg plugin' \
+optdepends=('openexr: for using the openexr plugin'
+            'ffmpeg: for using the ffmpeg plugin'
+            'librsvg: for using the svg plugin'
             'jasper: for using the jasper plugin')
-options=('!libtool')
-source=(ftp://ftp.gimp.org/pub/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2 gegl-0.2.0-ffmpeg-0.11.diff)
+source=(ftp://ftp.gimp.org/pub/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2
+        gegl-0.2.0-ffmpeg-0.11.diff
+        gegl-0.2.0-CVE-2012-4433.patch
+        gegl-0.2.0-lua-5.2.patch
+        gegl-0.2.0-remove-src-over-op.patch)
 sha1sums=('764cc66cb3c7b261b8fc18a6268a0e264a91d573'
-          'c10fd988c634fcf0948cc91a51d6528f6f1704ba')
+          'e2e00633149fa4d5196520e284609de257eb012f'
+          '44d48bd9ad008703de9f8eb683d557bac39a02c8'
+          'c78a092b880874ba7784b652bcd9c532e2b9975d'
+          'dc9ae21cc5ba0fb47ef05793f0cb169572dfab74')
 
 prepare() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  patch -p1 -i "${srcdir}/gegl-0.2.0-ffmpeg-0.11.diff"
+  cd ${pkgname}-${pkgver}
+  patch -Np1 -i ../gegl-0.2.0-ffmpeg-0.11.diff
+  patch -Np1 -i ../gegl-0.2.0-CVE-2012-4433.patch
+  patch -Np1 -i ../gegl-0.2.0-lua-5.2.patch
+  patch -Np1 -i ../gegl-0.2.0-remove-src-over-op.patch
 }
 
 build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+  cd ${pkgname}-${pkgver}
   ./configure  --prefix=/usr  --with-sdl --with-openexr --with-librsvg \
     --with-libavformat --with-jasper --disable-docs
+
+  # https://bugzilla.gnome.org/show_bug.cgi?id=655517
+  sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
+
   make
 }
 
 check() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+  cd ${pkgname}-${pkgver}
   make check
 }
 
 package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+  cd ${pkgname}-${pkgver}
   make DESTDIR="${pkgdir}" install
 }
diff --git a/extra/gegl/gegl-0.2.0-CVE-2012-4433.patch b/extra/gegl/gegl-0.2.0-CVE-2012-4433.patch
new file mode 100644
index 000000000..965c6fc20
--- /dev/null
+++ b/extra/gegl/gegl-0.2.0-CVE-2012-4433.patch
@@ -0,0 +1,159 @@
+From ffa77a246652c7e706d690682fe659f50fbe5656 Mon Sep 17 00:00:00 2001
+From: Nils Philippsen <nils@redhat.com>
+Date: Mon, 1 Jul 2013 12:03:51 +0200
+Subject: [PATCH] patch: CVE-2012-4433
+
+Squashed commit of the following:
+
+commit 2a9071e2dc4cfe1aaa7a726805985281936f9874
+Author: Nils Philippsen <nils@redhat.com>
+Date:   Tue Oct 16 16:57:37 2012 +0200
+
+    ppm-load: bring comment in line with reality
+
+    (cherry picked from commit 6975a9cfeaf0698b42ac81b1c2f00d13c8755453)
+
+commit 8bb88ebf78e54837322d3be74688f98800e9f33a
+Author: Nils Philippsen <nils@redhat.com>
+Date:   Tue Oct 16 16:56:40 2012 +0200
+
+    ppm-load: CVE-2012-4433: add plausibility checks for header fields
+
+    Refuse values that are non-decimal, negative or overflow the target
+    type.
+
+    (cherry picked from commit 4757cdf73d3675478d645a3ec8250ba02168a230)
+
+commit 2b099886969bf055a8635d06a4d89f20fed1ee42
+Author: Nils Philippsen <nils@redhat.com>
+Date:   Tue Oct 16 16:58:27 2012 +0200
+
+    ppm-load: CVE-2012-4433: don't overflow memory allocation
+
+    Carefully selected width/height values could cause the size of a later
+    allocation to overflow, resulting in a buffer much too small to store
+    the data which would then written beyond its end.
+
+    (cherry picked from commit 1e92e5235ded0415d555aa86066b8e4041ee5a53)
+---
+ operations/external/ppm-load.c | 64 +++++++++++++++++++++++++++++++++++-------
+ 1 file changed, 54 insertions(+), 10 deletions(-)
+
+diff --git a/operations/external/ppm-load.c b/operations/external/ppm-load.c
+index efe6d56..e22521c 100644
+--- a/operations/external/ppm-load.c
++++ b/operations/external/ppm-load.c
+@@ -36,6 +36,7 @@ gegl_chant_file_path (path, _("File"), "", _("Path of file to load."))
+ #include "gegl-chant.h"
+ #include <stdio.h>
+ #include <stdlib.h>
++#include <errno.h>
+ 
+ typedef enum {
+   PIXMAP_ASCII  = 51,
+@@ -44,8 +45,8 @@ typedef enum {
+ 
+ typedef struct {
+ 	map_type   type;
+-	gint       width;
+-	gint       height;
++	glong      width;
++	glong      height;
+         gsize      numsamples; /* width * height * channels */
+         gsize      bpc;        /* bytes per channel */
+ 	guchar    *data;
+@@ -61,7 +62,7 @@ ppm_load_read_header(FILE       *fp,
+     gchar  header[MAX_CHARS_IN_ROW];
+     gint   maxval;
+ 
+-    /* Check the PPM file Type P2 or P5 */
++    /* Check the PPM file Type P3 or P6 */
+     fgets (header,MAX_CHARS_IN_ROW,fp);
+ 
+     if (header[0] != ASCII_P ||
+@@ -82,12 +83,33 @@ ppm_load_read_header(FILE       *fp,
+       }
+ 
+     /* Get Width and Height */
+-    img->width  = strtol (header,&ptr,0);
+-    img->height = atoi (ptr);
+-    img->numsamples = img->width * img->height * CHANNEL_COUNT;
++    errno = 0;
++    img->width  = strtol (header,&ptr,10);
++    if (errno)
++      {
++        g_warning ("Error reading width: %s", strerror(errno));
++        return FALSE;
++      }
++    else if (img->width < 0)
++      {
++        g_warning ("Error: width is negative");
++        return FALSE;
++      }
++
++    img->height = strtol (ptr,&ptr,10);
++    if (errno)
++      {
++        g_warning ("Error reading height: %s", strerror(errno));
++        return FALSE;
++      }
++    else if (img->width < 0)
++      {
++        g_warning ("Error: height is negative");
++        return FALSE;
++      }
+ 
+     fgets (header,MAX_CHARS_IN_ROW,fp);
+-    maxval = strtol (header,&ptr,0);
++    maxval = strtol (header,&ptr,10);
+ 
+     if ((maxval != 255) && (maxval != 65535))
+       {
+@@ -109,6 +131,16 @@ ppm_load_read_header(FILE       *fp,
+       g_warning ("%s: Programmer stupidity error", G_STRLOC);
+     }
+ 
++    /* Later on, img->numsamples is multiplied with img->bpc to allocate
++     * memory. Ensure it doesn't overflow. */
++    if (!img->width || !img->height ||
++        G_MAXSIZE / img->width / img->height / CHANNEL_COUNT < img->bpc)
++      {
++        g_warning ("Illegal width/height: %ld/%ld", img->width, img->height);
++        return FALSE;
++      }
++    img->numsamples = img->width * img->height * CHANNEL_COUNT;
++
+     return TRUE;
+ }
+ 
+@@ -229,12 +261,24 @@ process (GeglOperation       *operation,
+   if (!ppm_load_read_header (fp, &img))
+     goto out;
+ 
+-  rect.height = img.height;
+-  rect.width = img.width;
+-
+   /* Allocating Array Size */
++
++  /* Should use g_try_malloc(), but this causes crashes elsewhere because the
++   * error signalled by returning FALSE isn't properly acted upon. Therefore
++   * g_malloc() is used here which aborts if the requested memory size can't be
++   * allocated causing a controlled crash. */
+   img.data = (guchar*) g_malloc (img.numsamples * img.bpc);
+ 
++  /* No-op without g_try_malloc(), see above. */
++  if (! img.data)
++    {
++      g_warning ("Couldn't allocate %" G_GSIZE_FORMAT " bytes, giving up.", ((gsize)img.numsamples * img.bpc));
++      goto out;
++    }
++
++  rect.height = img.height;
++  rect.width = img.width;
++
+   switch (img.bpc)
+     {
+     case 1:
+-- 
+1.8.3.1
+
diff --git a/extra/gegl/gegl-0.2.0-ffmpeg-0.11.diff b/extra/gegl/gegl-0.2.0-ffmpeg-0.11.diff
index a33ec6f7f..02fe77702 100644
--- a/extra/gegl/gegl-0.2.0-ffmpeg-0.11.diff
+++ b/extra/gegl/gegl-0.2.0-ffmpeg-0.11.diff
@@ -1,12 +1,21 @@
-diff -Naur gegl-0.2.0/operations/external/ff-load.c gegl-0.2.0-1/operations/external/ff-load.c
+diff -u -r gegl-0.2.0/operations/external/ff-load.c gegl-0.2.0-1/operations/external/ff-load.c
 --- gegl-0.2.0/operations/external/ff-load.c	2012-04-01 13:17:57.000000000 +0200
-+++ gegl-0.2.0-1/operations/external/ff-load.c	2012-07-11 12:42:05.174756560 +0200
++++ gegl-0.2.0-1/operations/external/ff-load.c	2013-10-20 03:22:06.824278863 +0200
 @@ -271,7 +271,7 @@
        gint err;
  
        ff_cleanup (o);
 -      err = av_open_input_file (&p->ic, o->path, NULL, 0, NULL);
-+err = avformat_open_input (&p->ic, o->path, NULL, NULL);
++      err = avformat_open_input (&p->ic, o->path, NULL, NULL);
        if (err < 0)
          {
            print_error (o->path, err);
+@@ -312,7 +312,7 @@
+       if (p->codec->capabilities & CODEC_CAP_TRUNCATED)
+         p->enc->flags |= CODEC_FLAG_TRUNCATED;
+ 
+-      if (avcodec_open (p->enc, p->codec) < 0)
++      if (avcodec_open2 (p->enc, p->codec, NULL) < 0)
+         {
+           g_warning ("error opening codec %s", p->enc->codec->name);
+           return;
diff --git a/extra/gegl/gegl-0.2.0-lua-5.2.patch b/extra/gegl/gegl-0.2.0-lua-5.2.patch
new file mode 100644
index 000000000..e5a60bb9f
--- /dev/null
+++ b/extra/gegl/gegl-0.2.0-lua-5.2.patch
@@ -0,0 +1,53 @@
+From 1e12a153d9a82a771c3bfd95c0265b810a424b3c Mon Sep 17 00:00:00 2001
+From: Nils Philippsen <nils@redhat.com>
+Date: Mon, 1 Jul 2013 14:41:33 +0200
+Subject: [PATCH] patch: lua-5.2
+
+Squashed commit of the following:
+
+commit 96f65d260c6e40940f2818b721c19565c1b40607
+Author: Vincent Untz <vuntz@gnome.org>
+Date:   Wed Jan 11 09:52:25 2012 +0100
+
+    Fix build with lua 5.2 by not using API deprecated in 5.1 already
+
+    https://bugzilla.gnome.org/show_bug.cgi?id=667675
+    (cherry picked from commit a14a29c39352c60f003a65b721c9af8a1d8d20df)
+---
+ operations/workshop/external/gluas.c | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/operations/workshop/external/gluas.c b/operations/workshop/external/gluas.c
+index 8ba1101..63e82a2 100644
+--- a/operations/workshop/external/gluas.c
++++ b/operations/workshop/external/gluas.c
+@@ -97,7 +97,7 @@ static int l_progress  (lua_State * lua);
+ static int l_flush     (lua_State * lua);
+ static int l_print     (lua_State * lua);
+ 
+-static const luaL_reg gluas_functions[] =
++static const luaL_Reg gluas_functions[] =
+ {
+     {"set_rgba",    l_set_rgba},
+     {"get_rgba",    l_get_rgba},
+@@ -122,7 +122,7 @@ static const luaL_reg gluas_functions[] =
+ };
+ static void
+ register_functions (lua_State      *L,
+-                    const luaL_reg *l)
++                    const luaL_Reg *l)
+ {
+   for (;l->name; l++)
+     lua_register (L, l->name, l->func);
+@@ -146,7 +146,7 @@ drawable_lua_process (GeglOperation       *op,
+     lua_State *L;
+     Priv p;
+ 
+-    L = lua_open ();
++    L = luaL_newstate ();
+     luaL_openlibs (L);
+ 
+     register_functions (L, gluas_functions);
+-- 
+1.8.3.1
+
diff --git a/extra/gegl/gegl-0.2.0-remove-src-over-op.patch b/extra/gegl/gegl-0.2.0-remove-src-over-op.patch
new file mode 100644
index 000000000..a823580fd
--- /dev/null
+++ b/extra/gegl/gegl-0.2.0-remove-src-over-op.patch
@@ -0,0 +1,195 @@
+From 72168aba34445e4cd99aaed32d8e6a80e89ce729 Mon Sep 17 00:00:00 2001
+From: Nils Philippsen <nils@redhat.com>
+Date: Mon, 1 Jul 2013 13:53:18 +0200
+Subject: [PATCH] patch: remove-src-over-op
+
+Squashed commit of the following:
+
+commit b766094d951bf1515a75408ee85d4e1af432e6bd
+Author: Daniel Sabo <DanielSabo@gmail.com>
+Date:   Tue Jun 4 20:57:03 2013 -0700
+
+    Remove auto-generated svg:src-over
+
+    It was already shadowed by gegl:over, which declares
+    svg:src-over as a compat-name.
+
+    (cherry picked from commit c1caf2401271e8a17fd1937bf84279c250bd8e2a)
+
+    Conflicts:
+    	po/POTFILES.in
+---
+ operations/generated/src-over.c            | 122 -----------------------------
+ operations/generated/svg-12-porter-duff.rb |   5 +-
+ po/POTFILES.in                             |   3 +-
+ 3 files changed, 4 insertions(+), 126 deletions(-)
+ delete mode 100644 operations/generated/src-over.c
+
+diff --git a/operations/generated/src-over.c b/operations/generated/src-over.c
+deleted file mode 100644
+index e586087..0000000
+--- a/operations/generated/src-over.c
++++ /dev/null
+@@ -1,122 +0,0 @@
+-
+-/* !!!! AUTOGENERATED FILE generated by svg-12-porter-duff.rb !!!!!
+- *
+- * This file is an image processing operation for GEGL
+- *
+- * GEGL 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 3 of the License, or (at your option) any later version.
+- *
+- * GEGL 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 GEGL; if not, see <http://www.gnu.org/licenses/>.
+- *
+- *  Copyright 2006, 2007 Øyvind Kolås <pippin@gimp.org>
+- *            2007 John Marshall
+- *
+- * SVG rendering modes; see:
+- *     http://www.w3.org/TR/SVG12/rendering.html
+- *     http://www.w3.org/TR/2004/WD-SVG12-20041027/rendering.html#comp-op-prop
+- *
+- *     aA = aux(src) alpha      aB = in(dst) alpha      aD = out alpha
+- *     cA = aux(src) colour     cB = in(dst) colour     cD = out colour
+- *
+- * !!!! AUTOGENERATED FILE !!!!!
+- */
+-#include "config.h"
+-#include <glib/gi18n-lib.h>
+-
+-
+-#ifdef GEGL_CHANT_PROPERTIES
+-
+-/* no properties */
+-
+-#else
+-
+-#define GEGL_CHANT_TYPE_POINT_COMPOSER
+-#define GEGL_CHANT_C_FILE        "src-over.c"
+-
+-#include "gegl-chant.h"
+-
+-static void prepare (GeglOperation *operation)
+-{
+-  const Babl *format = babl_format ("RaGaBaA float");
+-
+-  gegl_operation_set_format (operation, "input", format);
+-  gegl_operation_set_format (operation, "aux", format);
+-  gegl_operation_set_format (operation, "output", format);
+-}
+-
+-static gboolean
+-process (GeglOperation        *op,
+-          void                *in_buf,
+-          void                *aux_buf,
+-          void                *out_buf,
+-          glong                n_pixels,
+-          const GeglRectangle *roi,
+-          gint                 level)
+-{
+-  gint i;
+-  gfloat * GEGL_ALIGNED in = in_buf;
+-  gfloat * GEGL_ALIGNED aux = aux_buf;
+-  gfloat * GEGL_ALIGNED out = out_buf;
+-
+-  if (aux==NULL)
+-    return TRUE;
+-
+-  for (i = 0; i < n_pixels; i++)
+-    {
+-      gint   j;
+-      gfloat aA G_GNUC_UNUSED, aB G_GNUC_UNUSED, aD G_GNUC_UNUSED;
+-
+-      aB = in[3];
+-      aA = aux[3];
+-      aD = aA + aB - aA * aB;
+-
+-      for (j = 0; j < 3; j++)
+-        {
+-          gfloat cA G_GNUC_UNUSED, cB G_GNUC_UNUSED;
+-
+-          cB = in[j];
+-          cA = aux[j];
+-          out[j] = cA + cB * (1.0f - aA);
+-        }
+-      out[3] = aD;
+-      in  += 4;
+-      aux += 4;
+-      out += 4;
+-    }
+-  return TRUE;
+-}
+-
+-
+-static void
+-gegl_chant_class_init (GeglChantClass *klass)
+-{
+-  GeglOperationClass              *operation_class;
+-  GeglOperationPointComposerClass *point_composer_class;
+-
+-  operation_class      = GEGL_OPERATION_CLASS (klass);
+-  point_composer_class = GEGL_OPERATION_POINT_COMPOSER_CLASS (klass);
+-
+-  point_composer_class->process = process;
+-  operation_class->prepare = prepare;
+-
+-
+-  operation_class->compat_name = "gegl:src-over";
+-  gegl_operation_class_set_keys (operation_class,
+-    "name"      , "svg:src-over",
+-    "categories", "compositors:porter-duff",
+-    "description",
+-        _("Porter Duff operation src-over (d = cA + cB * (1.0f - aA))"),
+-        NULL);
+- 
+-
+-}
+-
+-#endif
+diff --git a/operations/generated/svg-12-porter-duff.rb b/operations/generated/svg-12-porter-duff.rb
+index 5516802..dab5d2f 100755
+--- a/operations/generated/svg-12-porter-duff.rb
++++ b/operations/generated/svg-12-porter-duff.rb
+@@ -1,4 +1,5 @@
+ #!/usr/bin/env ruby
++# encoding: utf-8
+ 
+ copyright = '
+ /* !!!! AUTOGENERATED FILE generated by svg-12-porter-duff.rb !!!!!
+@@ -38,8 +39,8 @@ a = [
+                         'aA'],
+       ['dst',           'cB',
+                         'aB'],
+-      ['src_over',      'cA + cB * (1.0f - aA)',
+-                        'aA + aB - aA * aB'],
++#      ['src_over',      'cA + cB * (1.0f - aA)',
++#                        'aA + aB - aA * aB'],
+       ['dst_over',      'cB + cA * (1.0f - aB)',
+                         'aA + aB - aA * aB'],
+       ['dst_in',        'cB * aA', # <- XXX: typo?
+diff --git a/po/POTFILES.in b/po/POTFILES.in
+index e309594..d36cbc2 100644
+--- a/po/POTFILES.in
++++ b/po/POTFILES.in
+@@ -115,10 +115,9 @@ operations/generated/plus.c
+ operations/generated/screen.c
+ operations/generated/soft-light.c
+ operations/generated/src-atop.c
++operations/generated/src.c
+ operations/generated/src-in.c
+ operations/generated/src-out.c
+-operations/generated/src-over.c
+-operations/generated/src.c
+ operations/generated/subtract.c
+ operations/generated/svg-multiply.c
+ operations/generated/xor.c
+-- 
+1.8.3.1
+
diff --git a/extra/genius/PKGBUILD b/extra/genius/PKGBUILD
index 80ef5a0b2..a77810362 100644
--- a/extra/genius/PKGBUILD
+++ b/extra/genius/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 191334 2013-07-23 17:00:55Z jgc $
+# $Id: PKGBUILD 197981 2013-10-30 12:03:54Z allan $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: Arjan Timmerman <arjan@soulfly.nl>
 
@@ -11,7 +11,7 @@ license=('GPL')
 url="http://www.jirka.org/genius.html"
 depends=('vte' 'gtksourceview2' 'mpfr' 'desktop-file-utils' 'hicolor-icon-theme')
 makedepends=('intltool' 'gnome-doc-utils')
-options=('!libtool' '!makeflags')
+options=('!makeflags')
 install=genius.install
 source=(http://ftp.gnome.org/pub/GNOME/sources/genius/1.0/${pkgname}-${pkgver}.tar.xz)
 sha256sums=('2af0cf64a3bae45e8e6c38ce8c0c0724386ae29614a83d9eff179ee09ecef44f')
diff --git a/extra/geoclue/PKGBUILD b/extra/geoclue/PKGBUILD
index 0122e3915..d5af8518d 100644
--- a/extra/geoclue/PKGBUILD
+++ b/extra/geoclue/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 180261 2013-03-19 00:26:52Z heftig $
+# $Id: PKGBUILD 197982 2013-10-30 12:04:23Z allan $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Contributor: György Balló <ballogy@freestart.hu>
 
@@ -13,7 +13,6 @@ depends=(dbus-glib libxml2 dconf)
 makedepends=(networkmanager libsoup-gnome gtk-doc)
 optdepends=('networkmanager: geolocation'
             'libsoup-gnome: Skyhook location provider')
-options=('!libtool')
 install=geoclue.install
 source=(http://freedesktop.org/~hadess/$pkgname-$pkgver.tar.gz)
 md5sums=('779245045bfeeec4853da8baaa3a18e6')
diff --git a/extra/geoclue2/PKGBUILD b/extra/geoclue2/PKGBUILD
index 70f7bfb9a..8950df832 100644
--- a/extra/geoclue2/PKGBUILD
+++ b/extra/geoclue2/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 196002 2013-10-07 11:46:24Z jgc $
+# $Id: PKGBUILD 197983 2013-10-30 12:04:51Z allan $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Contributor: György Balló <ballogy@freestart.hu>
 
@@ -12,7 +12,6 @@ license=(LGPL)
 depends=(libsoup json-glib)
 makedepends=(intltool geoip)
 optdepends=('geoip: geoip-lookup server binary')
-options=('!libtool')
 install=geoclue.install
 source=(http://freedesktop.org/software/geoclue/releases/1.99/geoclue-$pkgver.tar.xz)
 md5sums=('b991f4a409b492996a38627ee18fa76e')
diff --git a/extra/geocode-glib/PKGBUILD b/extra/geocode-glib/PKGBUILD
index e3ec1a334..801e4a2ce 100644
--- a/extra/geocode-glib/PKGBUILD
+++ b/extra/geocode-glib/PKGBUILD
@@ -9,7 +9,7 @@ license=('GPL')
 url="https://git.gnome.org/browse/geocode-glib/"
 depends=('glib2' 'json-glib' 'libsoup')
 makedepends=('intltool' 'gobject-introspection')
-options=('!libtool' '!emptydirs')
+options=('!emptydirs')
 source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
 sha256sums=('0aedc198cf8a9b934a290d50aadaf4b48bb13c3b4783618c6753eb466cdaa637')
 
diff --git a/extra/geoip/PKGBUILD b/extra/geoip/PKGBUILD
index 5857354ba..6e2f7d317 100644
--- a/extra/geoip/PKGBUILD
+++ b/extra/geoip/PKGBUILD
@@ -1,17 +1,17 @@
-# $Id: PKGBUILD 194736 2013-09-23 12:28:32Z jgc $
+# $Id: PKGBUILD 197302 2013-10-25 01:44:22Z allan $
 # Maintainer: Dan McGee <dan@archlinux.org>
 # Contributor: Manolis Tzanidakis <manolis@archlinux.org>
 
 pkgname=geoip
 pkgver=1.5.1
-pkgrel=1
+pkgrel=2
 pkgdesc="Non-DNS IP-to-country resolver C library & utils"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.maxmind.com/app/c"
 license=('GPL')
 depends=('zlib' 'geoip-database')
 backup=('etc/geoip/GeoIP.conf')
-options=('!libtool' '!emptydirs')
+options=('!emptydirs')
 source=(http://www.maxmind.com/download/geoip/api/c/GeoIP-$pkgver.tar.gz 
         pkgconfig.patch)
 sha256sums=('ec35ee73fcc54c493f4252565d1c81d022b398dd16de3af1522c8cab016f8731'
diff --git a/extra/gettext-mono/PKGBUILD b/extra/gettext-mono/PKGBUILD
index 61d2a19a4..28ef8d012 100644
--- a/extra/gettext-mono/PKGBUILD
+++ b/extra/gettext-mono/PKGBUILD
@@ -1,17 +1,16 @@
-# $Id: PKGBUILD 176967 2013-02-03 06:53:37Z allan $
+# $Id: PKGBUILD 198992 2013-11-05 22:36:26Z daniel $
 # Maintainer: Daniel Isenmann <daniel@archlinux.org>
 
 pkgname=gettext-mono
-pkgver=0.18.2
+pkgver=0.18.3.1
 pkgrel=1
 pkgdesc="mono assemblies for GNU internationalization library"
 arch=('i686' 'x86_64')
 url="http://www.gnu.org/software/gettext"
 license=('GPL')
-depends=('mono>=2.10.6')
-source=(ftp://ftp.gnu.org/pub/gnu/gettext/gettext-$pkgver.tar.gz{,.sig})
-md5sums=('0c86e5af70c195ab8bd651d17d783928'
-         '1a658e29a03ab42da6d2d468b0583407')
+depends=('mono>=3.2.3')
+source=(ftp://ftp.gnu.org/pub/gnu/gettext/gettext-$pkgver.tar.gz)
+md5sums=('3fc808f7d25487fc72b5759df7419e02')
 
 build() {
   # get rid of that .wapi errors; thanks to brice
diff --git a/extra/ghc/PKGBUILD b/extra/ghc/PKGBUILD
index 70c158f18..20a0bca01 100644
--- a/extra/ghc/PKGBUILD
+++ b/extra/ghc/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 183848 2013-04-28 16:50:01Z td123 $
+# $Id: PKGBUILD 196900 2013-10-21 03:40:08Z td123 $
 # Maintainer: Thomas Dziedzic <gostrc@gmail.com>
 # Maintainer: Vesa Kaihlavirta <vesa@archlinux.org>
 # Special note for devs looking to upgrade this package:
@@ -6,6 +6,9 @@
 #   Libraries depend on versions specified by those hashes.
 #   This implies that all libraries need to be rebuilt when ghc is rebuilt.
 
+# use the following command to print out packages that need to get rebuilt
+# grep -r ghc /var/abs/ | awk -F '/' '{ print $5; }' | sort -u
+
 pkgname=ghc
 pkgver=7.6.3
 pkgrel=1
@@ -21,6 +24,7 @@ install='ghc.install'
 # keep this otherwise a lot of tests will show as unexpected failures... need to investigate why using -jn for n > 1 does this...
 #options=('!makeflags')
 # missing rtl?
+options=('staticlibs')
 provides=('haskell-array=0.4.0.1'
           'haskell-base=4.6.0.1'
           'haskell-binary=0.5.1.1'
diff --git a/extra/ghex/PKGBUILD b/extra/ghex/PKGBUILD
index 33ff85744..ade65980e 100644
--- a/extra/ghex/PKGBUILD
+++ b/extra/ghex/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 196153 2013-10-07 12:05:35Z jgc $
+# $Id: PKGBUILD 197985 2013-10-30 12:05:49Z allan $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: Tobias Kieslich <tobias@justdreams.de>
 
@@ -11,7 +11,7 @@ license=('GPL')
 url="http://live.gnome.org/Ghex"
 depends=('gtk3' 'hicolor-icon-theme')
 makedepends=('intltool' 'itstool' 'docbook-xsl')
-options=('!libtool' '!emptydirs')
+options=('!emptydirs')
 install=ghex.install
 source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver:0:4}/$pkgname-$pkgver.tar.xz)
 sha256sums=('9c31383b1d32c8942ca0327c615336f5777309674c4fc090e8cceb1576c63255')
diff --git a/extra/giblib/PKGBUILD b/extra/giblib/PKGBUILD
index eb0a5691b..36d8da2a6 100644
--- a/extra/giblib/PKGBUILD
+++ b/extra/giblib/PKGBUILD
@@ -1,16 +1,15 @@
-# $Id: PKGBUILD 137679 2011-09-10 11:58:36Z pierre $
+# $Id: PKGBUILD 197987 2013-10-30 12:06:34Z allan $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Tom Newsom <Jeepster@gmx.co.uk>
 
 pkgname=giblib
 pkgver=1.2.4
-pkgrel=5.1
+pkgrel=6
 pkgdesc="A library that feh uses as a wrapper to imlib2"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://freshmeat.net/projects/giblib/"
 license=('MIT')
 depends=('imlib2' 'libxext' 'freetype2')
-options=('!libtool')
 source=("http://linuxbrit.co.uk/downloads/${pkgname}-${pkgver}.tar.gz")
 md5sums=('c810ef5389baf24882a1caca2954385e')
 
diff --git a/extra/giflib/PKGBUILD b/extra/giflib/PKGBUILD
index 627444421..140c8817a 100644
--- a/extra/giflib/PKGBUILD
+++ b/extra/giflib/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 191918 2013-08-01 06:59:47Z bpiotrowski $
+# $Id: PKGBUILD 197988 2013-10-30 12:06:55Z allan $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: Baptiste Daroussin <baptiste.daroussin@gmail.com>
 # Contributor: Grigorios Bouzakis <grbzks[at]gmail[dot]com>
@@ -16,7 +16,6 @@ makedepends=('xmlto' 'docbook-xml' 'docbook-xsl')
 provides=("libungif=${pkgver}")
 conflicts=('libungif')
 replaces=('libungif')
-options=('!libtool')
 source=(http://downloads.sourceforge.net/sourceforge/giflib/${pkgname}-${pkgver}.tar.bz2
         giflib-5.0.4-include-stddef.patch)
 md5sums=('da60935d07374de00a78c2f6f720c8f5'
diff --git a/extra/gimp/PKGBUILD b/extra/gimp/PKGBUILD
index 8baf014ff..cbbcb1ceb 100644
--- a/extra/gimp/PKGBUILD
+++ b/extra/gimp/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 193684 2013-08-28 00:06:02Z eric $
+# $Id: PKGBUILD 198812 2013-11-05 16:40:42Z bpiotrowski $
 # Maintainer: Daniel Isenmann <daniel@archlinux.org>
 
 pkgname=gimp
-pkgver=2.8.6
-pkgrel=2
+pkgver=2.8.8
+pkgrel=1
 pkgdesc="GNU Image Manipulation Program"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.gimp.org/"
@@ -17,12 +17,12 @@ optdepends=('gutenprint: for sophisticated printing only as gimp has built-in cu
             'alsa-lib: for MIDI event controller module'
             'curl: for URI support'
             'ghostscript: for postscript support')
-options=('!libtool' '!makeflags')
+options=('!makeflags')
 conflicts=('gimp-devel')
 install=gimp.install
 source=(ftp://ftp.gimp.org/pub/gimp/v${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2 linux.gpl 
         uri-backend-libcurl.patch)
-md5sums=('12b3fdf33d1f07ae79b412a9e38b9693'
+md5sums=('ef2547c3514a1096931637bd6250635a'
          'bb27bc214261d36484093e857f015f38'
          'e894f4b2ffa92c71448fdd350e9b78c6')
 
diff --git a/extra/git/PKGBUILD b/extra/git/PKGBUILD
index 11f677f4c..1d5e15b8a 100644
--- a/extra/git/PKGBUILD
+++ b/extra/git/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 193588 2013-08-24 16:58:24Z dan $
+# $Id: PKGBUILD 197743 2013-10-29 02:17:19Z dan $
 # Maintainer: Dan McGee <dan@archlinux.org>
 
 pkgname=git
-pkgver=1.8.4
+pkgver=1.8.4.2
 pkgrel=1
 pkgdesc="the fast distributed version control system"
 arch=(i686 x86_64 'mips64el')
@@ -115,7 +115,7 @@ package() {
   install -D -m 644 "$srcdir"/git-daemon.socket "$pkgdir"/usr/lib/systemd/system/git-daemon.socket
 }
 
-md5sums=('355768a1c70d0cb4fedf4b598ac1375b'
-         'e3720f56e18a5ab8ee1871ac9c72ca7c'
+md5sums=('6f63d103465b86ca0ebe4189ea54731c'
+         '2b4719ec820d845134b689247abe65e8'
          '042524f942785772d7bd52a1f02fe5ae'
          'f67869315c2cc112e076f0c73f248002')
diff --git a/extra/gjs/PKGBUILD b/extra/gjs/PKGBUILD
index db3f85d07..5243a8144 100644
--- a/extra/gjs/PKGBUILD
+++ b/extra/gjs/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 196045 2013-10-07 11:51:04Z jgc $
+# $Id: PKGBUILD 197990 2013-10-30 12:07:37Z allan $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 
 pkgname=gjs
@@ -9,7 +9,6 @@ arch=('i686' 'x86_64')
 url="http://live.gnome.org/Gjs"
 license=(GPL)
 depends=(cairo gobject-introspection 'js>=17.0.0')
-options=('!libtool')
 source=(http://ftp.gnome.org/pub/gnome/sources/gjs/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
 sha256sums=('6b2065a0e7bd1db562a70c5fd52ea2499097f1cf02c9c279d1b82b660bfb8176')
 
diff --git a/extra/gksu/PKGBUILD b/extra/gksu/PKGBUILD
index 7e0f33e15..e0d7b16ea 100644
--- a/extra/gksu/PKGBUILD
+++ b/extra/gksu/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 143680 2011-11-28 11:06:46Z jgc $
+# $Id: PKGBUILD 197991 2013-10-30 12:07:59Z allan $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: Eduardo Lopes (eduol@gmx.net)
 
@@ -11,7 +11,6 @@ url="http://www.nongnu.org/gksu/index.html"
 license=('GPL')
 depends=('libgksu>=2.0.12' 'xorg-xauth')
 makedepends=('gtk-doc' 'intltool')
-options=('!libtool')
 source=(http://people.debian.org/~kov/gksu/${pkgname}-${pkgver}.tar.gz)
 md5sums=('cacbcac3fc272dce01c6ea38354489e2')
 
diff --git a/extra/glade/PKGBUILD b/extra/glade/PKGBUILD
index 6c1181d90..66cfeddd3 100644
--- a/extra/glade/PKGBUILD
+++ b/extra/glade/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 196046 2013-10-07 11:51:05Z jgc $
+# $Id: PKGBUILD 197992 2013-10-30 12:08:19Z allan $
 # Maintainer: Douglas Soares de Andrade <douglas@archlinux.org>
 
 pkgname=glade
@@ -11,7 +11,6 @@ depends=('gtk3' 'libxml2' 'desktop-file-utils' 'hicolor-icon-theme')
 makedepends=('intltool' 'gtk-doc' 'gobject-introspection' 'python2-gobject' 'itstool' 'docbook-xsl')
 optdepends=('python2: Python widgets support'
             'devhelp: help browser')
-options=('!libtool')
 url="http://glade.gnome.org/"
 install=glade.install
 source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
diff --git a/extra/glamor-egl/PKGBUILD b/extra/glamor-egl/PKGBUILD
index 0565d6c3f..1a8f1336a 100644
--- a/extra/glamor-egl/PKGBUILD
+++ b/extra/glamor-egl/PKGBUILD
@@ -13,7 +13,6 @@ depends=('mesa-libgl')
 makedepends=('xorg-server-devel')
 source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
 conflicts=('glamor-git')
-options=('!libtool')
 sha256sums=('f42805b68e2bddc90cb5d9d3811e4f2176659c5686f295865839b20b7be7f359')
 
 build() {
diff --git a/extra/glib-networking/PKGBUILD b/extra/glib-networking/PKGBUILD
index 1fbe885bc..d2f7c8e3d 100644
--- a/extra/glib-networking/PKGBUILD
+++ b/extra/glib-networking/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 196048 2013-10-07 11:51:08Z jgc $
+# $Id: PKGBUILD 197995 2013-10-30 12:09:26Z allan $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 
 pkgname=glib-networking
-pkgver=2.38.0
+pkgver=2.38.1
 pkgrel=1
 pkgdesc="Network-related giomodules for glib"
 arch=('i686' 'x86_64' 'mips64el')
@@ -10,21 +10,26 @@ url="http://www.gtk.org/"
 license=(GPL2)
 depends=(glib2 libproxy gnutls ca-certificates gsettings-desktop-schemas)
 makedepends=(intltool)
-options=('!libtool')
 install=glib-networking.install
 source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('a43eacbf721b475cf6ba0cd2eab02a332014f71a4c41d0b44bd7bbf8ed1f840d')
+sha256sums=('32ea1e504f69ff6693ac4119ad598ded50bb0440cf4484d28ef0adf8fcc85653')
 
 build() {
   cd $pkgname-$pkgver
   ./configure --prefix=/usr --sysconfdir=/etc \
-    --libexecdir=/usr/lib/$pkgname --disable-static
+    --libexecdir=/usr/lib/$pkgname --disable-static \
+    --disable-installed-tests
   make
 }
 
+check() {
+  cd $pkgname-$pkgver
+  make -k check
+}
+
 package() {
   cd $pkgname-$pkgver
-  make DESTDIR="$pkgdir" install
+  make DESTDIR="$pkgdir" install testfiles_DATA=
 }
 
 # vim:set ts=2 sw=2 et:
diff --git a/extra/glib/PKGBUILD b/extra/glib/PKGBUILD
index 14c76e55c..a364a8c81 100644
--- a/extra/glib/PKGBUILD
+++ b/extra/glib/PKGBUILD
@@ -1,15 +1,15 @@
-# $Id: PKGBUILD 191242 2013-07-22 06:31:51Z eric $
+# $Id: PKGBUILD 197238 2013-10-24 16:18:46Z eric $
 # Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgname=glib
 pkgver=1.2.10
-pkgrel=10
+pkgrel=11
 pkgdesc="Common C routines used by Gtk+ and other libs"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.gtk.org/"
 license=('LGPL')
 depends=('glibc' 'sh')
-options=('!libtool' '!makeflags')
+options=('!makeflags')
 install=glib.install
 source=(ftp://ftp.gtk.org/pub/gtk/v1.2/${pkgname}-${pkgver}.tar.gz
 	gcc340.patch aclocal-fixes.patch glib1-autotools.patch)
diff --git a/extra/glibmm/PKGBUILD b/extra/glibmm/PKGBUILD
index 180362e24..eae133c9b 100644
--- a/extra/glibmm/PKGBUILD
+++ b/extra/glibmm/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 196330 2013-10-11 14:50:36Z heftig $
+# $Id: PKGBUILD 197994 2013-10-30 12:09:05Z allan $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: Tom Newsom <Jeepster@gmx.co.uk>
 
@@ -10,7 +10,6 @@ arch=('i686' 'x86_64' 'mips64el')
 license=('LGPL')
 makedepends=('glib2' 'libsigc++2.0' 'pkgconfig')
 source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-options=('!libtool')
 url="http://www.gtkmm.org/"
 sha256sums=('f37bab6bedb7b68045e356feca9e27760a5ce50d95df07156656a0e1deabc402')
 
diff --git a/extra/glpk/PKGBUILD b/extra/glpk/PKGBUILD
index df4f43807..0b4096bb5 100644
--- a/extra/glpk/PKGBUILD
+++ b/extra/glpk/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 191850 2013-07-31 15:25:15Z bpiotrowski $
+# $Id: PKGBUILD 197996 2013-10-30 12:09:46Z allan $
 # Maintainer: Ronald van Haren <ronald.archlinux.org>
 # Contributor: bzklrm <bzklrm@gmail.com>
 # Additional contributors Senjin, Xavier, dundee
@@ -11,7 +11,6 @@ arch=('i686' 'x86_64' 'mips64el')
 url="http://www.gnu.org/software/glpk/glpk.html"
 license=('GPL')
 depends=('glibc')
-options=('!libtool')
 source=(http://ftp.gnu.org/gnu/glpk/${pkgname}-${pkgver}.tar.gz{,.sig})
 sha1sums=('44b30b0de777a0a07e00615ac6791af180ff4d2c'
           'SKIP')
diff --git a/extra/glu/PKGBUILD b/extra/glu/PKGBUILD
index 40424b8b8..1ccfe9b74 100644
--- a/extra/glu/PKGBUILD
+++ b/extra/glu/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 178743 2013-02-26 16:19:48Z andyrtr $
+# $Id: PKGBUILD 197997 2013-10-30 12:10:07Z allan $
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 # Contributor: Laurent Carlier <lordheavym@gmail.com>
 
@@ -10,7 +10,6 @@ arch=('i686' 'x86_64' 'mips64el')
 url="http://cgit.freedesktop.org/mesa/glu/"
 license=('LGPL')
 depends=('libgl')
-options=('!libtool')
 source=(ftp://ftp.freedesktop.org/pub/mesa/$pkgname/$pkgname-$pkgver.tar.bz2)
 sha256sums=('1f7ad0d379a722fcbd303aa5650c6d7d5544fde83196b42a73d1193568a4df12')
 
diff --git a/extra/gmetadom/PKGBUILD b/extra/gmetadom/PKGBUILD
index 8d6a6d913..7d3b84a59 100644
--- a/extra/gmetadom/PKGBUILD
+++ b/extra/gmetadom/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 137758 2011-09-10 15:29:12Z pierre $
+# $Id: PKGBUILD 197998 2013-10-30 12:10:28Z allan $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Jan de Groot <jgc@archlinux.org>
 
@@ -11,7 +11,7 @@ url="http://gmetadom.sourceforge.net/"
 license=('LGPL')
 depends=('gdome2')
 makedepends=('pkgconfig' 'ocaml')
-options=('!libtool' '!makeflags')
+options=('!makeflags')
 source=("http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.gz"
         'gmetadom-0.2.6-gcc43.patch')
 md5sums=('7bfb5d9c6f20ffa5e790b63d1f8cb481'
diff --git a/extra/gmime/PKGBUILD b/extra/gmime/PKGBUILD
index 08153cdac..5a53f6556 100644
--- a/extra/gmime/PKGBUILD
+++ b/extra/gmime/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 194406 2013-09-16 08:05:52Z jgc $
+# $Id: PKGBUILD 197999 2013-10-30 12:10:54Z allan $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: Ben <ben@benmazer.net>
 
@@ -11,7 +11,6 @@ license=('GPL')
 url="http://spruce.sourceforge.net/gmime/"
 depends=('glib2' 'gpgme' 'zlib')
 [ "$CARCH" != "mips64el" ] && makedepends=('gtk-sharp-2')
-options=('!libtool')
 source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
 sha256sums=('783fc14190459c568a31c2fd6dba1e8afa0431e2931aa46f652aa486ad881ae6')
 
diff --git a/extra/gnet/PKGBUILD b/extra/gnet/PKGBUILD
index 04a85ea81..8fce6824d 100644
--- a/extra/gnet/PKGBUILD
+++ b/extra/gnet/PKGBUILD
@@ -1,15 +1,14 @@
-# $Id: PKGBUILD 191233 2013-07-21 23:25:28Z eric $
+# $Id: PKGBUILD 197240 2013-10-24 16:49:18Z eric $
 # Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgname=gnet
 pkgver=2.0.8
-pkgrel=3
+pkgrel=4
 pkgdesc="A simple network library"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://live.gnome.org/GNetLibrary"
 license=('LGPL')
 depends=('glib2')
-options=('!libtool')
 source=(http://ftp.gnome.org/pub/GNOME/sources/gnet/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2)
 sha1sums=('74a33dd25cc594b874e3a5171795efd99e567387')
 
diff --git a/extra/gnome-bluetooth/PKGBUILD b/extra/gnome-bluetooth/PKGBUILD
index 321dc1c6e..158fde19f 100644
--- a/extra/gnome-bluetooth/PKGBUILD
+++ b/extra/gnome-bluetooth/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 196050 2013-10-07 11:51:10Z jgc $
+# $Id: PKGBUILD 198000 2013-10-30 12:11:19Z allan $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 # Contributor: Roman Kyrylych <roman@archlinux.org>
 
@@ -11,7 +11,7 @@ url="http://live.gnome.org/GnomeBluetooth"
 license=(GPL LGPL)
 depends=(gtk3 hicolor-icon-theme libnotify bluez)
 makedepends=(intltool gobject-introspection itstool docbook-xsl)
-options=(!libtool !emptydirs)
+options=(!emptydirs)
 install=gnome-bluetooth.install
 source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz
         61-gnome-bluetooth-rfkill.rules)
diff --git a/extra/gnome-calculator/PKGBUILD b/extra/gnome-calculator/PKGBUILD
index c9212569b..0f4f8b541 100644
--- a/extra/gnome-calculator/PKGBUILD
+++ b/extra/gnome-calculator/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 196051 2013-10-07 11:51:12Z jgc $
+# $Id: PKGBUILD 196809 2013-10-19 20:33:48Z heftig $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Contributor: Jan de Groot <jgc@archlinux.org>
 
 pkgname=gnome-calculator
-pkgver=3.10.0
+pkgver=3.10.1
 pkgrel=1
 pkgdesc="GNOME Scientific calculator"
 arch=('i686' 'x86_64' 'mips64el')
@@ -17,7 +17,7 @@ options=(!emptydirs)
 url="http://www.gnome.org"
 install=gnome-calculator.install
 source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz)
-sha256sums=('d76ad21286ea20308bb6302833ce8e5846df7e8ccd2b7ac0a48619f0d6cf2cb1')
+sha256sums=('9268f06e53647e9a61a773b7ae499d4fd3097843060fc9baa8f97912247df48f')
 
 build() {
   cd $pkgname-$pkgver
diff --git a/extra/gnome-chess/PKGBUILD b/extra/gnome-chess/PKGBUILD
index 121eae114..ffdef50d3 100644
--- a/extra/gnome-chess/PKGBUILD
+++ b/extra/gnome-chess/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 196390 2013-10-12 16:54:13Z heftig $
+# $Id: PKGBUILD 198001 2013-10-30 12:11:39Z allan $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Contributor: Jan de Groot <jgc@archlinux.org>
 
 pkgname=gnome-chess
-pkgver=3.10.1
+pkgver=3.10.1.1
 pkgrel=1
 pkgdesc="Play the classic two-player boardgame of chess"
 arch=('i686' 'x86_64' 'mips64el')
@@ -13,12 +13,12 @@ makedepends=('intltool' 'itstool' 'gobject-introspection')
 optdepends=('gnuchess: Play against computer')
 conflicts=('gnome-games')
 replaces=('gnome-games')
-options=('!emptydirs' '!libtool')
+options=('!emptydirs')
 install=gnome-chess.install
 url="https://live.gnome.org/Chess"
 groups=('gnome-extra')
-source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('6541db85d2ca5b843fce61bd3be9c08733cf456c6fdf9bbc02ad78d043ca71fd')
+source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver:0:4}/$pkgname-$pkgver.tar.xz)
+sha256sums=('abdee96eaf56689c4c2bd78cd115a0e30d302e16a8f42dfcb39520c9a33c6eec')
 
 build() {
   cd $pkgname-$pkgver
diff --git a/extra/gnome-clocks/PKGBUILD b/extra/gnome-clocks/PKGBUILD
index ae4eba65a..bc1762c43 100644
--- a/extra/gnome-clocks/PKGBUILD
+++ b/extra/gnome-clocks/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 196053 2013-10-07 11:51:15Z jgc $
+# $Id: PKGBUILD 198002 2013-10-30 12:11:59Z allan $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 
 pkgname=gnome-clocks
-pkgver=3.10.0
+pkgver=3.10.1
 pkgrel=1
 pkgdesc="Clocks applications for GNOME"
 arch=(i686 x86_64 mips64el)
@@ -11,11 +11,10 @@ license=(GPL)
 depends=(gtk3 libcanberra libgweather gnome-desktop libnotify
          hicolor-icon-theme gnome-themes-standard geoclue2 geocode-glib)
 makedepends=(intltool vala gobject-introspection itstool)
-options=(!libtool)
 groups=(gnome-extra)
 install=gnome-clocks.install
 source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz)
-sha256sums=('f6418272e8d3a9ad41fba49712917130b09db925b6caecd78653541aedee3e2d')
+sha256sums=('5f6f3b7bb9929353d974aa444b10bb4d0f414176449cce2c626fabd2d4b55b43')
 
 build() {
   cd $pkgname-$pkgver
diff --git a/extra/gnome-color-manager/PKGBUILD b/extra/gnome-color-manager/PKGBUILD
index 24becb277..70683fcfd 100644
--- a/extra/gnome-color-manager/PKGBUILD
+++ b/extra/gnome-color-manager/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 196054 2013-10-07 11:51:16Z jgc $
+# $Id: PKGBUILD 198003 2013-10-30 12:12:21Z allan $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 
 pkgname=gnome-color-manager
-pkgver=3.10.0
+pkgver=3.10.1
 pkgrel=1
 pkgdesc="Color profile manager for the GNOME desktop"
 arch=(i686 x86_64 'mips64el')
@@ -12,10 +12,10 @@ depends=(libcanberra vte3 exiv2 hicolor-icon-theme desktop-file-utils clutter-gt
          mash shared-color-profiles shared-color-targets gnome-desktop colord-gtk libexif)
 makedepends=(intltool yelp-tools)
 install=gnome-color-manager.install
-options=('!libtool' '!emptydirs')
+options=('!emptydirs')
 groups=('gnome-extra')
 source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('95e27198fb6c7d45918d1a47a440ed5af0c65bbe2ec53fb8898d4c00c7dc8f00')
+sha256sums=('2944627f4166aaac08ba9d73614cbd79eba93573bd7d32e17a12082e30fb1399')
 
 build(){
   cd $pkgname-$pkgver
diff --git a/extra/gnome-contacts/PKGBUILD b/extra/gnome-contacts/PKGBUILD
index 86453a889..ede10f321 100644
--- a/extra/gnome-contacts/PKGBUILD
+++ b/extra/gnome-contacts/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 196056 2013-10-07 11:51:18Z jgc $
+# $Id: PKGBUILD 196595 2013-10-15 14:57:07Z heftig $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 
 pkgname=gnome-contacts
-pkgver=3.10
+pkgver=3.10.1
 pkgrel=1
 pkgdesc="Contacts Manager for GNOME"
 arch=(i686 x86_64 mips64el)
@@ -12,8 +12,8 @@ groups=(gnome)
 depends=('gtk3' 'folks' 'libnotify' 'gnome-desktop' 'dconf' 'gnome-online-accounts' 'libgee' 'telepathy-glib' 'cheese')
 makedepends=('intltool' 'vala' 'gobject-introspection')
 install=$pkgname.install
-source=(http://download.gnome.org/sources/$pkgname/${pkgver}/$pkgname-$pkgver.tar.xz)
-sha256sums=('1cb57d81455ee44e50745452bfefdf74f9ad4e393661199005c665284cda20cf')
+source=(http://download.gnome.org/sources/$pkgname/${pkgver:0:4}/$pkgname-$pkgver.tar.xz)
+sha256sums=('e119c32bb10136e7190f11f79334fa82ed56468cff5bb7836da0ebf7b572779b')
 
 build() {
   cd $pkgname-$pkgver
diff --git a/extra/gnome-control-center/PKGBUILD b/extra/gnome-control-center/PKGBUILD
index aadb184d4..711bdbe6f 100644
--- a/extra/gnome-control-center/PKGBUILD
+++ b/extra/gnome-control-center/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 196057 2013-10-07 11:51:20Z jgc $
+# $Id: PKGBUILD 198004 2013-10-30 12:12:43Z allan $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Contributor: Jan de Groot <jgc@archlinux.org>
 
 pkgname=gnome-control-center
-pkgver=3.10.0
+pkgver=3.10.1
 pkgrel=1
 pkgdesc="The Control Center for GNOME"
 license=(GPL)
@@ -11,8 +11,8 @@ arch=('i686' 'x86_64' 'mips64el')
 depends=(accountsservice cups-pk-helper gnome-bluetooth gnome-desktop gnome-menus
          gnome-online-accounts gnome-settings-daemon gsettings-desktop-schemas gtk3
          libgtop network-manager-applet sound-theme-freedesktop upower libpwquality
-         gnome-color-manager smbclient modemmanager)
-makedepends=(gnome-doc-utils intltool docbook-xsl)
+         gnome-color-manager smbclient modemmanager libgnomekbd)
+makedepends=(gnome-doc-utils intltool docbook-xsl gnome-common)
 optdepends=('system-config-printer: Printer settings'
             'gnome-user-share: Bluetooth and WebDAV file sharing'
             'rygel: media sharing'
@@ -21,9 +21,17 @@ optdepends=('system-config-printer: Printer settings'
 groups=(gnome)
 url="http://www.gnome.org"
 install=gnome-control-center.install
-options=('!libtool' '!emptydirs')
-source=(http://download.gnome.org/sources/$pkgname/${pkgver:0:4}/$pkgname-$pkgver.tar.xz)
-sha256sums=('ea74d87e255308f130039a9afab548ae0416e2c96e69adfc7c794d1775f1474f')
+options=('!emptydirs')
+source=(http://download.gnome.org/sources/$pkgname/${pkgver:0:4}/$pkgname-$pkgver.tar.xz
+        buildfix.patch)
+sha256sums=('fbfc1a935c33901c6afc999160696e0cde60ccb9997679cc8d0a2ff952568cbe'
+            'f58644e8735d3eb1e911ba2373e6c91cfde67b1ceaf54dca179b3a1c8db7466d')
+
+prepare() {
+  cd $pkgname-$pkgver
+  patch -Np1 -i ../buildfix.patch
+  autoreconf -fi
+}
 
 build() {
   cd $pkgname-$pkgver
diff --git a/extra/gnome-control-center/buildfix.patch b/extra/gnome-control-center/buildfix.patch
new file mode 100644
index 000000000..baf2ee6a5
--- /dev/null
+++ b/extra/gnome-control-center/buildfix.patch
@@ -0,0 +1,15 @@
+diff -u -r gnome-control-center-3.10.1/panels/background/Makefile.am gnome-control-center-3.10.1-buildfix/panels/background/Makefile.am
+--- gnome-control-center-3.10.1/panels/background/Makefile.am	2013-10-11 13:19:22.000000000 +0200
++++ gnome-control-center-3.10.1-buildfix/panels/background/Makefile.am	2013-10-16 00:59:02.966707377 +0200
+@@ -52,11 +52,6 @@
+ libbackground_la_LIBADD += $(SOCIALWEB_LIBS)
+ endif
+ 
+-noinst_PROGRAMS = test-chooser-dialog
+-test_chooser_dialog_SOURCES = test-chooser-dialog.c
+-test_chooser_dialog_LDADD = libbackground-chooser.la
+-test_chooser_dialog_LDFLAGS = $(PANEL_LIBS) $(BACKGROUND_PANEL_LIBS)
+-
+ resource_files = $(shell glib-compile-resources --sourcedir=$(srcdir) --generate-dependencies $(srcdir)/background.gresource.xml)
+ cc-background-resources.c: background.gresource.xml $(resource_files)
+ 	$(AM_V_GEN) glib-compile-resources --target=$@ --sourcedir=$(srcdir) --generate-source --c-name cc_background $<
diff --git a/extra/gnome-control-center/no-deprecated-upower.diff b/extra/gnome-control-center/no-deprecated-upower.diff
deleted file mode 100644
index 4fa629855..000000000
--- a/extra/gnome-control-center/no-deprecated-upower.diff
+++ /dev/null
@@ -1,69 +0,0 @@
-diff --git c/panels/power/cc-power-panel.c i/panels/power/cc-power-panel.c
-index d70496a..af71db9 100644
---- c/panels/power/cc-power-panel.c
-+++ i/panels/power/cc-power-panel.c
-@@ -70,6 +70,7 @@ struct _CcPowerPanelPrivate
-   GCancellable  *cancellable;
-   GtkBuilder    *builder;
-   UpClient      *up_client;
-+  GDBusProxy    *logind_proxy;
-   GDBusProxy    *screen_proxy;
-   gboolean       has_batteries;
- 
-@@ -137,6 +138,7 @@ cc_power_panel_dispose (GObject *object)
-     }
-   g_clear_object (&priv->builder);
-   g_clear_object (&priv->screen_proxy);
-+  g_clear_object (&priv->logind_proxy);
-   g_clear_object (&priv->up_client);
- #ifdef HAVE_BLUETOOTH
-   g_clear_object (&priv->bt_client);
-@@ -1737,6 +1739,7 @@ add_automatic_suspend_section (CcPowerPanel *self)
-   GtkWidget *dialog;
-   GtkWidget *combo;
-   GtkCellRenderer *cell;
-+  GVariant *result;
- 
-   /* The default values for these settings are unfortunate for us;
-    * timeout == 0, action == suspend means 'do nothing' - just
-@@ -1820,7 +1823,23 @@ add_automatic_suspend_section (CcPowerPanel *self)
-   gtk_widget_set_margin_bottom (label, 6);
-   gtk_box_pack_start (GTK_BOX (box), label, TRUE, TRUE, 0);
- 
--  if (up_client_get_can_hibernate (self->priv->up_client))
-+  value = 0;
-+  result = g_dbus_proxy_call_sync (self->priv->logind_proxy,
-+                                   "CanHibernate",
-+                                   NULL,
-+                                   G_DBUS_CALL_FLAGS_NONE,
-+                                   -1,
-+                                   NULL,
-+                                   NULL);
-+  if (result)
-+    {
-+      g_variant_get (result, "(s)", &s);
-+      if (g_strcmp0 (s, "yes") == 0)
-+        value = 1;
-+      g_variant_unref(result);
-+    }
-+
-+  if (value)
-     {
-       model = (GtkTreeModel*)gtk_builder_get_object (priv->builder, "liststore_critical");
-       priv->critical_battery_combo = sw = gtk_combo_box_new_with_model (model);
-@@ -2070,6 +2089,15 @@ cc_power_panel_init (CcPowerPanel *self)
-                             got_screen_proxy_cb,
-                             self);
- 
-+  priv->logind_proxy = g_dbus_proxy_new_for_bus_sync (G_BUS_TYPE_SYSTEM,
-+                                                      G_DBUS_PROXY_FLAGS_NONE,
-+                                                      NULL,
-+                                                      "org.freedesktop.login1",
-+                                                      "/org/freedesktop/login1",
-+                                                      "org.freedesktop.login1.Manager",
-+                                                      NULL,
-+                                                      &error);
-+
-   priv->up_client = up_client_new ();
- 
-   priv->gsd_settings = g_settings_new ("org.gnome.settings-daemon.plugins.power");
diff --git a/extra/gnome-desktop-sharp/PKGBUILD b/extra/gnome-desktop-sharp/PKGBUILD
index 3a6309dc5..73e693b1a 100644
--- a/extra/gnome-desktop-sharp/PKGBUILD
+++ b/extra/gnome-desktop-sharp/PKGBUILD
@@ -1,16 +1,15 @@
-# $Id: PKGBUILD 144403 2011-12-05 14:57:02Z jgc $
+# $Id: PKGBUILD 198007 2013-10-30 12:13:47Z allan $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgbase=gnome-desktop-sharp
 pkgname=('gnome-desktop-sharp' 'libgnome-desktop-sharp' 'gtkhtml-sharp' 'gtksourceview2-sharp' 'rsvg2-sharp' 'vte-sharp' 'wnck-sharp')
 pkgver=2.26.0
-pkgrel=8
+pkgrel=9
 arch=('i686' 'x86_64')
 license=(LGPL)
 url="http://gtk-sharp.sourceforge.net"
 makedepends=('gnome-sharp' 'gnome-desktop2' 'vte' 'librsvg' 'libwnck' 'gtkhtml' 'gtksourceview2' 'monodoc')
-options=('!libtool')
-source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.bz2
+source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver:0:4}/$pkgname-$pkgver.tar.bz2
 	gnome-desktop-sharp-lib-target.patch)
 md5sums=('4bc990900bb318b2ba0b0e7998bb47d1'
          '980cd3adf5e745f4caee0a172a51dcc3')
@@ -19,9 +18,9 @@ build() {
     export MONO_SHARED_DIR="$srcdir/wapi"
     mkdir -p "$MONO_SHARED_DIR"
 
-    cd "$srcdir/$pkgname-$pkgver"
+    cd $pkgname-$pkgver
     patch -Np1 -i $srcdir/gnome-desktop-sharp-lib-target.patch
-    ./configure --prefix=/usr --sysconfdir=/etc
+    ./configure --prefix=/usr --sysconfdir=/etc --disable-static
     make
 }
 
@@ -34,7 +33,7 @@ package_libgnome-desktop-sharp() {
     pkgdesc="Mono bindings for libgnome-desktop"
     depends=('gtk-sharp-2' 'gnome-desktop2')
 
-    cd "$srcdir/$pkgbase-$pkgver"
+    cd $pkgbase-$pkgver
     make -C gnomedesktop install DESTDIR="$pkgdir"
 }
 
@@ -42,7 +41,7 @@ package_gtkhtml-sharp() {
     pkgdesc="Mono bindings for gtkhtml"
     depends=('gtk-sharp-2' 'gtkhtml')
 
-    cd "$srcdir/$pkgbase-$pkgver"
+    cd $pkgbase-$pkgver
     make -C gtkhtml install DESTDIR="$pkgdir"
 }
 
@@ -50,7 +49,7 @@ package_gtksourceview2-sharp() {
     pkgdesc="Mono bindings for gtksourceview2"
     depends=('gtk-sharp-2' 'gtksourceview2')
 
-    cd "$srcdir/$pkgbase-$pkgver"
+    cd $pkgbase-$pkgver
     make -C gtksourceview install DESTDIR="$pkgdir"
 }
 
@@ -58,7 +57,7 @@ package_rsvg2-sharp() {
     pkgdesc="Mono bindings for librsvg"
     depends=('gtk-sharp-2' 'librsvg')
 
-    cd "$srcdir/$pkgbase-$pkgver"
+    cd $pkgbase-$pkgver
     make -C rsvg install DESTDIR="$pkgdir"
 }
 
@@ -66,7 +65,7 @@ package_vte-sharp() {
     pkgdesc="Mono bindings for libvte"
     depends=('gtk-sharp-2' 'vte')
 
-    cd "$srcdir/$pkgbase-$pkgver"
+    cd $pkgbase-$pkgver
     make -C vte install DESTDIR="$pkgdir"
 }
 
@@ -74,6 +73,6 @@ package_wnck-sharp() {
     pkgdesc="Mono bindings for libwnck"
     depends=('gtk-sharp-2' 'libwnck')
 
-    cd "$srcdir/$pkgbase-$pkgver"
+    cd $pkgbase-$pkgver
     make -C wnck install DESTDIR="$pkgdir"
 }
diff --git a/extra/gnome-desktop/PKGBUILD b/extra/gnome-desktop/PKGBUILD
index c234c2309..d2111fda6 100644
--- a/extra/gnome-desktop/PKGBUILD
+++ b/extra/gnome-desktop/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 196058 2013-10-07 11:51:23Z jgc $
+# $Id: PKGBUILD 198005 2013-10-30 12:13:04Z allan $
 # Maintainer:  Jan de Groot <jan@archlinux.org>
 
 pkgname=gnome-desktop
-pkgver=3.10.0
+pkgver=3.10.1
 pkgrel=1
 epoch=1
 pkgdesc="Library with common API for various GNOME modules"
@@ -12,9 +12,8 @@ depends=(gsettings-desktop-schemas gtk3 libxkbfile xkeyboard-config iso-codes)
 makedepends=(intltool gobject-introspection itstool)
 url="http://www.gnome.org"
 groups=(gnome)
-options=(!libtool)
 source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('3e87352ba30e9965199fb360c852e22ccb7c7e5c02965b6d63fb175f3737b75c')
+sha256sums=('10aca72355e8e2854450ce10edfb6da433af62ea0d87b0718ff62e9a40aabb41')
 
 build() {
   cd $pkgname-$pkgver
diff --git a/extra/gnome-desktop2/PKGBUILD b/extra/gnome-desktop2/PKGBUILD
index 2900f8d25..39f3f4fff 100644
--- a/extra/gnome-desktop2/PKGBUILD
+++ b/extra/gnome-desktop2/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 148750 2012-02-05 11:49:09Z ibiru $
+# $Id: PKGBUILD 198006 2013-10-30 12:13:26Z allan $
 # Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com>
 # Contributor:  Jan de Groot <jan@archlinux.org>
 
@@ -12,7 +12,7 @@ license=(GPL LGPL)
 depends=(gconf gtk2 startup-notification)
 makedepends=(gnome-doc-utils intltool)
 url="http://www.gnome.org"
-options=(!libtool !emptydirs)
+options=(!emptydirs)
 source=(http://ftp.gnome.org/pub/gnome/sources/$_pkgname/${pkgver%.*}/$_pkgname-$pkgver.tar.bz2)
 sha256sums=('55cbecf67efe1fa1e57ac966520a7c46d799c8ba3c652a1219f60cafccb3739d')
 
diff --git a/extra/gnome-dictionary/PKGBUILD b/extra/gnome-dictionary/PKGBUILD
index e47c61929..653509952 100644
--- a/extra/gnome-dictionary/PKGBUILD
+++ b/extra/gnome-dictionary/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 196236 2013-10-09 09:41:32Z heftig $
+# $Id: PKGBUILD 198008 2013-10-30 12:14:08Z allan $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 
 pkgname=gnome-dictionary
@@ -11,7 +11,6 @@ license=('GPL2')
 depends=('dconf' 'gtk3')
 makedepends=('intltool' 'itstool' 'docbook-xsl')
 install=$pkgname.install
-options=(!libtool)
 groups=('gnome')
 source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
 sha256sums=('258b60fe50f7d0580a7dc3bb83f7fe2f6f0597d4013d97ac083c3f062c350ed7')
diff --git a/extra/gnome-disk-utility/PKGBUILD b/extra/gnome-disk-utility/PKGBUILD
index 3a63e5f2c..c4d622438 100644
--- a/extra/gnome-disk-utility/PKGBUILD
+++ b/extra/gnome-disk-utility/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 196060 2013-10-07 11:51:25Z jgc $
+# $Id: PKGBUILD 198009 2013-10-30 12:14:33Z allan $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: Silvio Knizek (killermoehre)
 
@@ -12,7 +12,7 @@ url="http://www.gnome.org"
 groups=(gnome)
 depends=(udisks2 gtk3 libsecret libpwquality libcanberra libdvdread libnotify desktop-file-utils gnome-icon-theme-symbolic)
 makedepends=(intltool docbook-xsl gnome-settings-daemon)
-options=('!libtool' '!emptydirs')
+options=('!emptydirs')
 install=gnome-disk-utility.install
 source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver:0:4}/$pkgname-$pkgver.tar.xz)
 sha256sums=('34e23a62e711ec543670550f9312a5ad6610ce807d57345146b6af989788b8aa')
diff --git a/extra/gnome-documents/PKGBUILD b/extra/gnome-documents/PKGBUILD
index 91595e4bf..a113aeee1 100644
--- a/extra/gnome-documents/PKGBUILD
+++ b/extra/gnome-documents/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 196061 2013-10-07 11:51:26Z jgc $
+# $Id: PKGBUILD 198010 2013-10-30 12:14:53Z allan $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 
 pkgname=gnome-documents
@@ -13,7 +13,6 @@ depends=(evince gjs gtk3 gnome-desktop gnome-online-accounts libgdata
          tracker libzapojit webkitgtk gnome-online-miners)
 makedepends=(intltool gobject-introspection itstool docbook-xsl)
 optdepends=('unoconv: Support for Libreoffice document types')
-options=('!libtool')
 install=gnome-documents.install
 source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
 sha256sums=('93365aee61c2777d1fe70fa8f55f6e3ce9e7e130dd2869d74eb85787825be9f6')
diff --git a/extra/gnome-font-viewer/PKGBUILD b/extra/gnome-font-viewer/PKGBUILD
index ac73bae46..85d27ff84 100644
--- a/extra/gnome-font-viewer/PKGBUILD
+++ b/extra/gnome-font-viewer/PKGBUILD
@@ -1,4 +1,4 @@
-#  $Id: PKGBUILD 196062 2013-10-07 11:51:28Z jgc $
+#  $Id: PKGBUILD 198011 2013-10-30 12:15:32Z allan $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 
 pkgname=gnome-font-viewer
@@ -9,7 +9,7 @@ arch=(i686 x86_64 mips64el)
 license=('GPL')
 depends=('gtk3' 'desktop-file-utils' 'gnome-desktop')
 makedepends=('intltool')
-options=('!libtool' '!emptydirs')
+options=('!emptydirs')
 url="http://www.gnome.org"
 groups=('gnome')
 install=gnome-font-viewer.install
diff --git a/extra/gnome-keyring-sharp/PKGBUILD b/extra/gnome-keyring-sharp/PKGBUILD
index 37bd25238..6616d9887 100644
--- a/extra/gnome-keyring-sharp/PKGBUILD
+++ b/extra/gnome-keyring-sharp/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 156470 2012-04-18 17:42:37Z daniel $
+# $Id: PKGBUILD 198013 2013-10-30 12:16:17Z allan $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 pkgname=gnome-keyring-sharp
 pkgver=1.0.2
@@ -9,7 +9,7 @@ url="http://www.mono-project.com/Libraries"
 license=('custom')
 depends=('libgnome-keyring' 'gtk-sharp-2')
 source=(http://www.go-mono.com/archive/${pkgname}/${pkgname}-${pkgver}.tar.gz)
-options=('!makeflags' '!libtool')
+options=('!makeflags')
 md5sums=('f9a48319f3fe6123017b000d714d68b1')
 
 build() {
diff --git a/extra/gnome-keyring/PKGBUILD b/extra/gnome-keyring/PKGBUILD
index 349f6e48a..4e86de131 100644
--- a/extra/gnome-keyring/PKGBUILD
+++ b/extra/gnome-keyring/PKGBUILD
@@ -1,20 +1,20 @@
-#$Id: PKGBUILD 196066 2013-10-07 11:51:34Z jgc $
+#$Id: PKGBUILD 198012 2013-10-30 12:15:53Z allan $
 # Maintainer: Jan De Groot <jgc@archlinux.org>
 
 pkgname=gnome-keyring
-pkgver=3.10.0
+pkgver=3.10.1
 pkgrel=1
 pkgdesc="GNOME Password Management daemon"
 arch=(i686 x86_64 'mips64el')
 license=('GPL' 'LGPL')
 depends=('gtk3' 'gcr' 'libcap-ng')
-makedepends=('intltool')
+makedepends=('intltool' 'gtk-doc')
 groups=('gnome')
-options=('!libtool' '!emptydirs')
+options=('!emptydirs')
 url="http://www.gnome.org"
 install=gnome-keyring.install
 source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('1cc87260fa17b8e39071fdae0418cd9ca5f913d50e23d8f456f3e2c6d6d22213')
+sha256sums=('18001fa94c6d92e476b76423fe585dbf649051bba33012a037b07449c215dbf8')
 
 build() {
   cd "$pkgname-$pkgver"
diff --git a/extra/gnome-klotski/PKGBUILD b/extra/gnome-klotski/PKGBUILD
index e9ce6d8c5..3cdef0384 100644
--- a/extra/gnome-klotski/PKGBUILD
+++ b/extra/gnome-klotski/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 196067 2013-10-07 11:51:35Z jgc $
+# $Id: PKGBUILD 198014 2013-10-30 12:16:40Z allan $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Contributor: Jan de Groot <jgc@archlinux.org>
 
@@ -12,7 +12,7 @@ depends=('desktop-file-utils' 'hicolor-icon-theme' 'gtk3' 'librsvg')
 makedepends=('intltool' 'itstool' 'gobject-introspection')
 conflicts=('gnome-games')
 replaces=('gnome-games')
-options=('!emptydirs' '!libtool')
+options=('!emptydirs')
 install=gnome-klotski.install
 url="https://live.gnome.org/Klotski"
 groups=('gnome-extra')
diff --git a/extra/gnome-mahjongg/PKGBUILD b/extra/gnome-mahjongg/PKGBUILD
index e01bc365b..6c17fd33a 100644
--- a/extra/gnome-mahjongg/PKGBUILD
+++ b/extra/gnome-mahjongg/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 168943 2012-10-16 16:31:44Z heftig $
+# $Id: PKGBUILD 198015 2013-10-30 12:17:01Z allan $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Contributor: Jan de Groot <jgc@archlinux.org>
 
 pkgname=gnome-mahjongg
-pkgver=3.10.0
+pkgver=3.10.1
 pkgrel=1
 pkgdesc="Disassemble a pile of tiles by removing matching pairs"
 arch=('i686' 'x86_64' 'mips64el')
@@ -12,12 +12,12 @@ depends=('desktop-file-utils' 'hicolor-icon-theme' 'gtk3' 'librsvg')
 makedepends=('intltool' 'itstool' 'gobject-introspection')
 conflicts=('gnome-games')
 replaces=('gnome-games')
-options=('!emptydirs' '!libtool')
+options=('!emptydirs')
 install=gnome-mahjongg.install
 url="https://live.gnome.org/Mahjongg"
 groups=('gnome-extra')
 source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('bcbb67d0784e3e8c1772d83f559506c40b5ff2d38c8212db004b0d913f04e963')
+sha256sums=('fb987b1a024abd40cf013670854421d0fea1fffd107752493220b8cbb287ddd5')
 
 build() {
   cd $pkgname-$pkgver
diff --git a/extra/gnome-menus/PKGBUILD b/extra/gnome-menus/PKGBUILD
index 977af2778..e940e78a3 100644
--- a/extra/gnome-menus/PKGBUILD
+++ b/extra/gnome-menus/PKGBUILD
@@ -1,18 +1,17 @@
-# $Id: PKGBUILD 196156 2013-10-07 12:17:09Z jgc $
+# $Id: PKGBUILD 198017 2013-10-30 12:17:45Z allan $
 # Maintainer: Jan de Groot <jan@archlinux.org>
 
 pkgname=gnome-menus
-pkgver=3.10.0
+pkgver=3.10.1
 pkgrel=1
 pkgdesc="GNOME menu specifications"
 arch=('i686' 'x86_64' 'mips64el')
 depends=('glib2')
 makedepends=('intltool' 'gobject-introspection')
-options=('!libtool')
 license=('GPL' 'LGPL')
 url="http://www.gnome.org"
 source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('713a58ff9e3264be70dd233c2935cfce4ee76223c17044ecbf6cb53eba875192')
+sha256sums=('46950aba274c1ad58234374fa9b235258650737307f3bc396af48eb983668a71')
 
 build() {
   cd "$pkgname-$pkgver"
diff --git a/extra/gnome-mines/PKGBUILD b/extra/gnome-mines/PKGBUILD
index 9c7e3a4d2..cdc9cb1fe 100644
--- a/extra/gnome-mines/PKGBUILD
+++ b/extra/gnome-mines/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 196385 2013-10-12 16:47:50Z heftig $
+# $Id: PKGBUILD 198018 2013-10-30 12:18:05Z allan $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Contributor: Jan de Groot <jgc@archlinux.org>
 
@@ -12,7 +12,7 @@ depends=('desktop-file-utils' 'hicolor-icon-theme' 'gtk3' 'librsvg')
 makedepends=('intltool' 'itstool' 'gobject-introspection')
 conflicts=('gnome-games')
 replaces=('gnome-games')
-options=('!emptydirs' '!libtool')
+options=('!emptydirs')
 install=gnome-mines.install
 url="https://live.gnome.org/Mines"
 groups=('gnome-extra')
diff --git a/extra/gnome-music/PKGBUILD b/extra/gnome-music/PKGBUILD
index 409f8ebb0..5c28a347a 100644
--- a/extra/gnome-music/PKGBUILD
+++ b/extra/gnome-music/PKGBUILD
@@ -1,19 +1,25 @@
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=gnome-music
-pkgver=3.10.0
+pkgver=3.10.1
 pkgrel=2
 pkgdesc="Music player and management application"
 arch=(i686 x86_64)
 license=('GPL')
 url="https://wiki.gnome.org/Apps/Music"
-depends=(grilo grilo-plugins tracker python gobject-introspection libdmapsharing python-dbus dbus-glib)
+depends=(grilo grilo-plugins tracker python gobject-introspection libdmapsharing python-dbus dbus-glib gnome-icon-theme gnome-themes-standard gtk3 gvfs tracker python-gobject)
 makedepends=(intltool)
-options=('!libtool')
 groups=('gnome-extra')
 install=gnome-music.install
-source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('16ecbb93f4e69a7e85b86fc73413744073d69edaa09e71e135afe2c8de5b1d69')
+source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver:0:4}/$pkgname-$pkgver.tar.xz
+        notification.patch)
+sha256sums=('3b75643e8a6e4d9b44b2572f0ddecfa0ec32affd9172c43a4bec909d15ac9d7c'
+            '629ff5a277aecd97d3e1040d3eee70b8f011f3cf65c7fa8ec03fc22b829059fd')
+
+prepare() {
+  cd $pkgname-$pkgver
+  patch -Np1 -i ../notification.patch
+}
 
 build() {
   cd $pkgname-$pkgver
diff --git a/extra/gnome-music/gnome-music.install b/extra/gnome-music/gnome-music.install
index 2b172e29c..c0ed9a0d7 100644
--- a/extra/gnome-music/gnome-music.install
+++ b/extra/gnome-music/gnome-music.install
@@ -1,6 +1,5 @@
 post_install() {
   glib-compile-schemas usr/share/glib-2.0/schemas
-  update-desktop-database -q
   gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
 }
 
diff --git a/extra/gnome-music/notification.patch b/extra/gnome-music/notification.patch
new file mode 100644
index 000000000..7a98d98e9
--- /dev/null
+++ b/extra/gnome-music/notification.patch
@@ -0,0 +1,21 @@
+From efb6a7c0db5c40207bf78bde9d0f9b32ac667e9b Mon Sep 17 00:00:00 2001
+From: Jack Gurulian <jack.gurulian@gmail.com>
+Date: Tue, 15 Oct 2013 10:54:47 +0000
+Subject: Correctly use AlbumArtCache.get_media_title in notifications
+
+---
+diff --git a/gnomemusic/notification.py b/gnomemusic/notification.py
+index 2c8485e..5775db1 100644
+--- a/gnomemusic/notification.py
++++ b/gnomemusic/notification.py
+@@ -78,7 +78,7 @@ class NotificationManager:
+             album = item.get_string(Grl.METADATA_KEY_ALBUM)\
+                 or _("Unknown Album")
+ 
+-            self._notification.update(item.get_title(),
++            self._notification.update(AlbumArtCache.get_media_title(item),
+                                       # TRANSLATORS: by refers to the artist, from to the album
+                                       _("by %s, from %s") % ('<b>' + artist + '</b>',
+                                                              '<i>' + album + '</i>'),
+--
+cgit v0.9.2
diff --git a/extra/gnome-nibbles/PKGBUILD b/extra/gnome-nibbles/PKGBUILD
index 71864656a..69b9e5af9 100644
--- a/extra/gnome-nibbles/PKGBUILD
+++ b/extra/gnome-nibbles/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 196347 2013-10-12 04:08:16Z heftig $
+# $Id: PKGBUILD 198020 2013-10-30 12:18:48Z allan $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Contributor: Jan de Groot <jgc@archlinux.org>
 
@@ -12,7 +12,7 @@ depends=('desktop-file-utils' 'hicolor-icon-theme' 'clutter-gtk' 'libcanberra' '
 makedepends=('intltool' 'itstool' 'gobject-introspection')
 conflicts=('gnome-games')
 replaces=('gnome-games')
-options=('!emptydirs' '!libtool')
+options=('!emptydirs')
 install=gnome-nibbles.install
 url="https://live.gnome.org/Nibbles"
 groups=('gnome-extra')
diff --git a/extra/gnome-online-accounts/PKGBUILD b/extra/gnome-online-accounts/PKGBUILD
index a110b1e75..d048a670f 100644
--- a/extra/gnome-online-accounts/PKGBUILD
+++ b/extra/gnome-online-accounts/PKGBUILD
@@ -1,23 +1,26 @@
-# $Id: PKGBUILD 196071 2013-10-07 11:51:42Z jgc $
+# $Id: PKGBUILD 198021 2013-10-30 12:19:09Z allan $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 
 pkgname=gnome-online-accounts
-pkgver=3.10.0
-pkgrel=1
+pkgver=3.10.1
+pkgrel=2
 pkgdesc="GNOME service to access online accounts"
 arch=(i686 x86_64 mips64el)
 url="http://www.gnome.org"
 license=('GPL')
-depends=('webkitgtk' 'json-glib' 'libnotify' 'rest' 'hicolor-icon-theme' 'libsecret' 'telepathy-glib')
+depends=('webkitgtk' 'json-glib' 'libnotify' 'rest' 'hicolor-icon-theme' 'libsecret'
+         'telepathy-glib' 'krb5' 'gcr')
 makedepends=('intltool' 'libxslt' 'gobject-introspection' 'docbook-xsl')
-options=(!libtool)
 install=$pkgname.install
 source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver:0:4}/$pkgname-$pkgver.tar.xz)
-sha256sums=('bba85366632cf5ce777b6889eab505d98d7593c37f7859a312dc57dde05a0feb')
+sha256sums=('d925841a4c1c7a46a0837fc7e219891a46431e089847fa248e3f691c23ff7d9b')
 
 build() {
   cd $pkgname-$pkgver
-  ./configure --prefix=/usr --libexecdir=/usr/lib/$pkgname
+  ./configure --prefix=/usr --libexecdir=/usr/lib/$pkgname --disable-static \
+    --enable-exchange --enable-facebook --enable-flickr \
+    --enable-google --enable-imap-smtp --enable-kerberos \
+    --enable-owncloud --enable-telepathy --enable-windows-live
   make
 }
 
diff --git a/extra/gnome-online-miners/PKGBUILD b/extra/gnome-online-miners/PKGBUILD
index 9211d6522..1f55a9071 100644
--- a/extra/gnome-online-miners/PKGBUILD
+++ b/extra/gnome-online-miners/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 196006 2013-10-07 11:48:35Z jgc $
+# $Id: PKGBUILD 198022 2013-10-30 12:19:29Z allan $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 
 pkgname=gnome-online-miners
@@ -9,7 +9,6 @@ arch=(i686 x86_64)
 url="http://www.gnome.org"
 license=(GPL)
 depends=(libgdata gnome-online-accounts grilo libzapojit tracker)
-options=(!libtool)
 source=(http://download.gnome.org/sources/$pkgname/${pkgver:0:4}/$pkgname-$pkgver.tar.xz)
 sha256sums=('a4ca0d78452f8d19ed4eedeb5164b93aead9566cb9e2cf9826d49e3bad02a504')
  
diff --git a/extra/gnome-photos/PKGBUILD b/extra/gnome-photos/PKGBUILD
index 84a78e9bd..de1e034b2 100644
--- a/extra/gnome-photos/PKGBUILD
+++ b/extra/gnome-photos/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 196072 2013-10-07 11:51:43Z jgc $
+# $Id: PKGBUILD 198023 2013-10-30 12:19:50Z allan $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 
 pkgname=gnome-photos
-pkgver=3.10.0
+pkgver=3.10.1
 pkgrel=1
 pkgdesc="Access, organize, and share your photos on GNOME"
 arch=(i686 x86_64 mips64el)
@@ -10,11 +10,10 @@ url="https://www.gnome.org/"
 license=(GPL)
 depends=(exempi gtk3 libexif librsvg babl gegl gnome-desktop gnome-online-accounts lcms2 tracker hicolor-icon-theme grilo)
 makedepends=(intltool)
-options=(!libtool)
 groups=(gnome-extra)
 install=gnome-photos.install
 source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz)
-sha256sums=('65cb5790ec5a282c8bc8b4902858a0b4b3cec2fe39709a580dc073a23a5fc210')
+sha256sums=('40129310635fc5939e5c95616c2ea2042f30f0eef5e0c8cdd21aa0e7ff7c7085')
 
 build() {
   cd $pkgname-$pkgver
diff --git a/extra/gnome-power-manager/PKGBUILD b/extra/gnome-power-manager/PKGBUILD
index fbe60f96a..5ae3c6c03 100644
--- a/extra/gnome-power-manager/PKGBUILD
+++ b/extra/gnome-power-manager/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 196073 2013-10-07 11:51:45Z jgc $
+# $Id: PKGBUILD 196489 2013-10-14 11:54:21Z heftig $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Contributor: Jan de Groot <jgc@archlinux.org>
 
 pkgname=gnome-power-manager
-pkgver=3.10.0
+pkgver=3.10.1
 pkgrel=1
 pkgdesc="System power information and statistics"
 arch=(i686 x86_64 mips64el)
@@ -14,7 +14,7 @@ makedepends=(intltool)
 options=(!emptydirs)
 install=gnome-power-manager.install
 source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz)
-sha256sums=('e193f7b6c813acab2d57eefec783d267b26d114c2185ffe41334000c65f76841')
+sha256sums=('71c79a2f74ca076153a4f2a5dfc28a1dcb9179722108644421033780950595e2')
 
 build() {
   cd $pkgname-$pkgver
diff --git a/extra/gnome-python-desktop/01_wnck_enums.patch b/extra/gnome-python-desktop/01_wnck_enums.patch
new file mode 100644
index 000000000..512b702df
--- /dev/null
+++ b/extra/gnome-python-desktop/01_wnck_enums.patch
@@ -0,0 +1,32 @@
+Bug: https://bugzilla.gnome.org/show_bug.cgi?id=630063
+Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=597414
+
+--- a/wnck/wnck.defs
++++ b/wnck/wnck.defs
+@@ -100,7 +100,7 @@
+   )
+ )
+ 
+-(define-enum WindowState
++(define-flags WindowState
+   (in-module "Wnck")
+   (c-name "WnckWindowState")
+   (gtype-id "WNCK_TYPE_WINDOW_STATE")
+@@ -121,7 +121,7 @@
+   )
+ )
+ 
+-(define-enum WindowActions
++(define-flags WindowActions
+   (in-module "Wnck")
+   (c-name "WnckWindowActions")
+   (gtype-id "WNCK_TYPE_WINDOW_ACTIONS")
+@@ -184,7 +184,7 @@
+   )
+ )
+ 
+-(define-enum WindowMoveResizeMask
++(define-flags WindowMoveResizeMask
+   (in-module "Wnck")
+   (c-name "WnckWindowMoveResizeMask")
+   (gtype-id "WNCK_TYPE_WINDOW_MOVE_RESIZE_MASK")
diff --git a/extra/gnome-python-desktop/PKGBUILD b/extra/gnome-python-desktop/PKGBUILD
index 336997ea5..137090b63 100644
--- a/extra/gnome-python-desktop/PKGBUILD
+++ b/extra/gnome-python-desktop/PKGBUILD
@@ -1,34 +1,37 @@
-# $Id: PKGBUILD 196074 2013-10-07 11:51:47Z jgc $
+# $Id: PKGBUILD 198025 2013-10-30 12:20:39Z allan $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: Arjan Timmerman <arjan@soulfly.nl>
 # Contributor: Wael Nasreddine <gandalf@siemens-mobiles.org>
 
 pkgbase=gnome-python-desktop
-pkgname=('gnome-python-desktop' 'python2-gnomedesktop' 'python2-gnomekeyring' 'python2-gtop' 'python2-metacity' 'python2-rsvg' 'python2-totem-plparser' 'python2-wnck')
+pkgname=('gnome-python-desktop' 'python2-gnomedesktop' 'python2-gnomekeyring' 'python2-gtop' 'python2-rsvg' 'python2-totem-plparser' 'python2-wnck')
 pkgver=2.32.0
-pkgrel=13
+pkgrel=14
 arch=(i686 x86_64 'mips64el')
 license=('GPL' 'LGPL')
-options=('!libtool')
-makedepends=('intltool' 'pkg-config' 'gnome-python' 'libgtop' 'totem-plparser' 'gnome-desktop2' 'metacity' 'librsvg' 'libwnck')
+makedepends=('intltool' 'pkg-config' 'gnome-python' 'libgtop' 'totem-plparser' 'gnome-desktop2' 'librsvg' 'libwnck')
 url="http://www.gnome.org"
 source=(http://ftp.gnome.org/pub/gnome/sources/${pkgbase}/2.32/${pkgbase}-${pkgver}.tar.bz2
-        gnome-python-desktop-2.32.0-metacity-build.patch)
+        01_wnck_enums.patch)
 sha256sums=('09dbd580bf3b0ef60f91b090eafe6d08ddcc50a609e2b425a7f8eca46d4e0ee9'
-            'f012f9bd2f9baa527f07ad2f6e312c875bb6f2d3204270a1b053278a3a0c86b3')
+            'bb51a303bc745f13f9386c734c0467267a19cb193c330eff0b7d39aad0edb1c1')
+
+prepare() {
+  cd $pkgbase-$pkgver
+  patch -Np1 -i ../01_wnck_enums.patch
+}
 
 build() {
-  cd "${srcdir}/${pkgbase}-${pkgver}"
-  patch -p1 -i ../gnome-python-desktop-2.32.0-metacity-build.patch
-  PYTHON=/usr/bin/python2 ./configure --prefix=/usr --enable-metacity
+  cd $pkgbase-$pkgver
+  PYTHON=/usr/bin/python2 ./configure --prefix=/usr --disable-metacity
   make
 }
 
 package_gnome-python-desktop() {
-  depends=('python2-gnomedesktop' 'python2-gnomekeyring' 'python2-gtop' 'python2-metacity' 'python2-rsvg' 'python2-totem-plparser' 'python2-wnck' 'gnome-python')
+  depends=('python2-gnomedesktop' 'python2-gnomekeyring' 'python2-gtop' 'python2-rsvg' 'python2-totem-plparser' 'python2-wnck' 'gnome-python')
   pkgdesc="Python bindings for the GNOME desktop environment"
 
-  cd "${srcdir}/${pkgbase}-${pkgver}"
+  cd $pkgbase-$pkgver
   make install-pkgconfigDATA DESTDIR="${pkgdir}"
 }
 
@@ -38,7 +41,7 @@ package_python2-gnomedesktop() {
   conflicts=('python-gnomedesktop<=2.32.0-10')
   replaces=('python-gnomedesktop<=2.32.0-10')
   
-  cd "${srcdir}/${pkgbase}-${pkgver}"
+  cd $pkgbase-$pkgver
   make -C gnomedesktop install DESTDIR="${pkgdir}"
 }
 
@@ -48,7 +51,7 @@ package_python2-gnomekeyring() {
   conflicts=('python-gnomekeyring<=2.32.0-10')
   replaces=('python-gnomekeyring<=2.32.0-10')
 
-  cd "${srcdir}/${pkgbase}-${pkgver}"
+  cd $pkgbase-$pkgver
   make -C gnomekeyring install DESTDIR="${pkgdir}"
 }
 
@@ -58,27 +61,17 @@ package_python2-gtop() {
   conflicts=('python-gtop<=2.32.0-10')
   replaces=('python-gtop<=2.32.0-10')
 
-  cd "${srcdir}/${pkgbase}-${pkgver}"
+  cd $pkgbase-$pkgver
   make -C gtop install DESTDIR="${pkgdir}"
 }
 
-package_python2-metacity() {
-  depends=('pygtk' 'metacity')
-  pkgdesc="Python bindings for metacity"
-  conflicts=('python-metacity<=2.32.0-10')
-  replaces=('python-metacity<=2.32.0-10')
-
-  cd "${srcdir}/${pkgbase}-${pkgver}"
-  make -C metacity install DESTDIR="${pkgdir}"
-}
-
 package_python2-rsvg() {
   depends=('pygtk' 'librsvg')
   pkgdesc="Python bindings for librsvg"
   conflicts=('python-rsvg<=2.32.0-10')
   replaces=('python-rsvg<=2.32.0-10')
 
-  cd "${srcdir}/${pkgbase}-${pkgver}"
+  cd $pkgbase-$pkgver
   make -C rsvg install DESTDIR="${pkgdir}"
   install -m755 -d "${pkgdir}/usr/share/pygtk/2.0/defs"
   install -m644 rsvg/rsvg.defs "${pkgdir}/usr/share/pygtk/2.0/defs/"
@@ -90,7 +83,7 @@ package_python2-totem-plparser() {
   conflicts=('python-totem-plparser<=2.32.0-10')
   replaces=('python-totem-plparser<=2.32.0-10')
 
-  cd "${srcdir}/${pkgbase}-${pkgver}"
+  cd $pkgbase-$pkgver
   make -C totem install DESTDIR="${pkgdir}"
   install -m755 -d "${pkgdir}/usr/share/pygtk/2.0/defs"
   install -m644 totem/plparser.defs "${pkgdir}/usr/share/pygtk/2.0/defs/"
@@ -102,6 +95,6 @@ package_python2-wnck() {
   conflicts=('python-wnck<=2.32.0-10')
   replaces=('python-wnck<=2.32.0-10')
 
-  cd "${srcdir}/${pkgbase}-${pkgver}"
+  cd $pkgbase-$pkgver
   make -C wnck install DESTDIR="${pkgdir}"
 }
diff --git a/extra/gnome-python-extras/PKGBUILD b/extra/gnome-python-extras/PKGBUILD
index 78f010c10..d7dcdb311 100644
--- a/extra/gnome-python-extras/PKGBUILD
+++ b/extra/gnome-python-extras/PKGBUILD
@@ -1,63 +1,50 @@
-# $Id: PKGBUILD 150866 2012-02-23 13:12:25Z ibiru $
+# $Id: PKGBUILD 198026 2013-10-30 12:21:00Z allan $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgbase=gnome-python-extras
-pkgname=('gnome-python-extras' 'python2-egg' 'python2-gksu2' 'python2-gtkhtml2' 'python2-gtkspell')
+pkgname=('gnome-python-extras' 'python2-egg' 'python2-gtkspell')
 pkgver=2.25.3
-pkgrel=12.1
+pkgrel=13
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.daa.com.au/~james/pygtk/"
 license=('GPL' 'LGPL')
-makedepends=('libgtkhtml' 'gtkspell' 'libgksu' 'libgnomeui' 'python2' 'pygtk' 'gnome-python')
-options=('!libtool')
+makedepends=('gtkspell' 'libgnomeui' 'python2' 'pygtk' 'gnome-python')
 source=(http://ftp.gnome.org/pub/gnome/sources/gnome-python-extras/2.25/gnome-python-extras-${pkgver}.tar.bz2
 	gnome-python-extras-2.25.3-update-for-2.27.2.patch)
 md5sums=('9f3b7ec5c57130b96061cb486b79c076' '0b0a4d93016d14f2306682301de3bda3')
 sha1sums=('e69e5288466c960ed6f985bb10c9969b21ed85a4' 'b065efb7f7f5baa7b95b63bcadb6a4623d1bc9e5')
 
+prepare() {
+  cd $pkgbase-$pkgver
+  patch -Np1 -i ../gnome-python-extras-2.25.3-update-for-2.27.2.patch
+}
+    
 build() {
-    cd "${srcdir}/gnome-python-extras-${pkgver}"
-    patch -Np1 -i "${srcdir}"/gnome-python-extras-2.25.3-update-for-2.27.2.patch
-    PYTHON=/usr/bin/python2 ./configure --prefix=/usr
-    make
+  cd $pkgbase-$pkgver
+  PYTHON=/usr/bin/python2 ./configure --prefix=/usr --disable-gksu --disable-gtkhtml2 --disable-gksu2 --disable-gksuui
+  make
 }
 
 package_gnome-python-extras() {
-    pkgdesc="Gnome Python interfaces for libraries not part of the core platform"
-    depends=('python2-egg' 'python2-gksu2' 'python2-gtkhtml2' 'python2-gtkspell')
+  pkgdesc="Gnome Python interfaces for libraries not part of the core platform"
+  depends=('python2-egg' 'python2-gtkspell')
 
-    cd "${srcdir}/gnome-python-extras-${pkgver}"
-    make install-pkgconfigDATA DESTDIR="${pkgdir}"
+  cd $pkgbase-$pkgver
+  make install-pkgconfigDATA DESTDIR="${pkgdir}"
 }
 
 package_python2-egg(){
-    pkgdesc="Python bindings for interacting with egg"
-    depends=('libgnomeui' 'pygtk')
-
-    cd "${srcdir}/gnome-python-extras-${pkgver}"
-    make -C egg install DESTDIR="${pkgdir}"
-}
-
-package_python2-gksu2() {
-    pkgdesc="Python bindings for the gksu2"
-    depends=('libgksu' 'pygtk')
-
-    cd "${srcdir}/gnome-python-extras-${pkgver}"
-    make -C gksu2 install DESTDIR="${pkgdir}"
-}
-
-package_python2-gtkhtml2() {
-    pkgdesc="Python bindings for the gtkhtml2"
-    depends=('libgtkhtml' 'pygtk')
+  pkgdesc="Python bindings for interacting with egg"
+  depends=('libgnomeui' 'pygtk')
 
-    cd "${srcdir}/gnome-python-extras-${pkgver}"
-    make -C gtkhtml2 install DESTDIR="${pkgdir}"
+  cd $pkgbase-$pkgver
+  make -C egg install DESTDIR="${pkgdir}"
 }
 
 package_python2-gtkspell() {
-    pkgdesc="Python bindings for the gtkspell"
-    depends=('gtkspell' 'pygtk')
+  pkgdesc="Python bindings for the gtkspell"
+  depends=('gtkspell' 'pygtk')
 
-    cd "${srcdir}/gnome-python-extras-${pkgver}"
-    make -C gtkspell install DESTDIR="${pkgdir}"
+  cd $pkgbase-$pkgver
+  make -C gtkspell install DESTDIR="${pkgdir}"
 }
diff --git a/extra/gnome-python/PKGBUILD b/extra/gnome-python/PKGBUILD
index d407be1a7..351cff327 100644
--- a/extra/gnome-python/PKGBUILD
+++ b/extra/gnome-python/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 148754 2012-02-05 11:49:16Z ibiru $
+# $Id: PKGBUILD 198024 2013-10-30 12:20:16Z allan $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: Sarah Hay <sarah@archlinux.org>
 
@@ -9,7 +9,6 @@ pkgrel=8.1
 arch=(i686 x86_64 mips64el)
 license=('LGPL')
 makedepends=('pygtk' 'pyorbit' 'libgnomeui')
-options=('!libtool')
 url="http://www.pygtk.org/"
 source=(http://ftp.gnome.org/pub/gnome/sources/gnome-python/2.28/gnome-python-${pkgver}.tar.bz2)
 sha256sums=('759ce9344cbf89cf7f8449d945822a0c9f317a494f56787782a901e4119b96d8')
diff --git a/extra/gnome-robots/PKGBUILD b/extra/gnome-robots/PKGBUILD
index 42091c6fd..8667a9791 100644
--- a/extra/gnome-robots/PKGBUILD
+++ b/extra/gnome-robots/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 196075 2013-10-07 11:51:48Z jgc $
+# $Id: PKGBUILD 198027 2013-10-30 12:21:25Z allan $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Contributor: Jan de Groot <jgc@archlinux.org>
 
@@ -12,7 +12,7 @@ depends=('desktop-file-utils' 'hicolor-icon-theme' 'gtk3' 'libcanberra' 'librsvg
 makedepends=('intltool' 'itstool' 'gobject-introspection')
 conflicts=('gnome-games')
 replaces=('gnome-games')
-options=('!emptydirs' '!libtool')
+options=('!emptydirs')
 install=gnome-robots.install
 url="https://live.gnome.org/Robots"
 groups=('gnome-extra')
diff --git a/extra/gnome-settings-daemon/0001-power-Use-logind-to-discover-critical-action-availab.patch b/extra/gnome-settings-daemon/0001-power-Use-logind-to-discover-critical-action-availab.patch
deleted file mode 100644
index 7e678f936..000000000
--- a/extra/gnome-settings-daemon/0001-power-Use-logind-to-discover-critical-action-availab.patch
+++ /dev/null
@@ -1,77 +0,0 @@
-From 1271864ddfc053a1567d046b5fcdf8351da3f438 Mon Sep 17 00:00:00 2001
-From: "Jan Alexander Steffens (heftig)" <jan.steffens@gmail.com>
-Date: Mon, 5 Aug 2013 18:15:00 +0200
-Subject: [PATCH] power: Use logind to discover critical action availability
-
-The upower functionality is deprecated and will return an
-error unless upower is built with --enable-deprecated.
-
-Follows a similar patch to gnome-control-center.
----
- plugins/power/gsd-power-manager.c | 42 ++++++++++++++++++++++++++++-----------
- 1 file changed, 30 insertions(+), 12 deletions(-)
-
-diff --git a/plugins/power/gsd-power-manager.c b/plugins/power/gsd-power-manager.c
-index fde90ef..8bd124f 100644
---- a/plugins/power/gsd-power-manager.c
-+++ b/plugins/power/gsd-power-manager.c
-@@ -27,7 +27,6 @@
- #include <string.h>
- #include <glib/gi18n.h>
- #include <gtk/gtk.h>
--#define UPOWER_ENABLE_DEPRECATED 1
- #include <libupower-glib/upower.h>
- #include <libnotify/notify.h>
- #include <canberra-gtk.h>
-@@ -1164,18 +1163,37 @@ static GsdPowerActionType
- manager_critical_action_get (GsdPowerManager *manager,
-                              gboolean         is_ups)
- {
--        GsdPowerActionType policy;
-+        GsdPowerActionType policy = GSD_POWER_ACTION_SHUTDOWN;
-+        GsdPowerActionType setpolicy;
-+        GVariant *result = NULL;
-+        gchar *s;
- 
--        policy = g_settings_get_enum (manager->priv->settings, "critical-battery-action");
--        if (policy == GSD_POWER_ACTION_SUSPEND) {
--                if (is_ups == FALSE &&
--                    up_client_get_can_suspend (manager->priv->up_client))
--                        return policy;
--                return GSD_POWER_ACTION_SHUTDOWN;
--        } else if (policy == GSD_POWER_ACTION_HIBERNATE) {
--                if (up_client_get_can_hibernate (manager->priv->up_client))
--                        return policy;
--                return GSD_POWER_ACTION_SHUTDOWN;
-+        setpolicy = g_settings_get_enum (manager->priv->settings, "critical-battery-action");
-+
-+        if (setpolicy == GSD_POWER_ACTION_SUSPEND) {
-+                if (is_ups == FALSE) {
-+                        result = g_dbus_proxy_call_sync (manager->priv->logind_proxy,
-+                                                         "CanSuspend",
-+                                                         NULL,
-+                                                         G_DBUS_CALL_FLAGS_NONE,
-+                                                         -1, NULL, NULL);
-+                }
-+        } else if (setpolicy == GSD_POWER_ACTION_HIBERNATE) {
-+                result = g_dbus_proxy_call_sync (manager->priv->logind_proxy,
-+                                                 "CanHibernate",
-+                                                 NULL,
-+                                                 G_DBUS_CALL_FLAGS_NONE,
-+                                                 -1, NULL, NULL);
-+        } else {
-+                /* Other actions need no check */
-+                return setpolicy;
-+        }
-+
-+        if (result) {
-+                g_variant_get (result, "(s)", &s);
-+                if (g_strcmp0 (s, "yes") == 0)
-+                        policy = setpolicy;
-+                g_variant_unref (result);
-         }
- 
-         return policy;
--- 
-1.8.3.4
-
diff --git a/extra/gnome-settings-daemon/PKGBUILD b/extra/gnome-settings-daemon/PKGBUILD
index c1ca47019..e3147ba0f 100644
--- a/extra/gnome-settings-daemon/PKGBUILD
+++ b/extra/gnome-settings-daemon/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 196078 2013-10-07 11:51:53Z jgc $
+# $Id: PKGBUILD 198028 2013-10-30 12:21:47Z allan $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 
 pkgname=gnome-settings-daemon
-pkgver=3.10.0
+pkgver=3.10.1
 pkgrel=1
 pkgdesc="The GNOME Settings daemon"
 arch=('i686' 'x86_64' 'mips64el')
@@ -10,12 +10,12 @@ license=('GPL')
 depends=('dconf' 'gnome-desktop' 'gsettings-desktop-schemas' 'hicolor-icon-theme' 'libcanberra-pulse' 'libnotify'
          'libsystemd' 'libwacom' 'pulseaudio' 'pulseaudio-alsa' 'upower' 'ibus' 'librsvg' 'libgweather' 'geocode-glib' 'geoclue2')
 makedepends=('intltool' 'xf86-input-wacom' 'libxslt' 'docbook-xsl')
-options=('!emptydirs' '!libtool')
+options=('!emptydirs')
 install=gnome-settings-daemon.install
 url="http://www.gnome.org"
 groups=('gnome')
 source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('9b9fb21603b28f080de16a96986269f3a6b61bbbcc4dda0272159aa3e4d67005')
+sha256sums=('a97b202ad22d68cc17100f0770b9a72c08c95b67f03299cbe5d6dcda0d909b31')
 
 build() {
   cd $pkgname-$pkgver
diff --git a/extra/gnome-sharp/PKGBUILD b/extra/gnome-sharp/PKGBUILD
index 988ecf5da..8309e53eb 100644
--- a/extra/gnome-sharp/PKGBUILD
+++ b/extra/gnome-sharp/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 179961 2013-03-13 13:55:50Z jgc $
+# $Id: PKGBUILD 198029 2013-10-30 12:22:09Z allan $
 # Maintainer: tobias <tobias@archlinux.org>
 
 pkgbase=gnome-sharp
@@ -9,7 +9,6 @@ arch=(i686 x86_64)
 license=(LGPL)
 url="http://gtk-sharp.sourceforge.net"
 makedepends=('gtk-sharp-2' 'libgnomeui' 'monodoc')
-options=('!libtool')
 source=(http://ftp.gnome.org/pub/gnome/sources/gnome-sharp/2.24/${pkgbase}-${pkgver}.tar.bz2
         02_fix_pkg-config_paths.patch
         04_initialize_dbus_glib_threading.patch)
diff --git a/extra/gnome-shell/PKGBUILD b/extra/gnome-shell/PKGBUILD
index 4bc5142a2..98ab83245 100644
--- a/extra/gnome-shell/PKGBUILD
+++ b/extra/gnome-shell/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 196079 2013-10-07 11:51:54Z jgc $
+# $Id: PKGBUILD 198030 2013-10-30 12:22:37Z allan $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 # Contributor: Flamelab <panosfilip@gmail.com
 
 pkgname=gnome-shell
-pkgver=3.10.0.1
+pkgver=3.10.1
 pkgrel=1
 pkgdesc="The next generation GNOME Shell"
 arch=(i686 x86_64 mips64el)
@@ -15,12 +15,12 @@ depends=(accountsservice caribou evolution-data-server gcr gjs gnome-bluetooth g
          telepathy-logger telepathy-mission-control unzip)
 makedepends=(intltool gtk-doc gnome-control-center)
 optdepends=('gnome-control-center: System settings')
-options=('!libtool' '!emptydirs')
+options=('!emptydirs')
 install=gnome-shell.install
 groups=(gnome)
 source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver:0:4}/$pkgname-$pkgver.tar.xz
         nm-libexecdir.patch)
-sha256sums=('eb98ca6274e82e446834221b2dfd9af0e12e5ebce651319435524fd6cd5f4ec9'
+sha256sums=('52f43dcd6df9dd00e5fbcd16a0d7551801cbc77f8777f047e548e7803bb90e02'
             'e5bb10ad2e5c3e0fde3d05babd1bfdda701e553e02d493f7e54cb7832ce7e607')
 
 prepare() {
diff --git a/extra/gnome-speech/PKGBUILD b/extra/gnome-speech/PKGBUILD
index b23d80e3f..a7cdc3102 100644
--- a/extra/gnome-speech/PKGBUILD
+++ b/extra/gnome-speech/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 137673 2011-09-10 11:43:42Z pierre $
+# $Id: PKGBUILD 198031 2013-10-30 12:22:59Z allan $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=gnome-speech
@@ -14,7 +14,6 @@ makedepends=('intltool' 'pkgconfig' 'espeak')
 optdepends=('espeak: Text to speech engine'
             'festival: Text to speech engine')
 [ "$CARCH" != "mips64el" ] && optdepends+=('java-access-bridge: Speech support for java')
-options=('!libtool')
 source=("http://ftp.gnome.org/pub/gnome/sources/${pkgname}/0.4/${pkgname}-${pkgver}.tar.bz2")
 md5sums=('89cbc23fc131c33396c0346085759f63')
 
diff --git a/extra/gnome-system-monitor/PKGBUILD b/extra/gnome-system-monitor/PKGBUILD
index 2e2069b64..dc6a5f6be 100644
--- a/extra/gnome-system-monitor/PKGBUILD
+++ b/extra/gnome-system-monitor/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 196083 2013-10-07 11:52:01Z jgc $
+# $Id: PKGBUILD 196588 2013-10-15 14:51:47Z heftig $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Contributor: Jan de Groot <jgc@archlinux.org>
 
 pkgname=gnome-system-monitor
-pkgver=3.10.0
+pkgver=3.10.1
 pkgrel=1
 pkgdesc="A system monitor for GNOME"
 arch=(i686 x86_64 'mips64el')
@@ -15,7 +15,7 @@ url="http://www.gnome.org"
 groups=('gnome')
 install=gnome-system-monitor.install
 source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('a6bd4e925b21db08e687f7b71a0363777e1dbdda143142232c1c78ecf14821ac')
+sha256sums=('d3d4ecff7426b0944c13f051b6e4e624a3cd5d39c155a9fba289144b8b87ab0f')
 
 build() {
   cd $pkgname-$pkgver
diff --git a/extra/gnome-terminal/PKGBUILD b/extra/gnome-terminal/PKGBUILD
index 2f2567a30..a78d84d64 100644
--- a/extra/gnome-terminal/PKGBUILD
+++ b/extra/gnome-terminal/PKGBUILD
@@ -1,21 +1,21 @@
-# $Id: PKGBUILD 196084 2013-10-07 11:52:02Z jgc $
+# $Id: PKGBUILD 198033 2013-10-30 12:23:40Z allan $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=gnome-terminal
-pkgver=3.10.0
-pkgrel=2
+pkgver=3.10.1
+pkgrel=1
 pkgdesc="The GNOME Terminal Emulator"
 arch=('i686' 'x86_64' 'mips64el')
 license=(GPL)
 depends=(vte3 gsettings-desktop-schemas dconf)
 makedepends=(gnome-doc-utils intltool itstool docbook-xsl desktop-file-utils gconf libnautilus-extension)
 optdepends=('gconf: settings migration when upgrading from older version')
-options=('!emptydirs' '!libtool')
+options=('!emptydirs')
 url="http://www.gnome.org"
 groups=('gnome')
 install=gnome-terminal.install
 source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver:0:4}/$pkgname-$pkgver.tar.xz)
-sha256sums=('2f7cc56d39e083eee0419c7d7e9ae43e00dca8bc55bdd31271fb193ec7f63796')
+sha256sums=('d267e5245232e10ef12411ed7be1d879226b66f64f7cabe9731a7bd8b28e9f27')
 
 build() {
   cd $pkgname-$pkgver
diff --git a/extra/gnome-tetravex/PKGBUILD b/extra/gnome-tetravex/PKGBUILD
index 87ee40378..7ec148214 100644
--- a/extra/gnome-tetravex/PKGBUILD
+++ b/extra/gnome-tetravex/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 196085 2013-10-07 11:52:04Z jgc $
+# $Id: PKGBUILD 198034 2013-10-30 12:24:02Z allan $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Contributor: Jan de Groot <jgc@archlinux.org>
 
 pkgname=gnome-tetravex
-pkgver=3.10.0
+pkgver=3.10.1
 pkgrel=1
 pkgdesc="Complete the puzzle by matching numbered tiles"
 arch=('i686' 'x86_64' 'mips64el')
@@ -12,12 +12,12 @@ depends=('desktop-file-utils' 'hicolor-icon-theme' 'gtk3' 'librsvg')
 makedepends=('intltool' 'itstool' 'gobject-introspection')
 conflicts=('gnome-games')
 replaces=('gnome-games')
-options=('!emptydirs' '!libtool')
+options=('!emptydirs')
 install=gnome-tetravex.install
 url="https://live.gnome.org/Tetravex"
 groups=('gnome-extra')
 source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('12ae001325038cdf4bc5bd1bb8efe1807e560c55d63aa9dd21ac997d2f51dadf')
+sha256sums=('8ea9503ae8252807eb2a9b33bb50bc7d3e7f65b11f8965dd5c2ab82f8a217162')
 
 build() {
   cd $pkgname-$pkgver
diff --git a/extra/gnome-themes-standard/PKGBUILD b/extra/gnome-themes-standard/PKGBUILD
index f0def4d2a..4f8496a58 100644
--- a/extra/gnome-themes-standard/PKGBUILD
+++ b/extra/gnome-themes-standard/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 196086 2013-10-07 11:52:07Z jgc $
+# $Id: PKGBUILD 198035 2013-10-30 12:24:24Z allan $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 
 pkgname=gnome-themes-standard
@@ -14,7 +14,7 @@ optdepends=('gtk-engines: HighContrast GTK2 theme')
 groups=(gnome)
 replaces=(gnome-themes)
 conflicts=(gnome-themes)
-options=('!libtool' '!emptydirs')
+options=('!emptydirs')
 source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
 sha256sums=('812c6cfc534fced921dc327b436e70020d8979529284bb59d72d6f37af1f4b38')
 
diff --git a/extra/gnome-user-share/PKGBUILD b/extra/gnome-user-share/PKGBUILD
index bb4ce9a23..b86afc0a3 100644
--- a/extra/gnome-user-share/PKGBUILD
+++ b/extra/gnome-user-share/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 196089 2013-10-07 11:52:13Z jgc $
+# $Id: PKGBUILD 198036 2013-10-30 12:24:47Z allan $
 # Maintainer: Roman Kyrylych <roman@archlinux.org>
 
 pkgname=gnome-user-share
@@ -10,7 +10,7 @@ url="http://ftp.gnome.org/pub/GNOME/sources/gnome-user-share/"
 license=('GPL')
 depends=('mod_dnssd' 'dconf' 'gtk3' 'hicolor-icon-theme' 'libnotify' 'gnome-bluetooth' 'libcanberra')
 makedepends=('intltool' 'libnautilus-extension' 'itstool' 'docbook-xsl' 'dbus-glib')
-options=('!emptydirs' '!libtool')
+options=('!emptydirs')
 groups=('gnome')
 install=gnome-user-share.install
 source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz)
diff --git a/extra/gnome-vfs/PKGBUILD b/extra/gnome-vfs/PKGBUILD
index 5e3bf7ca5..1dde8db7e 100644
--- a/extra/gnome-vfs/PKGBUILD
+++ b/extra/gnome-vfs/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 191321 2013-07-23 15:15:03Z jgc $
+# $Id: PKGBUILD 198037 2013-10-30 12:25:08Z allan $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=gnome-vfs
@@ -9,7 +9,7 @@ arch=(i686 x86_64 'mips64el')
 license=('LGPL')
 depends=('gconf' 'bzip2' 'avahi' 'smbclient' 'gnome-mime-data' 'krb5' 'gnutls' 'libgcrypt')
 makedepends=('pkgconfig' 'intltool' 'gtk-doc' 'gnome-common')
-options=('!libtool' '!emptydirs')
+options=('!emptydirs')
 url="http://www.gnome.org"
 install=gnome-vfs.install
 source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/2.24/gnome-vfs-${pkgver}.tar.bz2
diff --git a/extra/gnome-vfsmm/PKGBUILD b/extra/gnome-vfsmm/PKGBUILD
index 71747e1b1..8fabcea98 100644
--- a/extra/gnome-vfsmm/PKGBUILD
+++ b/extra/gnome-vfsmm/PKGBUILD
@@ -1,4 +1,4 @@
-#$Id: PKGBUILD 137756 2011-09-10 15:24:38Z pierre $
+#$Id: PKGBUILD 198038 2013-10-30 12:25:28Z allan $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: Kritoke <typeolinux@yahoo.com>
 
@@ -10,7 +10,6 @@ arch=('i686' 'x86_64' 'mips64el')
 license=('LGPL')
 depends=('gnome-vfs' 'glibmm')
 makedepends=('pkgconfig' 'doxygen')
-options=('!libtool')
 url="http://gtkmm.sourceforge.net/"
 source=("http://ftp.gnome.org/pub/gnome/sources/${pkgname}/2.26/${pkgname}-${pkgver}.tar.bz2")
 md5sums=('d27d34b6a8722c557366729071c1baab')
diff --git a/extra/gnome-weather/PKGBUILD b/extra/gnome-weather/PKGBUILD
index 1ed6c2a93..8da9ebd56 100644
--- a/extra/gnome-weather/PKGBUILD
+++ b/extra/gnome-weather/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 196090 2013-10-07 11:52:14Z jgc $
+# $Id: PKGBUILD 198039 2013-10-30 12:25:50Z allan $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 
 pkgname=gnome-weather
-pkgver=3.10.0
+pkgver=3.10.1
 pkgrel=1
 pkgdesc="Access current weather conditions and forecasts"
 arch=(i686 x86_64 mips64el)
@@ -10,11 +10,10 @@ url="https://www.gnome.org/"
 license=(GPL)
 depends=(gtk3 gjs libgweather)
 makedepends=(intltool gobject-introspection)
-options=(!libtool)
 groups=(gnome-extra)
 install=gnome-weather.install
 source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/${pkgver:0:4}/${pkgname}-${pkgver}.tar.xz)
-sha256sums=('66d764a19ceebc512711a3b71c849e04021311fa12d617148bbf22c083121b69')
+sha256sums=('e0f2503c2cc9ced72da7728b262a767342b82852a74196db44377d18f1820fe4')
 
 build() {
   cd $pkgname-$pkgver
diff --git a/extra/gnu-efi-libs/PKGBUILD b/extra/gnu-efi-libs/PKGBUILD
index 7c7d3f940..28de86fd1 100644
--- a/extra/gnu-efi-libs/PKGBUILD
+++ b/extra/gnu-efi-libs/PKGBUILD
@@ -5,12 +5,12 @@
 _pkgver="3.0"
 pkgname="gnu-efi-libs"
 pkgver="${_pkgver}u"
-pkgrel="2"
+pkgrel="4"
 pkgdesc="Library for building UEFI Applications using GNU toolchain"
 url="http://sourceforge.net/projects/gnu-efi/"
 license=('GPL')
 arch=('x86_64' 'i686')
-options=('!strip' '!makeflags')
+options=('!strip' '!makeflags' 'staticlibs')
 makedepends=('pciutils')
 
 source=("http://download.sourceforge.net/gnu-efi/gnu-efi_${pkgver}.orig.tar.gz")
diff --git a/extra/gnucash/PKGBUILD b/extra/gnucash/PKGBUILD
index 827fb93ec..2730148d9 100644
--- a/extra/gnucash/PKGBUILD
+++ b/extra/gnucash/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 188077 2013-06-08 11:18:22Z bpiotrowski $
+# $Id: PKGBUILD 198654 2013-11-01 13:54:39Z eric $
 # Maintainer: Aaron Griffin <aaron@archlinux.org>
 # Contributor: Mark Schneider <queueRAM@gmail.com>
 
 pkgname=gnucash
 pkgver=2.4.13
-pkgrel=1
+pkgrel=2
 pkgdesc="A personal and small-business financial-accounting application"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.gnucash.org"
@@ -14,7 +14,7 @@ makedepends=('intltool')
 optdepends=('evince: for print preview'
             'perl-finance-quote: for stock information lookups'
             'perl-date-manip: for stock information lookups')
-options=('!libtool' '!makeflags' '!emptydirs')
+options=('!makeflags' '!emptydirs')
 install=gnucash.install
 source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.bz2)
 sha1sums=('cd28d4e7d84d71ade56173734d634ccadc59ed81')
diff --git a/extra/gnumeric/PKGBUILD b/extra/gnumeric/PKGBUILD
index 6c39e8b4d..f4568beb9 100644
--- a/extra/gnumeric/PKGBUILD
+++ b/extra/gnumeric/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 196206 2013-10-08 07:53:37Z jgc $
+# $Id: PKGBUILD 198041 2013-10-30 12:26:38Z allan $
 # Maintainer: Eric Belanger <eric@archlinux.org>
 # Contributor: Kritoke <typeolinux@yahoo.com>
 
@@ -17,7 +17,6 @@ optdepends=('python2-gobject: for python plugin support'
             'psiconv: for Psion 5 file support'
             'yelp: for viewing the help manual')
 install=gnumeric.install
-options=('!libtool')
 source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz
         revert-warnings.patch)
 sha256sums=('02688fb6c32c28db2eb4e9a8e012cf1386f4f3a18b4c94f5ecdd13342521ec76'
diff --git a/extra/gnutls/PKGBUILD b/extra/gnutls/PKGBUILD
index 32ed5cb91..0d0898891 100644
--- a/extra/gnutls/PKGBUILD
+++ b/extra/gnutls/PKGBUILD
@@ -1,21 +1,21 @@
-# $Id: PKGBUILD 193808 2013-09-02 08:07:32Z andyrtr $
+# $Id: PKGBUILD 198663 2013-11-01 16:03:59Z andyrtr $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 
 pkgname=gnutls
-pkgver=3.2.4
+pkgver=3.2.6
 pkgrel=1
 pkgdesc="A library which provides a secure layer over a reliable transport layer"
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL3' 'LGPL2.1')
 url="http://www.gnutls.org/"
 install=gnutls.install
-options=('!libtool' '!zipman')
+options=('!zipman')
 depends=('gcc-libs' 'libtasn1' 'readline' 'zlib' 'nettle' 'p11-kit')
 makedepends=('strace' 'datefudge')
 [ "$CARCH" = "mips64el" ] || makedepends+=('valgrind')
 source=(ftp://ftp.gnutls.org/gcrypt/gnutls/v3.2/${pkgname}-${pkgver}.tar.xz{,.sig})
-md5sums=('79ef8538d65128b7ed47046649b98c27'
+md5sums=('1dfe5188df1641754056d853725ef785'
          'SKIP')
 
 build() {
diff --git a/extra/gobject-introspection/PKGBUILD b/extra/gobject-introspection/PKGBUILD
index 495f939f7..4795673fe 100644
--- a/extra/gobject-introspection/PKGBUILD
+++ b/extra/gobject-introspection/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 196091 2013-10-07 11:52:16Z jgc $
+# $Id: PKGBUILD 198043 2013-10-30 12:27:25Z allan $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=gobject-introspection
@@ -10,7 +10,6 @@ arch=('x86_64' 'i686' 'mips64el')
 license=('LGPL' 'GPL')
 depends=('glib2' 'python2' 'python2-mako')
 makedepends=('cairo')
-options=('!libtool')
 source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver::4}/$pkgname-$pkgver.tar.xz)
 sha256sums=('3575e5d353c17a567fdf7ffaaa7aebe9347b5b0eee8e69d612ba56a9def67d73')
 
diff --git a/extra/goffice/PKGBUILD b/extra/goffice/PKGBUILD
index 1602c276c..c73c95e4b 100644
--- a/extra/goffice/PKGBUILD
+++ b/extra/goffice/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 196195 2013-10-08 07:31:56Z jgc $
+# $Id: PKGBUILD 198044 2013-10-30 12:27:46Z allan $
 # Maintainer: Aaron Griffin <aaron@archlinux.org>
 
 pkgname=goffice
@@ -8,7 +8,6 @@ pkgdesc="A library of document-centric objects and utilities built on top of GLi
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.gnome.org"
 license=('GPL')
-options=('!libtool')
 makedepends=('pkgconfig' 'intltool' 'gtk-doc' 'gobject-introspection')
 depends=('librsvg' 'gtk3' 'libgsf' 'libspectre')
 source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver:0:4}/${pkgname}-${pkgver}.tar.xz)
diff --git a/extra/goffice0.8/PKGBUILD b/extra/goffice0.8/PKGBUILD
index b97e476c7..966fd20ed 100644
--- a/extra/goffice0.8/PKGBUILD
+++ b/extra/goffice0.8/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 173347 2012-12-19 14:13:59Z jgc $
+# $Id: PKGBUILD 198045 2013-10-30 12:28:07Z allan $
 # Maintainer: Aaron Griffin <aaron@archlinux.org>
 
 pkgname=goffice0.8
@@ -8,7 +8,6 @@ pkgdesc="A library of document-centric objects and utilities built on top of GLi
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.gnome.org"
 license=('GPL')
-options=('!libtool')
 depends=('gtk2' 'gconf' 'libgsf')
 conflicts=('goffice<0.10')
 makedepends=('pkgconfig' 'intltool' 'gtk-doc')
diff --git a/extra/gperftools/PKGBUILD b/extra/gperftools/PKGBUILD
index d22eba99f..02984390d 100644
--- a/extra/gperftools/PKGBUILD
+++ b/extra/gperftools/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 191875 2013-08-01 00:55:33Z dreisner $
+# $Id: PKGBUILD 198046 2013-10-30 12:28:29Z allan $
 # Maintainer: Dave Reisner <dreisner@archlinux.org>
 # Contributor: Alexander Rødseth <rodseth@gmail.com>
 # Contributor: Thomas Jost <schnouki@schnouki.net>
@@ -8,7 +8,7 @@
 
 pkgname=gperftools
 pkgver=2.1
-pkgrel=1
+pkgrel=2
 pkgdesc="Fast, multi-threaded malloc() and nifty performance analysis tools"
 arch=('i686' 'x86_64')
 url="http://code.google.com/p/gperftools/"
@@ -16,7 +16,6 @@ license=('BSD')
 depends=('perl')
 optdepends=('graphviz: pprof graph generation'
             'gv: pprof postscript generation')
-options=('!libtool')
 source=("http://$pkgname.googlecode.com/files/$pkgname-$pkgver.tar.gz")
 sha256sums=('f3ade29924f89409d8279ab39e00af7420593baa4941c318db42e70ead7e494f')
 
diff --git a/extra/gpsd/PKGBUILD b/extra/gpsd/PKGBUILD
index de6cbd64e..f0f11325c 100644
--- a/extra/gpsd/PKGBUILD
+++ b/extra/gpsd/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 187860 2013-06-07 09:24:56Z tomegun $
+# $Id: PKGBUILD 198047 2013-10-30 12:28:49Z allan $
 # Maintainer: Tom Gundersen <teg@jklm.no>
 # Contributor: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com>
@@ -6,7 +6,7 @@
 
 pkgname=gpsd
 pkgver=3.9
-pkgrel=3
+pkgrel=4
 pkgdesc="GPS daemon and library to support USB/serial GPS devices"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://catb.org/gpsd/"
@@ -17,7 +17,6 @@ optdepends=('php: generate a PHP status page for your GPS'
             'pygtk: GUI frontends')
 makedepends=('scons' 'docbook-xsl' 'chrpath')
 backup=('etc/gpsd.conf')
-options=('!libtool')
 install="${pkgname}.install"
 source=("http://download.savannah.gnu.org/releases/${pkgname}/${pkgname}-${pkgver}.tar.gz"{,.sig}
         'gpsd.conf')
@@ -33,9 +32,10 @@ build() {
     gpscat gpsfake gpsprof xgps xgpsspeed
 
   scons prefix=/usr \
-    systemd=yes \
-    libQgpsmm=no \
-    PYTHONPATH=/usr/bin/python2
+        systemd=yes \
+        libQgpsmm=no \
+        gpsd_group=uucp \
+        PYTHONPATH=/usr/bin/python2
   scons build
 }
 
diff --git a/extra/gptfdisk/PKGBUILD b/extra/gptfdisk/PKGBUILD
index 18074728f..cfc55d56f 100644
--- a/extra/gptfdisk/PKGBUILD
+++ b/extra/gptfdisk/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 189840 2013-07-09 09:22:21Z foutrelis $
+# $Id: PKGBUILD 196742 2013-10-17 14:02:47Z andyrtr $
 # Maintainer: Evangelos Foutras <evangelos@foutrelis.com>
 # Contributor: Tobias Powalowski <tpowa@archlinux.org>
 # Contributor: Hokum <hokum_at_mail_dot_ru>
 
 pkgname=gptfdisk
-pkgver=0.8.7
-pkgrel=1
+pkgver=0.8.8
+pkgrel=2
 pkgdesc="A text-mode partitioning tool that works on Globally Unique Identifier (GUID) Partition Table (GPT) disks"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.rodsbooks.com/gdisk/"
@@ -15,21 +15,18 @@ provides=("gdisk=$pkgver")
 conflicts=('gdisk')
 replaces=('gdisk')
 source=(http://downloads.sourceforge.net/project/$pkgname/$pkgname/$pkgver/$pkgname-$pkgver.tar.gz)
-sha256sums=('39e61d9f3701e95db1bcb83ce8fb211b22f33548e3c75b17f22067c6968e91e3')
 
 build() {
-  cd "$srcdir/$pkgname-$pkgver"
-
+  cd $pkgname-$pkgver
   make
 }
 
 package () {
-  cd "$srcdir/$pkgname-$pkgver"
+  cd $pkgname-$pkgver
 
   install -d "$pkgdir"/usr/{bin,share/{doc/gdisk,man/man8}}
   install -t "$pkgdir/usr/bin" {,c,s}gdisk fixparts
   install -m644 -t "$pkgdir/usr/share/man/man8" {{,c,s}gdisk,fixparts}.8
   install -m644 -t "$pkgdir/usr/share/doc/gdisk" README NEWS
 }
-
-# vim:set ts=2 sw=2 et:
+md5sums=('bd47d03ec27bab5613254b5a20f72143')
diff --git a/extra/graphicsmagick/PKGBUILD b/extra/graphicsmagick/PKGBUILD
index 9802dd885..6c9ac7775 100644
--- a/extra/graphicsmagick/PKGBUILD
+++ b/extra/graphicsmagick/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 186381 2013-05-26 09:24:32Z bluewind $
+# $Id: PKGBUILD 198048 2013-10-30 12:29:09Z allan $
 # Maintainer: Ronald van Haren <ronald.archlinux.org>
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
 # Contributor: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
@@ -14,7 +14,6 @@ license=('MIT')
 makedepends=('perl')
 depends=('bzip2' 'freetype2' 'ghostscript' 'jasper' 'lcms2' 'xz'
          'libtiff' 'libwmf' 'libsm' 'libxml2' 'libltdl')
-options=('!libtool')
 source=("http://downloads.sourceforge.net/project/${pkgname}/${pkgname}/${pkgver}/GraphicsMagick-${pkgver}.tar.xz")
 sha1sums=('085c23666adcf88585119cb6aea7efe5c58481d4')
 
diff --git a/extra/graphite/PKGBUILD b/extra/graphite/PKGBUILD
index 680294ec3..f948f5b09 100644
--- a/extra/graphite/PKGBUILD
+++ b/extra/graphite/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 188519 2013-06-15 07:02:29Z andyrtr $
+# $Id: PKGBUILD 198049 2013-10-30 12:29:30Z allan $
 # Maintainer: AndyRTR <andyrtr@archlinux.org>
 
 pkgname=graphite
@@ -13,7 +13,7 @@ depends=('gcc-libs')
 makedepends=('cmake' 'freetype2' 'python2')
              # - only for docs - target doesn't install properly
              #  'doxygen' 'texlive-latexextra' 'graphviz' 'asciidoc' 'perl-module-build' 'icu') # builds doc properly? 'texlive-helvetic' seems to be missing
-options=('!libtool' '!emptydirs')
+options=('!emptydirs')
 source=(http://downloads.sourceforge.net/project/silgraphite/graphite2/graphite2-${pkgver}.tgz
         graphite2-1.2.0-cmakepath.patch)
 md5sums=('7042305e4208af4c2d5249d814ccce58'
diff --git a/extra/graphviz/PKGBUILD b/extra/graphviz/PKGBUILD
index 5125687bf..d648d2d5b 100644
--- a/extra/graphviz/PKGBUILD
+++ b/extra/graphviz/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 194533 2013-09-17 17:04:18Z bisson $
+# $Id: PKGBUILD 198050 2013-10-30 12:29:51Z allan $
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
 # Contributor: kevin <kevin@archlinux.org>
 # Contributor: John Proctor <jproctor@prium.net>
 
 pkgname=graphviz
-pkgver=2.32.0
+pkgver=2.34.0
 pkgrel=2
 pkgdesc='Graph visualization software'
 url='http://www.graphviz.org/'
@@ -26,24 +26,17 @@ if [ "$CARCH" != "mips64el" ]; then
   optdepends+=('mono: sharp bindings'
                'r: r bindings')
 fi
-source=("${url}/pub/${pkgname}/stable/SOURCES/${pkgname}-${pkgver}.tar.gz")
-sha1sums=('a64f4a409012d13d18338ecb8bd7253083ebc35e')
+source=("${url}/pub/${pkgname}/stable/SOURCES/${pkgname}-${pkgver}.tar.gz"
+        'dotty.patch')
+sha1sums=('5a0c00bebe7f4c7a04523db21f40966dc9f0d441'
+          '31bc9f505c8b6470289a0d6ec31c237765cba239')
 
-options=('!libtool')
 install=install
 
 prepare() {
 	cd "${srcdir}/${pkgname}-${pkgver}"
+	patch -p1 -i ../dotty.patch
 	sed \
-		-e 's: qw(\([^)]*\)): (qw(\1)):g' \
-		-i config/config_perl.pl
-	sed \
-		-e '/"archdir"/s:$:+" '"$(echo -I/usr/include/ruby-2.0.0/{$CARCH-linux,ruby/backward,})"'":' \
-		-e '/CONFIG/s:site:vendor:' \
-		-i config/config_ruby.rb
-	sed \
-		-e 's:guile-1.8:guile-2.0:g' \
-		-e 's:ruby-1.9:ruby-2.0:g' \
 		-e '/LIBPOSTFIX="64"/d' \
 		-i configure
 }
@@ -53,8 +46,7 @@ build() {
 	export PYTHON=python2
 	export LUA=lua5.1
 
-	./configure --prefix=/usr --with-cgraph=no
-	make || sed '/caml_array_length/d' -i tclpkg/gv/gv_ocaml.cpp # swig goes wonky
+	./configure --prefix=/usr
 	make
 }
 
diff --git a/extra/graphviz/dotty.patch b/extra/graphviz/dotty.patch
new file mode 100644
index 000000000..7c8ca1d7f
--- /dev/null
+++ b/extra/graphviz/dotty.patch
@@ -0,0 +1,21 @@
+diff -Naur old/cmd/dotty/dotty_layout.lefty new/cmd/dotty/dotty_layout.lefty
+--- old/cmd/dotty/dotty_layout.lefty	2013-09-06 15:07:52.000000000 -1000
++++ new/cmd/dotty/dotty_layout.lefty	2013-10-22 15:23:50.153028328 -1000
+@@ -5,7 +5,7 @@
+     local fd;
+ 
+     if (~dotty.lservers[lserver] | tablesize (dotty.lservers[lserver]) == 0) {
+-        if (~((fd = openio ('pipe', lserver, 'r+', '%e -Txdot')) >= 0)) {
++        if (~((fd = openio ('pipe', lserver, 'r+', '%e -Txdot1.2')) >= 0)) {
+             dotty.message (0, concat ('cannot start ', lserver));
+             return null;
+         }
+@@ -438,6 +438,8 @@
+             }
+         } else if (t[i] == 'I') {
+             i = i + 7;
++        } else if (t[i] == 't') {
++            i = i + 2;
+         } else {
+             dotty.message (0, concat ('draw language parser error: ', t[i]));
+             return null;
diff --git a/extra/grilo-plugins/PKGBUILD b/extra/grilo-plugins/PKGBUILD
index dd7e4c5ce..acf83faf6 100644
--- a/extra/grilo-plugins/PKGBUILD
+++ b/extra/grilo-plugins/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 196093 2013-10-07 11:52:19Z jgc $
+# $Id: PKGBUILD 198052 2013-10-30 12:30:49Z allan $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 
 pkgname=grilo-plugins
@@ -19,7 +19,7 @@ optdepends=('gupnp-av: uPnP plugin'
             'totem-plparser: Youtube plugin, Vimeo plugin, Optical media plugin'
             'libdmapsharing: DMAP sharing plugin'
             'json-glib: TMDb plugin')
-options=('!libtool' '!emptydirs')
+options=('!emptydirs')
 groups=('gnome')
 source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz)
 sha256sums=('902b839bd1cdc27613d9e44af2afe00d1ef3b7471ae72c66c622560007e1023e')
diff --git a/extra/grilo/PKGBUILD b/extra/grilo/PKGBUILD
index f92e34e65..d5707a9c2 100644
--- a/extra/grilo/PKGBUILD
+++ b/extra/grilo/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 196092 2013-10-07 11:52:18Z jgc $
+# $Id: PKGBUILD 198051 2013-10-30 12:30:26Z allan $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 
 pkgname=grilo
@@ -11,7 +11,7 @@ license=('LGPL')
 depends=('gtk3' 'libxml2' 'libsoup' 'liboauth')
 makedepends=('gobject-introspection' 'gtk-doc' 'vala' 'intltool')
 optdepends=('grilo-plugins: Plugins for grilo')
-options=('!libtool' '!emptydirs')
+options=('!emptydirs')
 source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz)
 sha256sums=('4a854ee6f9a220f05e696813949be94780c12a7fb281253f10a545f30ed596d8')
 
diff --git a/extra/gsasl/PKGBUILD b/extra/gsasl/PKGBUILD
index b786e0d6b..d7f0999c6 100644
--- a/extra/gsasl/PKGBUILD
+++ b/extra/gsasl/PKGBUILD
@@ -1,27 +1,25 @@
-# $Id: PKGBUILD 170167 2012-11-04 02:30:50Z eric $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Contributor: Orivej Desh <smpuj@bk.ru>
-# Maintainer: Orivej Desh <smpuj@bk.ru>
+# $Id: PKGBUILD 197247 2013-10-24 18:39:54Z eric $
+# Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgname=gsasl
 pkgver=1.8.0
-pkgrel=2.1
+pkgrel=3
 pkgdesc="Simple Authentication and Security Layer framework and a few common SASL mechanisms"
 arch=("i686" "x86_64" "mips64el")
 url="http://josefsson.org/gsasl/"
-license=("GPL")
+license=('GPL')
 depends=('gnutls' 'libidn' 'krb5' 'libgcrypt')
-source=("ftp://ftp.gnu.org/gnu/gsasl/$pkgname-$pkgver.tar.gz")
-md5sums=('982fe54a20016aa46a871c084c990c36')
+install=gsasl.install
+source=(ftp://ftp.gnu.org/gnu/gsasl/${pkgname}-${pkgver}.tar.gz)
+sha1sums=('343fd97ae924dc406986c02fb9b889f4114239ae')
 
 build() {
-  cd "$srcdir/$pkgname-$pkgver"
+  cd ${pkgname}-${pkgver}
   ./configure --prefix=/usr --with-gssapi-impl=mit
   make
 }
 
 package() {
-  cd "$srcdir/$pkgname-$pkgver"
-  make DESTDIR="$pkgdir" install
-  rm "$pkgdir/usr/share/info/dir" "$pkgdir/usr/lib/libgsasl.la"
+  cd ${pkgname}-${pkgver}
+  make DESTDIR="${pkgdir}" install
 }
diff --git a/extra/gsasl/gsasl.install b/extra/gsasl/gsasl.install
new file mode 100644
index 000000000..b9b69f97e
--- /dev/null
+++ b/extra/gsasl/gsasl.install
@@ -0,0 +1,16 @@
+infodir=usr/share/info
+file=gsasl.info
+
+post_install() {
+  [[ -x usr/bin/install-info ]] || return 0
+  install-info "$infodir/$file.gz" "$infodir/dir" 2> /dev/null
+}
+
+post_upgrade() {
+  post_install "$1"
+}
+
+pre_remove() {
+  [[ -x usr/bin/install-info ]] || return 0
+  install-info --delete "$infodir/$file.gz" "$infodir/dir" 2> /dev/null
+}
diff --git a/extra/gsl/PKGBUILD b/extra/gsl/PKGBUILD
index 9119271a8..617c996fd 100644
--- a/extra/gsl/PKGBUILD
+++ b/extra/gsl/PKGBUILD
@@ -1,19 +1,18 @@
-# $Id: PKGBUILD 171358 2012-11-17 09:32:49Z eric $
+# $Id: PKGBUILD 198053 2013-10-30 12:31:09Z allan $
 # Maintainer: Ronald van Haren <ronald.archlinux.org>
 # Contributor: Juergen Hoetzel <juergen.archlinux.org>
 # Contributor: Tom Newsom <Jeepster@gmx.co.uk>
 
 pkgname=gsl
 pkgver=1.15
-pkgrel=2.2
+pkgrel=3
 pkgdesc="The GNU Scientific Library (GSL) is a modern numerical library for C and C++ programmers"
 url="http://www.gnu.org/software/gsl/gsl.html"
-source=("http://ftp.belnet.be/mirror/ftp.gnu.org/gnu/gsl/$pkgname-$pkgver.tar.gz")
+source=("http://ftp.gnu.org/gnu/gsl/$pkgname-$pkgver.tar.gz")
 install=gsl.install
 license=('GPL')
 arch=('i686' 'x86_64' 'mips64el')
 depends=('glibc' 'bash')
-options=('!libtool')
 sha1sums=('d914f84b39a5274b0a589d9b83a66f44cd17ca8e')
 
 build() {
diff --git a/extra/gssdp/PKGBUILD b/extra/gssdp/PKGBUILD
index 0ed3e6019..0f27364d8 100644
--- a/extra/gssdp/PKGBUILD
+++ b/extra/gssdp/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 194952 2013-09-24 10:27:03Z heftig $
+# $Id: PKGBUILD 198636 2013-10-31 15:44:36Z heftig $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Contributor: György Balló <ballogy@freestart.hu>
 
 pkgname=gssdp
-pkgver=0.14.5
+pkgver=0.14.6
 pkgrel=1
 pkgdesc="A GObject-based API for handling resource discovery and announcement over SSDP"
 arch=('i686' 'x86_64' 'mips64el')
@@ -12,9 +12,8 @@ license=(LGPL)
 depends=(libsoup)
 makedepends=(gobject-introspection gtk3 gtk-doc vala)
 optdepends=('gtk3: gssdp-device-sniffer')
-options=('!libtool')
 source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver:0:4}/${pkgname}-${pkgver}.tar.xz)
-sha256sums=('e847940a852c968d18c7ca044783e9b938c84c3b5f53978a29b636bf95c91af1')
+sha256sums=('9acfdeb99080b165c34ea7c65fb909ea356b4550937972a73df5b69b419eeacd')
 
 build() {
   cd $pkgname-$pkgver
diff --git a/extra/gst-libav/PKGBUILD b/extra/gst-libav/PKGBUILD
index 5ab50f608..e3167fb81 100644
--- a/extra/gst-libav/PKGBUILD
+++ b/extra/gst-libav/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 196095 2013-10-07 11:52:22Z jgc $
+# $Id: PKGBUILD 198055 2013-10-30 12:31:51Z allan $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=gst-libav
@@ -10,7 +10,7 @@ license=('GPL')
 url="http://gstreamer.freedesktop.org/"
 depends=('gst-plugins-base-libs' 'bzip2')
 makedepends=('yasm')
-options=(!libtool !emptydirs)
+options=(!emptydirs)
 provides=("gst-ffmpeg=$pkgver-$pkgrel")
 source=(${url}/src/$pkgname/$pkgname-$pkgver.tar.xz)
 sha256sums=('48721eb318ffffdd134edea754d0b65d76b08c8209a8d2c8a42bca1f799f9099')
diff --git a/extra/gst-plugins-base/PKGBUILD b/extra/gst-plugins-base/PKGBUILD
index f8d375037..0969a6a00 100644
--- a/extra/gst-plugins-base/PKGBUILD
+++ b/extra/gst-plugins-base/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 196097 2013-10-07 11:52:25Z jgc $
+# $Id: PKGBUILD 198057 2013-10-30 12:32:34Z allan $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgbase=gst-plugins-base
@@ -9,7 +9,7 @@ pkgdesc="GStreamer Multimedia Framework Base Plugins"
 arch=('i686' 'x86_64' 'mips64el')
 license=('LGPL')
 makedepends=('pkgconfig' 'gstreamer' 'orc' 'libxv' 'alsa-lib' 'cdparanoia' 'libvisual' 'libvorbis' 'libtheora' 'pango' 'gobject-introspection')
-options=(!libtool !emptydirs)
+options=(!emptydirs)
 url="http://gstreamer.freedesktop.org/"
 source=(${url}/src/$pkgbase/$pkgbase-${pkgver}.tar.xz)
 sha256sums=('8656e20bf4b675e5696fb4af193793351926d428ca02826c5667a6384729a45d')
diff --git a/extra/gst-plugins-good/PKGBUILD b/extra/gst-plugins-good/PKGBUILD
index e718e77b8..dcd044f02 100644
--- a/extra/gst-plugins-good/PKGBUILD
+++ b/extra/gst-plugins-good/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 196098 2013-10-07 11:52:26Z jgc $
+# $Id: PKGBUILD 198058 2013-10-30 12:32:54Z allan $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=gst-plugins-good
@@ -10,7 +10,7 @@ license=('LGPL')
 url="http://gstreamer.freedesktop.org/"
 depends=('libpulse' 'jack' 'libsoup' 'gst-plugins-base-libs' 'wavpack' 'aalib' 'taglib' 'libdv' 'libshout' 'libvpx' 'gdk-pixbuf2' 'libcaca' 'libavc1394' 'libiec61883' 'libxdamage' 'v4l-utils' 'cairo')
 makedepends=('gstreamer' 'speex' 'flac' 'libraw1394' 'python')
-options=(!libtool !emptydirs)
+options=(!emptydirs)
 source=(${url}/src/$pkgname/$pkgname-$pkgver.tar.xz)
 sha256sums=('2256a6b2744ea18d8810642cf9061a2f12f4b7eba87d3fbc98004262b4f0fdfa')
 
diff --git a/extra/gst-plugins-ugly/PKGBUILD b/extra/gst-plugins-ugly/PKGBUILD
index 30d834adb..87ea800c9 100644
--- a/extra/gst-plugins-ugly/PKGBUILD
+++ b/extra/gst-plugins-ugly/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 196099 2013-10-07 11:52:28Z jgc $
+# $Id: PKGBUILD 198059 2013-10-30 12:33:14Z allan $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=gst-plugins-ugly
@@ -9,7 +9,7 @@ arch=('i686' 'x86_64' 'mips64el')
 license=('LGPL')
 url="http://gstreamer.freedesktop.org/"
 depends=('gst-plugins-base-libs' 'libdvdread' 'lame' 'libmpeg2' 'a52dec' 'libmad' 'libsidplay' 'libcdio' 'x264' 'opencore-amr')
-options=(!libtool !emptydirs)
+options=(!emptydirs)
 source=(${url}/src/$pkgname/$pkgname-$pkgver.tar.xz)
 sha256sums=('e4760af4b12bf97ba0a8001cfe733d9d52160a0ad81f6c6f0d0d3a9e798626de')
 
diff --git a/extra/gstreamer-vaapi/PKGBUILD b/extra/gstreamer-vaapi/PKGBUILD
index d14884e68..e6da373b9 100644
--- a/extra/gstreamer-vaapi/PKGBUILD
+++ b/extra/gstreamer-vaapi/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 193801 2013-09-01 14:13:21Z heftig $
+# $Id: PKGBUILD 198068 2013-10-30 12:36:23Z allan $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 
 pkgbase=gstreamer-vaapi
@@ -11,7 +11,7 @@ license=(LGPL)
 url="http://www.freedesktop.org/software/vaapi/releases/gstreamer-vaapi/"
 makedepends=(gst-plugins-base gst-plugins-bad gstreamer0.10-base-plugins gstreamer0.10-bad-plugins libva
              libxrandr)
-options=(!libtool !emptydirs)
+options=(!emptydirs)
 
 source=($url/$pkgbase-${pkgver}.tar.bz2)
 sha1sums=('884a47cc4916f441bec160235927556a79c7ea09')
diff --git a/extra/gstreamer/PKGBUILD b/extra/gstreamer/PKGBUILD
index e8da8a074..47a882b6e 100644
--- a/extra/gstreamer/PKGBUILD
+++ b/extra/gstreamer/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 196100 2013-10-07 11:52:29Z jgc $
+# $Id: PKGBUILD 198060 2013-10-30 12:33:34Z allan $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=gstreamer
@@ -11,7 +11,6 @@ url="http://gstreamer.freedesktop.org/"
 depends=('libxml2' 'glib2')
 optdepends=('sh: feedback script')
 makedepends=('intltool' 'pkgconfig' 'gtk-doc' 'gobject-introspection')
-options=('!libtool')
 source=(${url}/src/gstreamer/gstreamer-${pkgver}.tar.xz)
 sha256sums=('94af5274299f845adf41cc504e0209b269acab7721293f49850fea27b4099463')
 
diff --git a/extra/gstreamer0.10-base/PKGBUILD b/extra/gstreamer0.10-base/PKGBUILD
index 283c3805a..bcc6a7b95 100644
--- a/extra/gstreamer0.10-base/PKGBUILD
+++ b/extra/gstreamer0.10-base/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 185705 2013-05-17 12:41:12Z foutrelis $
+# $Id: PKGBUILD 198063 2013-10-30 12:34:39Z allan $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgbase=('gstreamer0.10-base')
@@ -8,7 +8,7 @@ pkgrel=1.2
 arch=('i686' 'x86_64' 'mips64el')
 license=('LGPL')
 makedepends=('pkgconfig' 'gstreamer0.10>=0.10.35' 'orc' 'libxv' 'alsa-lib' 'cdparanoia' 'libvisual' 'libvorbis' 'libtheora' 'pango' 'gobject-introspection')
-options=(!libtool !emptydirs)
+options=(!emptydirs)
 url="http://gstreamer.freedesktop.org/"
 source=(${url}/src/gst-plugins-base/gst-plugins-base-${pkgver}.tar.xz)
 sha256sums=('1fe45c3894903001d4d008b0713dab089f53726dcb5842d5b40c2595a984e64a')
diff --git a/extra/gstreamer0.10-ffmpeg/PKGBUILD b/extra/gstreamer0.10-ffmpeg/PKGBUILD
index 05e514295..fa183d3dc 100644
--- a/extra/gstreamer0.10-ffmpeg/PKGBUILD
+++ b/extra/gstreamer0.10-ffmpeg/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 147131 2012-01-22 11:26:07Z andyrtr $
+# $Id: PKGBUILD 198064 2013-10-30 12:34:59Z allan $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=gstreamer0.10-ffmpeg
@@ -11,7 +11,6 @@ depends=('gstreamer0.10-base' 'bzip2')
 makedepends=('pkgconfig' 'yasm' 'sdl')
 url="http://www.gstreamer.net"
 groups=('gstreamer0.10-plugins')
-options=('!libtool')
 source=(http://gstreamer.freedesktop.org/src/gst-ffmpeg/gst-ffmpeg-${pkgver}.tar.bz2)
 sha256sums=('76fca05b08e00134e3cb92fa347507f42cbd48ddb08ed3343a912def187fbb62')
 
diff --git a/extra/gstreamer0.10-good/PKGBUILD b/extra/gstreamer0.10-good/PKGBUILD
index 157a4b8a9..4831eb827 100644
--- a/extra/gstreamer0.10-good/PKGBUILD
+++ b/extra/gstreamer0.10-good/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 184390 2013-05-06 19:37:46Z foutrelis $
+# $Id: PKGBUILD 198065 2013-10-30 12:35:19Z allan $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgbase=gstreamer0.10-good
@@ -9,7 +9,7 @@ arch=('i686' 'x86_64' 'mips64el')
 license=('LGPL')
 makedepends=('intltool' 'pkgconfig' 'gstreamer0.10-base' 'libavc1394' 'libiec61883' 'aalib' 'libshout' 'libdv' 'flac' 'gconf' 'wavpack' 'taglib' 'libsoup-gnome' 'v4l-utils' 'libcaca' 'bzip2' 'gdk-pixbuf2' 'libpulse' 'jack' 'udev' 'gtk-doc')
 url="http://gstreamer.freedesktop.org/"
-options=(!libtool !emptydirs)
+options=(!emptydirs)
 source=(${url}/src/gst-plugins-good/gst-plugins-good-${pkgver}.tar.xz
         linux-3.6.patch)
 sha256sums=('77a8436a7c0a15f876bad29616835046890df2bcaf72da02151bd91e3d292b64'
diff --git a/extra/gstreamer0.10-python/PKGBUILD b/extra/gstreamer0.10-python/PKGBUILD
index ac97e9317..d1f5d324e 100644
--- a/extra/gstreamer0.10-python/PKGBUILD
+++ b/extra/gstreamer0.10-python/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 147133 2012-01-22 11:30:42Z andyrtr $
+# $Id: PKGBUILD 198066 2013-10-30 12:35:41Z allan $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=gstreamer0.10-python
@@ -10,7 +10,6 @@ license=('LGPL')
 url="http://gstreamer.freedesktop.org/"
 depends=('pygobject>=2.20.0' 'gstreamer0.10-base>=0.10.32')
 makedepends=('pkgconfig')
-options=('!libtool')
 source=(http://gstreamer.freedesktop.org/src/gst-python/gst-python-${pkgver}.tar.bz2)
 md5sums=('937152fe896241f827689f4b53e79b22')
 
diff --git a/extra/gstreamer0.10-ugly/PKGBUILD b/extra/gstreamer0.10-ugly/PKGBUILD
index 102ae5931..0ba48c793 100644
--- a/extra/gstreamer0.10-ugly/PKGBUILD
+++ b/extra/gstreamer0.10-ugly/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 191896 2013-08-01 06:53:29Z bpiotrowski $
+# $Id: PKGBUILD 198067 2013-10-30 12:36:02Z allan $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgbase=gstreamer0.10-ugly
@@ -9,7 +9,6 @@ arch=('i686' 'x86_64' 'mips64el')
 license=('LGPL')
 makedepends=('pkgconfig' 'gstreamer0.10-base>=0.10.34' 'libdvdread' 'lame' 'libmpeg2' 'a52dec' 'libmad' 'libsidplay' 'libcdio' 'x264' 'opencore-amr')
 url="http://gstreamer.freedesktop.org/"
-options=(!libtool)
 source=(${url}/src/gst-plugins-ugly/gst-plugins-ugly-${pkgver}.tar.xz
         opencore-amr.patch
         cdio-cd-text-api.patch)
diff --git a/extra/gstreamer0.10/PKGBUILD b/extra/gstreamer0.10/PKGBUILD
index 1c60ca0e8..ddd359dc0 100644
--- a/extra/gstreamer0.10/PKGBUILD
+++ b/extra/gstreamer0.10/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 184011 2013-04-30 20:11:04Z jgc $
+# $Id: PKGBUILD 198061 2013-10-30 12:33:54Z allan $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=gstreamer0.10
@@ -11,7 +11,6 @@ url="http://gstreamer.com"
 depends=('libxml2' 'glib2')
 optdepends=('sh: feedback script')
 makedepends=('intltool' 'pkgconfig' 'gtk-doc' 'gobject-introspection' 'git')
-options=('!libtool')
 source=("git://anongit.freedesktop.org/gstreamer-sdk/gstreamer#commit=ce96cff8e2bf1772dc330387fa98e94f187fc2ab"
         tests-remove-silly-test_fail_abstract_new-check.patch)
 sha256sums=('SKIP'
diff --git a/extra/gthumb/PKGBUILD b/extra/gthumb/PKGBUILD
index 57200067e..c22e4f301 100644
--- a/extra/gthumb/PKGBUILD
+++ b/extra/gthumb/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 196101 2013-10-07 11:52:31Z jgc $
+# $Id: PKGBUILD 198069 2013-10-30 12:36:47Z allan $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Contributor: Jan de Groot <jgc@archlinux.org>
 # Contributor: Tobias Kieslich <tobias@justdreams.de>
 
 pkgname=gthumb
-pkgver=3.2.3
-pkgrel=4
+pkgver=3.2.4
+pkgrel=1
 pkgdesc="Image browser and viewer for the GNOME Desktop"
 arch=(i686 x86_64 mips64el)
 license=(GPL)
@@ -19,16 +19,13 @@ optdepends=('libopenraw: read RAW files'
             'libchamplain: map viewer'
             'brasero: burn discs'
             'liboauth: web albums')
-options=('!libtool' '!emptydirs')
+options=('!emptydirs')
 install=gthumb.install
-source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz
-        gtk310.patch)
-sha256sums=('9f596b6e59b70bbdf177930f6b2cbc6aabdfc1a281db527e3515946c5ca4e70a'
-            'dcbfad2eb7047c1ea4210dc0af1054dc2ec863331f12fcd59c05021570d38bfe')
+source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
+sha256sums=('0b94e7317911334c80fce5116970186963419fd0c25eed4ecca2a4ddcc968177')
 
 prepare() {
   cd $pkgname-$pkgver
-  patch -Np1 -i ../gtk310.patch
 }
 
 build() {
diff --git a/extra/gthumb/gtk310.patch b/extra/gthumb/gtk310.patch
deleted file mode 100644
index 86f0e99e8..000000000
--- a/extra/gthumb/gtk310.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 36ba0c99c1780ca9f23f220ced70a76b97ce8260 Mon Sep 17 00:00:00 2001
-From: Paolo Bacchilega <paobac@src.gnome.org>
-Date: Fri, 27 Sep 2013 15:40:33 +0000
-Subject: Fixed broken window layout with gtk+ 3.10
-
-[bug #708800]
----
-diff --git a/gthumb/gth-window.c b/gthumb/gth-window.c
-index a2960bc..a2cce99 100644
---- a/gthumb/gth-window.c
-+++ b/gthumb/gth-window.c
-@@ -324,6 +324,7 @@ gth_window_attach (GthWindow     *window,
- 		return;
- 	}
- 
-+	gtk_widget_set_vexpand (child, FALSE);
- 	gtk_grid_attach (GTK_GRID (window->priv->grid),
- 			  child,
- 			  0, position,
-@@ -362,6 +363,7 @@ gth_window_attach_content (GthWindow *window,
- 
- 	_gtk_container_remove_children (GTK_CONTAINER (window->priv->contents[page]), NULL, NULL);
- 	gtk_widget_set_hexpand (child, TRUE);
-+	gtk_widget_set_vexpand (child, TRUE);
- 	gtk_container_add (GTK_CONTAINER (window->priv->contents[page]), child);
- }
- 
---
-cgit v0.9.2
diff --git a/extra/gtk-engines/PKGBUILD b/extra/gtk-engines/PKGBUILD
index 7e0a08600..a1b834520 100644
--- a/extra/gtk-engines/PKGBUILD
+++ b/extra/gtk-engines/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 161439 2012-06-11 15:51:44Z jgc $
+# $Id: PKGBUILD 198072 2013-10-30 12:37:51Z allan $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=gtk-engines
@@ -9,7 +9,6 @@ arch=(i686 x86_64 'mips64el')
 license=('GPL' 'LGPL')
 depends=('gtk2>=2.22.0')
 makedepends=('pkg-config' 'intltool')
-options=('!libtool')
 url="http://live.gnome.org/GnomeArt"
 source=(ftp://ftp.archlinux.org/other/gtk-engines/${pkgname}-${pkgver}.tar.gz
         ftp://ftp.archlinux.org/other/gtk-engines/${pkgname}-${pkgver}.tar.gz.sig)
diff --git a/extra/gtk-sharp-2/PKGBUILD b/extra/gtk-sharp-2/PKGBUILD
index d1827c87c..f82eabb75 100644
--- a/extra/gtk-sharp-2/PKGBUILD
+++ b/extra/gtk-sharp-2/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 196159 2013-10-07 12:30:37Z jgc $
+# $Id: PKGBUILD 198081 2013-10-30 12:41:20Z allan $
 # Maintainer: tobias <tobias@archlinux.org>
 
 pkgname=gtk-sharp-2
@@ -11,7 +11,7 @@ url="http://gtk-sharp.sourceforge.net"
 depends=('mono' 'libglade' 'gtk2')
 makedepends=('pkgconfig' 'monodoc')
 conflicts=('gtk#')
-options=('!libtool' '!makeflags')
+options=('!makeflags')
 source=(https://github.com/mono/gtk-sharp/archive/${pkgver}.tar.gz)
 md5sums=('0cdaef41857e29c23942a148c83122ac')
 
diff --git a/extra/gtk-vnc/PKGBUILD b/extra/gtk-vnc/PKGBUILD
index f4e743253..f44c7b0d6 100644
--- a/extra/gtk-vnc/PKGBUILD
+++ b/extra/gtk-vnc/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 185577 2013-05-15 08:05:37Z bpiotrowski $
+# $Id: PKGBUILD 198085 2013-10-30 12:42:46Z allan $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Contributor: Jan de Groot <jgc@archlinux.org>
 # Contributor: Allan McRae <mcrae_allan@hotmail.com>
@@ -14,7 +14,6 @@ license=('LGPL')
 depends=('libgcrypt' 'gtk3')
 optdepends=('gtk2: GTK2 widget')
 makedepends=('intltool' 'pygtk' 'pygobject2-devel' 'gtk-doc' 'gtk2' 'vala' 'gobject-introspection')
-options=('!libtool')
 source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz)
 sha256sums=('b51bda7edebb82ab142c292bd1b1493406bc8225a5c834d854bbafef9e9a471f')
 
diff --git a/extra/gtk-xfce-engine/PKGBUILD b/extra/gtk-xfce-engine/PKGBUILD
index d9d45b80e..33e970617 100644
--- a/extra/gtk-xfce-engine/PKGBUILD
+++ b/extra/gtk-xfce-engine/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 166516 2012-09-09 13:16:50Z foutrelis $
+# $Id: PKGBUILD 198086 2013-10-30 12:43:06Z allan $
 # Maintainer: Evangelos Foutras <evangelos@foutrelis.com>
 # Contributor: tobias <tobias funnychar archlinux.org>
 
@@ -11,7 +11,6 @@ url="http://www.xfce.org/"
 license=('GPL2')
 groups=('xfce4')
 makedepends=('gtk2' 'gtk3')
-options=('!libtool')
 source=(http://archive.xfce.org/src/xfce/$pkgbase/3.0/$pkgbase-$pkgver.tar.bz2)
 sha256sums=('eb03cf81da1a91e426a2141c092ed7a1634cab29ea2f3546480e901290a7a06d')
 
diff --git a/extra/gtk/PKGBUILD b/extra/gtk/PKGBUILD
index 7356f01c6..b38894662 100644
--- a/extra/gtk/PKGBUILD
+++ b/extra/gtk/PKGBUILD
@@ -1,16 +1,15 @@
-# $Id: PKGBUILD 191240 2013-07-22 03:45:27Z eric $
+# $Id: PKGBUILD 197249 2013-10-24 18:51:37Z eric $
 # Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgname=gtk
 pkgver=1.2.10
-pkgrel=12
+pkgrel=13
 pkgdesc="GTK+ is a multi-platform toolkit (v1)"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.gtk.org/"
 license=('LGPL')
 depends=('libxi' 'glib' 'sh')
 makedepends=('libxt')
-options=('!libtool')
 install=gtk.install
 source=(ftp://ftp.gtk.org/pub/gtk/v1.2/gtk+-${pkgver}.tar.gz
         aclocal-fixes.patch)
diff --git a/extra/gtk2/PKGBUILD b/extra/gtk2/PKGBUILD
index 75a97d1dd..2ae904e9e 100644
--- a/extra/gtk2/PKGBUILD
+++ b/extra/gtk2/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 196328 2013-10-11 14:41:41Z heftig $
+# $Id: PKGBUILD 198070 2013-10-30 12:37:07Z allan $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgbase=gtk2
@@ -9,7 +9,6 @@ arch=('i686' 'x86_64' 'mips64el')
 url="http://www.gtk.org/"
 makedepends=('atk' 'pango' 'libxcursor' 'libxinerama' 'libxrandr' 'libxi' 'libxcomposite' 'libxdamage'
              'shared-mime-info' 'cairo' 'libcups' 'gdk-pixbuf2' 'gobject-introspection')
-options=('!libtool')
 license=('LGPL')
 source=(http://ftp.gnome.org/pub/gnome/sources/gtk+/2.24/gtk+-$pkgver.tar.xz
         gtkrc xid-collision-debug.patch)
diff --git a/extra/gtk3/PKGBUILD b/extra/gtk3/PKGBUILD
index c4ea72288..819910bd3 100644
--- a/extra/gtk3/PKGBUILD
+++ b/extra/gtk3/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 196329 2013-10-11 14:46:45Z heftig $
+# $Id: PKGBUILD 198071 2013-10-30 12:37:29Z allan $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 
 pkgname=gtk3
-pkgver=3.10.1
+pkgver=3.10.2
 pkgrel=1
 pkgdesc="GObject-based multi-platform GUI toolkit (v3)"
 arch=(i686 x86_64 mips64el)
@@ -14,13 +14,16 @@ depends=(atk cairo gtk-update-icon-cache libcups libxcursor libxinerama libxrand
 makedepends=(gobject-introspection)
 optdepends=('gnome-themes-standard: Default widget theme'
             'gnome-icon-theme: Default icon theme')
-options=('!libtool')
 license=(LGPL)
 source=(http://ftp.gnome.org/pub/gnome/sources/gtk+/${pkgver%.*}/gtk+-$pkgver.tar.xz
         settings.ini)
-sha256sums=('c12e6897fb1ec8d8f1a6de6cd0ac1372fee6fd63ee3a5a63813dc5f3473e6ab8'
+sha256sums=('93af12d28e5f6ccc373ea59f31147e2884c9b3c15dc4841ce3b5cee45b13814c'
             '14369dfd1d325c393e17c105d5d5cc5501663277bd4047ea04a50abb3cfbd119')
 
+prepare() {
+    cd "gtk+-$pkgver"
+}
+
 build() {
     cd "gtk+-$pkgver"
 
diff --git a/extra/gtkglext/PKGBUILD b/extra/gtkglext/PKGBUILD
index 0e9b76d76..7b6448c5f 100644
--- a/extra/gtkglext/PKGBUILD
+++ b/extra/gtkglext/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 169936 2012-10-30 22:45:47Z heftig $
+# $Id: PKGBUILD 198073 2013-10-30 12:38:12Z allan $
 # Maintainer: Ronald van Haren <ronald.archlinux.org>
 # Contributor: Ben <ben@benmazer.net>
 
@@ -11,7 +11,6 @@ url="http://gtkglext.sourceforge.net/"
 license=('LGPL')
 depends=('gtk2' 'glu' 'libxmu' 'pangox-compat')
 makedepends=('mesa')
-options=('!libtool')
 source=("http://downloads.sourceforge.net/sourceforge/gtkglext/${pkgname}-${pkgver}.tar.bz2"
 	'gtk2.20.patch')
 md5sums=('ed7ba24ce06a8630c07f2d0ee5f04ab4'
diff --git a/extra/gtkglextmm/PKGBUILD b/extra/gtkglextmm/PKGBUILD
index 9e77e8894..2c7f02d66 100644
--- a/extra/gtkglextmm/PKGBUILD
+++ b/extra/gtkglextmm/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 168604 2012-10-13 11:47:19Z andyrtr $
+# $Id: PKGBUILD 198074 2013-10-30 12:38:35Z allan $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Bastien Bouclet <bastien.bouclet@gmail.com>
 # Contributor: SpepS <dreamspepser at yahoo dot it>
@@ -11,7 +11,6 @@ arch=('i686' 'x86_64' 'mips64el')
 url="http://gtkglext.sourceforge.net/"
 depends=('gtkmm' 'gtkglext')
 makedepends=('mesa')
-options=('!libtool')
 license=('GPL')
 source=("http://downloads.sourceforge.net/sourceforge/gtkglext/${pkgname}-${pkgver}.tar.bz2"
         'gdkspanfunc.patch')
diff --git a/extra/gtkhtml/PKGBUILD b/extra/gtkhtml/PKGBUILD
index 7733293ac..fb04f4c46 100644
--- a/extra/gtkhtml/PKGBUILD
+++ b/extra/gtkhtml/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 148774 2012-02-05 11:49:58Z ibiru $
+# $Id: PKGBUILD 198075 2013-10-30 12:38:55Z allan $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=gtkhtml
@@ -10,7 +10,6 @@ license=('GPL')
 depends=('gconf' 'gtk2' 'gnome-icon-theme' 'enchant' 'iso-codes' 'libsoup')
 makedepends=('intltool')
 url="http://www.gnome.org"
-options=('!libtool')
 source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/3.32/${pkgname}-${pkgver}.tar.bz2)
 sha256sums=('8746053cf709e1de37c7ac775ab1364ddda4b75167660ed7f98a237b3797e39f')
 
diff --git a/extra/gtkhtml4/PKGBUILD b/extra/gtkhtml4/PKGBUILD
index a5d505ae8..1666f222d 100644
--- a/extra/gtkhtml4/PKGBUILD
+++ b/extra/gtkhtml4/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 191835 2013-07-31 09:23:27Z jgc $
+# $Id: PKGBUILD 198076 2013-10-30 12:39:18Z allan $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 
 pkgname=gtkhtml4
@@ -11,7 +11,6 @@ license=('GPL')
 depends=('gtk3' 'enchant' 'iso-codes' 'gnome-icon-theme' 'libsoup')
 makedepends=('intltool')
 url="http://www.gnome.org"
-options=('!libtool')
 source=(http://ftp.gnome.org/pub/gnome/sources/$_pkgbasename/${pkgver%.*}/$_pkgbasename-$pkgver.tar.xz)
 sha256sums=('145d23bbe729ff4ee7e7027bb5ff405b34822271327fdd81fe913134831374cd')
 
diff --git a/extra/gtkimageview/PKGBUILD b/extra/gtkimageview/PKGBUILD
index a0890e70c..f5752f333 100644
--- a/extra/gtkimageview/PKGBUILD
+++ b/extra/gtkimageview/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 145169 2011-12-18 22:03:46Z giovanni $
+# $Id: PKGBUILD 198077 2013-10-30 12:39:44Z allan $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Jan Blazek <appolito@gmail.com>
 # Contributor: Jose Valecillos <valecillosjg (at) gmail (dot) com>
@@ -12,7 +12,6 @@ url="http://trac.bjourne.webfactional.com/"
 license=('LGPL2.1')
 depends=('gtk2')
 makedepends=('pkgconfig')
-options=('!libtool')
 source=("http://trac.bjourne.webfactional.com/attachment/wiki/WikiStart/${pkgname}-${pkgver}.tar.gz?format=raw")
 md5sums=('501367b3f50e69a12208dc9c6ad00b18')
 
diff --git a/extra/gtkmathview/PKGBUILD b/extra/gtkmathview/PKGBUILD
index 4843b101a..da86e7d9b 100644
--- a/extra/gtkmathview/PKGBUILD
+++ b/extra/gtkmathview/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 137761 2011-09-10 15:35:20Z pierre $
+# $Id: PKGBUILD 198078 2013-10-30 12:40:13Z allan $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Jan de Groot <jgc@archlinux.org>
 
@@ -10,7 +10,6 @@ arch=('i686' 'x86_64' 'mips64el')
 url="http://helm.cs.unibo.it/mml-widget/"
 license=('GPL')
 depends=('popt' 'gtk2' 't1lib' 'gmetadom')
-options=('!libtool')
 source=("http://helm.cs.unibo.it/mml-widget/sources/${pkgname}-${pkgver}.tar.gz"
         'gtkmathview-0.8.0-gcc44.patch'
         'gtkmathview-0.8.0-cond-t1.patch'
diff --git a/extra/gtkmm/PKGBUILD b/extra/gtkmm/PKGBUILD
index be91b660a..eac071f9f 100644
--- a/extra/gtkmm/PKGBUILD
+++ b/extra/gtkmm/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 189082 2013-06-28 13:55:25Z lcarlier $
+# $Id: PKGBUILD 198079 2013-10-30 12:40:35Z allan $
 # Contributor: Tom Newsom <Jeepster@gmx.co.uk>
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
@@ -9,7 +9,7 @@ pkgrel=1
 arch=('i686' 'x86_64' 'mips64el')
 makedepends=('gtk2' 'pangomm' 'atkmm' 'glibmm-docs')
 license=('LGPL')
-options=('!libtool' '!emptydirs')
+options=('!emptydirs')
 url="http://www.gtkmm.org/"
 source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgbase}/2.24/${pkgbase}-${pkgver}.tar.xz)
 sha256sums=('443a2ff3fcb42a915609f1779000390c640a6d7fd19ad8816e6161053696f5ee')
diff --git a/extra/gtkmm3/PKGBUILD b/extra/gtkmm3/PKGBUILD
index 3f324013c..e7363ea6c 100644
--- a/extra/gtkmm3/PKGBUILD
+++ b/extra/gtkmm3/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 196332 2013-10-11 14:56:43Z heftig $
+# $Id: PKGBUILD 198080 2013-10-30 12:40:57Z allan $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 
 pkgbase=gtkmm3
@@ -9,7 +9,7 @@ pkgrel=1
 arch=('i686' 'x86_64' 'mips64el')
 makedepends=('gtk3' 'pangomm' 'atkmm' 'glibmm-docs' 'mm-common' 'doxygen' 'libxslt')
 license=('LGPL')
-options=('!libtool' '!emptydirs')
+options=('!emptydirs')
 url="http://www.gtkmm.org/"
 source=(http://ftp.gnome.org/pub/GNOME/sources/$_pkgbasename/${pkgver%.*}/$_pkgbasename-$pkgver.tar.xz)
 sha256sums=('5e45fed4a7cff1baa72d1ef67e0d9883063d3a575cb53190e7ecf27047d241f8')
diff --git a/extra/gtksourceview2/PKGBUILD b/extra/gtksourceview2/PKGBUILD
index 8deeee2b1..1841c4011 100644
--- a/extra/gtksourceview2/PKGBUILD
+++ b/extra/gtksourceview2/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 148778 2012-02-05 11:50:06Z ibiru $
+# $Id: PKGBUILD 198082 2013-10-30 12:41:42Z allan $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=gtksourceview2
@@ -9,7 +9,6 @@ arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 depends=('gtk2>=2.22.0' 'libxml2>=2.7.7')
 makedepends=('intltool' 'pkg-config')
-options=('!libtool')
 url="http://www.gnome.org"
 source=(http://ftp.gnome.org/pub/gnome/sources/gtksourceview/2.10/gtksourceview-${pkgver}.tar.bz2)
 sha256sums=('c585773743b1df8a04b1be7f7d90eecdf22681490d6810be54c81a7ae152191e')
diff --git a/extra/gtksourceview3/PKGBUILD b/extra/gtksourceview3/PKGBUILD
index 30ca82b3e..0b6a646e6 100644
--- a/extra/gtksourceview3/PKGBUILD
+++ b/extra/gtksourceview3/PKGBUILD
@@ -1,19 +1,18 @@
-# $Id: PKGBUILD 196105 2013-10-07 11:52:37Z jgc $
+# $Id: PKGBUILD 198083 2013-10-30 12:42:02Z allan $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 
 pkgname=gtksourceview3
 _pkgbasename=gtksourceview
-pkgver=3.10.0
+pkgver=3.10.1
 pkgrel=1
 pkgdesc="A text widget adding syntax highlighting and more to GNOME"
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 depends=('gtk3' 'libxml2')
 makedepends=('intltool' 'gobject-introspection' 'glade')
-options=('!libtool')
 url="http://www.gnome.org"
 source=(http://ftp.gnome.org/pub/gnome/sources/$_pkgbasename/${pkgver%.*}/$_pkgbasename-$pkgver.tar.xz)
-sha256sums=('5208afa6edccf4d70a30ed1da399cefcceb8a8b879305d491be4be3e3d6ef776')
+sha256sums=('38de44f832b4110a3442af2fce58fce0a54f4b22a763c490bcdc1b1db2fb0b01')
 
 build() {
   cd "$_pkgbasename-$pkgver"
diff --git a/extra/gtkspell/PKGBUILD b/extra/gtkspell/PKGBUILD
index 48c96f584..cdfb37a34 100644
--- a/extra/gtkspell/PKGBUILD
+++ b/extra/gtkspell/PKGBUILD
@@ -1,23 +1,22 @@
-# $Id: PKGBUILD 150411 2012-02-17 12:37:06Z allan $
+# $Id: PKGBUILD 198084 2013-10-30 12:42:23Z allan $
 # Maintainer: Roman Kyrylych <roman@archlinux.org>
 # Contributer: Ben <ben@benmazer.net>
 
 pkgname=gtkspell
 pkgver=2.0.16
-pkgrel=2.1
+pkgrel=3
 url="http://gtkspell.sourceforge.net/"
-pkgdesc="GtkSpell provides word-processor-style highlighting and replacement of misspelled words in a GtkTextView widget"
+pkgdesc="Provides word-processor-style highlighting and replacement of misspelled words in a GtkTextView widget"
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 depends=('gtk2' 'enchant')
 makedepends=('intltool' 'gtk-doc')
-options=('!libtool')
 source=(http://gtkspell.sourceforge.net/download/${pkgname}-${pkgver}.tar.gz)
 md5sums=('f75dcc9338f182c571b321d37c606a94')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr
+  ./configure --prefix=/usr --disable-static
   make
 }
 
diff --git a/extra/gts/PKGBUILD b/extra/gts/PKGBUILD
index 565a2f9d1..f505f5342 100644
--- a/extra/gts/PKGBUILD
+++ b/extra/gts/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 188503 2013-06-15 04:44:21Z bisson $
+# $Id: PKGBUILD 198087 2013-10-30 12:43:27Z allan $
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
 # Contributor: Thomas Dziedzic <gostrc at gmail>
 # Contributor: Juergen Hoetzel <juergen@archlinux.org>
@@ -15,7 +15,6 @@ depends=('glib2')
 source=("http://downloads.sourceforge.net/project/${pkgname}/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.gz")
 sha1sums=('000720bebecf0b153eb28260bd30fbd979dcc040')
 
-options=('!libtool')
 
 build() {
 	cd "${pkgname}-${pkgver}"
diff --git a/extra/gucharmap/PKGBUILD b/extra/gucharmap/PKGBUILD
index 167566090..10d7a06c5 100644
--- a/extra/gucharmap/PKGBUILD
+++ b/extra/gucharmap/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 196106 2013-10-07 11:52:39Z jgc $
+# $Id: PKGBUILD 198088 2013-10-30 12:43:49Z allan $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Contributor: Jan De Groot <jgc@archlinux.org>
 
 pkgname=gucharmap
-pkgver=3.9.99
+pkgver=3.10.0
 pkgrel=1
 pkgdesc="Gnome Unicode Charmap"
 arch=('i686' 'x86_64' 'mips64el')
@@ -11,11 +11,11 @@ license=('GPL')
 url="http://www.gnome.org"
 depends=('dconf' 'gtk3' 'hicolor-icon-theme')
 makedepends=('gtk-doc' 'intltool' 'gobject-introspection' 'itstool' 'docbook-xsl' 'desktop-file-utils')
-options=('!libtool' '!emptydirs')
-groups=('gnome')
+options=('!emptydirs')
+groups=(gnome)
 install=gucharmap.install
 source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('7a9425f07f8e4053e0382e627d65ca428674f8c63f2c721877ae8c62c25ccb00')
+sha256sums=('a0447b5dd13e3364c5ca9bacb1f7387043d664effd64980e400c5b3d7301b617')
 
 build() {
   cd $pkgname-$pkgver
diff --git a/extra/guile/PKGBUILD b/extra/guile/PKGBUILD
index e1fb8eb71..b5b6ff73f 100644
--- a/extra/guile/PKGBUILD
+++ b/extra/guile/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 188079 2013-06-08 11:18:24Z bpiotrowski $
+# $Id: PKGBUILD 198089 2013-10-30 12:44:09Z allan $
 # Contributor: Tom Newsom <Jeepster@gmx.co.uk>
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
@@ -12,7 +12,6 @@ license=('GPL')
 depends=('gmp' 'libltdl' 'ncurses>=5.7' 'texinfo' 'libunistring' 'gc' 'libffi')
 install=guile.install
 source=(ftp://ftp.gnu.org/pub/gnu/${pkgname}/${pkgname}-${pkgver}.tar.gz)
-options=('!libtool')
 md5sums=('531839c3fe887382ca9d4774db544d34')
 
 build() {
diff --git a/extra/guile1.8/PKGBUILD b/extra/guile1.8/PKGBUILD
index 36123ffad..e69ce6463 100644
--- a/extra/guile1.8/PKGBUILD
+++ b/extra/guile1.8/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 188080 2013-06-08 11:18:25Z bpiotrowski $
+# $Id: PKGBUILD 198090 2013-10-30 12:44:33Z allan $
 # Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl>
 
 pkgname=guile1.8
@@ -10,7 +10,6 @@ arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 depends=('gmp' 'libltdl' 'ncurses>=5.7' 'texinfo')
 source=(ftp://ftp.gnu.org/pub/gnu/guile/guile-$pkgver.tar.gz)
-options=('!libtool')
 md5sums=('18661a8fdfef13e2fcb7651720aa53f3')
 
 build() {
diff --git a/extra/gupnp-av/PKGBUILD b/extra/gupnp-av/PKGBUILD
index d0cf118a7..703a85af0 100644
--- a/extra/gupnp-av/PKGBUILD
+++ b/extra/gupnp-av/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 186713 2013-05-30 17:40:28Z heftig $
+# $Id: PKGBUILD 198092 2013-10-30 12:45:19Z allan $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Contributor: Thijs Vermeir <thijsvermeir@gmail.com>
 # Contributor: Denis Zawada <deno@rootnode.net>
 
 pkgname=gupnp-av
-pkgver=0.12.2
+pkgver=0.12.3
 pkgrel=1
 pkgdesc="Library to ease handling and implementation of UPnP A/V profiles"
 arch=('i686' 'x86_64' 'mips64el')
@@ -12,9 +12,8 @@ url="http://gupnp.org/"
 license=(LGPL)
 depends=(gupnp)
 makedepends=(gobject-introspection gtk-doc vala)
-options=('!libtool')
 source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz)
-sha256sums=('43597bdfb1c352338e706962ff7fcdbcb544c5a36f27c9c2aaa5a550b6990270')
+sha256sums=('fa37325ee8aa22909131eedff871b61ccd183b66c7770c147a0d4c34b83bbf02')
 
 build() {
   cd $pkgname-$pkgver
diff --git a/extra/gupnp-dlna/PKGBUILD b/extra/gupnp-dlna/PKGBUILD
index 43a85b154..0b30c8d8a 100644
--- a/extra/gupnp-dlna/PKGBUILD
+++ b/extra/gupnp-dlna/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 186714 2013-05-30 17:41:26Z heftig $
+# $Id: PKGBUILD 198093 2013-10-30 12:45:39Z allan $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Contributor: Balló György <ballogyor+arch at gmail dot com>
 
@@ -11,7 +11,6 @@ url="http://gupnp.org/"
 license=(LGPL)
 depends=(gst-plugins-base-libs)
 makedepends=(gobject-introspection gtk-doc vala)
-options=('!libtool')
 source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
 sha256sums=('158a22dc9c11645817596322e2516701f0d49e40f1892ddc8832afd26221c5c3')
 
diff --git a/extra/gupnp-igd/PKGBUILD b/extra/gupnp-igd/PKGBUILD
index 57e204603..e0f8150e5 100644
--- a/extra/gupnp-igd/PKGBUILD
+++ b/extra/gupnp-igd/PKGBUILD
@@ -1,33 +1,32 @@
-# $Id: PKGBUILD 183422 2013-04-21 22:11:03Z heftig $
+# $Id: PKGBUILD 197430 2013-10-25 20:13:38Z eric $
 # Maintainer: Eric Bélanger <eric@archlinux.org>
-# Contributor: William Díaz <wdiaz [at] archlinux [dot] us>
 
 pkgname=gupnp-igd
 pkgver=0.2.2
-pkgrel=1
+pkgrel=2
 pkgdesc="A library to handle UPnP IGD port mapping"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.gupnp.org"
-license=(LGPL)
-depends=(gupnp python2-gobject2)
-makedepends=(gettext)
-options=('!libtool' '!makeflags')
-source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver::3}/$pkgname-$pkgver.tar.xz)
+license=('LGPL')
+depends=('gupnp' 'python2-gobject2')
+makedepends=('gobject-introspection')
+options=('!makeflags')
+source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver::3}/${pkgname}-${pkgver}.tar.xz)
 sha1sums=('bd24e98b224b3a233b0ab6714638ed4c6bf64b47')
 
 build() {
-  cd $pkgname-$pkgver
+  cd ${pkgname}-${pkgver}
   PYTHON=python2 ./configure --prefix=/usr
   make
 }
 
 check() {
-  cd $pkgname-$pkgver
+  cd ${pkgname}-${pkgver}
   make check
 }
 
 package() {
-  cd $pkgname-$pkgver
-  make DESTDIR="$pkgdir" install
+  cd ${pkgname}-${pkgver}
+  make DESTDIR="${pkgdir}" install
 }
 
diff --git a/extra/gupnp/PKGBUILD b/extra/gupnp/PKGBUILD
index 4820db26a..1c04627ee 100644
--- a/extra/gupnp/PKGBUILD
+++ b/extra/gupnp/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 194953 2013-09-24 10:27:41Z heftig $
+# $Id: PKGBUILD 198637 2013-10-31 15:45:29Z heftig $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Contributor: György Balló <ballogy@freestart.hu>
 
 pkgname=gupnp
-pkgver=0.20.6
+pkgver=0.20.8
 pkgrel=1
 pkgdesc="An object-oriented UPNP framework"
 arch=('i686' 'x86_64' 'mips64el')
@@ -12,9 +12,8 @@ license=(LGPL)
 depends=(gssdp util-linux)
 makedepends=(gobject-introspection gtk-doc vala) 
 optdepends=('python2: gupnp-binding-tool')
-options=('!libtool')
 source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz)
-sha256sums=('1b4ed7de9fdf2da2a5610a0101271f1661706e6481737d7a2ac0f318b5b2dbaa')
+sha256sums=('f70da127e0d35a7b8aecaf6f58b740bbb56836451be33d7aeb7979a5c131eac8')
 
 build() {
   cd $pkgname-$pkgver
diff --git a/extra/gutenprint/PKGBUILD b/extra/gutenprint/PKGBUILD
index 47d3ffcc7..c570248bd 100644
--- a/extra/gutenprint/PKGBUILD
+++ b/extra/gutenprint/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 185818 2013-05-19 12:13:34Z andyrtr $
+# $Id: PKGBUILD 198094 2013-10-30 12:46:05Z allan $
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 
 pkgname=gutenprint
@@ -18,7 +18,7 @@ optdepends=('cups:		to use cups printer spooler(recommended)'
 source=(http://downloads.sourceforge.net/gimp-print/$pkgname-$pkgver.tar.bz2)
 url="http://gimp-print.sourceforge.net/"
 replaces=('gimp-print')
-options=('!libtool' '!emptydirs')
+options=('!emptydirs')
 md5sums=('aefbec27b96dd404d9ac9811e17d58ce')
 
 build() {
diff --git a/extra/gvfs/PKGBUILD b/extra/gvfs/PKGBUILD
index 531903e0c..1eb1dd97a 100644
--- a/extra/gvfs/PKGBUILD
+++ b/extra/gvfs/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 196107 2013-10-07 11:52:42Z jgc $
+# $Id: PKGBUILD 198095 2013-10-30 12:46:31Z allan $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgbase=gvfs
@@ -9,7 +9,6 @@ arch=('i686' 'x86_64' 'mips64el')
 license=('LGPL')
 makedepends=('avahi' 'dbus-glib' 'fuse' 'intltool' 'libarchive' 'libcdio-paranoia' 'libgphoto2' 'libimobiledevice' 'libsoup' 'smbclient' 'udisks2' 'libsecret' 'docbook-xsl' 'gtk3' 'libmtp' 'gnome-online-accounts' 'libbluray')
 url="http://www.gnome.org"
-options=(!libtool)
 source=(http://ftp.gnome.org/pub/gnome/sources/$pkgbase/${pkgver%.*}/$pkgbase-$pkgver.tar.xz)
 sha256sums=('a24ce342a3369f7ec34f19deadc5da46bf51070d39d8733f0848d9ba4bb55da7')
 
diff --git a/extra/harfbuzz/PKGBUILD b/extra/harfbuzz/PKGBUILD
index 7f1e0aefd..1fd370d1c 100644
--- a/extra/harfbuzz/PKGBUILD
+++ b/extra/harfbuzz/PKGBUILD
@@ -1,23 +1,23 @@
-# $Id: PKGBUILD 191565 2013-07-25 16:28:52Z heftig $
+# $Id: PKGBUILD 198735 2013-11-02 15:15:10Z heftig $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgbase=(harfbuzz)
 pkgname=(harfbuzz harfbuzz-icu)
-pkgver=0.9.19
+pkgver=0.9.23
 pkgrel=1
 pkgdesc="OpenType text shaping engine"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.freedesktop.org/wiki/Software/HarfBuzz"
 license=(MIT)
-makedepends=(glib2 freetype2 graphite cairo icu)
-options=(!libtool)
+makedepends=(glib2 freetype2 graphite cairo icu gobject-introspection)
 source=(http://www.freedesktop.org/software/harfbuzz/release/${pkgbase}-${pkgver}.tar.bz2)
-sha256sums=('d2da0f060d47f6ad9de8c8781bb21fa4b9eae8ea1cd1e956b814095baa002f35')
+sha256sums=('171ab7f58e7243082a4582f4d1f21b3f44462931ea92a6909d303ad3614794c7')
 
 build() {
   cd $pkgbase-$pkgver
   ./configure --prefix=/usr \
-    --with-glib --with-freetype --with-cairo --with-icu --with-graphite2
+    --with-glib --with-freetype --with-cairo --with-icu --with-graphite2 \
+    --with-gobject
   make
 }
 
diff --git a/extra/haskell-http/PKGBUILD b/extra/haskell-http/PKGBUILD
index 621e10490..21c7e46ae 100644
--- a/extra/haskell-http/PKGBUILD
+++ b/extra/haskell-http/PKGBUILD
@@ -11,6 +11,7 @@ arch=('i686' 'x86_64')
 depends=('ghc=7.6.3-1' 'sh' 'haskell-network=2.4.1.2-1' 'haskell-parsec=3.1.3-3' 'haskell-mtl=2.1.2-3')
 source=("http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz")
 install=${pkgname}.install
+options=('staticlibs')
 md5sums=('94be05278da4e9324aaef6e012e751e2')
 
 build() {
diff --git a/extra/haskell-mtl/PKGBUILD b/extra/haskell-mtl/PKGBUILD
index c755c10a8..9ff28ad5e 100644
--- a/extra/haskell-mtl/PKGBUILD
+++ b/extra/haskell-mtl/PKGBUILD
@@ -11,6 +11,7 @@ arch=('i686' 'x86_64')
 depends=('ghc=7.6.3-1' 'sh' 'haskell-transformers=0.3.0.0-4')
 source=("http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz")
 install=${pkgname}.install
+options=('staticlibs')
 md5sums=('943c110524d96126bfa0e61f7df1ebcd')
 
 build() {
diff --git a/extra/haskell-network/PKGBUILD b/extra/haskell-network/PKGBUILD
index 70bbb8aa9..0ef09b9b5 100644
--- a/extra/haskell-network/PKGBUILD
+++ b/extra/haskell-network/PKGBUILD
@@ -11,6 +11,7 @@ arch=('i686' 'x86_64')
 depends=('ghc=7.6.3-1' 'sh' 'haskell-parsec=3.1.3-3')
 source=("http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz")
 install=${pkgname}.install
+options=('staticlibs')
 md5sums=('032075c35dea5d23923af3928f9a5511')
 
 build() {
diff --git a/extra/haskell-parsec/PKGBUILD b/extra/haskell-parsec/PKGBUILD
index 02ae2aa0e..2b8284f13 100644
--- a/extra/haskell-parsec/PKGBUILD
+++ b/extra/haskell-parsec/PKGBUILD
@@ -11,6 +11,7 @@ arch=('i686' 'x86_64')
 depends=('ghc=7.6.3-1' 'sh' 'haskell-mtl=2.1.2-3' 'haskell-text=0.11.2.3-3')
 source=("http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz")
 install=${pkgname}.install
+options('staticlibs')
 md5sums=('d72fc94b81153132c61125a1ec52a4a5')
 
 build() {
diff --git a/extra/haskell-random/PKGBUILD b/extra/haskell-random/PKGBUILD
index 649d2bd84..ba0c472c3 100644
--- a/extra/haskell-random/PKGBUILD
+++ b/extra/haskell-random/PKGBUILD
@@ -11,6 +11,7 @@ arch=('i686' 'x86_64')
 depends=('ghc=7.6.3-1' 'sh')
 source=("http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz")
 install=${pkgname}.install
+options=('staticlibs')
 md5sums=('9a249cfa7ff6793cbf2be06e9fcd7538')
 
 build() {
diff --git a/extra/haskell-text/PKGBUILD b/extra/haskell-text/PKGBUILD
index b50b41af4..da4b5abf7 100644
--- a/extra/haskell-text/PKGBUILD
+++ b/extra/haskell-text/PKGBUILD
@@ -11,6 +11,7 @@ arch=('i686' 'x86_64')
 depends=('ghc=7.6.3-1' 'sh')
 source=("http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz")
 install=${pkgname}.install
+options=('staticlibs')
 md5sums=('7a469d49a7576fb3a18785cb64d4ee6c')
 
 build() {
diff --git a/extra/haskell-transformers/PKGBUILD b/extra/haskell-transformers/PKGBUILD
index 94006ab2d..144848401 100644
--- a/extra/haskell-transformers/PKGBUILD
+++ b/extra/haskell-transformers/PKGBUILD
@@ -11,6 +11,7 @@ arch=('i686' 'x86_64')
 depends=('ghc=7.6.3-1' 'sh')
 source=("http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz")
 install=${pkgname}.install
+options=('staticlibs')
 md5sums=('852dc0b79cc2bcb39136287d3dd385e5')
 
 build() {
diff --git a/extra/haskell-zlib/PKGBUILD b/extra/haskell-zlib/PKGBUILD
index 2c541b5f3..5175a544f 100644
--- a/extra/haskell-zlib/PKGBUILD
+++ b/extra/haskell-zlib/PKGBUILD
@@ -11,6 +11,7 @@ arch=('i686' 'x86_64')
 depends=('ghc=7.6.3-1' 'sh' 'zlib')
 source=("http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz")
 install=${pkgname}.install
+options=('staticlibs')
 md5sums=('d0d10786d2bbd1d401a8b28a83e88475')
 
 build() {
diff --git a/extra/hddtemp/PKGBUILD b/extra/hddtemp/PKGBUILD
index 9b13f06b9..7859d3039 100644
--- a/extra/hddtemp/PKGBUILD
+++ b/extra/hddtemp/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 186029 2013-05-20 14:50:15Z bisson $
+# $Id: PKGBUILD 198097 2013-10-30 12:47:12Z allan $
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
 # Contributor: Ionut Biru <ibiru@archlinux.org>
 # Contributor: Andrea Scarpino <andrea@archlinux.org>
@@ -21,7 +21,6 @@ sha1sums=('65393b0a4d9862c030c81702d95c1acd00da275b'
           'b9bcdd0537c1540e55e5056445b571ea61d5a4a3'
           '9b02e5bed22f81ceab2b69bae788a9a3aa5c2147')
 
-options=('!libtool')
 
 build() {
 	cd "${srcdir}/${pkgname}-${_origver}"
diff --git a/extra/hdf5-cpp-fortran/PKGBUILD b/extra/hdf5-cpp-fortran/PKGBUILD
index bc9edb8ef..118b8c455 100644
--- a/extra/hdf5-cpp-fortran/PKGBUILD
+++ b/extra/hdf5-cpp-fortran/PKGBUILD
@@ -6,7 +6,7 @@
 
 pkgname=hdf5-cpp-fortran
 _pkgname=hdf5
-pkgver=1.8.10_patch1
+pkgver=1.8.11
 pkgrel=1
 arch=('i686' 'x86_64' 'mips64el')
 pkgdesc="General purpose library and file format for storing scientific data"
@@ -17,8 +17,7 @@ makedepends=('time' 'gcc-fortran')
 conflicts=('hdf5')
 provides=('hdf5')
 source=(ftp://ftp.hdfgroup.org/HDF5/current/src/${_pkgname}-${pkgver/_/-}.tar.bz2)
-options=('!libtool')
-sha1sums=('458cb91496e313debd55d52a7f89459a5469cceb')
+sha1sums=('87ded0894b104cf23a4b965f4ac0a567f8612e5e')
 
 build() {
   cd $srcdir/${_pkgname}-${pkgver/_/-}
diff --git a/extra/hdf5-openmpi/PKGBUILD b/extra/hdf5-openmpi/PKGBUILD
index 218b45fcf..eab5d5b9d 100644
--- a/extra/hdf5-openmpi/PKGBUILD
+++ b/extra/hdf5-openmpi/PKGBUILD
@@ -8,7 +8,7 @@
 
 pkgname=hdf5-openmpi
 _pkgname=hdf5
-pkgver=1.8.10_patch1
+pkgver=1.8.11
 pkgrel=1
 arch=('i686' 'x86_64' 'mips64el')
 pkgdesc="General purpose library and file format for storing scientific data (OpenMPI version)"
@@ -20,8 +20,7 @@ provides=('hdf5')
 conflicts=('hdf5')
 source=(ftp://ftp.hdfgroup.org/HDF5/current/src/${_pkgname}-${pkgver/_/-}.tar.bz2 
 mpi.patch) 
-options=('!libtool')
-sha1sums=('458cb91496e313debd55d52a7f89459a5469cceb'
+sha1sums=('87ded0894b104cf23a4b965f4ac0a567f8612e5e'
           '658d4a3e537c9c76da3200effa8f95b656a21936')
 
 build() {
diff --git a/extra/hdf5/PKGBUILD b/extra/hdf5/PKGBUILD
index 16b32c174..0d02b5511 100644
--- a/extra/hdf5/PKGBUILD
+++ b/extra/hdf5/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 185120 2013-05-11 09:31:27Z ronald $
+# $Id: PKGBUILD 198099 2013-10-30 12:47:33Z allan $
 # Maintainer: Ronald van Haren <ronald.archlinux.org>
 # Contributor: Stefan Husmann <stefan-husmann@t-online.de>
 # Contributor: damir <damir@archlinux.org>
 # Contributor: Tom K <tomk@runbox.com>
 
 pkgname=hdf5
-pkgver=1.8.10_patch1
+pkgver=1.8.11
 pkgrel=1
 arch=('i686' 'x86_64' 'mips64el')
 pkgdesc="General purpose library and file format for storing scientific data"
@@ -14,8 +14,7 @@ license=('custom')
 depends=('zlib' 'sh')
 makedepends=('time')
 source=(ftp://ftp.hdfgroup.org/HDF5/current/src/${pkgname}-${pkgver/_/-}.tar.bz2)
-options=('!libtool')
-sha1sums=('458cb91496e313debd55d52a7f89459a5469cceb')
+sha1sums=('87ded0894b104cf23a4b965f4ac0a567f8612e5e')
 
 build() {
   cd $srcdir/${pkgname}-${pkgver/_/-}
diff --git a/extra/hdf5/mpi.patch b/extra/hdf5/mpi.patch
deleted file mode 100644
index 4fadc13e2..000000000
--- a/extra/hdf5/mpi.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Prevent accidental inclusion of mpi c++ headers 
-when hdf5.h is included third party library
-
-https://bugs.gentoo.org/show_bug.cgi?id=420777
-https://bugs.archlinux.org/task/33343
-
---- a/src/H5public.h
-+++ b/src/H5public.h
-@@ -58,6 +58,8 @@
- #   include <stddef.h>
- #endif
- #ifdef H5_HAVE_PARALLEL
-+#   define OMPI_SKIP_MPICXX   /* Make sure that cxx specific headers are not included */
-+#   define MPICH_SKIP_MPICXX
- #   include <mpi.h>
- #ifndef MPI_FILE_NULL		/*MPIO may be defined in mpi.h already       */
- #   include <mpio.h>
-
diff --git a/extra/hspell/PKGBUILD b/extra/hspell/PKGBUILD
index 5477adb4b..43f22ba55 100644
--- a/extra/hspell/PKGBUILD
+++ b/extra/hspell/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 165612 2012-08-27 09:42:27Z jgc $
+# $Id: PKGBUILD 198104 2013-10-30 12:48:55Z allan $
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 
 pkgbase=hspell
@@ -9,7 +9,7 @@ arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 url="http://www.ivrix.org.il/projects/spell-checker/"
 makedepends=('glibc' 'zlib' 'perl' 'hunspell' 'gawk')
-options=('!libtool' '!makeflags')
+options=('!makeflags')
 source=(http://hspell.ivrix.org.il/${pkgname}-${pkgver}.tar.gz{,.sig})
 md5sums=('32fbc1a71e86ab46bf7870c6eec9a6be'
          '858120037dd52ae823788518329ee7d3')
diff --git a/extra/htdig/PKGBUILD b/extra/htdig/PKGBUILD
index 2043be927..5ae7a6d14 100644
--- a/extra/htdig/PKGBUILD
+++ b/extra/htdig/PKGBUILD
@@ -1,16 +1,15 @@
-# $Id: PKGBUILD 149485 2012-02-08 10:07:38Z pierre $
+# $Id: PKGBUILD 197001 2013-10-21 12:35:19Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Giovanni Scafora <giovanni@archlinux.org>
 
 pkgname=htdig
 pkgver=3.2.0b6
-pkgrel=8.2
+pkgrel=9
 pkgdesc="Scripts and HTML code needed for using ht://Dig as a web search engine"
 url="http://www.htdig.org/"
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 depends=('openssl')
-options=('!libtool' 'emptydirs')
 source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2"
         'gcc4.3.patch'
         'CVE-2007-6110.patch')
@@ -18,11 +17,15 @@ md5sums=('8b9b9587a411ac7dd278fa5413428960'
          '2aeda683f95b58efc0978d7fe951de59'
          '0d9099d3b5a32d322a8e0240f85a3578')
 
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+prepare() {
+  cd ${pkgname}-${pkgver}
 
   patch -p1 -i "${srcdir}/gcc4.3.patch"
   patch -p1 -i "${srcdir}/CVE-2007-6110.patch"
+}
+
+build() {
+  cd ${pkgname}-${pkgver}
 
   ./configure --prefix=/usr \
     --mandir=/usr/share/man \
@@ -30,15 +33,15 @@ build() {
     --with-default-config-file=/etc/htdig/htdig.conf \
     --with-database-dir=/var/lib/htdig/db \
     --with-cgi-bin-dir=/usr/bin \
-	--with-common-dir=/usr/share/doc/htdig \
-	--with-search-dir=/usr/share/doc/htdig \
-	--with-image-dir=/usr/share/doc/htdig \
+    --with-common-dir=/usr/share/doc/htdig \
+    --with-search-dir=/usr/share/doc/htdig \
+    --with-image-dir=/usr/share/doc/htdig \
     --localstatedir=/var/lib/htdig \
     --with-ssl
   make
 }
 
 package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+  cd ${pkgname}-${pkgver}
   make DESTDIR="${pkgdir}" install
 }
diff --git a/extra/hugin/PKGBUILD b/extra/hugin/PKGBUILD
index 3b9d9af0f..d632332e4 100644
--- a/extra/hugin/PKGBUILD
+++ b/extra/hugin/PKGBUILD
@@ -1,37 +1,29 @@
-# $Id: PKGBUILD 191897 2013-08-01 06:53:30Z bpiotrowski $
+# $Id: PKGBUILD 198592 2013-10-30 16:39:01Z bisson $
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
 # Contributor: Tobias Kieslich <tobias@archlinux.org>
 # Contributor: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Dominik Ryba <domryba@post.pl>
 
 pkgname=hugin
-pkgver=2012.0.0
-pkgrel=8
+pkgver=2013.0.0
+pkgrel=2
 pkgdesc='Panorama photo stitcher'
 url='http://hugin.sourceforge.net/'
 license=('GPL')
 arch=('i686' 'x86_64' 'mips64el')
-depends=('wxgtk' 'boost-libs' 'enblend-enfuse' 'exiv2' 'autopano-sift-c'
+depends=('wxgtk' 'boost-libs' 'enblend-enfuse' 'exiv2' 'libpano13'
          'lensfun' 'lapack' 'make' 'perl-image-exiftool' 'desktop-file-utils')
 makedepends=('cmake' 'boost' 'tclap' 'mesa')
 source=("http://downloads.sourceforge.net/project/${pkgname}/${pkgname}/${pkgname}-${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2")
-sha1sums=('53f97d030716e66dc5a49c7e786686a9d5262b8d')
+sha1sums=('0e0689cf2ca0c4a2730cffe06380eda976b6772d')
 
 install=install
 
-prepare() {
-	cd "${srcdir}/${pkgname}-${pkgver}"
-	sed 's/Luk.... Jirkovsk../Lukas Jirkovsky/g' -i doc/deghosting_mask.pod
-	# pod2man limitation (makepkg uses LC_ALL=C and Unicode chars take two bytes)
-}
-
 build() {
 	cd "${srcdir}/${pkgname}-${pkgver}"
-	export CXXFLAGS+=" -fpermissive" 
 	cmake . \
 		-DCMAKE_BUILD_TYPE=Release \
 		-DCMAKE_INSTALL_PREFIX=/usr \
-		-DCMAKE_EXE_LINKER_FLAGS="-lpthread" \
 		-DENABLE_LAPACK=yes \
 		-DBUILD_HSI=no
 	make
diff --git a/extra/hunspell/PKGBUILD b/extra/hunspell/PKGBUILD
index 5cc192ff8..4800c6f1b 100644
--- a/extra/hunspell/PKGBUILD
+++ b/extra/hunspell/PKGBUILD
@@ -1,17 +1,16 @@
-# $Id: PKGBUILD 166664 2012-09-15 07:49:23Z andyrtr $
+# $Id: PKGBUILD 197086 2013-10-21 18:34:57Z andyrtr $
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 # Contributor: Hussam Al-Tayeb <ht990332@gmail.com>
 
 pkgname=hunspell
 pkgver=1.3.2
-pkgrel=2
+pkgrel=3
 pkgdesc="Spell checker and morphological analyzer library and program"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://hunspell.sourceforge.net/"
 license=('GPL' 'LGPL' 'MPL')
 depends=('gcc-libs' 'readline')
 optdepends=('perl: for ispellaff2myspell')
-options=('!libtool')
 source=(http://downloads.sourceforge.net/hunspell/hunspell-$pkgver.tar.gz)
 md5sums=('3121aaf3e13e5d88dfff13fb4a5f1ab8')
 
diff --git a/extra/hwloc/PKGBUILD b/extra/hwloc/PKGBUILD
index 41ddf12bc..27767cc6c 100644
--- a/extra/hwloc/PKGBUILD
+++ b/extra/hwloc/PKGBUILD
@@ -1,29 +1,33 @@
-# $Id: PKGBUILD 188118 2013-06-10 06:43:40Z bpiotrowski $
+# $Id: PKGBUILD 197744 2013-10-29 02:18:00Z eric $
 # Maintainer : Stéphane Gaudreault <stephane@archlinux.org>
 # Contributor: Sylvain HENRY <hsyl20@yahoo.fr>
 # Contributor: Hervé YVIQUEL <elldekaa@gmail.com>
 
 pkgname=hwloc
-pkgver=1.7.1
+pkgver=1.7.2
 pkgrel=1
 pkgdesc="Portable Hardware Locality is a portable abstraction of hierarchical architectures"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.open-mpi.org/projects/hwloc/"
 license=('BSD')
 depends=('sh' 'pciutils' 'cairo' 'libxml2')
-makedepends=('pkg-config')
-options=('!libtool' '!docs')
-source=(http://www.open-mpi.org/software/hwloc/v1.7/downloads/${pkgname}-${pkgver}.tar.bz2)
-sha1sums=('7bb4e6c68d1c24f881d3f7ddf0682b50622351c8')
+options=('!docs')
+source=(http://www.open-mpi.org/software/hwloc/v${pkgver%.*}/downloads/${pkgname}-${pkgver}.tar.bz2)
+sha1sums=('bcd7d71e038af6e1f06a233fdf1c00739033e128')
 
 build() {
-   cd "${srcdir}/${pkgname}-${pkgver}"
+   cd ${pkgname}-${pkgver}
    ./configure --prefix=/usr
    make
 }
 
+check() {
+   cd ${pkgname}-${pkgver}
+   make check
+}
+
 package() {
-   cd "${srcdir}/${pkgname}-${pkgver}"
+   cd ${pkgname}-${pkgver}
    make DESTDIR="${pkgdir}" install
 
    install -Dm644 COPYING "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE
diff --git a/extra/hyphen/PKGBUILD b/extra/hyphen/PKGBUILD
index 0173be489..78e206ffa 100644
--- a/extra/hyphen/PKGBUILD
+++ b/extra/hyphen/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 166656 2012-09-14 14:39:16Z andyrtr $
+# $Id: PKGBUILD 198105 2013-10-30 12:49:16Z allan $
 # Maintainer: AndyRTR <andyrtr@archlinux.org>
 
 pkgbase=hyphen
@@ -9,7 +9,6 @@ arch=('i686' 'x86_64' 'mips64el')
 url="http://hunspell.sf.net"
 license=('GPL' 'LGPL' 'MPL')
 makedepends=('glibc' 'perl')
-options=('!libtool')
 source=(http://downloads.sourceforge.net/hunspell/${pkgname}-${pkgver}.tar.gz)
 md5sums=('ee527b48ef1a7e95ee803a1f7c283c56')
 
diff --git a/extra/iagno/PKGBUILD b/extra/iagno/PKGBUILD
index e9e388d61..f6d9c784c 100644
--- a/extra/iagno/PKGBUILD
+++ b/extra/iagno/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 196392 2013-10-12 16:57:40Z heftig $
+# $Id: PKGBUILD 198106 2013-10-30 12:49:38Z allan $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Contributor: Jan de Groot <jgc@archlinux.org>
 
@@ -12,7 +12,7 @@ depends=('hicolor-icon-theme' 'gtk3' 'libcanberra' 'librsvg')
 makedepends=('intltool' 'itstool' 'gobject-introspection')
 conflicts=('gnome-games')
 replaces=('gnome-games')
-options=('!emptydirs' '!libtool')
+options=('!emptydirs')
 install=iagno.install
 url="https://live.gnome.org/Iagno"
 groups=('gnome-extra')
diff --git a/extra/ibus/PKGBUILD b/extra/ibus/PKGBUILD
index 7e0926f22..7b25436ff 100644
--- a/extra/ibus/PKGBUILD
+++ b/extra/ibus/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 194672 2013-09-21 02:17:57Z eric $
+# $Id: PKGBUILD 198107 2013-10-30 12:49:58Z allan $
 # Maintainer:
 
 pkgname=ibus
@@ -10,7 +10,6 @@ url="http://ibus.googlecode.com"
 license=('LGPL')
 depends=('hicolor-icon-theme' 'gtk2' 'gtk3' 'python2-gobject' 'libnotify')
 makedepends=('gobject-introspection' 'vala' 'dconf' 'gconf' 'iso-codes' 'intltool')
-options=('!libtool')
 install=ibus.install
 source=(http://ibus.googlecode.com/files/${pkgname}-${pkgver}.tar.gz)
 sha1sums=('2ce4b4d728a4685fd77360d0097b0e568f920c7b')
diff --git a/extra/icu/PKGBUILD b/extra/icu/PKGBUILD
index e9c3a0f2b..ef62e2712 100644
--- a/extra/icu/PKGBUILD
+++ b/extra/icu/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 186326 2013-05-24 19:56:49Z andyrtr $
+# $Id: PKGBUILD 196744 2013-10-17 14:02:49Z andyrtr $
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 # Contributor: Art Gramlich <art@gramlich-net.com>
 
 pkgname=icu
-pkgver=51.2
+pkgver=52.1
 pkgrel=1
 pkgdesc="International Components for Unicode library"
 arch=(i686 x86_64 'mips64el')
@@ -14,15 +14,17 @@ depends=('gcc-libs>=4.7.1-5' 'sh')
 source=(#http://download.icu-project.org/files/${pkgname}4c/${pkgver}/${pkgname}4c-${pkgver/./_}-src.tgz
 	    http://download.icu-project.org/files/${pkgname}4c/${pkgver}/${pkgname}4c-${pkgver//./_}-src.tgz
 	    icu.8198.revert.icu5431.patch)
-md5sums=('072e501b87065f3a0ca888f1b5165709'
+md5sums=('9e96ed4c1d99c0d14ac03c140f9f346c'
          'ebd5470fc969c75e52baf4af94a9ee82')
 
-build() {
-  cd ${srcdir}/icu/source
-
+prepare() {
+  cd icu/source
   # fix Malayalam encoding https://bugzilla.redhat.com/show_bug.cgi?id=654200
   patch -Rp3 -i ${srcdir}/icu.8198.revert.icu5431.patch
+}
 
+build() {
+  cd icu/source
   ./configure --prefix=/usr \
 	--sysconfdir=/etc \
 	--mandir=/usr/share/man \
@@ -31,12 +33,12 @@ build() {
 }
 
 check() {
-  cd "$srcdir/icu/source"
+  cd icu/source
   make -k check # passes all
 }
 
 package() {
-  cd ${srcdir}/icu/source
+  cd icu/source
   make -j1 DESTDIR=${pkgdir} install
 
   # Install license
diff --git a/extra/id3lib/PKGBUILD b/extra/id3lib/PKGBUILD
index c10e010f8..0bd854311 100644
--- a/extra/id3lib/PKGBUILD
+++ b/extra/id3lib/PKGBUILD
@@ -1,15 +1,14 @@
-# $Id: PKGBUILD 151326 2012-02-25 14:15:27Z pierre $
+# $Id: PKGBUILD 198108 2013-10-30 12:50:19Z allan $
 # Contributor: Jochem Kossen <j.kossen@home.nl>
 
 pkgname=id3lib
 pkgver=3.8.3
-pkgrel=12.1
+pkgrel=13
 pkgdesc="An open-source, cross-platform software development library for reading, writing, and manipulating ID3v1 and ID3v2 tags"
 arch=('i686' 'x86_64' 'mips64el')
 license=('LGPL')
 url="http://id3lib.sourceforge.net/"
 depends=('zlib' 'gcc-libs')
-options=('!libtool')
 source=("http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.gz"
         'patch_id3lib_3.8.3_UTF16_writing_bug.diff'
         'id3lib-3.8.3-CVE-2007-4460.patch'
diff --git a/extra/idnkit/PKGBUILD b/extra/idnkit/PKGBUILD
index d6ef840bf..359bb37f4 100644
--- a/extra/idnkit/PKGBUILD
+++ b/extra/idnkit/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 191237 2013-07-22 00:42:58Z eric $
+# $Id: PKGBUILD 198109 2013-10-30 12:50:40Z allan $
 # Contributor: Igor Nemilentsev <trezorg@gmail.com>
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
 
@@ -11,7 +11,7 @@ license=('custom:BSD')
 arch=('i686' 'x86_64' 'mips64el')
 depends=('glibc')
 backup=('etc/idnalias.conf' 'etc/idn.conf')
-options=('!makeflags' '!libtool')
+options=('!makeflags')
 source=("http://www.nic.ad.jp/ja/idn/idnkit/download/sources/idnkit-${pkgver}-src.tar.gz")
 sha1sums=('7d843ffcf9843b7af02079e5a160520f28c75048')
 
diff --git a/extra/ilmbase/PKGBUILD b/extra/ilmbase/PKGBUILD
index d9d7347fd..e872ea323 100644
--- a/extra/ilmbase/PKGBUILD
+++ b/extra/ilmbase/PKGBUILD
@@ -3,13 +3,12 @@
 
 pkgname=ilmbase
 pkgver=2.0.1
-pkgrel=1
+pkgrel=2
 depends=('gcc-libs')
 pkgdesc="Base libraries from ILM for OpenEXR"
 arch=(i686 x86_64 mips64el)
 url="http://www.openexr.com"
 license=('custom')
-options=('!libtool')
 source=(http://download.savannah.nongnu.org/releases/openexr/$pkgname-$pkgver.tar.gz
 	ilmbase-IexMath.patch) 
 
diff --git a/extra/imagemagick/PKGBUILD b/extra/imagemagick/PKGBUILD
index a1f73f8bb..1e30e166c 100644
--- a/extra/imagemagick/PKGBUILD
+++ b/extra/imagemagick/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 195181 2013-09-26 23:04:47Z eric $
+# $Id: PKGBUILD 198752 2013-11-03 00:30:32Z eric $
 # Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgbase=imagemagick
 pkgname=('imagemagick' 'imagemagick-doc')
-pkgver=6.8.7.0
-pkgrel=1
+pkgver=6.8.7.4
+pkgrel=2
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.imagemagick.org/"
 license=('custom')
@@ -14,7 +14,7 @@ makedepends=('libltdl' 'lcms2' 'libxt' 'fontconfig' 'libxext' 'ghostscript' \
 #source=(http://www.imagemagick.org/download/ImageMagick-${pkgver%.*}-${pkgver##*.}.tar.xz{,.asc} \
 source=(ftp://ftp.sunet.se/pub/multimedia/graphics/ImageMagick/ImageMagick-${pkgver%.*}-${pkgver##*.}.tar.xz{,.asc} \
         perlmagick.rpath.patch)
-sha1sums=('e7f5bc0cb03a16fb1b7c278c63bf4ac81e1642b2'
+sha1sums=('88e936a1738967d078a9500f430e9017400a05e9'
           'SKIP'
           'e143cf9d530fabf3b58023899b5cc544ba93daec')
 
@@ -27,13 +27,16 @@ prepare() {
 
 build() {
   cd ImageMagick-${pkgver%.*}-${pkgver##*.}
-  [ "$CARCH" != "mips64el" ] && extraconf="--enable-opencl"
-  ./configure --prefix=/usr --sysconfdir=/etc --with-modules --disable-static \
+  [[ $CARCH = "i686" ]] && EXTRAOPTS="--with-gcc-arch=i686"
+  [[ $CARCH = "x86_64" ]] && EXTRAOPTS="--with-gcc-arch=x86-64"
+  [ "$CARCH" != "mips64el" ] && EXTRAOPTS="--enable-opencl"
+
+  ./configure --prefix=/usr --sysconfdir=/etc --with-modules \
     --enable-hdri --with-wmf --with-openexr --with-xml --with-lcms2 --with-jp2 \
     --with-webp --with-gslib --with-gs-font-dir=/usr/share/fonts/Type1 \
     --with-perl --with-perl-options="INSTALLDIRS=vendor" --with-lqr --with-rsvg \
-    --without-gvc --without-djvu --without-autotrace \
-    --without-jbig --without-fpx --without-dps --without-fftw  $extraconf
+    --enable-opencl --without-gvc --without-djvu --without-autotrace \
+    --without-jbig --without-fpx --without-dps --without-fftw $EXTRAOPTS
  make
 }
 
diff --git a/extra/imap/PKGBUILD b/extra/imap/PKGBUILD
index 9b3e729b0..2ad5306e4 100644
--- a/extra/imap/PKGBUILD
+++ b/extra/imap/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 185244 2013-05-12 11:04:34Z pierre $
+# $Id: PKGBUILD 197175 2013-10-23 13:52:03Z pierre $
 
 pkgname=imap
 pkgver=2007f
-pkgrel=3
+pkgrel=4
 pkgdesc="An IMAP/POP server"
 arch=('i686' 'x86_64' 'mips64el')
 license=('APACHE')
@@ -12,19 +12,22 @@ provides=('imap-server' 'pop3-server')
 conflicts=('courier-mta' 'courier-imap')
 source=("ftp://ftp.cac.washington.edu/imap/${pkgname}-${pkgver}.tar.gz"
         'imap' 'ipop2' 'ipop3')
+options=('staticlibs')
 backup=(etc/xinetd.d/{imap,ipop2,ipop3} etc/ssl/certs/{imapd,ipop3d}.pem)
 md5sums=('2126fd125ea26b73b20f01fcd5940369'
          '3ae5b3b333bc8ea2da106f6a97d7bd8d'
          '448f988dc5f9bdb2223dcea3abc4f5f1'
          '1499b13015075f0aafba04324a6f523a')
 
-build() {
+prepare() {
   sed \
     -e "s:-g -fno-omit-frame-pointer -O6:\${CFLAGS}:" \
     -e "s:SSLDIR=/usr/local/ssl:SSLDIR=/usr:" \
     -e "s:SSLCERTS=\$(SSLDIR)/certs:SSLCERTS=/etc/ssl/certs:" \
     -i $srcdir/$pkgname-$pkgver/src/osdep/unix/Makefile
+}
 
+build() {
   cd $srcdir/$pkgname-$pkgver
   # NOTE: if you wish to enforce SSL, use SSLTYPE=unix.nopwd
 
diff --git a/extra/imlib/PKGBUILD b/extra/imlib/PKGBUILD
index ae0924c92..ef3c493d7 100644
--- a/extra/imlib/PKGBUILD
+++ b/extra/imlib/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 191919 2013-08-01 06:59:48Z bpiotrowski $
+# $Id: PKGBUILD 198111 2013-10-30 12:51:24Z allan $
 # Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgname=imlib
@@ -10,7 +10,6 @@ url="http://freshmeat.net/projects/imlib/"
 license=('GPL')
 depends=('gtk' 'giflib' 'libpng' 'libtiff')
 makedepends=('libxt')
-options=('!libtool')
 source=(http://ftp.gnome.org/pub/GNOME/sources/imlib/1.9/${pkgname}-${pkgver}.tar.bz2
         debian-bug448360.patch CAN-2004-1026.patch aclocal-fixes.patch 
         imlib-1.9.15-libpng15.patch imlib-giflib5.patch)
diff --git a/extra/imlib2/PKGBUILD b/extra/imlib2/PKGBUILD
index a51feb3fd..10fe35b41 100644
--- a/extra/imlib2/PKGBUILD
+++ b/extra/imlib2/PKGBUILD
@@ -1,17 +1,16 @@
-# $Id: PKGBUILD 191920 2013-08-01 06:59:49Z bpiotrowski $
+# $Id: PKGBUILD 198112 2013-10-30 12:51:45Z allan $
 # Maintainer: Ronald van Haren <ronald.archlinux.org>
 # Contributor: Arjan Timmerman <arjan.archlinux.org>
 # Contributor: Tom Newsom <Jeepster.gmx.co.uk>
 
 pkgname=imlib2
 pkgver=1.4.5
-pkgrel=5
+pkgrel=6
 pkgdesc="Library that does image file loading and saving as well as rendering, manipulation, arbitrary polygon support"
 url="http://sourceforge.net/projects/enlightenment/"
 arch=('i686' 'x86_64' 'mips64el')
 license=('BSD')
 depends=('libtiff' 'giflib' 'bzip2' 'freetype2' 'libxext' 'libpng' 'libid3tag' 'libjpeg-turbo')
-options=('!libtool')
 source=(http://downloads.sourceforge.net/enlightenment/$pkgname-$pkgver.tar.bz2
         imlib2-giflib5.patch)
 sha1sums=('af86a2c38f4bc3806db57e64e74dc9814ad474a0'
diff --git a/extra/iniparser/PKGBUILD b/extra/iniparser/PKGBUILD
index c42825e7e..2dc020765 100644
--- a/extra/iniparser/PKGBUILD
+++ b/extra/iniparser/PKGBUILD
@@ -1,16 +1,16 @@
-# $Id: PKGBUILD 189665 2013-07-04 11:16:11Z tpowa $
+# $Id: PKGBUILD 196933 2013-10-21 07:46:00Z tpowa $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: Roman Kyrylych <Roman.Kyrylych@gmail.com>
 # Contributor: Roman Kyrylych <Roman.Kyrylych@gmail.com>
 
 pkgname=iniparser
 pkgver=3.1
-pkgrel=3
+pkgrel=4
 pkgdesc="A free stand-alone ini file parsing library written in portable ANSI C"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://ndevilla.free.fr/iniparser/"
 license=('MIT')
-depends=()
+depends=('glibc')
 makedepends=('chrpath')
 source=(http://ndevilla.free.fr/iniparser/$pkgname-$pkgver.tar.gz)
 md5sums=('0aa4f995468ed390caf323f50a285bc3')
diff --git a/extra/inkscape/PKGBUILD b/extra/inkscape/PKGBUILD
index 37428a872..893fd7e0c 100644
--- a/extra/inkscape/PKGBUILD
+++ b/extra/inkscape/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 194677 2013-09-21 18:35:38Z eric $
+# $Id: PKGBUILD 198681 2013-11-02 04:22:27Z bisson $
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
 # Contributor: Tobias Kieslich <tobias@justdreams.de>
 # Contributor: tobias <tobias@archlinux.org>
 
 pkgname=inkscape
 pkgver=0.48.4
-pkgrel=11
+pkgrel=12
 pkgdesc='Vector graphics editor using the SVG file format'
 url='http://inkscape.sourceforge.net/'
 license=('GPL' 'LGPL')
@@ -17,14 +17,12 @@ optdepends=('pstoedit: latex formulas'
             'texlive-core: latex formulas'
             'python2-numpy: some extensions'
             'python2-lxml: some extensions and filters'
-            'pyxml: some extensions'
             'uniconvertor: reading/writing to some proprietary formats')
 source=("http://downloads.sourceforge.net/project/${pkgname}/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.bz2"
         'spuriouscomma.patch')
 sha1sums=('5f26f6ad191d1e7c2a9fb69a438722beb172224c'
           '7d1d5a6d1d2b0926721a994d5889c52890fc57c1')
 
-options=('!libtool')
 install=install
 
 prepare() {
diff --git a/extra/iptraf-ng/PKGBUILD b/extra/iptraf-ng/PKGBUILD
index 18bd9482c..763ce965b 100644
--- a/extra/iptraf-ng/PKGBUILD
+++ b/extra/iptraf-ng/PKGBUILD
@@ -1,21 +1,20 @@
-# $Id: PKGBUILD 187060 2013-06-03 11:16:37Z allan $
+# $Id: PKGBUILD 198707 2013-11-02 08:25:46Z ioni $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 # Maintainer: sh0 <mee@sh0.org>
 
 pkgname=iptraf-ng
-pkgver=1.1.3.1
-pkgrel=2
+pkgver=1.1.4
+pkgrel=1
 pkgdesc="A console-based network monitoring utility (a fork of original iptraf)"
 url="https://fedorahosted.org/iptraf-ng/"
 arch=('i686' 'x86_64' 'mips64el')
 depends=('ncurses')
 license=('GPL2')
 replaces=('iptraf')
-options=('!libtool')
 source=(https://fedorahosted.org/releases/i/p/$pkgname/$pkgname-$pkgver.tar.gz
         0001-token-ring-kernel-v3.5-kill-off-token-ring-support.patch
         iptraf-ng-linux-3.5-compat.patch)
-md5sums=('1a2c02944b0b012d6a3de96207610fa2'
+md5sums=('de27cfeeede96e2acfb0edc8439b034a'
          'd5eab1e094b93f0e3a256cf9ccfaa9c3'
          'd2ddee5f9ff485155235f7cb4671d8fb')
 
diff --git a/extra/iptraf-ng/iptraf-ng-linux-3.5-compat.patch b/extra/iptraf-ng/iptraf-ng-linux-3.5-compat.patch
deleted file mode 100644
index 85fd791df..000000000
--- a/extra/iptraf-ng/iptraf-ng-linux-3.5-compat.patch
+++ /dev/null
@@ -1,127 +0,0 @@
-From 72512af1a3f1d55fff73cdfe7b63d9cfe8cc37ab Mon Sep 17 00:00:00 2001
-From: Nikola Pajkovsky <npajkovs@redhat.com>
-Date: Wed, 23 May 2012 16:32:27 +0200
-Subject: [PATCH 01/91] token-ring: kernel v3.5 kill off token-ring support
-
-Signed-off-by: Nikola Pajkovsky <npajkovs@redhat.com>
----
- src/hostmon.c          | 10 ----------
- src/iptraf-ng-compat.h |  1 -
- src/othptab.c          |  6 ------
- src/packet.c           | 27 ---------------------------
- src/tcptable.c         |  4 ----
- 5 files changed, 48 deletions(-)
-
-diff --git a/src/hostmon.c b/src/hostmon.c
-index 40a2b95..72b91f8 100644
---- a/src/hostmon.c
-+++ b/src/hostmon.c
-@@ -1004,16 +1004,6 @@ void hostmon(const struct OPTIONS *options, time_t facilitytime, char *ifptr,
- 				       FDDI_K_ALEN);
- 				list = flist;
- 				break; }
--			case ARPHRD_IEEE802:
--			case ARPHRD_IEEE802_TR: {
--				struct trh_hdr *hdr_trh =
--					(struct trh_hdr *)pkt.pkt_buf;
--				memcpy(scratch_saddr, hdr_trh->saddr,
--				       TR_ALEN);
--				memcpy(scratch_daddr, hdr_trh->daddr,
--				       TR_ALEN);
--				list = flist;
--				break; }
- 			default:
- 				/* unknown link protocol */
- 				continue;
-diff --git a/src/iptraf-ng-compat.h b/src/iptraf-ng-compat.h
-index d5aee4a..2d9da96 100644
---- a/src/iptraf-ng-compat.h
-+++ b/src/iptraf-ng-compat.h
-@@ -39,7 +39,6 @@
- #include <linux/if_ether.h>
- #include <linux/if_packet.h>
- #include <linux/if_fddi.h>
--#include <linux/if_tr.h>
- #include <linux/types.h>
- #include <linux/isdn.h>
- 
-diff --git a/src/othptab.c b/src/othptab.c
-index d12cdfd..1181eb1 100644
---- a/src/othptab.c
-+++ b/src/othptab.c
-@@ -193,12 +193,6 @@ struct othptabent *add_othp_entry(struct othptable *table, struct pkt_hdr *pkt,
- 					      saddr), new_entry->smacaddr);
- 			convmacaddr((char *) (((struct fddihdr *) packet)->
- 					      daddr), new_entry->dmacaddr);
--		} else if ((pkt->pkt_hatype == ARPHRD_IEEE802)
--			   || (pkt->pkt_hatype == ARPHRD_IEEE802_TR)) {
--			convmacaddr((char *) (((struct trh_hdr *) packet)->
--					      saddr), new_entry->smacaddr);
--			convmacaddr((char *) (((struct trh_hdr *) packet)->
--					      daddr), new_entry->dmacaddr);
- 		}
- 	}
- 
-diff --git a/src/packet.c b/src/packet.c
-index a43a27a..f3e4304 100644
---- a/src/packet.c
-+++ b/src/packet.c
-@@ -51,24 +51,6 @@ static int in_cksum(u_short * addr, int len)
- 	return (u_short) (~sum);
- }
- 
--static unsigned int get_tr_ip_offset(char *pkt)
--{
--	struct trh_hdr *trh;
--	unsigned int riflen = 0;
--
--	trh = (struct trh_hdr *) pkt;
--
--	/*
--	 * Check if this packet has TR routing information and get
--	 * its length.
--	 */
--	if (trh->saddr[0] & TR_RII)
--		riflen = (ntohs(trh->rcf) & TR_RCF_LEN_MASK) >> 8;
--
--	return sizeof(struct trh_hdr) - TR_MAXRIFLEN + riflen +
--	    sizeof(struct trllc);
--}
--
- static int packet_adjust(struct pkt_hdr *pkt)
- {
- 	int retval = 0;
-@@ -109,15 +91,6 @@ static int packet_adjust(struct pkt_hdr *pkt)
- 		pkt->pkt_payload += sizeof(struct fddihdr);
- 		pkt->pkt_len -= sizeof(struct fddihdr);
- 		break;
--	case ARPHRD_IEEE802_TR:
--	case ARPHRD_IEEE802:
--		pkt->pkt_payload = pkt->pkt_buf;
--		/* Token Ring patch supplied by Tomas Dvorak */
--		/* Get the start of the IP packet from the Token Ring frame. */
--		unsigned int dataoffset = get_tr_ip_offset(pkt->pkt_payload);
--		pkt->pkt_payload += dataoffset;
--		pkt->pkt_len -= dataoffset;
--		break;
- 	default:
- 		/* return a NULL packet to signal an unrecognized link */
- 		/* protocol to the caller.  Hopefully, this switch statement */
-diff --git a/src/tcptable.c b/src/tcptable.c
-index 56c4780..b0e5ccc 100644
---- a/src/tcptable.c
-+++ b/src/tcptable.c
-@@ -620,10 +620,6 @@ void updateentry(struct tcptable *table, struct tcptableent *tableentry,
- 		} else if (linkproto == ARPHRD_FDDI) {
- 			convmacaddr((char *) (((struct fddihdr *) packet)->
- 					      saddr), newmacaddr);
--		} else if ((linkproto == ARPHRD_IEEE802)
--			   || (linkproto == ARPHRD_IEEE802_TR)) {
--			convmacaddr((char *) (((struct trh_hdr *) packet)->
--					      saddr), newmacaddr);
- 		}
- 
- 		if (tableentry->smacaddr[0] != '\0') {
--- 
-1.8.3
-
diff --git a/extra/irqbalance/PKGBUILD b/extra/irqbalance/PKGBUILD
index e0e653f03..2371a50db 100644
--- a/extra/irqbalance/PKGBUILD
+++ b/extra/irqbalance/PKGBUILD
@@ -2,7 +2,7 @@
 # Contributor: Martin Striz <ms@poruba.net>
 
 pkgname=irqbalance
-pkgver=1.0.6
+pkgver=1.0.7
 pkgrel=1
 pkgdesc="IRQ balancing daemon for SMP systems"
 arch=('i686' 'x86_64' 'mips64el')
@@ -10,9 +10,9 @@ url="http://code.google.com/p/irqbalance"
 license=('GPL')
 depends=(glib2 numactl libcap-ng)
 makedepends=(pkgconfig)
-source=(http://irqbalance.googlecode.com/files/irqbalance-$pkgver.tar.gz
+source=(http://irqbalance.googlecode.com/files/irqbalance-$pkgver.tar.bz2
         irqbalance.service)
-md5sums=('b73b1a5a9e1c3c428ae39024c711e41e'
+md5sums=('09cb0ab81ab4f3401a7ff5dabc158a1e'
          'a97ad17dc7df98b81acb500b27f931e5')
 
 build() {
diff --git a/extra/irssi/PKGBUILD b/extra/irssi/PKGBUILD
index d1dc17947..632c25308 100644
--- a/extra/irssi/PKGBUILD
+++ b/extra/irssi/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 186385 2013-05-26 09:24:38Z bluewind $
+# $Id: PKGBUILD 198115 2013-10-30 12:52:50Z allan $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Dan McGee <dan@archlinux.org>
 
@@ -13,7 +13,6 @@ depends=('glib2' 'openssl')
 optdepends=('perl-libwww: for the scriptassist script')
 backup=('etc/irssi.conf')
 source=("http://irssi.org/files/${pkgname}-${pkgver}.tar.bz2")
-options=('!libtool')
 md5sums=('1dcb3f511b88df94b0c996f36668c7da')
 
 build() {
diff --git a/extra/jack/PKGBUILD b/extra/jack/PKGBUILD
index 657c8e04d..15dd2aa33 100644
--- a/extra/jack/PKGBUILD
+++ b/extra/jack/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 168114 2012-10-06 05:43:44Z schiv $
+# $Id: PKGBUILD 198116 2013-10-30 12:53:12Z allan $
 # Maintainer: Ray Rashif <schiv@archlinux.org>
 # Contributor: tobias <tobias@archlinux.net>
 # Contributor: Robert Emil Berge <robert@rebi.no>
@@ -20,7 +20,6 @@ optdepends=('celt: NetJACK driver')
 }
 url="http://jackaudio.org/"
 backup=(etc/security/limits.d/99-audio.conf)
-options=('!libtool')
 provides=("$_longname=$pkgver")
 conflicts=("$_longname")
 replaces=("$_longname")
diff --git a/extra/jade/PKGBUILD b/extra/jade/PKGBUILD
index 8c5652ff8..f5cdb38b7 100644
--- a/extra/jade/PKGBUILD
+++ b/extra/jade/PKGBUILD
@@ -1,39 +1,39 @@
-# $Id: PKGBUILD 161891 2012-06-16 05:10:30Z eric $
+# $Id: PKGBUILD 197761 2013-10-29 19:12:18Z eric $
 # Maintainer:
 # Contributor: dorphell <dorphell@archlinux.org>
 # Contributor: Tom Newsom <Jeepster@gmx.co.uk>
 
 pkgname=jade
 pkgver=1.2.1
-pkgrel=8.1
-_debpatch=47.1
+pkgrel=9
+_debpatch=47.3
 pkgdesc="James Clark's DSSSL Engine"
 url='http://www.jclark.com/jade/'
 arch=('i686' 'x86_64' 'mips64el')
 license=('custom')
 depends=('gcc-libs')
 replaces=('openjade')
-options=('!libtool' '!makeflags')
+options=('!makeflags')
 source=("ftp://ftp.jclark.com/pub/${pkgname}/${pkgname}-${pkgver}.tar.gz"
         "http://ftp.debian.org/debian/pool/main/j/jade/jade_${pkgver}-${_debpatch}.diff.gz")
 md5sums=('4239670ca6b578bff68b8c2e7cd1225f'
-         '6c9c0109e3b6d283cb7a18ec8a672575')
-
-build() {
-  cd "${srcdir}"/${pkgname}-${pkgver}
-
-  export CXXFLAGS="$CXXFLAGS -fpermissive"
+         'dc50fb2aad40ad4b26373953805fe4fc')
 
+prepare() {
+  cd ${pkgname}-${pkgver}
   patch -p1 -i "${srcdir}"/jade_${pkgver}-${_debpatch}.diff
+}
 
+build() {
+  cd ${pkgname}-${pkgver}
+  export CXXFLAGS="$CXXFLAGS -fpermissive"
   chmod 755 configure
   ./configure --prefix=/usr --enable-default-catalog=/usr/share/sgml/catalog
-
   make
 }
 
 package() {
-  cd "${srcdir}"/${pkgname}-${pkgver}
+  cd ${pkgname}-${pkgver}
   install -d -m755 "${pkgdir}"/usr/lib
   make prefix="${pkgdir}"/usr install
   mv "${pkgdir}"/usr/bin/sx "${pkgdir}"/usr/bin/sgml2xml
diff --git a/extra/jasper/PKGBUILD b/extra/jasper/PKGBUILD
index d32b2d349..5e7751da1 100644
--- a/extra/jasper/PKGBUILD
+++ b/extra/jasper/PKGBUILD
@@ -1,36 +1,39 @@
-# $Id: PKGBUILD 168605 2012-10-13 11:47:31Z andyrtr $
+# $Id: PKGBUILD 197251 2013-10-24 19:18:50Z eric $
 # Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgname=jasper
 pkgver=1.900.1
-pkgrel=8.1
+pkgrel=9
 pkgdesc="A software-based implementation of the codec specified in the emerging JPEG-2000 Part-1 standard"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.ece.uvic.ca/~mdadams/jasper/"
 license=('custom:JasPer2.0')
 depends=('libjpeg' 'freeglut' 'libxmu' 'glu')
-options=('!libtool')
-source=(http://www.ece.uvic.ca/~mdadams/${pkgname}/software/${pkgname}-${pkgver}.zip jpc_dec.c.patch
+source=(http://www.ece.uvic.ca/~mdadams/${pkgname}/software/${pkgname}-${pkgver}.zip
         patch-libjasper-stepsizes-overflow.diff jasper-1.900.1-CVE-2008-3520.patch
-        jasper-1.900.1-CVE-2008-3522.patch)
+        jpc_dec.c.patch jasper-1.900.1-CVE-2008-3522.patch)
 sha1sums=('9c5735f773922e580bf98c7c7dfda9bbed4c5191'
-          'c1a0176a15210c0af14d85e55ce566921957d780'
           'f298566fef08c8a589d072582112cd51c72c3983'
           '2483dba925670bf29f531d85d73c4e5ada513b01'
+          'c1a0176a15210c0af14d85e55ce566921957d780'
           '0e7b6142cd9240ffb15a1ed7297c43c76fa09ee4')
 
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+prepare() {
+  cd ${pkgname}-${pkgver}
   patch -p1 -i "${srcdir}/jpc_dec.c.patch"
   patch -p1 -i "${srcdir}/patch-libjasper-stepsizes-overflow.diff"
   patch -p1 -i "${srcdir}/jasper-1.900.1-CVE-2008-3520.patch"
   patch -p1 -i "${srcdir}/jasper-1.900.1-CVE-2008-3522.patch"
+}
+
+build() {
+  cd ${pkgname}-${pkgver}
   ./configure --prefix=/usr --mandir=/usr/share/man --enable-shared
   make
 }
 
 package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+  cd ${pkgname}-${pkgver}
   make DESTDIR="${pkgdir}" install
   install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
 }
diff --git a/extra/java-access-bridge/PKGBUILD b/extra/java-access-bridge/PKGBUILD
index 19e7e1e03..34a6aa91d 100644
--- a/extra/java-access-bridge/PKGBUILD
+++ b/extra/java-access-bridge/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 144415 2011-12-05 16:00:05Z jgc $
+# $Id: PKGBUILD 198117 2013-10-30 12:53:32Z allan $
 # Maitnainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=java-access-bridge
@@ -10,7 +10,6 @@ license=('LGPL')
 url="http://www.gnome.org"
 depends=('java-runtime' 'gtk2' 'at-spi' 'libbonobo' 'xorg-xprop')
 makedepends=('intltool' 'pkgconfig' 'java-environment')
-options=('!libtool')
 source=("http://ftp.gnome.org/pub/gnome/sources/${pkgname}/1.26/${pkgname}-${pkgver}.tar.bz2")
 sha1sums=('5f08bba19531954cec82df1bcdb89df67ee890a4')
 
diff --git a/extra/java7-openjdk/PKGBUILD b/extra/java7-openjdk/PKGBUILD
index 5bd2ea109..d241703a7 100644
--- a/extra/java7-openjdk/PKGBUILD
+++ b/extra/java7-openjdk/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 194862 2013-09-23 20:40:54Z guillaume $
+# $Id: PKGBUILD 197107 2013-10-21 20:21:18Z guillaume $
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 # Maintainer: Guillaume ALAUX <guillaume@archlinux.org>
 # Contributor: Jan de Groot <jgc@archlinux.org>
@@ -6,22 +6,22 @@
 pkgname=('jre7-openjdk-headless' 'jre7-openjdk' 'jdk7-openjdk' 'openjdk7-src' 'openjdk7-doc')
 pkgbase=java7-openjdk
 _java_ver=7
-_updatever=u40
-_icedtea_ver=2.4.2
+_icedtea_ver=2.4.3
 
 # check "${srcdir}/icedtea-${_icedtea_ver}"/Makefile.am
-_CORBA_CHANGESET=5ea58899ae9f
-_JAXP_CHANGESET=135f46e0e653
-_JAXWS_CHANGESET=a2ff16e5361f
-_JDK_CHANGESET=4bf5ac86e0e4
-_LANGTOOLS_CHANGESET=06ea051f7ffe
-_OPENJDK_CHANGESET=6125b83238df
+_JDK_UPDATE_VERSION=45
+_CORBA_CHANGESET=8ed5df839fbc
+_JAXP_CHANGESET=8f220f7b51c7
+_JAXWS_CHANGESET=652eb396f959
+_JDK_CHANGESET=7958751eb9ef
+_LANGTOOLS_CHANGESET=3c8eb52a32ea
+_OPENJDK_CHANGESET=e2f5917da3c1
 
-_HOTSPOT_CHANGESET=b732355257e3 # see "${srcdir}/icedtea-${_icedtea_ver}"/hotspot.map
+_HOTSPOT_CHANGESET=b59e02d9e72b # see "${srcdir}/icedtea-${_icedtea_ver}"/hotspot.map
 
 _bootstrap=0 # 0/1 for quick build or full bootstrap
 
-pkgver=${_java_ver}.${_updatever}_${_icedtea_ver}
+pkgver=${_java_ver}.u${_JDK_UPDATE_VERSION}_${_icedtea_ver}
 pkgrel=1
 arch=('i686' 'x86_64')
 url="http://icedtea.classpath.org"
@@ -47,16 +47,16 @@ source=(http://icedtea.classpath.org/download/source/icedtea-${_icedtea_ver}.tar
         jdk7-openjdk.profile.csh
         jre7-openjdk.profile
         jre7-openjdk.profile.csh)
-sha256sums=('3dab1edc5c0391bd67cfac60cbfb5c91aee6ea9726043252d9f216dfafd236b6'
-            'bc5703a7c31a6f1de53259768f613fa1f451d721d3301c58a59513dc3953d95b'
-            '41fc9041d7804bbd519290325c0a21b48405ed96ccf557037189b007391d33a8'
-            '3e043ea822cf18232fb0897431a2c900c8d29dce59e33bd8e3236ed1ac6c8fde'
-            'ac21931af93267188fb6dac8ed5eb44121e25e55fe432c19184c20c17cc9ceda'
-            '8cc46ef5d73a3a6445b411637fee5cc5f086e400d42b36f1f42eba4caee2a11a'
-            'd2de1d2e98ebea56d2367f0003e5f4b5031d55ed529a7c524df8eba9da08c735'
-            '4a4a04fa2c49d0a688400f6c9f129f47ba5cd931874c33254a047a1f36e6ac36'
+sha256sums=('15b1acc1fb43b83ca08d531491261c5eeaea4cad3598300074692acea93bdd3d'
+            '75a18abd117e3295c6de4d3450f0094a9abc08f2168e2911bce25d1e153107b9'
+            '7fab9af64ffcdf635a6fed5abf78cffd1f64be1f3827a1aaf3a0e5e1fdbc599c'
+            'cec41aebd42f4c8caba9c24c306ba78e8cf5da3d23da1604b98753340a2719ca'
+            'fb9c22e92c2a056917b7b5dce6905a01ab2e904cbc3c1c6badcc470d22136518'
+            '4df06346d197180bbb9d182e3ebc9ab6386562199d9898d057d0df75566349fe'
+            '462ad61fd34708c90362f9e3d3c432b9246833ea8ff0d8a14955ae386bce4a91'
+            'b7d7e01d7ab9e49b68aa29b55355a019d71f9ae5cabb4ea7378b55855a07df57'
             '9ad943ceb3dbcdf45d72974fc3667886a7ed65c69ab9abc17be5412827551a7f'
-            'fd615f476ef17853ae55b7aee3c92b6738f9ea584e915749b1caa7fdc5ff9ca4'
+            '56b919ababb13bd6afdcdaceb112b529b6e82539255f2dae9a7e5eb91645164b'
             'bd55299e08e6f8e61ba5baad0990170891801a29a1e8137e502b5e8a10fc37ea'
             '3f28f8bfc6dd105a07f747d7135c77a77de433e2b8647dd7520a900135203fbd'
             'b7c045b08ad55a9f79390c104fa846d0e7dbb49fccffb2fab2a3824b6b19c9c8'
@@ -123,7 +123,8 @@ package_jre7-openjdk-headless() {
   pkgdesc="Free Java environment based on OpenJDK 7.0 with IcedTea7 replacing binary plugs - Minimal Java runtime - needed for executing non GUI Java programs"
   depends=('libjpeg-turbo' 'lcms2' 'nss' 'ca-certificates-java')
   optdepends=('libcups: needed for Java Mauve support - libmawt.so'
-              'fontconfig: needed for Java Mauve support - libmawt.so')
+              'fontconfig: needed for Java Mauve support - libmawt.so'
+              'java-rhino: for some JavaScript support')
   provides=('java-runtime-headless=7')
   conflicts=('openjdk6')
   backup=(etc/profile.d/jre.sh
diff --git a/extra/java7-openjdk/openjdk7_nonreparenting-wm.diff b/extra/java7-openjdk/openjdk7_nonreparenting-wm.diff
index 22d54fc42..fb4710c13 100644
--- a/extra/java7-openjdk/openjdk7_nonreparenting-wm.diff
+++ b/extra/java7-openjdk/openjdk7_nonreparenting-wm.diff
@@ -1,16 +1,16 @@
---- openjdk/jdk/src/solaris/classes/sun/awt/X11/XWM.java.orig	2011-08-07 18:45:05.000000000 +0200
-+++ openjdk/jdk/src/solaris/classes/sun/awt/X11/XWM.java	2011-08-07 18:45:54.000000000 +0200
-@@ -103,7 +103,8 @@
-         COMPIZ_WM = 12,
+--- openjdk/jdk/src/solaris/classes/sun/awt/X11/XWM.java.orig	2013-10-16 16:17:14.000000000 +0200
++++ openjdk/jdk/src/solaris/classes/sun/awt/X11/XWM.java	2013-10-21 20:57:34.768580842 +0200
+@@ -105,7 +105,8 @@
          LG3D_WM = 13,
          CWM_WM = 14,
--        MUTTER_WM = 15;
-+        MUTTER_WM = 15,
-+        OTHER_NONREPARENTING_WM = 16;
+         MUTTER_WM = 15,
+-        MARCO_WM = 16;
++        MARCO_WM = 16,
++        OTHER_NONREPARENTING_WM = 17;
      public String toString() {
          switch  (WMID) {
            case NO_WM:
-@@ -583,7 +584,7 @@
+@@ -591,7 +592,7 @@
      // TODO: according to wikipedia, compiz is now reparenting. This should
      // probably be updated.
      static boolean isNonReparentingWM() {
@@ -19,7 +19,7 @@
      }
  
      /*
-@@ -771,9 +772,17 @@
+@@ -781,9 +782,17 @@
               * supports WIN or _NET wm spec.
               */
              else if (l_net_protocol.active()) {
@@ -28,18 +28,18 @@
 +                    awt_wmgr = XWM.OTHER_NONREPARENTING_WM;
 +                } else {
 +                    awt_wmgr = XWM.OTHER_WM;
-+				}
++                }
              } else if (win.active()) {
 -                awt_wmgr = XWM.OTHER_WM;
 +                if (XToolkit.getEnv("_JAVA_AWT_WM_NONREPARENTING") != null) {
 +                    awt_wmgr = XWM.OTHER_NONREPARENTING_WM;
 +                } else {
 +                    awt_wmgr = XWM.OTHER_WM;
-+				}
++                }
              }
              /*
               * Check for legacy WMs.
-@@ -784,6 +793,8 @@
+@@ -794,6 +803,8 @@
                  awt_wmgr = XWM.MOTIF_WM;
              } else if (isOpenLook()) {
                  awt_wmgr = XWM.OPENLOOK_WM;
@@ -48,7 +48,7 @@
              } else {
                  awt_wmgr = XWM.OTHER_WM;
              }
-@@ -1298,6 +1309,7 @@
+@@ -1309,6 +1320,7 @@
                    res = new Insets(28, 6, 6, 6);
                    break;
                case NO_WM:
diff --git a/extra/json-c/PKGBUILD b/extra/json-c/PKGBUILD
index 96e2ad232..a8b67c6ea 100644
--- a/extra/json-c/PKGBUILD
+++ b/extra/json-c/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 188176 2013-06-11 17:10:35Z heftig $
+# $Id: PKGBUILD 198118 2013-10-30 12:53:54Z allan $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Contributor: Geoffroy Carrier <geoffroy.carrier@koon.fr>
 # Contributor: congyiwu <congyiwu AT gmail DOT com>
@@ -10,7 +10,7 @@ url="https://github.com/json-c/json-c/wiki"
 license=(MIT)
 arch=('i686' 'x86_64' 'mips64el')
 depends=(glibc)
-options=(!libtool !makeflags)
+options=(!makeflags)
 source=(https://s3.amazonaws.com/${pkgname}_releases/releases/$pkgname-${pkgver}.tar.gz)
 sha256sums=('28dfc65145dc0d4df1dfe7701ac173c4e5f9347176c8983edbfac9149494448c')
 
diff --git a/extra/json-glib/PKGBUILD b/extra/json-glib/PKGBUILD
index 429061f9e..2758ab0d4 100644
--- a/extra/json-glib/PKGBUILD
+++ b/extra/json-glib/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 196109 2013-10-07 11:52:45Z jgc $
+# $Id: PKGBUILD 198119 2013-10-30 12:54:14Z allan $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 
 pkgname=json-glib
@@ -10,7 +10,6 @@ url="http://live.gnome.org/JsonGlib"
 license=('GPL')
 depends=('glib2')
 makedepends=('gobject-introspection')
-options=('!libtool')
 source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/${pkgver::4}/${pkgname}-${pkgver}.tar.xz)
 sha256sums=('a95475364ec27ab1d2a69303cf579018558bfb6981e3498b3aaf1e6401f7422c')
 
diff --git a/extra/k3b/PKGBUILD b/extra/k3b/PKGBUILD
index b9db17268..c59768f18 100644
--- a/extra/k3b/PKGBUILD
+++ b/extra/k3b/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 191898 2013-08-01 06:53:31Z bpiotrowski $
+# $Id: PKGBUILD 198120 2013-10-30 12:54:38Z allan $
 # Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgname=k3b
@@ -17,7 +17,6 @@ optdepends=('dvd+rw-tools: for dvd burning support'
             'emovix: for bootable multimedia cd/dvd support'
             'cdrdao: for disk-at-once (DAO) mode support'
             'cdparanoia: for cd ripping support')
-options=('!libtool')
 install=k3b.install
 source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2 \
         k3b-2.0.2-ffmpeg.patch k3b-2.0.2-libavformat54.patch k3b-2.0.2-libav9.patch)
diff --git a/extra/kactivities/PKGBUILD b/extra/kactivities/PKGBUILD
index 633e265da..7d522dcb7 100644
--- a/extra/kactivities/PKGBUILD
+++ b/extra/kactivities/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 195502 2013-10-01 15:14:00Z svenstaro $
+# $Id: PKGBUILD 198822 2013-11-05 19:43:12Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kactivities
-pkgver=4.11.2
+pkgver=4.11.3
 pkgrel=1
 arch=('i686' 'x86_64' 'mips64el')
 pkgdesc='API for using and interacting with the Activity Manager'
@@ -11,7 +11,7 @@ license=('GPL' 'FDL')
 depends=('nepomuk-core')
 makedepends=('cmake' 'automoc4' 'mesa')
 source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz")
-sha1sums=('3e484dd32e55cff7ce15899b8904c70c2f3e7a38')
+sha1sums=('74521e39e32e647b400e4495bc2dba2be0567ffa')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/kdeaccessibility-jovie/PKGBUILD b/extra/kdeaccessibility-jovie/PKGBUILD
index 2c50a2808..a1b81ae86 100644
--- a/extra/kdeaccessibility-jovie/PKGBUILD
+++ b/extra/kdeaccessibility-jovie/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 195556 2013-10-01 15:18:04Z svenstaro $
+# $Id: PKGBUILD 198849 2013-11-05 19:49:19Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdeaccessibility-jovie
-pkgver=4.11.2
+pkgver=4.11.3
 pkgrel=1
 arch=('i686' 'x86_64' 'mips64el')
 pkgdesc='A text to speech application'
@@ -14,7 +14,7 @@ makedepends=('cmake' 'automoc4')
 replaces=('kdeaccessibility-kttsd')
 install=${pkgname}.install
 source=("http://download.kde.org/stable/${pkgver}/src/jovie-${pkgver}.tar.xz")
-sha1sums=('67700e70c208ed2d15f7d8581c1f50b5f0f7cb4b')
+sha1sums=('9b2d3058b7ff0324015e80f6ef6f6a3d1ad63b53')
 
 build() {
   mkdir build
diff --git a/extra/kdeaccessibility-kaccessible/PKGBUILD b/extra/kdeaccessibility-kaccessible/PKGBUILD
index b1656a885..a697cd3d8 100644
--- a/extra/kdeaccessibility-kaccessible/PKGBUILD
+++ b/extra/kdeaccessibility-kaccessible/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 195558 2013-10-01 15:18:13Z svenstaro $
+# $Id: PKGBUILD 198850 2013-11-05 19:49:30Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdeaccessibility-kaccessible
-pkgver=4.11.2
+pkgver=4.11.3
 pkgrel=1
 arch=('i686' 'x86_64' 'mips64el')
 pkgdesc='Provides accessibility services like focus tracking and a screenreader'
@@ -12,7 +12,7 @@ groups=('kde' 'kdeaccessibility')
 depends=('kdelibs' 'speech-dispatcher')
 makedepends=('cmake' 'automoc4')
 source=("http://download.kde.org/stable/${pkgver}/src/kaccessible-${pkgver}.tar.xz")
-sha1sums=('fe602715dc4b241a0be88c5bfb3bc5f7a357c330')
+sha1sums=('3aedf1a924ab691551a349514a4f7e215f4a98e4')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/kdeaccessibility-kmag/PKGBUILD b/extra/kdeaccessibility-kmag/PKGBUILD
index ea60afd23..119b1c8d5 100644
--- a/extra/kdeaccessibility-kmag/PKGBUILD
+++ b/extra/kdeaccessibility-kmag/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 195560 2013-10-01 15:18:20Z svenstaro $
+# $Id: PKGBUILD 198851 2013-11-05 19:49:41Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdeaccessibility-kmag
-pkgver=4.11.2
+pkgver=4.11.3
 pkgrel=1
 arch=('i686' 'x86_64' 'mips64el')
 pkgdesc='Screen Magnifier'
@@ -13,7 +13,7 @@ depends=('kdebase-runtime')
 makedepends=('cmake' 'automoc4')
 install=${pkgname}.install
 source=("http://download.kde.org/stable/${pkgver}/src/kmag-${pkgver}.tar.xz")
-sha1sums=('1fb0fe89e1c973e1db9783232a3b03135a9cac39')
+sha1sums=('44bf5f6ee2eaa9b56c2cb90650170d8d53d5e6bd')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/kdeaccessibility-kmousetool/PKGBUILD b/extra/kdeaccessibility-kmousetool/PKGBUILD
index 126c5a2b4..a2c70d887 100644
--- a/extra/kdeaccessibility-kmousetool/PKGBUILD
+++ b/extra/kdeaccessibility-kmousetool/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 195562 2013-10-01 15:18:27Z svenstaro $
+# $Id: PKGBUILD 198852 2013-11-05 19:49:50Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdeaccessibility-kmousetool
-pkgver=4.11.2
+pkgver=4.11.3
 pkgrel=1
 arch=('i686' 'x86_64' 'mips64el')
 pkgdesc='Clicks the mouse for you, reducing the effects of RSI'
@@ -13,7 +13,7 @@ depends=('kdebase-runtime')
 makedepends=('cmake' 'automoc4')
 install=${pkgname}.install
 source=("http://download.kde.org/stable/${pkgver}/src/kmousetool-${pkgver}.tar.xz")
-sha1sums=('c783c8e4eb7c72be344dddddebcde786d715dab9')
+sha1sums=('4a45d54d6baeb4df2528ec8ce7cb93c1c6f60723')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/kdeaccessibility-kmouth/PKGBUILD b/extra/kdeaccessibility-kmouth/PKGBUILD
index bc95ec15e..ce56dd1a9 100644
--- a/extra/kdeaccessibility-kmouth/PKGBUILD
+++ b/extra/kdeaccessibility-kmouth/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 195564 2013-10-01 15:18:34Z svenstaro $
+# $Id: PKGBUILD 198853 2013-11-05 19:50:00Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdeaccessibility-kmouth
-pkgver=4.11.2
+pkgver=4.11.3
 pkgrel=1
 arch=('i686' 'x86_64' 'mips64el')
 pkgdesc='Speech Synthesizer Frontend'
@@ -13,7 +13,7 @@ depends=('kdebase-runtime')
 makedepends=('cmake' 'automoc4')
 install=${pkgname}.install
 source=("http://download.kde.org/stable/${pkgver}/src/kmouth-${pkgver}.tar.xz")
-sha1sums=('2bbc09abf8f76642f65fb6db4aa92c4c897c5176')
+sha1sums=('60f2417da21f5af70379a6186473b6e93973a5e8')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/kdeadmin-kcron/PKGBUILD b/extra/kdeadmin-kcron/PKGBUILD
index b5f1ceb38..7c311c68d 100644
--- a/extra/kdeadmin-kcron/PKGBUILD
+++ b/extra/kdeadmin-kcron/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 195566 2013-10-01 15:18:41Z svenstaro $
+# $Id: PKGBUILD 198854 2013-11-05 19:50:10Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdeadmin-kcron
-pkgver=4.11.2
+pkgver=4.11.3
 pkgrel=1
 pkgdesc='Configure and schedule tasks'
 url='http://userbase.kde.org/KCron'
@@ -12,7 +12,7 @@ groups=('kde' 'kdeadmin')
 depends=('kdebase-runtime')
 makedepends=('cmake' 'automoc4')
 source=("http://download.kde.org/stable/${pkgver}/src/kcron-${pkgver}.tar.xz")
-sha1sums=('6354f77e033f35e2e241522aae81359f162bfe90')
+sha1sums=('4c70b28a3830a5eb0db555366966f921eb8ee601')
 
 build() {
   mkdir build
diff --git a/extra/kdeadmin-ksystemlog/PKGBUILD b/extra/kdeadmin-ksystemlog/PKGBUILD
index 6b87307ae..1597fa6bf 100644
--- a/extra/kdeadmin-ksystemlog/PKGBUILD
+++ b/extra/kdeadmin-ksystemlog/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 195568 2013-10-01 15:18:48Z svenstaro $
+# $Id: PKGBUILD 198855 2013-11-05 19:50:20Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdeadmin-ksystemlog
-pkgver=4.11.2
+pkgver=4.11.3
 pkgrel=1
 pkgdesc='System log viewer tool'
 url='http://kde.org/applications/system/ksystemlog/'
@@ -13,7 +13,7 @@ depends=('kdebase-runtime')
 makedepends=('cmake' 'automoc4')
 source=("http://download.kde.org/stable/${pkgver}/src/ksystemlog-${pkgver}.tar.xz"
         'syslog-path.patch')
-sha1sums=('a14a55b46163de74c6c4e6754c9060acc00fc9d3'
+sha1sums=('31347f642b7735c477922b8dd8765b85c9ba5554'
           '20095ce6e0f3e5b6800a7c6e52de6fddba62c031')
 
 prepare() {
diff --git a/extra/kdeadmin-kuser/PKGBUILD b/extra/kdeadmin-kuser/PKGBUILD
index 9b2f8f355..09a978f8f 100644
--- a/extra/kdeadmin-kuser/PKGBUILD
+++ b/extra/kdeadmin-kuser/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 195570 2013-10-01 15:18:56Z svenstaro $
+# $Id: PKGBUILD 198856 2013-11-05 19:50:40Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdeadmin-kuser
-pkgver=4.11.2
+pkgver=4.11.3
 pkgrel=1
 pkgdesc='User Manager'
 url='http://kde.org/applications/system/kuser/'
@@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'kdepimlibs')
 makedepends=('cmake' 'automoc4')
 install=${pkgname}.install
 source=("http://download.kde.org/stable/${pkgver}/src/kuser-${pkgver}.tar.xz")
-sha1sums=('a4898545884c4414a89541252290b081e610e039')
+sha1sums=('675b2dd1745cd6566bea724e8b641c5408dead50')
 
 build() {
   mkdir build
diff --git a/extra/kdeartwork/PKGBUILD b/extra/kdeartwork/PKGBUILD
index acd3c37f4..44194b935 100644
--- a/extra/kdeartwork/PKGBUILD
+++ b/extra/kdeartwork/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 195572 2013-10-01 15:19:08Z svenstaro $
+# $Id: PKGBUILD 198857 2013-11-05 19:50:55Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 
@@ -12,7 +12,7 @@ pkgname=('kdeartwork-colorschemes'
          'kdeartwork-styles'
          'kdeartwork-wallpapers'
          'kdeartwork-weatherwallpapers')
-pkgver=4.11.2
+pkgver=4.11.3
 pkgrel=1
 arch=('i686' 'x86_64' 'mips64el')
 url='http://www.kde.org'
@@ -20,7 +20,7 @@ license=('GPL' 'LGPL' 'FDL')
 groups=('kde' 'kdeartwork')
 makedepends=('cmake' 'automoc4' 'xscreensaver' 'eigen' 'kdebase-workspace' 'libkexiv2')
 source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.xz")
-sha1sums=('4e58014eed76b88955af645507ddecadd4c5a70f')
+sha1sums=('c51a79c907f294bc559e181fe7c4ec733361fe2b')
 
 build() {
 	cd $srcdir
diff --git a/extra/kdebase-konsole/PKGBUILD b/extra/kdebase-konsole/PKGBUILD
index 61a3fc714..4947c16e4 100644
--- a/extra/kdebase-konsole/PKGBUILD
+++ b/extra/kdebase-konsole/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 195574 2013-10-01 15:19:39Z svenstaro $
+# $Id: PKGBUILD 198858 2013-11-05 19:51:42Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdebase-konsole
-pkgver=4.11.2
+pkgver=4.11.3
 pkgrel=1
 arch=('i686' 'x86_64' 'mips64el')
 url='http://kde.org/applications/system/konsole/'
@@ -12,7 +12,7 @@ groups=('kde' 'kdebase')
 depends=('kdebase-runtime' 'kdebase-lib')
 makedepends=('cmake' 'automoc4')
 source=("http://download.kde.org/stable/${pkgver}/src/konsole-${pkgver}.tar.xz")
-sha1sums=('bd4095086e6b9c4a271b0147c4fdf68aa7faba27')
+sha1sums=('16b282bd0ec32e712631f4a2b5c32aa8439f15f4')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/kdebase-workspace/PKGBUILD b/extra/kdebase-workspace/PKGBUILD
index d73feb4a3..4fbaba776 100644
--- a/extra/kdebase-workspace/PKGBUILD
+++ b/extra/kdebase-workspace/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 195528 2013-10-01 15:15:58Z svenstaro $
+# $Id: PKGBUILD 198835 2013-11-05 19:46:28Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 
 pkgname=kdebase-workspace
 _pkgname=kde-workspace
-pkgver=4.11.2
+pkgver=4.11.3
 pkgrel=1
 pkgdesc="Provides the interface and basic tools for the KDE workspace"
 arch=('i686' 'x86_64' 'mips64el')
@@ -28,7 +28,7 @@ backup=('usr/share/config/kdm/kdmrc')
 source=("http://download.kde.org/stable/${pkgver}/src/${_pkgname}-${pkgver}.tar.xz"
         'kde.pam' 'kde-np.pam' 'kscreensaver.pam' 'kdm.service' 'kdm.logrotate'
         'etc-scripts.patch' 'terminate-server.patch' 'kdm-xinitrd.patch')
-sha1sums=('fa19cf2b56f7cbcc8bb2200dc33a38150379f4ad'
+sha1sums=('b806e54be72f31d8b2001bc953445e75b5b79da6'
           '660eae40a707d2711d8d7f32a93214865506b795'
           '6aeecc9e0e221f0515c6bf544f9a3c11cb6961fe'
           '106635aa1aae51d6f0668b1853f6c49a4fe9d3d8'
diff --git a/extra/kdebase-workspace/kdebug-324574.patch b/extra/kdebase-workspace/kdebug-324574.patch
deleted file mode 100644
index 053eef57e..000000000
--- a/extra/kdebase-workspace/kdebug-324574.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-From: Weng Xuetian <wengxt@gmail.com>
-Date: Mon, 09 Sep 2013 15:43:06 +0000
-Subject: Delay KDE class initialization to main loop
-X-Git-Url: http://quickgit.kde.org/?p=kde-workspace.git&a=commitdiff&h=2e5a2450762f8dedf9ffd77028ed06b3a39a807d
----
-Delay KDE class initialization to main loop
-
-Gui platform plugin is loaded during QApplication construction, but it
-relies on some KApplication/QApplication data to work correctly.
-
-This patch delays the initialization to main loop, to ensure
-KApplication/QApplication is already constructed.
-
-BUG: 324574
-FIXED-IN: 4.11.2
-REVIEW: 112602
----
-
-
---- a/qguiplatformplugin_kde/qguiplatformplugin_kde.cpp
-+++ b/qguiplatformplugin_kde/qguiplatformplugin_kde.cpp
-@@ -28,6 +28,7 @@
- #include <KDE/KFileDialog>
- #include <KDE/KColorDialog>
- #include <QtCore/QHash>
-+#include <QtCore/QTimer>
- #include <QtGui/QFileDialog>
- #include <QtGui/QColorDialog>
- #include <QtGui/QApplication>
-@@ -153,9 +154,7 @@
- public:
-     KQGuiPlatformPlugin()
-     {
--        connect(KIconLoader::global(), SIGNAL(iconLoaderSettingsChanged()), this, SLOT(updateToolbarIcons()));
--        connect(KGlobalSettings::self(), SIGNAL(toolbarAppearanceChanged(int)), this, SLOT(updateToolbarStyle()));
--        connect(KGlobalSettings::self(), SIGNAL(kdisplayStyleChanged()), this, SLOT(updateWidgetStyle()));
-+        QMetaObject::invokeMethod(this, "init", Qt::QueuedConnection);
-     }
- 
-     virtual QStringList keys() const { return QStringList() << QLatin1String("kde"); }
-@@ -340,6 +339,13 @@
-     }
- 
- private slots:
-+    void init()
-+    {
-+        connect(KIconLoader::global(), SIGNAL(iconLoaderSettingsChanged()), this, SLOT(updateToolbarIcons()));
-+        connect(KGlobalSettings::self(), SIGNAL(toolbarAppearanceChanged(int)), this, SLOT(updateToolbarStyle()));
-+        connect(KGlobalSettings::self(), SIGNAL(kdisplayStyleChanged()), this, SLOT(updateWidgetStyle()));
-+    }
-+
-     void updateToolbarStyle()
-     {
-         //from gtksymbol.cpp
-
diff --git a/extra/kdebase/PKGBUILD b/extra/kdebase/PKGBUILD
index d43dd2d41..4b8b4aeb5 100644
--- a/extra/kdebase/PKGBUILD
+++ b/extra/kdebase/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 195532 2013-10-01 15:16:19Z svenstaro $
+# $Id: PKGBUILD 198837 2013-11-05 19:47:04Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 
@@ -11,7 +11,7 @@ pkgname=('kdebase-dolphin'
          'kdebase-konq-plugins'
          'kdebase-lib'
          'kdebase-plasma')
-pkgver=4.11.2
+pkgver=4.11.3
 pkgrel=1
 arch=('i686' 'x86_64' 'mips64el')
 url='http://www.kde.org'
@@ -19,12 +19,10 @@ license=('GPL' 'LGPL' 'FDL')
 groups=('kde' 'kdebase')
 makedepends=('kdelibs' 'cmake' 'automoc4' 'tidyhtml' 'nepomuk-widgets')
 source=("http://download.kde.org/stable/${pkgver}/src/kde-baseapps-${pkgver}.tar.xz")
-sha1sums=('6a988adf54e9f499365dce0ce1691d020411bd0d')
+sha1sums=('f2a6f4220efe395c124d8981edaaca0a462640b5')
 
 prepare() {
   mkdir build
-
-  cd kde-baseapps-${pkgver}
 }
 
 build() {
diff --git a/extra/kdebase/kdebug-324511.patch b/extra/kdebase/kdebug-324511.patch
deleted file mode 100644
index cca2a7254..000000000
--- a/extra/kdebase/kdebug-324511.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-commit 43a981481ab9161a83dd200db39c093e2502f68a
-Author: Bernd Buschinski <b.buschinski@googlemail.com>
-Date:   Wed Sep 4 16:23:35 2013 +0200
-
-    Fix toplevel bookmarks not showing in toolbar
-    regression from d1963e23
-
-diff --git a/konqueror/src/konqbookmarkbar.cpp b/konqueror/src/konqbookmarkbar.cpp
-index 2141575..199e15f 100644
---- a/konqueror/src/konqbookmarkbar.cpp
-+++ b/konqueror/src/konqbookmarkbar.cpp
-@@ -184,10 +184,12 @@ void KBookmarkBar::fillBookmarkBar(const KBookmarkGroup & parent)
- 
-         if (!bm.isGroup())
-         {
--	    if ( bm.isSeparator() )
-+            if ( bm.isSeparator() )
-+            {
-                 if (m_toolBar) {
-                     m_toolBar->addSeparator();
-                 }
-+            }
-             else
-             {
-                 KAction *action = new KBookmarkAction( bm, m_pOwner, 0 );
diff --git a/extra/kdebindings-kimono/PKGBUILD b/extra/kdebindings-kimono/PKGBUILD
index e12062047..759e535f8 100644
--- a/extra/kdebindings-kimono/PKGBUILD
+++ b/extra/kdebindings-kimono/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 195576 2013-10-01 15:19:48Z svenstaro $
+# $Id: PKGBUILD 198859 2013-11-05 19:51:53Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdebindings-kimono
-pkgver=4.11.2
+pkgver=4.11.3
 pkgrel=1
 pkgdesc=".NET/Mono bindings for the KDE libraries"
 url="https://projects.kde.org/projects/kde/kdebindings/csharp/kimono"
@@ -14,7 +14,7 @@ makedepends=('cmake' 'automoc4' 'kdebindings-smokegen' 'boost' 'kdepimlibs')
 optdepends=('kdepimlibs: akonadi bindings')
 conflicts=('kdebindings-csharp')
 source=("http://download.kde.org/stable/${pkgver}/src/kimono-${pkgver}.tar.xz")
-sha1sums=('629ec8027ee5650234dc19c26488cde0244ca7dd')
+sha1sums=('6e382ec674eaf19d865edf58f0c7d96824220cb8')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/kdebindings-korundum/PKGBUILD b/extra/kdebindings-korundum/PKGBUILD
index 6740edb87..af378260b 100644
--- a/extra/kdebindings-korundum/PKGBUILD
+++ b/extra/kdebindings-korundum/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 195578 2013-10-01 15:19:56Z svenstaro $
+# $Id: PKGBUILD 198860 2013-11-05 19:52:04Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdebindings-korundum
-pkgver=4.11.2
+pkgver=4.11.3
 pkgrel=1
 pkgdesc="Ruby bindings for libraries created by the KDE community"
 url="https://projects.kde.org/projects/kde/kdebindings/ruby/korundum"
@@ -16,7 +16,7 @@ optdepends=('kdegraphics-okular: okular bindings'
             'kdepimlibs: akonadi bindings')
 conflicts=('kdebindings-ruby')
 source=("http://download.kde.org/stable/${pkgver}/src/korundum-${pkgver}.tar.xz")
-sha1sums=('0ea502fb79d1c5f61b32dd8419880e4f29b229e2')
+sha1sums=('9622fd4a20a423b2fbc0de0b6258cb8de5262002')
 
 prepare() {
   mkdir build
diff --git a/extra/kdebindings-kross/PKGBUILD b/extra/kdebindings-kross/PKGBUILD
index 4b1dee7c8..50e24db00 100644
--- a/extra/kdebindings-kross/PKGBUILD
+++ b/extra/kdebindings-kross/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 195580 2013-10-01 15:20:04Z svenstaro $
+# $Id: PKGBUILD 198861 2013-11-05 19:52:14Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgbase=kdebindings-kross
 pkgname=('kdebindings-kross-python'
 #         'kdebindings-kross-ruby'
          'kdebindings-kross-java')
-pkgver=4.11.2
+pkgver=4.11.3
 pkgrel=1
 url="https://projects.kde.org/projects/kde/kdebindings/kross-interpreters"
 arch=('i686' 'x86_64' 'mips64el')
@@ -13,7 +13,7 @@ license=('GPL' 'LGPL' 'FDL')
 groups=('kdebindings')
 makedepends=('kdelibs' 'cmake' 'automoc4' 'python2' 'java-environment')
 source=("http://download.kde.org/stable/${pkgver}/src/kross-interpreters-${pkgver}.tar.xz")
-sha1sums=('89f232ceaa37d9b289e9a1a997695839071090fb')
+sha1sums=('1e3af7d4f43ff744e64c7dc24677feeddcb9384c')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/kdebindings-perlkde/PKGBUILD b/extra/kdebindings-perlkde/PKGBUILD
index 46a002942..c7fe9045f 100644
--- a/extra/kdebindings-perlkde/PKGBUILD
+++ b/extra/kdebindings-perlkde/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 195582 2013-10-01 15:20:12Z svenstaro $
+# $Id: PKGBUILD 198862 2013-11-05 19:52:24Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdebindings-perlkde
-pkgver=4.11.2
+pkgver=4.11.3
 pkgrel=1
 pkgdesc="Perl bindings for the KDE libraries"
 url="https://projects.kde.org/projects/kde/kdebindings/perl/perlkde"
@@ -13,7 +13,7 @@ depends=('kdebindings-perlqt' 'kdebindings-smokekde')
 makedepends=('cmake' 'automoc4' 'kdebindings-smokegen' 'kdepimlibs'
              'kdegraphics-okular' 'kdesdk-kate')
 source=("http://download.kde.org/stable/${pkgver}/src/perlkde-${pkgver}.tar.xz")
-sha1sums=('226673575d9daeb7498a2bcd3f9f196a3308d471')
+sha1sums=('5b7aac1eab0577a0a95612535e7c0d0e02cb057d')
 
 build() {
   mkdir build
diff --git a/extra/kdebindings-perlqt/PKGBUILD b/extra/kdebindings-perlqt/PKGBUILD
index 879bbfdc4..845d4c168 100644
--- a/extra/kdebindings-perlqt/PKGBUILD
+++ b/extra/kdebindings-perlqt/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 195520 2013-10-01 15:15:20Z svenstaro $
+# $Id: PKGBUILD 198831 2013-11-05 19:45:33Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdebindings-perlqt
-pkgver=4.11.2
+pkgver=4.11.3
 pkgrel=1
 pkgdesc="Perl bindings for the Qt libraries"
 url="https://projects.kde.org/projects/kde/kdebindings/perl/perlqt"
@@ -12,7 +12,7 @@ groups=('kdebindings')
 depends=('kdebindings-smokeqt' 'perl-list-moreutils')
 makedepends=('cmake' 'automoc4' 'kdebindings-smokegen')
 source=("http://download.kde.org/stable/${pkgver}/src/perlqt-${pkgver}.tar.xz")
-sha1sums=('2a6ddaafdbc0bd62ae7b1982f9bd0efa6908157c')
+sha1sums=('fb81299b5148cf6f9060e0ba09d4651e51f86404')
 
 build() {
   mkdir build
diff --git a/extra/kdebindings-python/PKGBUILD b/extra/kdebindings-python/PKGBUILD
index 84ab851cf..dee0d2b37 100644
--- a/extra/kdebindings-python/PKGBUILD
+++ b/extra/kdebindings-python/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 195514 2013-10-01 15:14:52Z svenstaro $
+# $Id: PKGBUILD 198828 2013-11-05 19:44:52Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgbase=kdebindings-python
 pkgname=('kdebindings-python'
          'kdebindings-python2'
          'kdebindings-python-common')
-pkgver=4.11.2
+pkgver=4.11.3
 pkgrel=1
 url='https://projects.kde.org/projects/kde/kdebindings/pykde4'
 arch=('i686' 'x86_64' 'mips64el')
@@ -14,7 +14,7 @@ groups=('kdebindings')
 makedepends=('cmake' 'automoc4' 'boost' 'kdepim-runtime' 'python2-pyqt4'
              'python-pyqt4' 'qscintilla' 'python2-sip' 'python-sip' 'mesa')
 source=("http://download.kde.org/stable/${pkgver}/src/pykde4-${pkgver}.tar.xz")
-sha1sums=('5e7c43e224fa1db4ae2bbec1eb040dd2855e8c86')
+sha1sums=('3a42c70bc994a1e74e777bad2e54478ae1d1da0c')
 
 prepare() {
   mkdir build
diff --git a/extra/kdebindings-qtruby/PKGBUILD b/extra/kdebindings-qtruby/PKGBUILD
index 2a08a37ef..811148b87 100644
--- a/extra/kdebindings-qtruby/PKGBUILD
+++ b/extra/kdebindings-qtruby/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 195524 2013-10-01 15:15:35Z svenstaro $
+# $Id: PKGBUILD 198833 2013-11-05 19:45:56Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdebindings-qtruby
-pkgver=4.11.2
+pkgver=4.11.3
 pkgrel=1
 pkgdesc="Ruby bindings for the Qt libraries"
 url="https://projects.kde.org/projects/kde/kdebindings/ruby/qtruby"
@@ -13,7 +13,7 @@ depends=('kdebindings-smokeqt' 'ruby')
 makedepends=('cmake' 'automoc4' 'kdebindings-smokegen')
 conflicts=('kdebindings-ruby')
 source=("http://download.kde.org/stable/${pkgver}/src/qtruby-${pkgver}.tar.xz")
-sha1sums=('a75925deb9caaf75dc9f77da861516767d40688a')
+sha1sums=('b2c8c16744c314af2fd6cc7afabe48fdfd274266')
 
 build() {
   mkdir build
diff --git a/extra/kdebindings-qyoto/PKGBUILD b/extra/kdebindings-qyoto/PKGBUILD
index 6d54fce7c..00223368d 100644
--- a/extra/kdebindings-qyoto/PKGBUILD
+++ b/extra/kdebindings-qyoto/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 195522 2013-10-01 15:15:27Z svenstaro $
+# $Id: PKGBUILD 198832 2013-11-05 19:45:45Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdebindings-qyoto
-pkgver=4.11.2
+pkgver=4.11.3
 pkgrel=1
 pkgdesc=".NET/Mono bindings for the Qt libraries"
 url="https://projects.kde.org/projects/kde/kdebindings/csharp/qyoto"
@@ -13,7 +13,7 @@ depends=('kdebindings-smokeqt' 'mono')
 makedepends=('cmake' 'automoc4' 'kdebindings-smokegen')
 conflicts=('kdebindings-csharp')
 source=("http://download.kde.org/stable/${pkgver}/src/qyoto-${pkgver}.tar.xz")
-sha1sums=('e10f00c4528e3d31a57935dd54c6276ba631e903')
+sha1sums=('5eb6107665cdf9cdc6b53dd17656866c252110d9')
 
 build() {
   mkdir build
diff --git a/extra/kdebindings-smokegen/PKGBUILD b/extra/kdebindings-smokegen/PKGBUILD
index a165ba2a8..44e2da37c 100644
--- a/extra/kdebindings-smokegen/PKGBUILD
+++ b/extra/kdebindings-smokegen/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 195508 2013-10-01 15:14:27Z svenstaro $
+# $Id: PKGBUILD 198825 2013-11-05 19:44:15Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdebindings-smokegen
-pkgver=4.11.2
+pkgver=4.11.3
 pkgrel=1
 pkgdesc="A general purpose C++ parser with a plugin infrastructure"
 url="https://projects.kde.org/projects/kde/kdebindings/smoke/smokegen"
@@ -12,7 +12,7 @@ depends=('kdebase-runtime')
 makedepends=('cmake' 'automoc4')
 conflicts=('kdebindings-smoke')
 source=("http://download.kde.org/stable/${pkgver}/src/smokegen-${pkgver}.tar.xz")
-sha1sums=('4fbb3292391d26b4c68bed44a819f54b05b33bc0')
+sha1sums=('ceb0385627c199384351d5c649ae384e5c5dcc02')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/kdebindings-smokekde/PKGBUILD b/extra/kdebindings-smokekde/PKGBUILD
index a6d6ef08f..a053ad548 100644
--- a/extra/kdebindings-smokekde/PKGBUILD
+++ b/extra/kdebindings-smokekde/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 195518 2013-10-01 15:15:12Z svenstaro $
+# $Id: PKGBUILD 198830 2013-11-05 19:45:21Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdebindings-smokekde
-pkgver=4.11.2
+pkgver=4.11.3
 pkgrel=1
 pkgdesc="Language independent library for KDE bindings"
 url="https://projects.kde.org/projects/kde/kdebindings/smoke/smokekde"
@@ -18,7 +18,7 @@ optdepends=('kdesdk-kate: Kate bindings'
             'kdepimlibs: akonadi bindings')
 conflicts=('kdebindings-smoke')
 source=("http://download.kde.org/stable/${pkgver}/src/smokekde-${pkgver}.tar.xz")
-sha1sums=('09b73d8f13767cd9132387e391ddde09b14ed972')
+sha1sums=('6cd8c535a0f6b40dab4c96c45a0301a9c7abd507')
 
 build() {
   mkdir build
diff --git a/extra/kdebindings-smokeqt/PKGBUILD b/extra/kdebindings-smokeqt/PKGBUILD
index f3857c279..4079403da 100644
--- a/extra/kdebindings-smokeqt/PKGBUILD
+++ b/extra/kdebindings-smokeqt/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 195510 2013-10-01 15:14:38Z svenstaro $
+# $Id: PKGBUILD 198826 2013-11-05 19:44:29Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdebindings-smokeqt
-pkgver=4.11.2
+pkgver=4.11.3
 pkgrel=1
 pkgdesc="Language independent library for Qt bindings"
 url="https://projects.kde.org/projects/kde/kdebindings/smoke/smokeqt"
@@ -13,7 +13,7 @@ depends=('kdebindings-smokegen' 'qimageblitz' 'qscintilla')
 makedepends=('cmake' 'automoc4' 'mesa')
 conflicts=('kdebindings-smoke')
 source=("http://download.kde.org/stable/${pkgver}/src/smokeqt-${pkgver}.tar.xz")
-sha1sums=('d54d2e3ffae9ab526b9e04d1f03dfb8898a590b5')
+sha1sums=('eaa6df3360174a34ff987622d024d09c2fce358c')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/kdeedu-analitza/PKGBUILD b/extra/kdeedu-analitza/PKGBUILD
index 1a41e328a..b96597258 100644
--- a/extra/kdeedu-analitza/PKGBUILD
+++ b/extra/kdeedu-analitza/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 195546 2013-10-01 15:17:21Z svenstaro $
+# $Id: PKGBUILD 198844 2013-11-05 19:48:24Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdeedu-analitza
-pkgver=4.11.2
+pkgver=4.11.3
 pkgrel=1
 pkgdesc="A library to add mathematical features to your program"
 url="https://projects.kde.org/projects/kde/kdeedu/analitza"
@@ -12,7 +12,7 @@ groups=('kde' 'kdeedu')
 depends=('kdebase-runtime')
 makedepends=('cmake' 'automoc4')
 source=("http://download.kde.org/stable/${pkgver}/src/analitza-${pkgver}.tar.xz")
-sha1sums=('f1b63cf72dc4ffa67ed96c1d073dda2dccf58e67')
+sha1sums=('525844959de2c21888496eb5aaf5b7996ccf823e')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/kdeedu-blinken/PKGBUILD b/extra/kdeedu-blinken/PKGBUILD
index d4873ab23..f420fe8ad 100644
--- a/extra/kdeedu-blinken/PKGBUILD
+++ b/extra/kdeedu-blinken/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 195584 2013-10-01 15:20:20Z svenstaro $
+# $Id: PKGBUILD 198863 2013-11-05 19:52:35Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdeedu-blinken
-pkgver=4.11.2
+pkgver=4.11.3
 pkgrel=1
 pkgdesc="Memory Enhancement Game"
 url="http://kde.org/applications/education/blinken/"
@@ -13,7 +13,7 @@ depends=('kdebase-runtime')
 makedepends=('cmake' 'automoc4')
 install=${pkgname}.install
 source=("http://download.kde.org/stable/${pkgver}/src/blinken-${pkgver}.tar.xz")
-sha1sums=('8517eb54038d0c51bd993dc26456993bb8cf1631')
+sha1sums=('c556d8c35a93dd0a85c1a7508c0353dc1b6ef61e')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/kdeedu-cantor/PKGBUILD b/extra/kdeedu-cantor/PKGBUILD
index e2d8c6789..7b6ed11d4 100644
--- a/extra/kdeedu-cantor/PKGBUILD
+++ b/extra/kdeedu-cantor/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 195586 2013-10-01 15:20:28Z svenstaro $
+# $Id: PKGBUILD 198864 2013-11-05 19:52:47Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdeedu-cantor
-pkgver=4.11.2
+pkgver=4.11.3
 pkgrel=1
 pkgdesc="KDE Frontend to Mathematical Software"
 url="http://kde.org/applications/education/cantor/"
@@ -16,7 +16,7 @@ optdepends=('maxima: Maxima backend'
             'r: R backend')
 install=${pkgname}.install
 source=("http://download.kde.org/stable/${pkgver}/src/cantor-${pkgver}.tar.xz")
-sha1sums=('d24c08721f0182bee317b24eb9afd99dd0790602')
+sha1sums=('fb0e450c0591db62ec9f71532a90c1ad15187c2e')
 
 prepare() {
   mkdir build
diff --git a/extra/kdeedu-kalgebra/PKGBUILD b/extra/kdeedu-kalgebra/PKGBUILD
index 8a2806879..44e2a393e 100644
--- a/extra/kdeedu-kalgebra/PKGBUILD
+++ b/extra/kdeedu-kalgebra/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 195588 2013-10-01 15:20:36Z svenstaro $
+# $Id: PKGBUILD 198865 2013-11-05 19:52:57Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdeedu-kalgebra
-pkgver=4.11.2
+pkgver=4.11.3
 pkgrel=1
 pkgdesc="Graph Calculator"
 url="http://kde.org/applications/education/kalgebra/"
@@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdeedu' 'kdeedu-analitza')
 makedepends=('cmake' 'automoc4')
 install=${pkgname}.install
 source=("http://download.kde.org/stable/${pkgver}/src/kalgebra-${pkgver}.tar.xz")
-sha1sums=('29fa67fc0a4925318742c9746b7f9a5aec865563')
+sha1sums=('3852c19219164403c21ab4cab0ffa4e1599ddfa3')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/kdeedu-kalzium/PKGBUILD b/extra/kdeedu-kalzium/PKGBUILD
index b2afb2769..b2a129968 100644
--- a/extra/kdeedu-kalzium/PKGBUILD
+++ b/extra/kdeedu-kalzium/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 195986 2013-10-07 07:06:21Z tpowa $
+# $Id: PKGBUILD 198866 2013-11-05 19:53:06Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdeedu-kalzium
-pkgver=4.11.2
-pkgrel=2
+pkgver=4.11.3
+pkgrel=1
 pkgdesc="Periodic Table of Elements"
 url="http://kde.org/applications/education/kalzium/"
 arch=('i686' 'x86_64' 'mips64el')
@@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'avogadro' 'ocaml' 'facile' 'chemical-mime-data')
 makedepends=('cmake' 'automoc4' 'mesa')
 install=${pkgname}.install
 source=("http://download.kde.org/stable/${pkgver}/src/kalzium-${pkgver}.tar.xz")
-sha1sums=('20789b2f67fc4fe53cd81d58283911bc0a8fa68c')
+sha1sums=('5a83d5fd65b9486c982f68070ece63a3ce1e0b8d')
 
 build() {
   mkdir build
diff --git a/extra/kdeedu-kanagram/PKGBUILD b/extra/kdeedu-kanagram/PKGBUILD
index e06789360..405951c4a 100644
--- a/extra/kdeedu-kanagram/PKGBUILD
+++ b/extra/kdeedu-kanagram/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 195592 2013-10-01 15:20:52Z svenstaro $
+# $Id: PKGBUILD 198867 2013-11-05 19:53:17Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdeedu-kanagram
-pkgver=4.11.2
+pkgver=4.11.3
 pkgrel=1
 pkgdesc="Letter Order Game"
 url="http://kde.org/applications/education/kanagram/"
@@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdeedu')
 makedepends=('cmake' 'automoc4')
 install=${pkgname}.install
 source=("http://download.kde.org/stable/${pkgver}/src/kanagram-${pkgver}.tar.xz")
-sha1sums=('57a0acb63161e8d927317068e30fa2701814582e')
+sha1sums=('eb86e5b7abc48dffdd14d68143484db1b4906d95')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/kdeedu-kbruch/PKGBUILD b/extra/kdeedu-kbruch/PKGBUILD
index 28eb48f01..88c297f45 100644
--- a/extra/kdeedu-kbruch/PKGBUILD
+++ b/extra/kdeedu-kbruch/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 195594 2013-10-01 15:21:00Z svenstaro $
+# $Id: PKGBUILD 198868 2013-11-05 19:53:27Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdeedu-kbruch
-pkgver=4.11.2
+pkgver=4.11.3
 pkgrel=1
 pkgdesc="Exercise Fractions"
 url="http://kde.org/applications/education/kbruch/"
@@ -13,7 +13,7 @@ depends=('kdebase-runtime')
 makedepends=('cmake' 'automoc4')
 install=${pkgname}.install
 source=("http://download.kde.org/stable/${pkgver}/src/kbruch-${pkgver}.tar.xz")
-sha1sums=('d3173e20ae4b95a601eb5cb2abdccad73e43a8a8')
+sha1sums=('b9f693a95071e169e4593d090979e9263828a26a')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/kdeedu-kgeography/PKGBUILD b/extra/kdeedu-kgeography/PKGBUILD
index 6d40f4723..ad01403b5 100644
--- a/extra/kdeedu-kgeography/PKGBUILD
+++ b/extra/kdeedu-kgeography/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 195596 2013-10-01 15:21:08Z svenstaro $
+# $Id: PKGBUILD 198869 2013-11-05 19:53:37Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdeedu-kgeography
-pkgver=4.11.2
+pkgver=4.11.3
 pkgrel=1
 pkgdesc="Geography Trainer"
 url="http://kde.org/applications/education/kgeography/"
@@ -13,7 +13,7 @@ depends=('kdebase-runtime')
 makedepends=('cmake' 'automoc4')
 install=${pkgname}.install
 source=("http://download.kde.org/stable/${pkgver}/src/kgeography-${pkgver}.tar.xz")
-sha1sums=('aaa13ed6f38704bfb5187a1b1ba81e214f576c9f')
+sha1sums=('21fe59b502814181a604fbbd7546738294eba84e')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/kdeedu-khangman/PKGBUILD b/extra/kdeedu-khangman/PKGBUILD
index 5faa48e4f..69ccd260e 100644
--- a/extra/kdeedu-khangman/PKGBUILD
+++ b/extra/kdeedu-khangman/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 195598 2013-10-01 15:21:17Z svenstaro $
+# $Id: PKGBUILD 198870 2013-11-05 19:53:47Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdeedu-khangman
-pkgver=4.11.2
+pkgver=4.11.3
 pkgrel=1
 pkgdesc="Hangman Game"
 url="http://kde.org/applications/education/khangman/"
@@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdeedu')
 makedepends=('cmake' 'automoc4')
 install=${pkgname}.install
 source=("http://download.kde.org/stable/${pkgver}/src/khangman-${pkgver}.tar.xz")
-sha1sums=('05126aab8d051323c58ef40ee8800f77f841c44c')
+sha1sums=('0cef2c1bbe9bdeab182de5abba55a79f98cc0b08')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/kdeedu-kig/PKGBUILD b/extra/kdeedu-kig/PKGBUILD
index 325ec5a19..2d2b80167 100644
--- a/extra/kdeedu-kig/PKGBUILD
+++ b/extra/kdeedu-kig/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 195600 2013-10-01 15:21:24Z svenstaro $
+# $Id: PKGBUILD 198871 2013-11-05 19:53:57Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdeedu-kig
-pkgver=4.11.2
+pkgver=4.11.3
 pkgrel=1
 pkgdesc="Interactive Geometry"
 url="http://kde.org/applications/education/kig/"
@@ -13,7 +13,7 @@ depends=('kdebase-runtime')
 makedepends=('cmake' 'automoc4' 'boost')
 install=${pkgname}.install
 source=("http://download.kde.org/stable/${pkgver}/src/kig-${pkgver}.tar.xz")
-sha1sums=('984137eab99bff5829521e395e1b704498fffba6')
+sha1sums=('02e485471a120ab2d39bfdc176cb136eaa1545c0')
 
 build() {
   mkdir build
diff --git a/extra/kdeedu-kiten/PKGBUILD b/extra/kdeedu-kiten/PKGBUILD
index 761a937b0..310e04121 100644
--- a/extra/kdeedu-kiten/PKGBUILD
+++ b/extra/kdeedu-kiten/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 195602 2013-10-01 15:21:32Z svenstaro $
+# $Id: PKGBUILD 198872 2013-11-05 19:54:08Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdeedu-kiten
-pkgver=4.11.2
+pkgver=4.11.3
 pkgrel=1
 pkgdesc="Japanese Reference/Study Tool"
 url="http://kde.org/applications/education/kiten/"
@@ -13,7 +13,7 @@ depends=('kdebase-runtime')
 makedepends=('cmake' 'automoc4')
 install=${pkgname}.install
 source=("http://download.kde.org/stable/${pkgver}/src/kiten-${pkgver}.tar.xz")
-sha1sums=('d8e4638de926e77d0866fac93d35f80234546ca3')
+sha1sums=('b57043aa783b61fba706058c161c5ccd925e6d19')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/kdeedu-klettres/PKGBUILD b/extra/kdeedu-klettres/PKGBUILD
index 923bb72cd..10710437b 100644
--- a/extra/kdeedu-klettres/PKGBUILD
+++ b/extra/kdeedu-klettres/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 195604 2013-10-01 15:21:54Z svenstaro $
+# $Id: PKGBUILD 198873 2013-11-05 19:54:19Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdeedu-klettres
-pkgver=4.11.2
+pkgver=4.11.3
 pkgrel=1
 pkgdesc="Learn The Alphabet"
 url="http://kde.org/applications/education/klettres/"
@@ -13,7 +13,7 @@ depends=('kdebase-runtime')
 makedepends=('cmake' 'automoc4')
 install=${pkgname}.install
 source=("http://download.kde.org/stable/${pkgver}/src/klettres-${pkgver}.tar.xz")
-sha1sums=('dcb66130f08ce5ed15ff271f3d119fdbaab53951')
+sha1sums=('14500ed25d6837c9f822fd6b29f21152eebb82eb')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/kdeedu-kmplot/PKGBUILD b/extra/kdeedu-kmplot/PKGBUILD
index 2d6af89f3..eb73d2d87 100644
--- a/extra/kdeedu-kmplot/PKGBUILD
+++ b/extra/kdeedu-kmplot/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 195606 2013-10-01 15:22:12Z svenstaro $
+# $Id: PKGBUILD 198874 2013-11-05 19:54:48Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdeedu-kmplot
-pkgver=4.11.2
+pkgver=4.11.3
 pkgrel=1
 pkgdesc="Mathematical Function Plotter"
 url="http://kde.org/applications/education/kmplot/"
@@ -13,7 +13,7 @@ depends=('kdebase-runtime')
 makedepends=('cmake' 'automoc4')
 install=${pkgname}.install
 source=("http://download.kde.org/stable/${pkgver}/src/kmplot-${pkgver}.tar.xz")
-sha1sums=('00dbf0f0df11ab82c65a491834b522865725c20e')
+sha1sums=('d2a5c8f6b01fd88c7d5acc91494c157df869f8e7')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/kdeedu-kstars/PKGBUILD b/extra/kdeedu-kstars/PKGBUILD
index 58513864b..2213a45af 100644
--- a/extra/kdeedu-kstars/PKGBUILD
+++ b/extra/kdeedu-kstars/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 195608 2013-10-01 15:22:36Z svenstaro $
+# $Id: PKGBUILD 198875 2013-11-05 19:54:57Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdeedu-kstars
-pkgver=4.11.2
+pkgver=4.11.3
 pkgrel=1
 pkgdesc="Desktop Planetarium"
 url="http://kde.org/applications/education/kstars/"
@@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'wcslib' 'libindi')
 makedepends=('cmake' 'automoc4' 'eigen')
 install=${pkgname}.install
 source=("http://download.kde.org/stable/${pkgver}/src/kstars-${pkgver}.tar.xz")
-sha1sums=('9dc44a2b6a6cda29d3508206b1737f38d5bff54a')
+sha1sums=('92a54609a43a65e81ff80b15d6fd1be20e123a60')
 
 build() {
   mkdir build
diff --git a/extra/kdeedu-ktouch/PKGBUILD b/extra/kdeedu-ktouch/PKGBUILD
index fd904e6e5..12ab43f7c 100644
--- a/extra/kdeedu-ktouch/PKGBUILD
+++ b/extra/kdeedu-ktouch/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 195610 2013-10-01 15:22:56Z svenstaro $
+# $Id: PKGBUILD 198876 2013-11-05 19:55:09Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdeedu-ktouch
-pkgver=4.11.2
+pkgver=4.11.3
 pkgrel=1
 pkgdesc="Touch Typing Tutor"
 url="http://kde.org/applications/education/ktouch/"
@@ -13,7 +13,7 @@ depends=('kdebase-runtime')
 makedepends=('cmake' 'automoc4' 'mesa')
 install=${pkgname}.install
 source=("http://download.kde.org/stable/${pkgver}/src/ktouch-${pkgver}.tar.xz")
-sha1sums=('d8b1c37a0270dbfba63d5dc2e73d7320e58c07e5')
+sha1sums=('4996509f4aa8d896095dd116be56c8f36739a465')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/kdeedu-kturtle/PKGBUILD b/extra/kdeedu-kturtle/PKGBUILD
index 1e0d32902..71ab780c6 100644
--- a/extra/kdeedu-kturtle/PKGBUILD
+++ b/extra/kdeedu-kturtle/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 195612 2013-10-01 15:23:10Z svenstaro $
+# $Id: PKGBUILD 198877 2013-11-05 19:55:19Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdeedu-kturtle
-pkgver=4.11.2
+pkgver=4.11.3
 pkgrel=1
 pkgdesc="Educational Programming Environment"
 url="http://kde.org/applications/education/kturtle/"
@@ -13,7 +13,7 @@ depends=('kdebase-runtime')
 makedepends=('cmake' 'automoc4')
 install=${pkgname}.install
 source=("http://download.kde.org/stable/${pkgver}/src/kturtle-${pkgver}.tar.xz")
-sha1sums=('1343755dbc7ffbcb0da848fa13804cb86895d568')
+sha1sums=('3faaf8994a6bbb7c4b5459aa0ea060e49f3a0c4d')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/kdeedu-kwordquiz/PKGBUILD b/extra/kdeedu-kwordquiz/PKGBUILD
index 696276c71..97a7c3818 100644
--- a/extra/kdeedu-kwordquiz/PKGBUILD
+++ b/extra/kdeedu-kwordquiz/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 195614 2013-10-01 15:23:31Z svenstaro $
+# $Id: PKGBUILD 198878 2013-11-05 19:55:28Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdeedu-kwordquiz
-pkgver=4.11.2
+pkgver=4.11.3
 pkgrel=1
 pkgdesc="Flash Card Trainer"
 url="http://kde.org/applications/education/kwordquiz/"
@@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdeedu')
 makedepends=('cmake' 'automoc4')
 install=${pkgname}.install
 source=("http://download.kde.org/stable/${pkgver}/src/kwordquiz-${pkgver}.tar.xz")
-sha1sums=('d630d944824296459d643a76323cab34126ddf92')
+sha1sums=('f46e6b5919942d4b563bf1e867330550ec5594b7')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/kdeedu-marble/PKGBUILD b/extra/kdeedu-marble/PKGBUILD
index ece18c857..4e190687e 100644
--- a/extra/kdeedu-marble/PKGBUILD
+++ b/extra/kdeedu-marble/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 195536 2013-10-01 15:16:34Z svenstaro $
+# $Id: PKGBUILD 198839 2013-11-05 19:47:27Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdeedu-marble
-pkgver=4.11.2
+pkgver=4.11.3
 pkgrel=1
 pkgdesc="Desktop Globe"
 url="http://kde.org/applications/education/marble/"
@@ -14,7 +14,7 @@ makedepends=('cmake' 'automoc4' 'gpsd')
 optdepends=('gpsd: gps support')
 install=${pkgname}.install
 source=("http://download.kde.org/stable/${pkgver}/src/marble-${pkgver}.tar.xz")
-sha1sums=('d37528ba9c61f8938569ea6af39d0fd5181f52d4')
+sha1sums=('b0b0cf06b4c60262861e748c6815d62513df13a7')
 
 build() {
   mkdir build
diff --git a/extra/kdeedu-pairs/PKGBUILD b/extra/kdeedu-pairs/PKGBUILD
index 8effe234e..6f8e7e2fb 100644
--- a/extra/kdeedu-pairs/PKGBUILD
+++ b/extra/kdeedu-pairs/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 195616 2013-10-01 15:23:51Z svenstaro $
+# $Id: PKGBUILD 198879 2013-11-05 19:55:38Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdeedu-pairs
-pkgver=4.11.2
+pkgver=4.11.3
 pkgrel=1
 pkgdesc="A memory and pairs game for KDE"
 url="https://projects.kde.org/projects/kde/kdeedu/pairs"
@@ -13,7 +13,7 @@ depends=('kdebase-runtime')
 makedepends=('cmake' 'automoc4')
 install=${pkgname}.install
 source=("http://download.kde.org/stable/${pkgver}/src/pairs-${pkgver}.tar.xz")
-sha1sums=('3c066354585127ad6f9c9e0ed99c8b6f0bd0c3b1')
+sha1sums=('d4825df57d5526aea3dc4308aceee6c65f41efba')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/kdeedu-parley/PKGBUILD b/extra/kdeedu-parley/PKGBUILD
index 09d17201f..fb0e9fef7 100644
--- a/extra/kdeedu-parley/PKGBUILD
+++ b/extra/kdeedu-parley/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 195618 2013-10-01 15:25:01Z svenstaro $
+# $Id: PKGBUILD 198880 2013-11-05 19:55:48Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdeedu-parley
-pkgver=4.11.2
+pkgver=4.11.3
 pkgrel=1
 pkgdesc="Vocabulary Trainer"
 url="http://kde.org/applications/education/parley/"
@@ -14,7 +14,7 @@ makedepends=('cmake' 'automoc4')
 optdepends=('kdebindings-kross-python: scripting support')
 install=${pkgname}.install
 source=("http://download.kde.org/stable/${pkgver}/src/parley-${pkgver}.tar.xz")
-sha1sums=('f98d01d01fde0ec28be842874245af4aa88a95b6')
+sha1sums=('2a0065fcfdb48db3dcdae992a7f8094035f6e81d')
 
 build() {
   mkdir build
diff --git a/extra/kdeedu-rocs/PKGBUILD b/extra/kdeedu-rocs/PKGBUILD
index a6a6a7d3e..c2e8d5276 100644
--- a/extra/kdeedu-rocs/PKGBUILD
+++ b/extra/kdeedu-rocs/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 195620 2013-10-01 15:25:09Z svenstaro $
+# $Id: PKGBUILD 198881 2013-11-05 19:55:59Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdeedu-rocs
-pkgver=4.11.2
+pkgver=4.11.3
 pkgrel=1
 pkgdesc="Rocs Graph Theory"
 url="http://kde.org/applications/education/rocs/"
@@ -13,7 +13,7 @@ depends=('kdebase-runtime')
 makedepends=('cmake' 'automoc4' 'boost')
 install=${pkgname}.install
 source=("http://download.kde.org/stable/${pkgver}/src/rocs-${pkgver}.tar.xz")
-sha1sums=('cede7bdee7f2d64da79b564461ede119108a6a55')
+sha1sums=('b1693d7bf589666334e08fa2258d7e4c90d44283')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/kdeedu-step/PKGBUILD b/extra/kdeedu-step/PKGBUILD
index fbedab5c5..47f85588a 100644
--- a/extra/kdeedu-step/PKGBUILD
+++ b/extra/kdeedu-step/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 195622 2013-10-01 15:25:16Z svenstaro $
+# $Id: PKGBUILD 198882 2013-11-05 19:56:08Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdeedu-step
-pkgver=4.11.2
+pkgver=4.11.3
 pkgrel=1
 pkgdesc="Interactive Physical Simulator"
 url="http://kde.org/applications/education/step/"
@@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libqalculate' 'gsl')
 makedepends=('cmake' 'automoc4' 'eigen' 'mesa')
 install=${pkgname}.install
 source=("http://download.kde.org/stable/${pkgver}/src/step-${pkgver}.tar.xz")
-sha1sums=('1b6dd907caa47f3867ad03eb7d4e91f3981a2730')
+sha1sums=('03058d4d3d228aa1a6e57483fb52d1c2cc66319b')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/kdegames-bomber/PKGBUILD b/extra/kdegames-bomber/PKGBUILD
index d7360c280..021cd24fe 100644
--- a/extra/kdegames-bomber/PKGBUILD
+++ b/extra/kdegames-bomber/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 195624 2013-10-01 15:25:22Z svenstaro $
+# $Id: PKGBUILD 198883 2013-11-05 19:56:17Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdegames-bomber
-pkgver=4.11.2
+pkgver=4.11.3
 pkgrel=1
 pkgdesc="A single player arcade game"
 url="http://kde.org/applications/games/bomber/"
@@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdegames')
 makedepends=('cmake' 'automoc4')
 install=${pkgname}.install
 source=("http://download.kde.org/stable/${pkgver}/src/bomber-${pkgver}.tar.xz")
-sha1sums=('c6bd8e69cd7e172f63893b7c1c6305006ace79ab')
+sha1sums=('c97235036e6e921529c108517ca35dfb4ca468e5')
 
 build() {
   mkdir build
diff --git a/extra/kdegames-bovo/PKGBUILD b/extra/kdegames-bovo/PKGBUILD
index 50a41fa9b..96c290cbb 100644
--- a/extra/kdegames-bovo/PKGBUILD
+++ b/extra/kdegames-bovo/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 195626 2013-10-01 15:25:29Z svenstaro $
+# $Id: PKGBUILD 198884 2013-11-05 19:56:25Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdegames-bovo
-pkgver=4.11.2
+pkgver=4.11.3
 pkgrel=1
 pkgdesc="A Gomoku like game for two players"
 url="http://kde.org/applications/games/bovo/"
@@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdegames')
 makedepends=('cmake' 'automoc4')
 install=${pkgname}.install
 source=("http://download.kde.org/stable/${pkgver}/src/bovo-${pkgver}.tar.xz")
-sha1sums=('7e98d4b6e4b7396f3f81a2295f35ddc0bf669ddc')
+sha1sums=('5dac983929801c794eb4d60016991c5557f88dd8')
 
 build() {
   mkdir build
diff --git a/extra/kdegames-granatier/PKGBUILD b/extra/kdegames-granatier/PKGBUILD
index f656d7393..dbf4a75c4 100644
--- a/extra/kdegames-granatier/PKGBUILD
+++ b/extra/kdegames-granatier/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 195628 2013-10-01 15:25:37Z svenstaro $
+# $Id: PKGBUILD 198885 2013-11-05 19:56:46Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdegames-granatier
-pkgver=4.11.2
+pkgver=4.11.3
 pkgrel=1
 pkgdesc="A clone of the classic Bomberman game"
 url="http://kde.org/applications/games/granatier/"
@@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdegames')
 makedepends=('cmake' 'automoc4')
 install=${pkgname}.install
 source=("http://download.kde.org/stable/${pkgver}/src/granatier-${pkgver}.tar.xz")
-sha1sums=('f83a41521c95d3f40963155f9f9760499cdb2429')
+sha1sums=('56069dbfa62e1da274c21d6e3fb41a30e3cc1460')
 
 build() {
   mkdir build
diff --git a/extra/kdegames-kapman/PKGBUILD b/extra/kdegames-kapman/PKGBUILD
index 69b5f349c..ca98177bb 100644
--- a/extra/kdegames-kapman/PKGBUILD
+++ b/extra/kdegames-kapman/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 195632 2013-10-01 15:25:51Z svenstaro $
+# $Id: PKGBUILD 198887 2013-11-05 19:57:01Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdegames-kapman
-pkgver=4.11.2
+pkgver=4.11.3
 pkgrel=1
 pkgdesc="A clone of the well known game Pac-Man"
 url="http://kde.org/applications/games/kapman/"
@@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdegames')
 makedepends=('cmake' 'automoc4')
 install=${pkgname}.install
 source=("http://download.kde.org/stable/${pkgver}/src/kapman-${pkgver}.tar.xz")
-sha1sums=('858147cc497c07fec55b5cfc9ed2abf671e71645')
+sha1sums=('3f064c087d477a896e86bf4d6b67d9c644cad60f')
 
 build() {
   mkdir build
diff --git a/extra/kdegames-katomic/PKGBUILD b/extra/kdegames-katomic/PKGBUILD
index dc2833492..7b8c9e556 100644
--- a/extra/kdegames-katomic/PKGBUILD
+++ b/extra/kdegames-katomic/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 195634 2013-10-01 15:25:59Z svenstaro $
+# $Id: PKGBUILD 198888 2013-11-05 19:57:11Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdegames-katomic
-pkgver=4.11.2
+pkgver=4.11.3
 pkgrel=1
 pkgdesc="A fun and educational game built around molecular geometry"
 url="http://kde.org/applications/games/katomic/"
@@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdegames')
 makedepends=('cmake' 'automoc4')
 install=${pkgname}.install
 source=("http://download.kde.org/stable/${pkgver}/src/katomic-${pkgver}.tar.xz")
-sha1sums=('d640e617e0ee55db1ffceafd14b714df290f185f')
+sha1sums=('9bd793a68f4ebfb468829eb89b951d6a5a36d917')
 
 build() {
   mkdir build
diff --git a/extra/kdegames-kblackbox/PKGBUILD b/extra/kdegames-kblackbox/PKGBUILD
index d523f9be9..940c6cdd3 100644
--- a/extra/kdegames-kblackbox/PKGBUILD
+++ b/extra/kdegames-kblackbox/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 195636 2013-10-01 15:26:08Z svenstaro $
+# $Id: PKGBUILD 198889 2013-11-05 19:57:21Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdegames-kblackbox
-pkgver=4.11.2
+pkgver=4.11.3
 pkgrel=1
 pkgdesc="A game of hide and seek played on a grid of boxes"
 url="http://kde.org/applications/games/kblackbox/"
@@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdegames')
 makedepends=('cmake' 'automoc4')
 install=${pkgname}.install
 source=("http://download.kde.org/stable/${pkgver}/src/kblackbox-${pkgver}.tar.xz")
-sha1sums=('27b8370bca2ece8aef7a0d9604d7dfd80c44b1d2')
+sha1sums=('30dfa88931acbf88fe24516d5003c96d638399c1')
 
 build() {
   mkdir build
diff --git a/extra/kdegames-kblocks/PKGBUILD b/extra/kdegames-kblocks/PKGBUILD
index d110f9f8a..855f67378 100644
--- a/extra/kdegames-kblocks/PKGBUILD
+++ b/extra/kdegames-kblocks/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 195638 2013-10-01 15:26:16Z svenstaro $
+# $Id: PKGBUILD 198890 2013-11-05 19:57:30Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdegames-kblocks
-pkgver=4.11.2
+pkgver=4.11.3
 pkgrel=1
 pkgdesc="The classic falling blocks game"
 url="http://kde.org/applications/games/kblocks/"
@@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdegames')
 makedepends=('cmake' 'automoc4')
 install=${pkgname}.install
 source=("http://download.kde.org/stable/${pkgver}/src/kblocks-${pkgver}.tar.xz")
-sha1sums=('d248a16fd4d430da6138f1b20ca8dcf67893e68c')
+sha1sums=('d2ac45452acf281b8faff36fbbfbd080a7af7dec')
 
 build() {
   mkdir build
diff --git a/extra/kdegames-kbounce/PKGBUILD b/extra/kdegames-kbounce/PKGBUILD
index 126c8b29a..5e2e46d62 100644
--- a/extra/kdegames-kbounce/PKGBUILD
+++ b/extra/kdegames-kbounce/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 195640 2013-10-01 15:26:26Z svenstaro $
+# $Id: PKGBUILD 198891 2013-11-05 19:57:39Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdegames-kbounce
-pkgver=4.11.2
+pkgver=4.11.3
 pkgrel=1
 pkgdesc="A single player arcade game with the elements of puzzle"
 url="http://kde.org/applications/games/kbounce/"
@@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdegames')
 makedepends=('cmake' 'automoc4')
 install=${pkgname}.install
 source=("http://download.kde.org/stable/${pkgver}/src/kbounce-${pkgver}.tar.xz")
-sha1sums=('a1bd2b405c6aae79dac8063d6b461e88ba6ded51')
+sha1sums=('afc1fca732886e67d99cdb33276621cf67d85592')
 
 build() {
   mkdir build
diff --git a/extra/kdegames-kbreakout/PKGBUILD b/extra/kdegames-kbreakout/PKGBUILD
index 3c888916b..37a3bb4a9 100644
--- a/extra/kdegames-kbreakout/PKGBUILD
+++ b/extra/kdegames-kbreakout/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 195642 2013-10-01 15:26:34Z svenstaro $
+# $Id: PKGBUILD 198892 2013-11-05 19:57:48Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdegames-kbreakout
-pkgver=4.11.2
+pkgver=4.11.3
 pkgrel=1
 pkgdesc="A Breakout-like game"
 url="http://kde.org/applications/games/kbreakout/"
@@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdegames')
 makedepends=('cmake' 'automoc4')
 install=${pkgname}.install
 source=("http://download.kde.org/stable/${pkgver}/src/kbreakout-${pkgver}.tar.xz")
-sha1sums=('2ae752f463e12b267e84b9847d68993b61becc4a')
+sha1sums=('c62ce7ad423f5c6ff3593ff22a3e851b2ee34471')
 
 build() {
   mkdir build
diff --git a/extra/kdegames-kdiamond/PKGBUILD b/extra/kdegames-kdiamond/PKGBUILD
index 386ecefd8..a5cf3e6f7 100644
--- a/extra/kdegames-kdiamond/PKGBUILD
+++ b/extra/kdegames-kdiamond/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 195644 2013-10-01 15:26:42Z svenstaro $
+# $Id: PKGBUILD 198893 2013-11-05 19:57:57Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdegames-kdiamond
-pkgver=4.11.2
+pkgver=4.11.3
 pkgrel=1
 pkgdesc="A single player puzzle game"
 url="http://kde.org/applications/games/kdiamond/"
@@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdegames')
 makedepends=('cmake' 'automoc4')
 install=${pkgname}.install
 source=("http://download.kde.org/stable/${pkgver}/src/kdiamond-${pkgver}.tar.xz")
-sha1sums=('bf6d4d03ed8dec892785cf898dd954d9f8867268')
+sha1sums=('bcb32208702219f3fbbb6f3693680e4f2b9bbe90')
 
 build() {
   mkdir build
diff --git a/extra/kdegames-kfourinline/PKGBUILD b/extra/kdegames-kfourinline/PKGBUILD
index bcc92f678..280c80600 100644
--- a/extra/kdegames-kfourinline/PKGBUILD
+++ b/extra/kdegames-kfourinline/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 195646 2013-10-01 15:26:52Z svenstaro $
+# $Id: PKGBUILD 198894 2013-11-05 19:58:06Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdegames-kfourinline
-pkgver=4.11.2
+pkgver=4.11.3
 pkgrel=1
 pkgdesc="A four-in-a-row game"
 url="http://kde.org/applications/games/kfourinline/"
@@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdegames')
 makedepends=('cmake' 'automoc4')
 install=${pkgname}.install
 source=("http://download.kde.org/stable/${pkgver}/src/kfourinline-${pkgver}.tar.xz")
-sha1sums=('c832f1485fad84e0e97c4de71bacc602f5cfe269')
+sha1sums=('bbbd81e2e91b10b61e56a498121f64a460a8328c')
 
 build() {
   mkdir build
diff --git a/extra/kdegames-kgoldrunner/PKGBUILD b/extra/kdegames-kgoldrunner/PKGBUILD
index 5d4bd8b3f..df09c2cf4 100644
--- a/extra/kdegames-kgoldrunner/PKGBUILD
+++ b/extra/kdegames-kgoldrunner/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 195648 2013-10-01 15:27:00Z svenstaro $
+# $Id: PKGBUILD 198895 2013-11-05 19:58:15Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdegames-kgoldrunner
-pkgver=4.11.2
+pkgver=4.11.3
 pkgrel=1
 pkgdesc="A game of action and puzzle solving"
 url="http://kde.org/applications/games/kgoldrunner/"
@@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdegames')
 makedepends=('cmake' 'automoc4')
 install=${pkgname}.install
 source=("http://download.kde.org/stable/${pkgver}/src/kgoldrunner-${pkgver}.tar.xz")
-sha1sums=('a6bc9684535df789a1d901bb76b491a6c0cd2152')
+sha1sums=('a977911bff2c8fb603e1befc1ec98ad1b14c8480')
 
 build() {
   mkdir build
diff --git a/extra/kdegames-kigo/PKGBUILD b/extra/kdegames-kigo/PKGBUILD
index ff320d10d..cd98155a1 100644
--- a/extra/kdegames-kigo/PKGBUILD
+++ b/extra/kdegames-kigo/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 195650 2013-10-01 15:27:10Z svenstaro $
+# $Id: PKGBUILD 198896 2013-11-05 19:58:25Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdegames-kigo
-pkgver=4.11.2
+pkgver=4.11.3
 pkgrel=1
 pkgdesc="An open-source implementation of the popular Go game"
 url="http://kde.org/applications/games/kigo/"
@@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdegames' 'gnugo')
 makedepends=('cmake' 'automoc4')
 install=${pkgname}.install
 source=("http://download.kde.org/stable/${pkgver}/src/kigo-${pkgver}.tar.xz")
-sha1sums=('7f542952c905a0159baa6bf76859e555ccc734f1')
+sha1sums=('8538ed582dc74bb2767fd73634a5c76d7dfd490d')
 
 build() {
   mkdir build
diff --git a/extra/kdegames-killbots/PKGBUILD b/extra/kdegames-killbots/PKGBUILD
index 3529def51..5effbff68 100644
--- a/extra/kdegames-killbots/PKGBUILD
+++ b/extra/kdegames-killbots/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 195652 2013-10-01 15:27:20Z svenstaro $
+# $Id: PKGBUILD 198897 2013-11-05 20:00:15Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdegames-killbots
-pkgver=4.11.2
+pkgver=4.11.3
 pkgrel=1
 pkgdesc="A simple game of evading killer robots"
 url="http://kde.org/applications/games/killbots/"
@@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdegames')
 makedepends=('cmake' 'automoc4')
 install=${pkgname}.install
 source=("http://download.kde.org/stable/${pkgver}/src/killbots-${pkgver}.tar.xz")
-sha1sums=('51fec4b46a44de9412ea30716b9aeabb23ce1b08')
+sha1sums=('34005bd79b80a1b1e2e62c65a9f410cc92cceff4')
 
 build() {
   mkdir build
diff --git a/extra/kdegames-kiriki/PKGBUILD b/extra/kdegames-kiriki/PKGBUILD
index 4d2605b70..e860427f7 100644
--- a/extra/kdegames-kiriki/PKGBUILD
+++ b/extra/kdegames-kiriki/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 195654 2013-10-01 15:27:31Z svenstaro $
+# $Id: PKGBUILD 198898 2013-11-05 20:00:25Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdegames-kiriki
-pkgver=4.11.2
+pkgver=4.11.3
 pkgrel=1
 pkgdesc="An addictive and fun dice game"
 url="http://kde.org/applications/games/kiriki/"
@@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdegames')
 makedepends=('cmake' 'automoc4')
 install=${pkgname}.install
 source=("http://download.kde.org/stable/${pkgver}/src/kiriki-${pkgver}.tar.xz")
-sha1sums=('85ee7a363c2acd357c234750e76735f4a44ecfe5')
+sha1sums=('d014ed9ca78ad3dff5c063f50e149a276c1ff70b')
 
 build() {
   mkdir build
diff --git a/extra/kdegames-kjumpingcube/PKGBUILD b/extra/kdegames-kjumpingcube/PKGBUILD
index 237ef18ba..8a5c11ccd 100644
--- a/extra/kdegames-kjumpingcube/PKGBUILD
+++ b/extra/kdegames-kjumpingcube/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 195656 2013-10-01 15:27:43Z svenstaro $
+# $Id: PKGBUILD 198899 2013-11-05 20:01:44Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdegames-kjumpingcube
-pkgver=4.11.2
+pkgver=4.11.3
 pkgrel=1
 pkgdesc="A simple tactical game"
 url="http://kde.org/applications/games/kjumpingcube/"
@@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdegames')
 makedepends=('cmake' 'automoc4')
 install=${pkgname}.install
 source=("http://download.kde.org/stable/${pkgver}/src/kjumpingcube-${pkgver}.tar.xz")
-sha1sums=('accd0b0113e3d39862a61073bfe43ead4ae66931')
+sha1sums=('80c138942b64911964dae05cceba7a948dcb8dd4')
 
 build() {
   mkdir build
diff --git a/extra/kdegames-klickety/PKGBUILD b/extra/kdegames-klickety/PKGBUILD
index a417b2916..b464cd554 100644
--- a/extra/kdegames-klickety/PKGBUILD
+++ b/extra/kdegames-klickety/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 195658 2013-10-01 15:27:50Z svenstaro $
+# $Id: PKGBUILD 198900 2013-11-05 20:01:53Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdegames-klickety
-pkgver=4.11.2
+pkgver=4.11.3
 pkgrel=1
 pkgdesc="An adaptation of the Clickomania game"
 url="http://kde.org/applications/games/klickety/"
@@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdegames')
 makedepends=('cmake' 'automoc4')
 install=${pkgname}.install
 source=("http://download.kde.org/stable/${pkgver}/src/klickety-${pkgver}.tar.xz")
-sha1sums=('8fbddac4341e15d13f49c32c0944c8039e439e2e')
+sha1sums=('e4e935f345101e2f72763a45b7d94169c4a30b40')
 
 build() {
   mkdir build
diff --git a/extra/kdegames-klines/PKGBUILD b/extra/kdegames-klines/PKGBUILD
index e8bbf2535..11be1ce1c 100644
--- a/extra/kdegames-klines/PKGBUILD
+++ b/extra/kdegames-klines/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 195660 2013-10-01 15:27:58Z svenstaro $
+# $Id: PKGBUILD 198901 2013-11-05 20:02:02Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdegames-klines
-pkgver=4.11.2
+pkgver=4.11.3
 pkgrel=1
 pkgdesc="A simple but highly addictive, one player game"
 url="http://kde.org/applications/games/klines/"
@@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdegames')
 makedepends=('cmake' 'automoc4')
 install=${pkgname}.install
 source=("http://download.kde.org/stable/${pkgver}/src/klines-${pkgver}.tar.xz")
-sha1sums=('52998f7c594c7d6deb6462c04569edfe6fc55526')
+sha1sums=('bd6ffbe50dc8e6409c4fd4f4114a5dfdf98e0cc5')
 
 build() {
   mkdir build
diff --git a/extra/kdegames-kmahjongg/PKGBUILD b/extra/kdegames-kmahjongg/PKGBUILD
index 8e66402c8..6a52b9a62 100644
--- a/extra/kdegames-kmahjongg/PKGBUILD
+++ b/extra/kdegames-kmahjongg/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 195662 2013-10-01 15:28:06Z svenstaro $
+# $Id: PKGBUILD 198902 2013-11-05 20:02:10Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdegames-kmahjongg
-pkgver=4.11.2
+pkgver=4.11.3
 pkgrel=1
 pkgdesc="A tile matching game for one or two players"
 url="http://kde.org/applications/games/kmahjongg/"
@@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkmahjongg' 'libkdegames')
 makedepends=('cmake' 'automoc4')
 install=${pkgname}.install
 source=("http://download.kde.org/stable/${pkgver}/src/kmahjongg-${pkgver}.tar.xz")
-sha1sums=('af458140e050374226e69a9041d61ea2cfa53a74')
+sha1sums=('9c8ade62b91da960d194b5df0c0d87b994025a00')
 
 build() {
   mkdir build
diff --git a/extra/kdegames-kmines/PKGBUILD b/extra/kdegames-kmines/PKGBUILD
index 3d010330f..2ae2f05ea 100644
--- a/extra/kdegames-kmines/PKGBUILD
+++ b/extra/kdegames-kmines/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 195664 2013-10-01 15:28:15Z svenstaro $
+# $Id: PKGBUILD 198903 2013-11-05 20:02:19Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdegames-kmines
-pkgver=4.11.2
+pkgver=4.11.3
 pkgrel=1
 pkgdesc="The classic Minesweeper game"
 url="http://kde.org/applications/games/kmines/"
@@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdegames')
 makedepends=('cmake' 'automoc4')
 install=${pkgname}.install
 source=("http://download.kde.org/stable/${pkgver}/src/kmines-${pkgver}.tar.xz")
-sha1sums=('e76b14c64361133dbaab03e72633d344f0e0faff')
+sha1sums=('e22e62f54a4e259385bd8927b1d582d011acb807')
 
 build() {
   mkdir build
diff --git a/extra/kdegames-knavalbattle/PKGBUILD b/extra/kdegames-knavalbattle/PKGBUILD
index 09b76ba2e..4ba26e0fd 100644
--- a/extra/kdegames-knavalbattle/PKGBUILD
+++ b/extra/kdegames-knavalbattle/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 195666 2013-10-01 15:28:22Z svenstaro $
+# $Id: PKGBUILD 198904 2013-11-05 20:03:35Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdegames-knavalbattle
-pkgver=4.11.2
+pkgver=4.11.3
 pkgrel=1
 pkgdesc="A ship sinking game"
 url="http://kde.org/applications/games/knavalbattle/"
@@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdegames')
 makedepends=('cmake' 'automoc4')
 install=${pkgname}.install
 source=("http://download.kde.org/stable/${pkgver}/src/knavalbattle-${pkgver}.tar.xz")
-sha1sums=('e9de15755f03bbdecb50765134bf4440214d2a93')
+sha1sums=('025c480ecea840efecbd20b41921ce56fe52d470')
 
 build() {
   mkdir build
diff --git a/extra/kdegames-knetwalk/PKGBUILD b/extra/kdegames-knetwalk/PKGBUILD
index 5c4b32f32..605568d5a 100644
--- a/extra/kdegames-knetwalk/PKGBUILD
+++ b/extra/kdegames-knetwalk/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 195668 2013-10-01 15:28:29Z svenstaro $
+# $Id: PKGBUILD 198905 2013-11-05 20:03:45Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdegames-knetwalk
-pkgver=4.11.2
+pkgver=4.11.3
 pkgrel=1
 pkgdesc="Connect all the terminals to the server, in as few turns as possible"
 url="http://kde.org/applications/games/knetwalk/"
@@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdegames')
 makedepends=('cmake' 'automoc4')
 install=${pkgname}.install
 source=("http://download.kde.org/stable/${pkgver}/src/knetwalk-${pkgver}.tar.xz")
-sha1sums=('259a493851f84217d37cd03306618cbebf50baf8')
+sha1sums=('ac66b169d7a7c3c42aa937efc2d6d1576b352d7e')
 
 build() {
   mkdir build
diff --git a/extra/kdegames-kolf/PKGBUILD b/extra/kdegames-kolf/PKGBUILD
index 29aff7c9d..3f001c9a1 100644
--- a/extra/kdegames-kolf/PKGBUILD
+++ b/extra/kdegames-kolf/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 195670 2013-10-01 15:28:37Z svenstaro $
+# $Id: PKGBUILD 198906 2013-11-05 20:04:01Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdegames-kolf
-pkgver=4.11.2
+pkgver=4.11.3
 pkgrel=1
 pkgdesc="A miniature golf game with 2d top-down view"
 url="http://kde.org/applications/games/kolf/"
@@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdegames')
 makedepends=('cmake' 'automoc4')
 install=${pkgname}.install
 source=("http://download.kde.org/stable/${pkgver}/src/kolf-${pkgver}.tar.xz")
-sha1sums=('1b32e7cb03ab7e8653e6f3a54f05f716e0d9ca8f')
+sha1sums=('5302fa38428e790d288687f6cfb6975e4b3ea6c6')
 
 build() {
   mkdir build
diff --git a/extra/kdegames-kollision/PKGBUILD b/extra/kdegames-kollision/PKGBUILD
index 8fc26b584..9ac6b370a 100644
--- a/extra/kdegames-kollision/PKGBUILD
+++ b/extra/kdegames-kollision/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 195672 2013-10-01 15:28:45Z svenstaro $
+# $Id: PKGBUILD 198907 2013-11-05 20:04:47Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdegames-kollision
-pkgver=4.11.2
+pkgver=4.11.3
 pkgrel=1
 pkgdesc="A simple ball dodging game"
 url="http://kde.org/applications/games/kollision/"
@@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdegames')
 makedepends=('cmake' 'automoc4')
 install=${pkgname}.install
 source=("http://download.kde.org/stable/${pkgver}/src/kollision-${pkgver}.tar.xz")
-sha1sums=('0c5be24b8885635de8e0ef94d70c7e5522287d3f')
+sha1sums=('1531e19d1a295590d343e7507d57f42479041d40')
 
 build() {
   mkdir build
diff --git a/extra/kdegames-konquest/PKGBUILD b/extra/kdegames-konquest/PKGBUILD
index 2e8b6da70..d614f7c9a 100644
--- a/extra/kdegames-konquest/PKGBUILD
+++ b/extra/kdegames-konquest/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 195674 2013-10-01 15:28:53Z svenstaro $
+# $Id: PKGBUILD 198908 2013-11-05 20:04:59Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdegames-konquest
-pkgver=4.11.2
+pkgver=4.11.3
 pkgrel=1
 pkgdesc="The KDE version of Gnu-Lactic"
 url="http://kde.org/applications/games/konquest/"
@@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdegames')
 makedepends=('cmake' 'automoc4')
 install=${pkgname}.install
 source=("http://download.kde.org/stable/${pkgver}/src/konquest-${pkgver}.tar.xz")
-sha1sums=('d8333e0965289b273554d81fa97d8b4b4a3f1456')
+sha1sums=('b0920dc829c4a06ca497d61c65db4e31df9a3297')
 
 build() {
   mkdir build
diff --git a/extra/kdegames-kpatience/PKGBUILD b/extra/kdegames-kpatience/PKGBUILD
index 8eee9fd6c..becd68899 100644
--- a/extra/kdegames-kpatience/PKGBUILD
+++ b/extra/kdegames-kpatience/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 195676 2013-10-01 15:29:02Z svenstaro $
+# $Id: PKGBUILD 198909 2013-11-05 20:05:08Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdegames-kpatience
-pkgver=4.11.2
+pkgver=4.11.3
 pkgrel=1
 pkgdesc="Offers a selection of solitaire card games"
 url="http://kde.org/applications/games/kpat/"
@@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdegames')
 makedepends=('cmake' 'automoc4')
 install=${pkgname}.install
 source=("http://download.kde.org/stable/${pkgver}/src/kpat-${pkgver}.tar.xz")
-sha1sums=('34e562ec8c892bbf9775e020e1c9fb5135adf164')
+sha1sums=('17ec8411212a75b3a2fab2b85f9c88bfe2bfbdd7')
 
 build() {
   mkdir build
diff --git a/extra/kdegames-kreversi/PKGBUILD b/extra/kdegames-kreversi/PKGBUILD
index f6a89633b..f34fd3546 100644
--- a/extra/kdegames-kreversi/PKGBUILD
+++ b/extra/kdegames-kreversi/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 195678 2013-10-01 15:29:10Z svenstaro $
+# $Id: PKGBUILD 198910 2013-11-05 20:05:17Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdegames-kreversi
-pkgver=4.11.2
+pkgver=4.11.3
 pkgrel=1
 pkgdesc="A simple one player strategy game played against the computer"
 url="http://kde.org/applications/games/kreversi/"
@@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdegames')
 makedepends=('cmake' 'automoc4')
 install=${pkgname}.install
 source=("http://download.kde.org/stable/${pkgver}/src/kreversi-${pkgver}.tar.xz")
-sha1sums=('adc039fd970fadd76e654fcae17b522baf0be716')
+sha1sums=('4bd4c5c96fc72ad6ea125f2ac5c4f3212d881763')
 
 build() {
   mkdir build
diff --git a/extra/kdegames-kshisen/PKGBUILD b/extra/kdegames-kshisen/PKGBUILD
index 837089359..a103077ea 100644
--- a/extra/kdegames-kshisen/PKGBUILD
+++ b/extra/kdegames-kshisen/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 195680 2013-10-01 15:29:18Z svenstaro $
+# $Id: PKGBUILD 198911 2013-11-05 20:05:26Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdegames-kshisen
-pkgver=4.11.2
+pkgver=4.11.3
 pkgrel=1
 pkgdesc="A solitaire-like game played using the standard set of Mahjong tiles"
 url="http://kde.org/applications/games/kshisen/"
@@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdegames' 'libkmahjongg')
 makedepends=('cmake' 'automoc4')
 install=${pkgname}.install
 source=("http://download.kde.org/stable/${pkgver}/src/kshisen-${pkgver}.tar.xz")
-sha1sums=('59e6d8e1a76206dbeef8697b919f7890ecca80b3')
+sha1sums=('8388960ca6964807b2dc9f6f54465a5408011c6d')
 
 build() {
   mkdir build
diff --git a/extra/kdegames-ksirk/PKGBUILD b/extra/kdegames-ksirk/PKGBUILD
index f98487ba5..f36b31a9b 100644
--- a/extra/kdegames-ksirk/PKGBUILD
+++ b/extra/kdegames-ksirk/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 195682 2013-10-01 15:29:25Z svenstaro $
+# $Id: PKGBUILD 198912 2013-11-05 20:05:36Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdegames-ksirk
-pkgver=4.11.2
+pkgver=4.11.3
 pkgrel=1
 pkgdesc="A computerized version of a well known strategy game"
 url="http://kde.org/applications/games/ksirk/"
@@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdegames')
 makedepends=('cmake' 'automoc4')
 install=${pkgname}.install
 source=("http://download.kde.org/stable/${pkgver}/src/ksirk-${pkgver}.tar.xz")
-sha1sums=('87fcb89e0160b8cc4e5b576f0aac3b5f074fb131')
+sha1sums=('bfb8f1cab0a6cc94618b612f6b24979a3cc52ed7')
 
 build() {
   mkdir build
diff --git a/extra/kdegames-ksnakeduel/PKGBUILD b/extra/kdegames-ksnakeduel/PKGBUILD
index 31768db78..be13c6e7e 100644
--- a/extra/kdegames-ksnakeduel/PKGBUILD
+++ b/extra/kdegames-ksnakeduel/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 195684 2013-10-01 15:29:33Z svenstaro $
+# $Id: PKGBUILD 198913 2013-11-05 20:05:45Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdegames-ksnakeduel
-pkgver=4.11.2
+pkgver=4.11.3
 pkgrel=1
 pkgdesc="A simple snake duel game"
 url="http://kde.org/applications/games/ksnakeduel/"
@@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdegames')
 makedepends=('cmake' 'automoc4')
 install=${pkgname}.install
 source=("http://download.kde.org/stable/${pkgver}/src/ksnakeduel-${pkgver}.tar.xz")
-sha1sums=('f05ea9a609b5a16d73c92ec8557a66f9c6f23b17')
+sha1sums=('c64fbe0973582938ed8aa46b65e29e3a6e38fb80')
 
 build() {
   mkdir build
diff --git a/extra/kdegames-kspaceduel/PKGBUILD b/extra/kdegames-kspaceduel/PKGBUILD
index bd8d57feb..9580ecb03 100644
--- a/extra/kdegames-kspaceduel/PKGBUILD
+++ b/extra/kdegames-kspaceduel/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 195686 2013-10-01 15:29:41Z svenstaro $
+# $Id: PKGBUILD 198914 2013-11-05 20:05:54Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdegames-kspaceduel
-pkgver=4.11.2
+pkgver=4.11.3
 pkgrel=1
 pkgdesc="Each of two possible players controls a satellite spaceship orbiting the sun"
 url="http://kde.org/applications/games/kspaceduel/"
@@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdegames')
 makedepends=('cmake' 'automoc4')
 install=${pkgname}.install
 source=("http://download.kde.org/stable/${pkgver}/src/kspaceduel-${pkgver}.tar.xz")
-sha1sums=('c488e638aea02b67bab6caf4898f7d007b44e089')
+sha1sums=('5c1507de0b2d20eda890895b03cbcffe6c3f57c5')
 
 build() {
   mkdir build
diff --git a/extra/kdegames-ksquares/PKGBUILD b/extra/kdegames-ksquares/PKGBUILD
index 0f16d38a9..e8bf721dc 100644
--- a/extra/kdegames-ksquares/PKGBUILD
+++ b/extra/kdegames-ksquares/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 195688 2013-10-01 15:29:48Z svenstaro $
+# $Id: PKGBUILD 198915 2013-11-05 20:06:04Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdegames-ksquares
-pkgver=4.11.2
+pkgver=4.11.3
 pkgrel=1
 pkgdesc="A modeled after the well known pen and paper based game of Dots and Boxes"
 url="http://kde.org/applications/games/ksquares/"
@@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdegames')
 makedepends=('cmake' 'automoc4')
 install=${pkgname}.install
 source=("http://download.kde.org/stable/${pkgver}/src/ksquares-${pkgver}.tar.xz")
-sha1sums=('f649ac82973623414342f2c1b48486fc9ab94973')
+sha1sums=('a1ea089ce5a0373f78801b605b7828b720f0aada')
 
 build() {
   mkdir build
diff --git a/extra/kdegames-ksudoku/PKGBUILD b/extra/kdegames-ksudoku/PKGBUILD
index 0de779d86..89b91f7b6 100644
--- a/extra/kdegames-ksudoku/PKGBUILD
+++ b/extra/kdegames-ksudoku/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 195690 2013-10-01 15:29:55Z svenstaro $
+# $Id: PKGBUILD 198916 2013-11-05 20:06:13Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdegames-ksudoku
-pkgver=4.11.2
+pkgver=4.11.3
 pkgrel=1
 pkgdesc="A logic-based symbol placement puzzle"
 url="http://kde.org/applications/games/ksudoku/"
@@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdegames')
 makedepends=('cmake' 'automoc4')
 install=${pkgname}.install
 source=("http://download.kde.org/stable/${pkgver}/src/ksudoku-${pkgver}.tar.xz")
-sha1sums=('73ac09b5e3f0d0be33aa6830349c9a20b7399d6f')
+sha1sums=('5f311bea8dffa71001f311317ff98b55e57c525d')
 
 build() {
   mkdir build
diff --git a/extra/kdegames-ktuberling/PKGBUILD b/extra/kdegames-ktuberling/PKGBUILD
index 296e4649d..612b7f6d0 100644
--- a/extra/kdegames-ktuberling/PKGBUILD
+++ b/extra/kdegames-ktuberling/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 195692 2013-10-01 15:30:05Z svenstaro $
+# $Id: PKGBUILD 198917 2013-11-05 20:06:22Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdegames-ktuberling
-pkgver=4.11.2
+pkgver=4.11.3
 pkgrel=1
 pkgdesc="A simple constructor game suitable for children and adults alike"
 url="http://kde.org/applications/games/ktuberling/"
@@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdegames')
 makedepends=('cmake' 'automoc4')
 install=${pkgname}.install
 source=("http://download.kde.org/stable/${pkgver}/src/ktuberling-${pkgver}.tar.xz")
-sha1sums=('e7cfb00de7a7142a164052d09ebcf07eb9f1d73a')
+sha1sums=('808820f30903cb34b578ad431e4c7b789cf8b04e')
 
 build() {
   mkdir build
diff --git a/extra/kdegames-kubrick/PKGBUILD b/extra/kdegames-kubrick/PKGBUILD
index 0dab47f3d..5e67848bf 100644
--- a/extra/kdegames-kubrick/PKGBUILD
+++ b/extra/kdegames-kubrick/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 195694 2013-10-01 15:30:14Z svenstaro $
+# $Id: PKGBUILD 198918 2013-11-05 20:06:35Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdegames-kubrick
-pkgver=4.11.2
+pkgver=4.11.3
 pkgrel=1
 pkgdesc="Based on the famous Rubik's Cube"
 url="http://kde.org/applications/games/kubrick/"
@@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdegames')
 makedepends=('cmake' 'automoc4')
 install=${pkgname}.install
 source=("http://download.kde.org/stable/${pkgver}/src/kubrick-${pkgver}.tar.xz")
-sha1sums=('0f5ef0e814532a1ff37364c43ad05de30d974efa')
+sha1sums=('38855de0bf35b3921632bb54e762b932e19e1a00')
 
 build() {
   mkdir build
diff --git a/extra/kdegames-lskat/PKGBUILD b/extra/kdegames-lskat/PKGBUILD
index 1243768ca..e5df0606d 100644
--- a/extra/kdegames-lskat/PKGBUILD
+++ b/extra/kdegames-lskat/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 195696 2013-10-01 15:30:22Z svenstaro $
+# $Id: PKGBUILD 198919 2013-11-05 20:06:44Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdegames-lskat
-pkgver=4.11.2
+pkgver=4.11.3
 pkgrel=1
 pkgdesc="Lieutenant Skat is a fun and engaging card game for two players"
 url="http://kde.org/applications/games/lskat/"
@@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdegames')
 makedepends=('cmake' 'automoc4')
 install=${pkgname}.install
 source=("http://download.kde.org/stable/${pkgver}/src/lskat-${pkgver}.tar.xz")
-sha1sums=('ad2736dba919a04f147f5854654a46e800830a53')
+sha1sums=('86046bcb33bbe85415fe0275964366236228ac3f')
 
 build() {
   mkdir build
diff --git a/extra/kdegames-palapeli/PKGBUILD b/extra/kdegames-palapeli/PKGBUILD
index e6b9a3352..2aa47ea83 100644
--- a/extra/kdegames-palapeli/PKGBUILD
+++ b/extra/kdegames-palapeli/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 195698 2013-10-01 15:30:31Z svenstaro $
+# $Id: PKGBUILD 198920 2013-11-05 20:06:53Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdegames-palapeli
-pkgver=4.11.2
+pkgver=4.11.3
 pkgrel=1
 pkgdesc="A single-player jigsaw puzzle game"
 url="http://kde.org/applications/games/palapeli/"
@@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdegames' 'qhull')
 makedepends=('cmake' 'automoc4')
 install=${pkgname}.install
 source=("http://download.kde.org/stable/${pkgver}/src/palapeli-${pkgver}.tar.xz")
-sha1sums=('162da00abfdd31958935e30cb5622f4fd29ab48e')
+sha1sums=('ebd7ad175b79d821ef0c2dc7fac07ec5339a85a3')
 
 build() {
   mkdir build
diff --git a/extra/kdegames-picmi/PKGBUILD b/extra/kdegames-picmi/PKGBUILD
index 79df436f1..970749ecb 100644
--- a/extra/kdegames-picmi/PKGBUILD
+++ b/extra/kdegames-picmi/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 195700 2013-10-01 15:30:39Z svenstaro $
+# $Id: PKGBUILD 198921 2013-11-05 20:07:02Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdegames-picmi
-pkgver=4.11.2
+pkgver=4.11.3
 pkgrel=1
 pkgdesc="A nonogram logic game for KDE"
 url="http://kde.org/applications/games/picmi/"
@@ -15,7 +15,7 @@ replaces=('picmi')
 conflicts=('picmi')
 install=${pkgname}.install
 source=("http://download.kde.org/stable/${pkgver}/src/picmi-${pkgver}.tar.xz")
-sha1sums=('2399ba362a6d97d556de2e7e4fce0d21b294fcbf')
+sha1sums=('f87583d20afcf0a5f2d714c8b6575b114e5360af')
 
 build() {
   mkdir build
diff --git a/extra/kdegraphics-gwenview/PKGBUILD b/extra/kdegraphics-gwenview/PKGBUILD
index 4c133c1e6..d32d10b77 100644
--- a/extra/kdegraphics-gwenview/PKGBUILD
+++ b/extra/kdegraphics-gwenview/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 195702 2013-10-01 15:30:46Z svenstaro $
+# $Id: PKGBUILD 198922 2013-11-05 20:07:12Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdegraphics-gwenview
-pkgver=4.11.2
+pkgver=4.11.3
 pkgrel=1
 pkgdesc="A fast and easy to use image viewer for KDE"
 url="http://kde.org/applications/graphics/gwenview/"
@@ -14,7 +14,7 @@ makedepends=('cmake' 'automoc4' 'mesa')
 optdepends=('kipi-plugins: extra plugins to share photos')
 install=$pkgname.install
 source=("http://download.kde.org/stable/${pkgver}/src/gwenview-${pkgver}.tar.xz")
-sha1sums=('a52c8c0312e5fd90e7a62099bd4a1a70fc5d37c0')
+sha1sums=('e4e6dcb883819fdc53e739d4d78d2b90c930f12e')
 
 build() {
   mkdir build
diff --git a/extra/kdegraphics-kamera/PKGBUILD b/extra/kdegraphics-kamera/PKGBUILD
index 71f14ad38..12c7590ff 100644
--- a/extra/kdegraphics-kamera/PKGBUILD
+++ b/extra/kdegraphics-kamera/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 195704 2013-10-01 15:30:54Z svenstaro $
+# $Id: PKGBUILD 198923 2013-11-05 20:07:22Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdegraphics-kamera
-pkgver=4.11.2
+pkgver=4.11.3
 pkgrel=1
 pkgdesc="Configure Kamera"
 url="http://kde.org/applications/graphics/kamera/"
@@ -12,7 +12,7 @@ groups=('kde' 'kdegraphics')
 depends=('kdebase-runtime' 'libgphoto2')
 makedepends=('cmake' 'automoc4')
 source=("http://download.kde.org/stable/${pkgver}/src/kamera-${pkgver}.tar.xz")
-sha1sums=('23008a038d247f81ad7878257eec329008a65f7e')
+sha1sums=('e412f5d7ec52257e13184c5b70ae97579d8d9455')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/kdegraphics-kcolorchooser/PKGBUILD b/extra/kdegraphics-kcolorchooser/PKGBUILD
index 0bd1a2fca..1a0aa03c9 100644
--- a/extra/kdegraphics-kcolorchooser/PKGBUILD
+++ b/extra/kdegraphics-kcolorchooser/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 195706 2013-10-01 15:31:02Z svenstaro $
+# $Id: PKGBUILD 198924 2013-11-05 20:07:32Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdegraphics-kcolorchooser
-pkgver=4.11.2
+pkgver=4.11.3
 pkgrel=1
 pkgdesc="Color Chooser"
 url="http://kde.org/applications/graphics/kcolorchooser/"
@@ -13,7 +13,7 @@ depends=('kdebase-runtime')
 makedepends=('cmake' 'automoc4')
 install=${pkgname}.install
 source=("http://download.kde.org/stable/${pkgver}/src/kcolorchooser-${pkgver}.tar.xz")
-sha1sums=('fedbdf1ead8bc1096c5c0da5fd9e857f67798ca5')
+sha1sums=('5ea857f02fb153f20c29f2e055f4de38c52c2d10')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/kdegraphics-kgamma/PKGBUILD b/extra/kdegraphics-kgamma/PKGBUILD
index 8a97a44ea..39555de0a 100644
--- a/extra/kdegraphics-kgamma/PKGBUILD
+++ b/extra/kdegraphics-kgamma/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 195708 2013-10-01 15:31:10Z svenstaro $
+# $Id: PKGBUILD 198925 2013-11-05 20:07:41Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdegraphics-kgamma
-pkgver=4.11.2
+pkgver=4.11.3
 pkgrel=1
 pkgdesc="A monitor calibration tool"
 url="http://kde.org/applications/graphics/kgamma/"
@@ -15,7 +15,7 @@ groups=('kde' 'kdegraphics')
 depends=('kdebase-runtime' 'libxxf86vm')
 makedepends=('cmake' 'automoc4')
 source=("http://download.kde.org/stable/${pkgver}/src/kgamma-${pkgver}.tar.xz")
-sha1sums=('b65fe9770310f60c2a9f951424100d0a02d13fa5')
+sha1sums=('54dbbf355bfed3b4d94fee10c30217443570926a')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/kdegraphics-kolourpaint/PKGBUILD b/extra/kdegraphics-kolourpaint/PKGBUILD
index 51c44fe15..35cda4e18 100644
--- a/extra/kdegraphics-kolourpaint/PKGBUILD
+++ b/extra/kdegraphics-kolourpaint/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 195710 2013-10-01 15:31:18Z svenstaro $
+# $Id: PKGBUILD 198926 2013-11-05 20:07:50Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdegraphics-kolourpaint
-pkgver=4.11.2
+pkgver=4.11.3
 pkgrel=1
 pkgdesc="Paint Program"
 url="http://kde.org/applications/graphics/kolourpaint/"
@@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'qimageblitz')
 makedepends=('cmake' 'automoc4')
 install=${pkgname}.install
 source=("http://download.kde.org/stable/${pkgver}/src/kolourpaint-${pkgver}.tar.xz")
-sha1sums=('bd7cb2c69daa94e19db34ac0eff2c4d494ba1491')
+sha1sums=('fb9adff50e0edc1bf01183e70fdf1a6b9438b7f9')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/kdegraphics-kruler/PKGBUILD b/extra/kdegraphics-kruler/PKGBUILD
index 6ce8e1a80..44adad058 100644
--- a/extra/kdegraphics-kruler/PKGBUILD
+++ b/extra/kdegraphics-kruler/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 195712 2013-10-01 15:31:25Z svenstaro $
+# $Id: PKGBUILD 198927 2013-11-05 20:08:00Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdegraphics-kruler
-pkgver=4.11.2
+pkgver=4.11.3
 pkgrel=1
 pkgdesc="Screen Ruler"
 url="http://kde.org/applications/graphics/kruler/"
@@ -13,7 +13,7 @@ depends=('kdebase-runtime')
 makedepends=('cmake' 'automoc4')
 install=${pkgname}.install
 source=("http://download.kde.org/stable/${pkgver}/src/kruler-${pkgver}.tar.xz")
-sha1sums=('01fa3df0c2a5e55e447ac9e03321f4ac299572e9')
+sha1sums=('be7a9cb78c8b2de25b6fbe22f2cce2dd885eafd5')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/kdegraphics-ksaneplugin/PKGBUILD b/extra/kdegraphics-ksaneplugin/PKGBUILD
index eedbeaa47..cbc6542ca 100644
--- a/extra/kdegraphics-ksaneplugin/PKGBUILD
+++ b/extra/kdegraphics-ksaneplugin/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 195714 2013-10-01 15:31:33Z svenstaro $
+# $Id: PKGBUILD 198928 2013-11-05 20:08:10Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdegraphics-ksaneplugin
-pkgver=4.11.2
+pkgver=4.11.3
 pkgrel=1
 pkgdesc="A scan plugin that implements the scanning"
 url="https://projects.kde.org/projects/kde/kdegraphics/ksaneplugin"
@@ -13,7 +13,7 @@ makedepends=('cmake' 'automoc4')
 replaces=('kdegraphics-libs')
 conflicts=('kdegraphics-libs')
 source=("http://download.kde.org/stable/${pkgver}/src/ksaneplugin-${pkgver}.tar.xz")
-sha1sums=('baf3f8d92e683f53f7fce59d7854783223942877')
+sha1sums=('f6ec3a98fe99e38cfa6dbfd56837b344ca27b956')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/kdegraphics-ksnapshot/PKGBUILD b/extra/kdegraphics-ksnapshot/PKGBUILD
index 5be7b819b..d4214e897 100644
--- a/extra/kdegraphics-ksnapshot/PKGBUILD
+++ b/extra/kdegraphics-ksnapshot/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 195716 2013-10-01 15:31:41Z svenstaro $
+# $Id: PKGBUILD 198929 2013-11-05 20:08:18Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdegraphics-ksnapshot
-pkgver=4.11.2
+pkgver=4.11.3
 pkgrel=1
 pkgdesc="Screen Capture Program"
 url="http://kde.org/applications/graphics/ksnapshot/"
@@ -14,7 +14,7 @@ makedepends=('cmake' 'automoc4')
 optdepends=('kipi-plugins')
 install=${pkgname}.install
 source=("http://download.kde.org/stable/${pkgver}/src/ksnapshot-${pkgver}.tar.xz")
-sha1sums=('2eaaa87438d3ee2b24fc1af61c1b18c4307f570d')
+sha1sums=('5e3837ef023ffa681417fbf7bc79e696e280cd1c')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/kdegraphics-mobipocket/PKGBUILD b/extra/kdegraphics-mobipocket/PKGBUILD
index 91c2311b8..66afe8d39 100644
--- a/extra/kdegraphics-mobipocket/PKGBUILD
+++ b/extra/kdegraphics-mobipocket/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 195718 2013-10-01 15:31:48Z svenstaro $
+# $Id: PKGBUILD 198930 2013-11-05 20:08:45Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdegraphics-mobipocket
-pkgver=4.11.2
+pkgver=4.11.3
 pkgrel=1
 pkgdesc="A collection of plugins to handle mobipocket files"
 url="https://projects.kde.org/projects/kde/kdegraphics/kdegraphics-mobipocket"
@@ -15,7 +15,7 @@ replaces=('kdegraphics-libs')
 conflicts=('kdegraphics-libs')
 install=${pkgname}.install
 source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz")
-sha1sums=('d1ab52f21a3908cebe22348e9aee3d649d2f32c5')
+sha1sums=('53d52b27ed1dd0149dacf2cd672ef52e762385d8')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/kdegraphics-okular/PKGBUILD b/extra/kdegraphics-okular/PKGBUILD
index 95f324035..e840d5645 100644
--- a/extra/kdegraphics-okular/PKGBUILD
+++ b/extra/kdegraphics-okular/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 195512 2013-10-01 15:14:45Z svenstaro $
+# $Id: PKGBUILD 198827 2013-11-05 19:44:40Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdegraphics-okular
-pkgver=4.11.2
+pkgver=4.11.3
 pkgrel=1
 pkgdesc='Document Viewer'
 arch=('i686' 'x86_64' 'mips64el')
@@ -15,7 +15,7 @@ makedepends=('cmake' 'automoc4')
 optdepends=('kdegraphics-mobipocket: mobipocket support')
 install=${pkgname}.install
 source=("http://download.kde.org/stable/${pkgver}/src/okular-${pkgver}.tar.xz")
-sha1sums=('9910de294467ab7b056983040abcff458ade1792')
+sha1sums=('b65e4124aab93220302721d03db09469f4c3d7c7')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/kdegraphics-strigi-analyzer/PKGBUILD b/extra/kdegraphics-strigi-analyzer/PKGBUILD
index 0043653d9..0b19e77a8 100644
--- a/extra/kdegraphics-strigi-analyzer/PKGBUILD
+++ b/extra/kdegraphics-strigi-analyzer/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 195720 2013-10-01 15:31:56Z svenstaro $
+# $Id: PKGBUILD 198931 2013-11-05 20:09:22Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdegraphics-strigi-analyzer
-pkgver=4.11.2
+pkgver=4.11.3
 pkgrel=1
 pkgdesc="Strigi analyzers for various graphics file formats"
 url="https://projects.kde.org/projects/kde/kdegraphics/kdegraphics-strigi-analyzer"
@@ -13,7 +13,7 @@ makedepends=('cmake' 'automoc4')
 replaces=('kdegraphics-libs')
 conflicts=('kdegraphics-libs')
 source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz")
-sha1sums=('df681ed83bdbbcffd66905d56001695c255d1d1d')
+sha1sums=('eba5719133828a14c51d3f18f3ff079c1cb2b076')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/kdegraphics-svgpart/PKGBUILD b/extra/kdegraphics-svgpart/PKGBUILD
index ee45f0ac0..22be0b831 100644
--- a/extra/kdegraphics-svgpart/PKGBUILD
+++ b/extra/kdegraphics-svgpart/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 195722 2013-10-01 15:32:04Z svenstaro $
+# $Id: PKGBUILD 198932 2013-11-05 20:09:32Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdegraphics-svgpart
-pkgver=4.11.2
+pkgver=4.11.3
 pkgrel=1
 pkgdesc="A KPart for viewing SVGs"
 url="https://projects.kde.org/projects/kde/kdegraphics/svgpart"
@@ -13,7 +13,7 @@ makedepends=('cmake' 'automoc4')
 replaces=('kdegraphics-libs')
 conflicts=('kdegraphics-libs')
 source=("http://download.kde.org/stable/${pkgver}/src/svgpart-${pkgver}.tar.xz")
-sha1sums=('28bc50ca0e7f414e38168df9a224c2dd3883ba24')
+sha1sums=('555da194e7909ec47d6ca5fd108dc9f327b79c8b')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/kdegraphics-thumbnailers/PKGBUILD b/extra/kdegraphics-thumbnailers/PKGBUILD
index 5a0b2dbba..4bd341b5d 100644
--- a/extra/kdegraphics-thumbnailers/PKGBUILD
+++ b/extra/kdegraphics-thumbnailers/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 195724 2013-10-01 15:32:13Z svenstaro $
+# $Id: PKGBUILD 198933 2013-11-05 20:09:42Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdegraphics-thumbnailers
-pkgver=4.11.2
+pkgver=4.11.3
 pkgrel=1
 pkgdesc="Thumbnailers for various graphics file formats"
 url="https://projects.kde.org/projects/kde/kdegraphics/kdegraphics-thumbnailers"
@@ -13,7 +13,7 @@ makedepends=('cmake' 'automoc4')
 replaces=('kdegraphics-libs')
 conflicts=('kdegraphics-libs')
 source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz")
-sha1sums=('7b25127d63f0bf4e8d67af21d4fd9bf636e9b691')
+sha1sums=('e23d895bcfd15584a3e405aaaae58c209ab70fa1')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/kdemultimedia-audiocd-kio/PKGBUILD b/extra/kdemultimedia-audiocd-kio/PKGBUILD
index 1aec6c8fc..0c4c6d841 100644
--- a/extra/kdemultimedia-audiocd-kio/PKGBUILD
+++ b/extra/kdemultimedia-audiocd-kio/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 195726 2013-10-01 15:32:21Z svenstaro $
+# $Id: PKGBUILD 198934 2013-11-05 20:09:53Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdemultimedia-audiocd-kio
-pkgver=4.11.2
+pkgver=4.11.3
 pkgrel=1
 pkgdesc="Kioslave for accessing audio CDs"
 url='https://projects.kde.org/projects/kde/kdemultimedia/audiocd-kio'
@@ -14,7 +14,7 @@ groups=('kde' 'kdemultimedia')
 replaces=('kdemultimedia-kioslave')
 conflicts=('kdemultimedia-kioslave')
 source=("http://download.kde.org/stable/${pkgver}/src/audiocd-kio-${pkgver}.tar.xz")
-sha1sums=('56cf44401ce26e6b25ce1dcd6cfa02ac09eed7eb')
+sha1sums=('9b23a28843b4d23fc1cbb947320a1dd66f2b0018')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/kdemultimedia-dragonplayer/PKGBUILD b/extra/kdemultimedia-dragonplayer/PKGBUILD
index c3c584726..178b2372d 100644
--- a/extra/kdemultimedia-dragonplayer/PKGBUILD
+++ b/extra/kdemultimedia-dragonplayer/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 195728 2013-10-01 15:32:28Z svenstaro $
+# $Id: PKGBUILD 198935 2013-11-05 20:10:03Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdemultimedia-dragonplayer
-pkgver=4.11.2
+pkgver=4.11.3
 pkgrel=1
 pkgdesc="A multimedia player where the focus is on simplicity, instead of
 features"
@@ -14,7 +14,7 @@ depends=('kdebase-runtime')
 makedepends=('cmake' 'automoc4')
 install="${pkgname}.install"
 source=("http://download.kde.org/stable/${pkgver}/src/dragon-${pkgver}.tar.xz")
-sha1sums=('b3c68741c9aff01aee8fb3c5bd3d3d7e14ddd5a7')
+sha1sums=('d6682f0dd7a62b7576bc9778ff711abdcc9ba45b')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/kdemultimedia-ffmpegthumbs/PKGBUILD b/extra/kdemultimedia-ffmpegthumbs/PKGBUILD
index b434b51de..5cdf2c160 100644
--- a/extra/kdemultimedia-ffmpegthumbs/PKGBUILD
+++ b/extra/kdemultimedia-ffmpegthumbs/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 195730 2013-10-01 15:32:37Z svenstaro $
+# $Id: PKGBUILD 198936 2013-11-05 20:10:13Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdemultimedia-ffmpegthumbs
-pkgver=4.11.2
+pkgver=4.11.3
 pkgrel=1
 pkgdesc='FFmpeg-based thumbnail creator for video files'
 url='https://projects.kde.org/projects/kde/kdemultimedia/ffmpegthumbs'
@@ -12,7 +12,7 @@ groups=('kde' 'kdemultimedia')
 depends=('kdelibs' 'ffmpeg')
 makedepends=('cmake' 'automoc4')
 source=("http://download.kde.org/stable/${pkgver}/src/ffmpegthumbs-${pkgver}.tar.xz")
-sha1sums=('066f3802c91125b821dde01ae3484fc98ba6cba4')
+sha1sums=('23d911d71dbcd6e5704b0ebec66d5ba0f91f9931')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/kdemultimedia-juk/PKGBUILD b/extra/kdemultimedia-juk/PKGBUILD
index e4382e24e..308ef0f6a 100644
--- a/extra/kdemultimedia-juk/PKGBUILD
+++ b/extra/kdemultimedia-juk/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 195732 2013-10-01 15:32:45Z svenstaro $
+# $Id: PKGBUILD 198937 2013-11-05 20:10:22Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdemultimedia-juk
-pkgver=4.11.2
+pkgver=4.11.3
 pkgrel=1
 pkgdesc='A jukebox, tagger and music collection manager'
 url='http://kde.org/applications/multimedia/juk/'
@@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'taglib')
 makedepends=('cmake' 'automoc4')
 install="${pkgname}.install"
 source=("http://download.kde.org/stable/${pkgver}/src/juk-${pkgver}.tar.xz")
-sha1sums=('7b9b04f3f0957b7b2afa51f55a4c9d4691ba2c2c')
+sha1sums=('05b684897ba8f4eb4cce1d10aaf1f1f6afa358be')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/kdemultimedia-kmix/PKGBUILD b/extra/kdemultimedia-kmix/PKGBUILD
index e3ad2eeb6..61836c3b5 100644
--- a/extra/kdemultimedia-kmix/PKGBUILD
+++ b/extra/kdemultimedia-kmix/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 195734 2013-10-01 15:32:52Z svenstaro $
+# $Id: PKGBUILD 198938 2013-11-05 20:11:56Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdemultimedia-kmix
-pkgver=4.11.2
+pkgver=4.11.3
 pkgrel=1
 pkgdesc="KDE volume control program"
 url='http://kde.org/applications/multimedia/kmix/'
@@ -13,7 +13,7 @@ depends=('kdebase-runtime')
 makedepends=('cmake' 'automoc4')
 install="${pkgname}.install"
 source=("http://download.kde.org/stable/${pkgver}/src/kmix-${pkgver}.tar.xz")
-sha1sums=('e47a77c19a00e9a68f36158e3c320204ca5c2707')
+sha1sums=('3d3813f66b034bbe603c0958d41b7b26cfa80e40')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/kdemultimedia-kscd/PKGBUILD b/extra/kdemultimedia-kscd/PKGBUILD
index e7a1297bd..6bc6e9e53 100644
--- a/extra/kdemultimedia-kscd/PKGBUILD
+++ b/extra/kdemultimedia-kscd/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 195736 2013-10-01 15:32:59Z svenstaro $
+# $Id: PKGBUILD 198939 2013-11-05 20:12:04Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdemultimedia-kscd
-pkgver=4.11.2
+pkgver=4.11.3
 pkgrel=1
 pkgdesc="KDE CD player"
 url='http://kde.org/applications/multimedia/kscd/'
@@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libmusicbrainz3')
 makedepends=('cmake' 'automoc4')
 install="${pkgname}.install"
 source=("http://download.kde.org/stable/${pkgver}/src/kscd-${pkgver}.tar.xz")
-sha1sums=('0380536835dfc97121f4de2a68ac574a38148b3f')
+sha1sums=('c2028b71516c6ca3708aac2170e9e146c51110ce')
 
 build() {
   mkdir build
diff --git a/extra/kdemultimedia-mplayerthumbs/PKGBUILD b/extra/kdemultimedia-mplayerthumbs/PKGBUILD
index cc5d3cd6f..3817fd6ad 100644
--- a/extra/kdemultimedia-mplayerthumbs/PKGBUILD
+++ b/extra/kdemultimedia-mplayerthumbs/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 195738 2013-10-01 15:33:07Z svenstaro $
+# $Id: PKGBUILD 198940 2013-11-05 20:12:16Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdemultimedia-mplayerthumbs
-pkgver=4.11.2
+pkgver=4.11.3
 pkgrel=1
 pkgdesc="MPlayer based thumbnail generator for video files"
 url='https://projects.kde.org/projects/kde/kdemultimedia/mplayerthumbs'
@@ -12,7 +12,7 @@ license=('GPL' 'LGPL' 'FDL')
 depends=('kdebase-runtime' 'mplayer')
 makedepends=('cmake' 'automoc4')
 source=("http://download.kde.org/stable/${pkgver}/src/mplayerthumbs-${pkgver}.tar.xz")
-sha1sums=('ea9b2fbb067894bef2b1e60cb72c1f7bfd0e9151')
+sha1sums=('6f61935359f2dfb1073884a8d48738663b5aa33a')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/kdenetwork-filesharing/PKGBUILD b/extra/kdenetwork-filesharing/PKGBUILD
index 07fcc6f3c..fd7801fdb 100644
--- a/extra/kdenetwork-filesharing/PKGBUILD
+++ b/extra/kdenetwork-filesharing/PKGBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdenetwork-filesharing
-pkgver=4.11.2
+pkgver=4.11.3
 pkgrel=1
 pkgdesc='Properties dialog plugin to share a directory with the local network'
 url='https://projects.kde.org/projects/kde/kdenetwork/kdenetwork-filesharing'
@@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'smbclient')
 makedepends=('cmake' 'automoc4')
 install=${pkgname}.install
 source=("http://download.kde.org/stable/${pkgver}/src/kdenetwork-filesharing-${pkgver}.tar.xz")
-sha1sums=('14c94385f1476b4debfee4c211080b6087ce6708')
+sha1sums=('db93e4617230aebd377e415475e7ad5dd4e9b549')
 
 build() {
   mkdir build
diff --git a/extra/kdenetwork-kdnssd/PKGBUILD b/extra/kdenetwork-kdnssd/PKGBUILD
index 1a34b4624..26fb1a73e 100644
--- a/extra/kdenetwork-kdnssd/PKGBUILD
+++ b/extra/kdenetwork-kdnssd/PKGBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdenetwork-kdnssd
-pkgver=4.11.2
+pkgver=4.11.3
 pkgrel=1
 pkgdesc='Monitors the network for DNS-SD services'
 url='https://projects.kde.org/projects/kde/kdenetwork/kdnssd'
@@ -12,7 +12,7 @@ groups=('kde' 'kdenetwork')
 depends=('kdebase-runtime')
 makedepends=('cmake' 'automoc4')
 source=("http://download.kde.org/stable/${pkgver}/src/kdnssd-${pkgver}.tar.xz")
-sha1sums=('ff10bfe39a968101a582705e0c844dcf545e8cb1')
+sha1sums=('4d26fda0e964c5baca68336a1c035252d6f1d4bb')
 
 build() {
   mkdir build
diff --git a/extra/kdenetwork-kget/PKGBUILD b/extra/kdenetwork-kget/PKGBUILD
index 4678b20e4..2382d20b8 100644
--- a/extra/kdenetwork-kget/PKGBUILD
+++ b/extra/kdenetwork-kget/PKGBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdenetwork-kget
-pkgver=4.11.2
+pkgver=4.11.3
 pkgrel=1
 pkgdesc='Download Manager'
 url='http://kde.org/applications/internet/kget/'
@@ -13,7 +13,7 @@ depends=('kdebase-workspace' 'kdebase-lib' 'libktorrent' 'libmms' 'gpgme' 'nepom
 makedepends=('cmake' 'automoc4' 'boost')
 install=${pkgname}.install
 source=("http://download.kde.org/stable/${pkgver}/src/kget-${pkgver}.tar.xz")
-sha1sums=('ea08c57090046987d0d4d5c8ad991364fccde471')
+sha1sums=('1f186e190d6f396eeeacbcb36fcfce414abb4365')
 
 build() {
   mkdir build
diff --git a/extra/kdenetwork-kppp/PKGBUILD b/extra/kdenetwork-kppp/PKGBUILD
index e31b67888..d34bd1c2f 100644
--- a/extra/kdenetwork-kppp/PKGBUILD
+++ b/extra/kdenetwork-kppp/PKGBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdenetwork-kppp
-pkgver=4.11.2
+pkgver=4.11.3
 pkgrel=1
 pkgdesc='Internet Dial-Up Tool'
 url='http://kde.org/applications/internet/kppp/'
@@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'ppp')
 makedepends=('cmake' 'automoc4')
 install=${pkgname}.install
 source=("http://download.kde.org/stable/${pkgver}/src/kppp-${pkgver}.tar.xz")
-sha1sums=('4ae9bea4814db06162e73b3bd496f023d74f488c')
+sha1sums=('11608fce538eecb3496406e50c4d2e17f5f520b1')
 
 build() {
   mkdir build
diff --git a/extra/kdenetwork-krdc/PKGBUILD b/extra/kdenetwork-krdc/PKGBUILD
index 27459761b..a268117fb 100644
--- a/extra/kdenetwork-krdc/PKGBUILD
+++ b/extra/kdenetwork-krdc/PKGBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdenetwork-krdc
-pkgver=4.11.2
+pkgver=4.11.3
 pkgrel=1
 pkgdesc='Remote Desktop Client'
 url='http://kde.org/applications/internet/krdc/'
@@ -15,7 +15,7 @@ optdepends=('libvncserver: VNC support'
             'freerdp: RDP support'
             'kdebase-keditbookmarks: to edit bookmarks')
 source=("http://download.kde.org/stable/${pkgver}/src/krdc-${pkgver}.tar.xz")
-sha1sums=('4df48d142823505770f47a8ac99454e8b2855a74')
+sha1sums=('17b7da4c9acfefcedb67d017323c66279aedc428')
 
 build() {
   mkdir build
diff --git a/extra/kdenetwork-krfb/PKGBUILD b/extra/kdenetwork-krfb/PKGBUILD
index 7ba2f81c3..f5e209fdf 100644
--- a/extra/kdenetwork-krfb/PKGBUILD
+++ b/extra/kdenetwork-krfb/PKGBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdenetwork-krfb
-pkgver=4.11.2
+pkgver=4.11.3
 pkgrel=1
 pkgdesc='Desktop Sharing'
 url='http://www.kde.org/applications/system/krfb'
@@ -15,7 +15,7 @@ groups=('kde' 'kdenetwork')
 depends=('kdebase-runtime' 'libvncserver' 'libxdamage' 'telepathy-qt')
 makedepends=('cmake' 'automoc4')
 source=("http://download.kde.org/stable/${pkgver}/src/krfb-${pkgver}.tar.xz")
-sha1sums=('b5b7b6c229f7c60382aa30dbf7726ad6044a4d6a')
+sha1sums=('391f0bbc115a6e874d8c16e76c9bc0d75ea2ab5f')
 
 build() {
   mkdir build
diff --git a/extra/kdenetwork-strigi-analyzers/PKGBUILD b/extra/kdenetwork-strigi-analyzers/PKGBUILD
index a0d929e08..c422a704f 100644
--- a/extra/kdenetwork-strigi-analyzers/PKGBUILD
+++ b/extra/kdenetwork-strigi-analyzers/PKGBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdenetwork-strigi-analyzers
-pkgver=4.11.2
+pkgver=4.11.3
 pkgrel=1
 pkgdesc='Strigi analyzers for various network protocols'
 url='https://projects.kde.org/projects/kde/kdenetwork/kdenetwork-strigi-analyzers'
@@ -12,7 +12,7 @@ groups=('kde' 'kdenetwork')
 depends=('kdebase-runtime')
 makedepends=('cmake' 'automoc4' 'boost')
 source=("http://download.kde.org/stable/${pkgver}/src/kdenetwork-strigi-analyzers-${pkgver}.tar.xz")
-sha1sums=('e59c6497f15c60ee703fb3c376da2e8d9a9ec021')
+sha1sums=('7b294cbf762ee5649df1a1f65d0613ee4b783641')
 
 build() {
   mkdir build
diff --git a/extra/kdepim-runtime/PKGBUILD b/extra/kdepim-runtime/PKGBUILD
index 2086e3dff..2a8d033dc 100644
--- a/extra/kdepim-runtime/PKGBUILD
+++ b/extra/kdepim-runtime/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 195506 2013-10-01 15:14:20Z svenstaro $
+# $Id: PKGBUILD 198824 2013-11-05 19:44:04Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 
 pkgname=kdepim-runtime
-pkgver=4.11.2
+pkgver=4.11.3
 pkgrel=1
 pkgdesc='Extends the functionality of kdepim'
 arch=('i686' 'x86_64' 'mips64el')
@@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkgapi' 'libkolab' 'libkfbapi')
 makedepends=('cmake' 'automoc4' 'boost')
 install="${pkgname}.install"
 source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz")
-sha1sums=('acc133c3c9d5cff0cdc9901b5ff7bd8b31a15825')
+sha1sums=('168455654655bd302c668ca91f18fab47fa6cd3c')
 
 prepare() {
   mkdir build
diff --git a/extra/kdepim/PKGBUILD b/extra/kdepim/PKGBUILD
index c837d5d44..1bb258901 100644
--- a/extra/kdepim/PKGBUILD
+++ b/extra/kdepim/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 195756 2013-10-01 15:34:28Z svenstaro $
+# $Id: PKGBUILD 198949 2013-11-05 20:17:31Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 
@@ -20,7 +20,7 @@ pkgname=('kdepim-akonadiconsole'
          'kdepim-ktimetracker'
          'kdepim-ktnef'
          'kdepim-libkdepim')
-pkgver=4.11.2
+pkgver=4.11.3
 pkgrel=1
 arch=('i686' 'x86_64')
 url='http://pim.kde.org'
@@ -29,7 +29,7 @@ groups=('kde' 'kdepim')
 makedepends=('cmake' 'automoc4' 'boost' 'kdepim-runtime' 'libxss' 'pilot-link'
              'kde-agent' 'nepomuk-widgets' 'link-grammar')
 source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.xz")
-sha1sums=('027a6560bcd8f55659f642f2041f1265453a02ad')
+sha1sums=('627b027bb276c41ac8a1face093e777bfafcabf0')
 
 build() {
 	mkdir build
diff --git a/extra/kdepimlibs/PKGBUILD b/extra/kdepimlibs/PKGBUILD
index bee074d41..1c11bab4b 100644
--- a/extra/kdepimlibs/PKGBUILD
+++ b/extra/kdepimlibs/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 195498 2013-10-01 15:13:18Z svenstaro $
+# $Id: PKGBUILD 198820 2013-11-05 19:40:54Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 
 pkgname=kdepimlibs
-pkgver=4.11.2
+pkgver=4.11.3
 pkgrel=1
 pkgdesc="KDE PIM Libraries"
 arch=('i686' 'x86_64' 'mips64el')
@@ -13,7 +13,7 @@ depends=('nepomuk-core' 'gpgme' 'akonadi' 'libical' 'prison' 'qjson')
 makedepends=('cmake' 'automoc4' 'boost' 'cyrus-sasl')
 install='kdepimlibs.install'
 source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz")
-sha1sums=('8808bee93143b4b0bbcfc8fb670efb9613ddae29')
+sha1sums=('ca131d0e1d24dd2c03e40de8b7d482abe4eba755')
 
 build() {
   mkdir build
diff --git a/extra/kdeplasma-addons/PKGBUILD b/extra/kdeplasma-addons/PKGBUILD
index 47e2ba4d5..3485ab153 100644
--- a/extra/kdeplasma-addons/PKGBUILD
+++ b/extra/kdeplasma-addons/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 195758 2013-10-01 15:34:46Z svenstaro $
+# $Id: PKGBUILD 198950 2013-11-05 20:17:53Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 
@@ -77,7 +77,7 @@ pkgname=('kdeplasma-addons-applets-bball'
          'kdeplasma-addons-wallpapers-qmlwallpapers'
          'kdeplasma-addons-wallpapers-virus'
          'kdeplasma-addons-wallpapers-weather')
-pkgver=4.11.2
+pkgver=4.11.3
 pkgrel=1
 arch=('i686' 'x86_64' 'mips64el')
 url='https://projects.kde.org/projects/kde/kdeplasma-addons'
@@ -86,7 +86,7 @@ groups=('kde' 'kdeplasma-addons')
 makedepends=('cmake' 'automoc4' 'kdebase-workspace' 'kdeedu-marble' 'eigen'
              'scim' 'qwt' 'boost' 'libkexiv2' 'ibus' 'qoauth' 'mesa')
 source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.xz")
-sha1sums=('2060310ec0dbd2f5b12ac2f783de85689c9df9e8')
+sha1sums=('8f2b219a3e3434ba67691ba642f6dc43419ce907')
 
 prepare() {
   mkdir build
diff --git a/extra/kdeplasma-addons/kdebug-324661.patch b/extra/kdeplasma-addons/kdebug-324661.patch
deleted file mode 100644
index 92de3fcc9..000000000
--- a/extra/kdeplasma-addons/kdebug-324661.patch
+++ /dev/null
@@ -1,76 +0,0 @@
-commit 7c3011e0a6459c00cf9d06d74da3a32f87f1a2f6
-Author: Eike Hein <hein@kde.org>
-Date:   Mon Sep 9 23:12:45 2013 +0200
-
-    Spin the event loop before destroying the menu.
-    
-    This allows the menu implementation to complete toggling the
-    launcher before the instance is destroyed. It's extremely un-
-    fortunate that the library currently requires this careful
-    handling; see e944d7ae in kde-workspace for a note on what
-    needs to be cleaned up there.
-    
-    BUG:324661
-
-diff --git a/applets/icontasks/windowtaskitem.cpp b/applets/icontasks/windowtaskitem.cpp
-index 970c19f..61b39ef 100644
---- a/applets/icontasks/windowtaskitem.cpp
-+++ b/applets/icontasks/windowtaskitem.cpp
-@@ -406,17 +406,18 @@ void WindowTaskItem::showContextMenu(const QPoint &pos, bool showAppMenu)
-         actionList.append(configAction);
-     }
- 
--    TaskManager::BasicMenu menu(0, m_task.data(), &m_applet->groupManager(), actionList, showAppMenu ? getAppMenu() : QList <QAction*>());
--    menu.adjustSize();
-+    TaskManager::BasicMenu * menu = new TaskManager::BasicMenu(0, m_task.data(), &m_applet->groupManager(), actionList, showAppMenu ? getAppMenu() : QList <QAction*>());
-+    menu->adjustSize();
- 
-     if (m_applet->formFactor() != Plasma::Vertical) {
--        menu.setMinimumWidth(size().width());
-+        menu->setMinimumWidth(size().width());
-     }
- 
-     Q_ASSERT(m_applet->containment());
-     Q_ASSERT(m_applet->containment()->corona());
-     stopWindowHoverEffect();
--    menu.exec(pos.isNull() ? m_applet->containment()->corona()->popupPosition(this, menu.size()) : pos);
-+    menu->exec(pos.isNull() ? m_applet->containment()->corona()->popupPosition(this, menu->size()) : pos);
-+    menu->deleteLater();
-     delete a;
- }
- 
-commit b56d1552e9a8f8efe8fb8fd641126e78627c61a9
-Author: Eike Hein <hein@kde.org>
-Date:   Mon Sep 9 23:33:30 2013 +0200
-
-    Fix it for non-running items too.
-    
-    BUG:324661
-
-diff --git a/applets/icontasks/applauncheritem.cpp b/applets/icontasks/applauncheritem.cpp
-index b5f646c..f721b5a 100644
---- a/applets/icontasks/applauncheritem.cpp
-+++ b/applets/icontasks/applauncheritem.cpp
-@@ -100,17 +100,18 @@ void AppLauncherItem::contextMenuEvent(QGraphicsSceneContextMenuEvent *e)
-         actionList.append(configAction);
-     }
- 
--    TaskManager::BasicMenu menu(0, m_launcher, &m_applet->groupManager(), actionList, getAppMenu());
--    menu.adjustSize();
-+    TaskManager::BasicMenu *menu = new TaskManager::BasicMenu(0, m_launcher, &m_applet->groupManager(), actionList, getAppMenu());
-+    menu->adjustSize();
- 
-     if (m_applet->formFactor() != Plasma::Vertical) {
--        menu.setMinimumWidth(size().width());
-+        menu->setMinimumWidth(size().width());
-     }
- 
-     Q_ASSERT(m_applet->containment());
-     Q_ASSERT(m_applet->containment()->corona());
-     stopWindowHoverEffect();
--    menu.exec(m_applet->containment()->corona()->popupPosition(this, menu.size()));
-+    menu->exec(m_applet->containment()->corona()->popupPosition(this, menu->size()));
-+    menu->deleteLater();
- }
- 
- 
diff --git a/extra/kdeplasma-applets-plasma-nm/PKGBUILD b/extra/kdeplasma-applets-plasma-nm/PKGBUILD
index ea548ab39..8b3f6260e 100644
--- a/extra/kdeplasma-applets-plasma-nm/PKGBUILD
+++ b/extra/kdeplasma-applets-plasma-nm/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 196399 2013-10-12 17:21:21Z andrea $
+# $Id: PKGBUILD 197151 2013-10-23 12:04:45Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Antonio Rojas < nqn1976 @ gmail.com >
 
 pkgname=kdeplasma-applets-plasma-nm
-pkgver=0.9.3.0
-pkgrel=2
+pkgver=0.9.3.1
+pkgrel=3
 pkgdesc="Plasma applet written in QML for managing network connections"
 arch=('i686' 'x86_64')
 url="https://projects.kde.org/projects/playground/network/plasma-nm"
@@ -13,11 +13,17 @@ depends=('kdebase-workspace' 'libnm-qt')
 makedepends=('cmake' 'automoc4' 'openconnect')
 optdepends=('mobile-broadband-provider-info: Database of mobile broadband service providers'
             'openconnect: Cisco AnyConnect VPN plugin')
-source=("http://download.kde.org/unstable/plasma-nm/plasma-nm-${pkgver}.tar.xz")
-md5sums=('cdc781eb6f62ebddbe4fafb444f72d9b')
+conflicts=('kdeplasma-applets-networkmanagement')
+source=("http://download.kde.org/unstable/plasma-nm/plasma-nm-${pkgver}.tar.xz"
+        'plasma-nm-fixes.patch')
+md5sums=('c6ce9cd8523ec0f99fe87dea8b76a02f'
+         'e5825709f49ba6c4386e909b80f75066')
 
 prepare() {
   mkdir build
+
+  cd plasma-nm-${pkgver}
+  patch -p1 -i "${srcdir}"/plasma-nm-fixes.patch
 }
 
 build() {
diff --git a/extra/kdeplasma-applets-plasma-nm/plasma-nm-fixes.patch b/extra/kdeplasma-applets-plasma-nm/plasma-nm-fixes.patch
new file mode 100644
index 000000000..d98448d7a
--- /dev/null
+++ b/extra/kdeplasma-applets-plasma-nm/plasma-nm-fixes.patch
@@ -0,0 +1,322 @@
+diff --git a/applet/declarative/contents/ui/main.qml b/applet/declarative/contents/ui/main.qml
+index 8ea88cc..aa81707 100644
+--- a/applet/declarative/contents/ui/main.qml
++++ b/applet/declarative/contents/ui/main.qml
+@@ -19,6 +19,7 @@
+ */
+ 
+ import QtQuick 1.1
++import org.kde.plasma.extras 0.1 as PlasmaExtras
+ import org.kde.plasma.components 0.1 as PlasmaComponents
+ import org.kde.plasma.core 0.1 as PlasmaCore
+ import org.kde.networkmanagement 0.1 as PlasmaNM
+@@ -77,16 +78,7 @@ Item {
+         anchors.fill: parent
+     }
+ 
+-    ListView {
+-        id: connectionView;
+-
+-        property bool expandedItem: false;
+-        property string previouslyExpandedItem: "";
+-
+-        property bool activeExpanded: true;
+-        property bool previousExpanded: true;
+-        property bool unknownExpanded: true;
+-
++    PlasmaExtras.ScrollArea {
+         anchors {
+             left: parent.left;
+             right: parent.right;
+@@ -95,50 +87,64 @@ Item {
+             topMargin: padding.margins.top;
+             bottomMargin: padding.margins.bottom
+         }
+-        clip: true
+-        model: connectionSortModel;
+-        currentIndex: -1;
+-        interactive: true;
+-        boundsBehavior: Flickable.StopAtBounds;
+-        section.property: "itemSection";
+-        section.delegate: SectionHeader {
+-            onHideSection: {
+-                if (section == i18n("Active connections")) {
+-                    connectionView.activeExpanded = false;
+-                } else if (section == i18n("Previous connections")) {
+-                    connectionView.previousExpanded = false;
+-                } else {
+-                    connectionView.unknownExpanded = false;
++
++        ListView {
++            id: connectionView;
++
++            property bool expandedItem: false;
++            property string previouslyExpandedItem: "";
++
++            property bool activeExpanded: true;
++            property bool previousExpanded: true;
++            property bool unknownExpanded: true;
++
++            anchors.fill: parent;
++
++            clip: true
++            model: connectionSortModel;
++            currentIndex: -1;
++            interactive: true;
++            boundsBehavior: Flickable.StopAtBounds;
++            section.property: "itemSection";
++            section.delegate: SectionHeader {
++                onHideSection: {
++                    if (section == i18n("Active connections")) {
++                        connectionView.activeExpanded = false;
++                    } else if (section == i18n("Previous connections")) {
++                        connectionView.previousExpanded = false;
++                    } else {
++                        connectionView.unknownExpanded = false;
++                    }
+                 }
+-            }
+ 
+-            onShowSection: {
+-                if (section == i18n("Active connections")) {
+-                    connectionView.activeExpanded = true;
+-                } else if (section == i18n("Previous connections")) {
+-                    connectionView.previousExpanded = true;
+-                } else {
+-                    connectionView.unknownExpanded = true;
++                onShowSection: {
++                    if (section == i18n("Active connections")) {
++                        connectionView.activeExpanded = true;
++                    } else if (section == i18n("Previous connections")) {
++                        connectionView.previousExpanded = true;
++                    } else {
++                        connectionView.unknownExpanded = true;
++                    }
+                 }
+             }
+-        }
+ 
+-        delegate: ConnectionItem {
+-            expanded: connectionView.expandedItem && connectionView.previouslyExpandedItem == itemUni;
+-            onItemExpanded: {
+-                if (itemExpanded) {
+-                    connectionView.expandedItem = true;
+-                    connectionView.previouslyExpandedItem = itemUni;;
+-                    connectionView.currentIndex = index;
+-                } else {
+-                    connectionView.expandedItem = false;
+-                    connectionView.previouslyExpandedItem = "";
++            delegate: ConnectionItem {
++                expanded: connectionView.expandedItem && connectionView.previouslyExpandedItem == itemUni;
++                onItemExpanded: {
++                    if (itemExpanded) {
++                        connectionView.expandedItem = true;
++                        connectionView.previouslyExpandedItem = itemUni;;
++                        connectionView.currentIndex = index;
++                    } else {
++                        connectionView.expandedItem = false;
++                        connectionView.previouslyExpandedItem = "";
++                    }
+                 }
+-            }
+ 
+-            ListView.onRemove: {
+-                if (ListView.isCurrentItem) {
+-                    connectionView.previouslyExpandedItem = "";
++                ListView.onRemove: {
++                    if (ListView.isCurrentItem) {
++                        connectionView.previouslyExpandedItem = "";
++                    }
+                 }
+             }
+         }
+diff --git a/declarative-plugins/applet/connectionicon.cpp b/declarative-plugins/applet/connectionicon.cpp
+index c3f8540..76bdca0 100644
+--- a/declarative-plugins/applet/connectionicon.cpp
++++ b/declarative-plugins/applet/connectionicon.cpp
+@@ -166,12 +166,24 @@ void ConnectionIcon::setIcons()
+ 
+     foreach (const NetworkManager::ActiveConnection::Ptr & active, actives) {
+         if (((active->default4() || active->default6()) && active->state() == NetworkManager::ActiveConnection::Activated) || !defaultRouteExists) {
++            NetworkManager::ActiveConnection::Ptr activeConnection;
++            if (active->vpn()) {
++                NetworkManager::ActiveConnection::Ptr activeTmp;
++                activeTmp = NetworkManager::findActiveConnection(active->specificObject());
++                if (activeTmp) {
++                    activeConnection = activeTmp;
++                }
+ 
+-            if (active->vpn() || active->devices().isEmpty()) {
++                vpnFound = true;
++                NMAppletDebug() << "Emit signal setHoverIcon(object-locked)";
++                Q_EMIT setHoverIcon("object-locked");
++            } else {
++                activeConnection = active;
++            }
++            if (activeConnection->devices().isEmpty()) {
+                 continue;
+             }
+-
+-            NetworkManager::Device::Ptr device = NetworkManager::findNetworkInterface(active->devices().first());
++            NetworkManager::Device::Ptr device = NetworkManager::findNetworkInterface(activeConnection->devices().first());
+             if (device) {
+                 NetworkManager::Device::Type type = device->type();
+ 
+@@ -184,7 +196,7 @@ void ConnectionIcon::setIcons()
+                         setWirelessIconForSignalStrength(100);
+                         connectionFound = true;
+                     } else {
+-                        NetworkManager::AccessPoint::Ptr ap = wifiDevice->findAccessPoint(active->specificObject());
++                        NetworkManager::AccessPoint::Ptr ap = wifiDevice->findAccessPoint(activeConnection->specificObject());
+                         if (ap) {
+                             setWirelessIcon(device, ap->ssid());
+                             connectionFound = true;
+@@ -222,9 +234,7 @@ void ConnectionIcon::setIcons()
+                     }
+                 }
+             }
+-        }
+-
+-        if (active->vpn() && active->state() == NetworkManager::ActiveConnection::Activated) {
++        } else if (active->vpn() && active->state() == NetworkManager::ActiveConnection::Activated) {
+             vpnFound = true;
+             NMAppletDebug() << "Emit signal setHoverIcon(object-locked)";
+             Q_EMIT setHoverIcon("object-locked");
+diff --git a/declarative-plugins/applet/networkstatus.cpp b/declarative-plugins/applet/networkstatus.cpp
+index d63066d..8149da9 100644
+--- a/declarative-plugins/applet/networkstatus.cpp
++++ b/declarative-plugins/applet/networkstatus.cpp
+@@ -129,8 +129,8 @@ void NetworkStatus::changeTooltip()
+     }
+ 
+     QString tooltip = "<qt>";
+-    QString format = "<b>%1 - %2</b><br>%3<br><br>";
+-    QString formatDefault = "<b>%1 - %2</b><br><b>%3</b><br><br>";
++    const QString format = "<b>%1 - %2</b><br>%3<br><br>";
++    const QString formatDefault = "<b>%1 - %2</b><br><b>%3</b><br><br>";
+ 
+     foreach (const NetworkManager::ActiveConnection::Ptr & active, NetworkManager::activeConnections()) {
+         if (!active->devices().isEmpty()) {
+@@ -145,7 +145,6 @@ void NetworkStatus::changeTooltip()
+                 } else {
+                     devName = device->ipInterfaceName();
+                 }
+-//                 conType = NetworkManager::ConnectionSettings::typeAsString(active->connection()->settings()->connectionType());
+                 if (active->vpn()) {
+                     conType = i18n("VPN Connection");
+                 } else {
+diff --git a/declarative-plugins/model/model.cpp b/declarative-plugins/model/model.cpp
+index 1b3f4c3..bb88362 100644
+--- a/declarative-plugins/model/model.cpp
++++ b/declarative-plugins/model/model.cpp
+@@ -230,7 +230,7 @@ void Model::addConnection(const QString& connection, const QString& device)
+ {
+     NetworkManager::Connection::Ptr con = NetworkManager::findConnection(connection);
+ 
+-    if (con->settings()->isSlave()) {
++    if (con->settings()->isSlave() || con->name().isEmpty() || con->uuid().isEmpty()) {
+         return;
+     }
+ 
+@@ -395,7 +395,11 @@ void Model::removeWirelessNetwork(const QString& ssid, const QString& device)
+         if (wirelessDevice) {
+             accessPoint = wirelessDevice->findAccessPoint(item->specificPath());
+         }
+-        if (accessPoint && accessPoint->mode() == NetworkManager::AccessPoint::Adhoc &&
++
++        // When accesspoint in ad-hoc mode dissapears, we should remove the item only when there is no connection. Similar case is when
++        // a wireless device is in AP mode, but in this case there could be only one visible AP and this should always be associated with some connection.
++        if (accessPoint && ((accessPoint->mode() == NetworkManager::AccessPoint::Adhoc && !item->connectionPath().isEmpty()) ||
++                            wirelessDevice->mode() == NetworkManager::WirelessDevice::ApMode) &&
+             NetworkManager::isWirelessEnabled() && NetworkManager::isWirelessHardwareEnabled()) {
+             item->setWirelessNetwork(QString());
+             if (updateItem(item)) {
+diff --git a/declarative-plugins/model/modelitem.cpp b/declarative-plugins/model/modelitem.cpp
+index 9a5931f..58d5c42 100644
+--- a/declarative-plugins/model/modelitem.cpp
++++ b/declarative-plugins/model/modelitem.cpp
+@@ -151,6 +151,17 @@ QString ModelItem::icon() const
+             break;
+         case NetworkManager::ConnectionSettings::Wireless:
+             if (m_signal == 0 ) {
++                if (!m_connectionPath.isEmpty()) {
++                    NetworkManager::Connection::Ptr con = NetworkManager::findConnection(m_connectionPath);
++                    if (con) {
++                        NetworkManager::WirelessSetting::Ptr wirelessSetting;
++                        wirelessSetting = con->settings()->setting(NetworkManager::Setting::Wireless).dynamicCast<NetworkManager::WirelessSetting>();
++                        if (wirelessSetting && (wirelessSetting->mode() == NetworkManager::WirelessSetting::Adhoc ||
++                                                wirelessSetting->mode() == NetworkManager::WirelessSetting::Ap)) {
++                            return "network-wireless-100";
++                        }
++                    }
++                }
+                 return "network-wireless-00";
+             } else if (m_signal < 20) {
+                 return "network-wireless-20";
+diff --git a/kded/bluetoothmonitor.cpp b/kded/bluetoothmonitor.cpp
+index 2221d09..5d0218b 100644
+--- a/kded/bluetoothmonitor.cpp
++++ b/kded/bluetoothmonitor.cpp
+@@ -220,6 +220,7 @@ void BluetoothMonitor::init()
+ 
+     mDunDevice = reply.value();
+ }
++
+ #if WITH_MODEMMANAGER_SUPPORT
+ void BluetoothMonitor::modemAdded(const QString &udi)
+ {
+diff --git a/lib/editor/bridgewidget.cpp b/lib/editor/bridgewidget.cpp
+index 8815eb2..95344c4 100644
+--- a/lib/editor/bridgewidget.cpp
++++ b/lib/editor/bridgewidget.cpp
+@@ -216,5 +216,5 @@ void BridgeWidget::populateBridges()
+ 
+ bool BridgeWidget::isValid() const
+ {
+-    return !m_ui->ifaceName->text().isEmpty() && m_ui->bridges->count() > 0;
++    return !m_ui->ifaceName->text().isEmpty();
+ }
+diff --git a/vpn/vpnc/vpnc.cpp b/vpn/vpnc/vpnc.cpp
+index d4a511d..645249d 100644
+--- a/vpn/vpnc/vpnc.cpp
++++ b/vpn/vpnc/vpnc.cpp
+@@ -145,7 +145,6 @@ NMVariantMapMap VpncUiPlugin::importConnectionSettings(const QString &fileName)
+     KConfigGroup cg(config, "main");   // Keys&Values are stored under [main]
+     if (cg.exists()) {
+         // Setup cisco-decrypt binary to decrypt the passwords
+-        QStringList decrArgs;
+         const QString ciscoDecryptBinary = KStandardDirs::findExe("cisco-decrypt", QString::fromLocal8Bit(qgetenv("PATH")) + ":/usr/lib/vpnc");
+         if (ciscoDecryptBinary.isEmpty()) {
+             mErrorMessage = i18n("Needed executable cisco-decrypt could not be found.");
+@@ -174,11 +173,11 @@ NMVariantMapMap VpncUiPlugin::importConnectionSettings(const QString &fileName)
+         }
+         else if (!decrPlugin->readStringKeyValue(cg,"enc_UserPassword").isEmpty() && !ciscoDecryptBinary.isEmpty()) {
+             // Decrypt the password and insert into map
+-            decrArgs.clear();
+-            decrArgs << decrPlugin->readStringKeyValue(cg,"enc_UserPassword");
+-            decrPlugin->ciscoDecrypt->setProgram(ciscoDecryptBinary, decrArgs);
++            decrPlugin->ciscoDecrypt->setProgram(ciscoDecryptBinary);
+             decrPlugin->ciscoDecrypt->start();
+-            if (decrPlugin->ciscoDecrypt->waitForStarted() && decrPlugin->ciscoDecrypt->waitForFinished()) {
++            decrPlugin->ciscoDecrypt->waitForStarted();
++            decrPlugin->ciscoDecrypt->write(decrPlugin->readStringKeyValue(cg,"enc_UserPassword").toUtf8());
++            if (decrPlugin->ciscoDecrypt->waitForFinished()) {
+                 secretData.insert(NM_VPNC_KEY_XAUTH_PASSWORD, decrPlugin->decryptedPasswd);
+             }
+         }
+@@ -203,11 +202,11 @@ NMVariantMapMap VpncUiPlugin::importConnectionSettings(const QString &fileName)
+         }
+         else if (!decrPlugin->readStringKeyValue(cg,"enc_GroupPwd").isEmpty() && !ciscoDecryptBinary.isEmpty()) {
+             //Decrypt the password and insert into map
+-            decrArgs.clear();
+-            decrArgs << decrPlugin->readStringKeyValue(cg,"enc_GroupPwd");
+-            decrPlugin->ciscoDecrypt->setProgram(ciscoDecryptBinary, decrArgs);
++            decrPlugin->ciscoDecrypt->setProgram(ciscoDecryptBinary);
+             decrPlugin->ciscoDecrypt->start();
+-            if (decrPlugin->ciscoDecrypt->waitForStarted() && decrPlugin->ciscoDecrypt->waitForFinished()) {
++            decrPlugin->ciscoDecrypt->waitForStarted();
++            decrPlugin->ciscoDecrypt->write(decrPlugin->readStringKeyValue(cg,"enc_GroupPwd").toUtf8());
++            if (decrPlugin->ciscoDecrypt->waitForFinished()) {
+                 secretData.insert(NM_VPNC_KEY_SECRET, decrPlugin->decryptedPasswd);
+                 data.insert(NM_VPNC_KEY_SECRET"-flags", QString::number(NetworkManager::Setting::AgentOwned));
+             }
diff --git a/extra/kdesdk-cervisia/PKGBUILD b/extra/kdesdk-cervisia/PKGBUILD
index 569da4072..aba451b1a 100644
--- a/extra/kdesdk-cervisia/PKGBUILD
+++ b/extra/kdesdk-cervisia/PKGBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdesdk-cervisia
-pkgver=4.11.2
+pkgver=4.11.3
 pkgrel=1
 pkgdesc='CVS Frontend'
 url='http://kde.org/applications/development/cervisia/'
@@ -13,7 +13,7 @@ depends=('kdebase-runtime')
 makedepends=('cmake' 'automoc4')
 install=${pkgname}.install
 source=("http://download.kde.org/stable/${pkgver}/src/cervisia-${pkgver}.tar.xz")
-sha1sums=('326bbab5cdb7a26d40a9813d3b6b63008e748b25')
+sha1sums=('5a15700bff3faf2dfddf440708edcb8e18163505')
 
 build() {
   mkdir build
diff --git a/extra/kdesdk-dev-scripts/PKGBUILD b/extra/kdesdk-dev-scripts/PKGBUILD
index 543a7bde1..5a77797e8 100644
--- a/extra/kdesdk-dev-scripts/PKGBUILD
+++ b/extra/kdesdk-dev-scripts/PKGBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdesdk-dev-scripts
-pkgver=4.11.2
+pkgver=4.11.3
 pkgrel=1
 pkgdesc='Scripts and setting files useful during development of KDE software'
 url='https://projects.kde.org/projects/kde/kdesdk/kde-dev-scripts'
@@ -12,7 +12,7 @@ groups=('kde' 'kdesdk')
 depends=('kdebase-runtime' 'python2')
 makedepends=('cmake' 'automoc4')
 source=("http://download.kde.org/stable/${pkgver}/src/kde-dev-scripts-${pkgver}.tar.xz")
-sha1sums=('228df6780ba192d6b345df10aefeb49254f13362')
+sha1sums=('dc372da52cc14272974164aae8daa26a05e2e8c3')
 
 build() {
   mkdir build
diff --git a/extra/kdesdk-dev-utils/PKGBUILD b/extra/kdesdk-dev-utils/PKGBUILD
index bbace57b0..9a5f8fc43 100644
--- a/extra/kdesdk-dev-utils/PKGBUILD
+++ b/extra/kdesdk-dev-utils/PKGBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdesdk-dev-utils
-pkgver=4.11.2
+pkgver=4.11.3
 pkgrel=1
 pkgdesc='Small utilities for developers using KDE/Qt libs/frameworks'
 url='https://projects.kde.org/projects/kde/kdesdk/kde-dev-utils'
@@ -17,7 +17,7 @@ replaces=('kdesdk-kmtrace' 'kdesdk-kpartloader' 'kdesdk-kprofilemethod'
           'kdesdk-kstartperf' 'kdesdk-kuiviewer')
 install=${pkgname}.install
 source=("http://download.kde.org/stable/${pkgver}/src/kde-dev-utils-${pkgver}.tar.xz")
-sha1sums=('156728376241093275639b0ac97736c432ee99ce')
+sha1sums=('0c8a8130e8e50b6fef336482c382533d9ff0ef83')
 
 build() {
   mkdir build
diff --git a/extra/kdesdk-dolphin-plugins/PKGBUILD b/extra/kdesdk-dolphin-plugins/PKGBUILD
index 70c8cb4c2..8afead78f 100644
--- a/extra/kdesdk-dolphin-plugins/PKGBUILD
+++ b/extra/kdesdk-dolphin-plugins/PKGBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdesdk-dolphin-plugins
-pkgver=4.11.2
+pkgver=4.11.3
 pkgrel=1
 pkgdesc='Extra Dolphin plugins'
 url='https://projects.kde.org/projects/kde/kdesdk/dolphin-plugins'
@@ -17,7 +17,7 @@ optdepends=('bzr: bazaar support'
             'subversion: svn support')
 install=${pkgname}.install
 source=("http://download.kde.org/stable/${pkgver}/src/dolphin-plugins-${pkgver}.tar.xz")
-sha1sums=('74e493c65046dc7e42dda1309650ca7c4ca9fc85')
+sha1sums=('bea6d35772eb4de7db38ab77db56e397abf8c171')
 
 build() {
   mkdir build
diff --git a/extra/kdesdk-kapptemplate/PKGBUILD b/extra/kdesdk-kapptemplate/PKGBUILD
index d979f81eb..8bb65eb98 100644
--- a/extra/kdesdk-kapptemplate/PKGBUILD
+++ b/extra/kdesdk-kapptemplate/PKGBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdesdk-kapptemplate
-pkgver=4.11.2
+pkgver=4.11.3
 pkgrel=1
 pkgdesc='KDE Template Generator'
 url='http://kde.org/applications/development/kapptemplate/'
@@ -13,7 +13,7 @@ depends=('kdebase-runtime')
 makedepends=('cmake' 'automoc4')
 install=${pkgname}.install
 source=("http://download.kde.org/stable/${pkgver}/src/kapptemplate-${pkgver}.tar.xz")
-sha1sums=('083698f4329337ef4e96b54ad30e9e7b9ed2eede')
+sha1sums=('a0a8f04819b828c4bb0ccd85d77ac3861667ab72')
 
 build() {
   mkdir build
diff --git a/extra/kdesdk-kate/PKGBUILD b/extra/kdesdk-kate/PKGBUILD
index e5be2b6a1..8c3cd1969 100644
--- a/extra/kdesdk-kate/PKGBUILD
+++ b/extra/kdesdk-kate/PKGBUILD
@@ -1,18 +1,18 @@
-# $Id: PKGBUILD 195516 2013-10-01 15:15:04Z svenstaro $
+# $Id: PKGBUILD 198829 2013-11-05 19:45:10Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgbase=kdesdk-kate
 pkgname=('kdebase-katepart'
          'kdebase-kwrite'
          'kdesdk-kate')
-pkgver=4.11.2
+pkgver=4.11.3
 pkgrel=1
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL' 'LGPL' 'FDL')
 makedepends=('kdelibs ''cmake' 'automoc4' 'kdebindings-python')
 source=("http://download.kde.org/stable/${pkgver}/src/kate-${pkgver}.tar.xz"
         'pkgbuild-syntax-highlight.patch')
-sha1sums=('3cb7211d2523b955d640808d45feaa68699f11f7'
+sha1sums=('c3e537ac9f47ba2c4b0d9ec7aef1c64c8060df79'
           '80c324c9db81c07a02374e7a092d75e0bdd6b4ea')
 
 prepare() {
diff --git a/extra/kdesdk-kcachegrind/PKGBUILD b/extra/kdesdk-kcachegrind/PKGBUILD
index b3c029b5a..191bfa49f 100644
--- a/extra/kdesdk-kcachegrind/PKGBUILD
+++ b/extra/kdesdk-kcachegrind/PKGBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdesdk-kcachegrind
-pkgver=4.11.2
+pkgver=4.11.3
 pkgrel=1
 pkgdesc='Visualization of Performance Profiling Data'
 url='http://kde.org/applications/development/kcachegrind/'
@@ -14,7 +14,7 @@ makedepends=('cmake' 'automoc4')
 optdepends=('php: PHP support')
 install=${pkgname}.install
 source=("http://download.kde.org/stable/${pkgver}/src/kcachegrind-${pkgver}.tar.xz")
-sha1sums=('e04d45340696709aef2a569d16996ac1f0633820')
+sha1sums=('7924d775688f0ecdadbe15ed59b5a00464efa16d')
 
 build() {
   mkdir build
diff --git a/extra/kdesdk-kioslaves/PKGBUILD b/extra/kdesdk-kioslaves/PKGBUILD
index ac846f03c..28e785f4f 100644
--- a/extra/kdesdk-kioslaves/PKGBUILD
+++ b/extra/kdesdk-kioslaves/PKGBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdesdk-kioslaves
-pkgver=4.11.2
+pkgver=4.11.3
 pkgrel=1
 pkgdesc='KIO-Slaves'
 url='https://projects.kde.org/projects/kde/kdesdk/kdesdk-kioslaves'
@@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'subversion')
 makedepends=('cmake' 'automoc4')
 install=${pkgname}.install
 source=("http://download.kde.org/stable/${pkgver}/src/kdesdk-kioslaves-${pkgver}.tar.xz")
-sha1sums=('865bf780ac091884bc486aa3d64c75c0ece183e4')
+sha1sums=('177d78db40c568a51c74d2c1e2e48d3838254e09')
 
 build() {
   mkdir build
diff --git a/extra/kdesdk-kompare/PKGBUILD b/extra/kdesdk-kompare/PKGBUILD
index 8795b8e04..4c857b1bc 100644
--- a/extra/kdesdk-kompare/PKGBUILD
+++ b/extra/kdesdk-kompare/PKGBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdesdk-kompare
-pkgver=4.11.2
+pkgver=4.11.3
 pkgrel=1
 pkgdesc='Diff/Patch Frontend'
 url='http://kde.org/applications/development/kompare/'
@@ -13,7 +13,7 @@ depends=('kdebase-runtime')
 makedepends=('cmake' 'automoc4')
 install=${pkgname}.install
 source=("http://download.kde.org/stable/${pkgver}/src/kompare-${pkgver}.tar.xz")
-sha1sums=('fc9e07e3ace90d83a010d8949dcddf6519b0917e')
+sha1sums=('7847720ac971d86a5b16309b024035db8e3bf3d3')
 
 build() {
   mkdir build
diff --git a/extra/kdesdk-lokalize/PKGBUILD b/extra/kdesdk-lokalize/PKGBUILD
index 51b3032fe..aac50809a 100644
--- a/extra/kdesdk-lokalize/PKGBUILD
+++ b/extra/kdesdk-lokalize/PKGBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdesdk-lokalize
-pkgver=4.11.2
+pkgver=4.11.3
 pkgrel=1
 pkgdesc='Computer-Aided Translation System'
 url='http://kde.org/applications/development/lokalize/'
@@ -16,7 +16,7 @@ optdepends=('translate-toolkit: enable extra scripts'
 install=${pkgname}.install
 source=("http://download.kde.org/stable/${pkgver}/src/lokalize-${pkgver}.tar.xz"
         'fix-python2-path.patch')
-sha1sums=('875429ea7297003843efa357bf1e110eed967075'
+sha1sums=('2a95316eae1045ed27ea2580d5530c5e9fa7d2f7'
           '07db42bbcae402c292eebf002e549b04162621c5')
 
 prepare() {
diff --git a/extra/kdesdk-okteta/PKGBUILD b/extra/kdesdk-okteta/PKGBUILD
index 260918745..3d62399ba 100644
--- a/extra/kdesdk-okteta/PKGBUILD
+++ b/extra/kdesdk-okteta/PKGBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdesdk-okteta
-pkgver=4.11.2
+pkgver=4.11.3
 pkgrel=1
 pkgdesc='Hex Editor'
 url='http://kde.org/applications/utilities/okteta/'
@@ -13,7 +13,7 @@ depends=('kdebase-runtime')
 makedepends=('cmake' 'automoc4')
 install=${pkgname}.install
 source=("http://download.kde.org/stable/${pkgver}/src/okteta-${pkgver}.tar.xz")
-sha1sums=('c7616231bf0b3d4273075a05c52c67ae2f80b721')
+sha1sums=('1b6d7a8911e401def759ac562fd0205a1160fa9b')
 
 build() {
   mkdir build
diff --git a/extra/kdesdk-poxml/PKGBUILD b/extra/kdesdk-poxml/PKGBUILD
index 8815145da..a06233bc4 100644
--- a/extra/kdesdk-poxml/PKGBUILD
+++ b/extra/kdesdk-poxml/PKGBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdesdk-poxml
-pkgver=4.11.2
+pkgver=4.11.3
 pkgrel=1
 pkgdesc='Translates DocBook XML files using gettext po files'
 url='https://projects.kde.org/projects/kde/kdesdk/poxml'
@@ -13,7 +13,7 @@ depends=('kdelibs')
 makedepends=('cmake' 'automoc4' 'antlr2')
 optdepends=('antlr2: required for po2xml and swappo tool')
 source=("http://download.kde.org/stable/${pkgver}/src/poxml-${pkgver}.tar.xz")
-sha1sums=('fa435373c74e5260a3ae423c236670f0bac70a33')
+sha1sums=('543bd37fdd8e876950aaaea254b53de0bdd122ae')
 
 build() {
   mkdir build
diff --git a/extra/kdesdk-strigi-analyzers/PKGBUILD b/extra/kdesdk-strigi-analyzers/PKGBUILD
index a6e2e98bb..1326dacfc 100644
--- a/extra/kdesdk-strigi-analyzers/PKGBUILD
+++ b/extra/kdesdk-strigi-analyzers/PKGBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdesdk-strigi-analyzers
-pkgver=4.11.2
+pkgver=4.11.3
 pkgrel=1
 pkgdesc='Analyzer plugins for strigi'
 url='https://projects.kde.org/projects/kde/kdesdk/kdesdk-strigi-analyzers'
@@ -12,7 +12,7 @@ groups=('kde' 'kdesdk')
 depends=('kdebase-runtime')
 makedepends=('cmake' 'automoc4')
 source=("http://download.kde.org/stable/${pkgver}/src/kdesdk-strigi-analyzers-${pkgver}.tar.xz")
-sha1sums=('1635a71fdcd83060a534356b99d3c0a70ca7a6ab')
+sha1sums=('c7672d1aaa6ecff3245c080252693536e7673461')
 
 build() {
   mkdir build
diff --git a/extra/kdesdk-thumbnailers/PKGBUILD b/extra/kdesdk-thumbnailers/PKGBUILD
index 7fd139d34..871977f2c 100644
--- a/extra/kdesdk-thumbnailers/PKGBUILD
+++ b/extra/kdesdk-thumbnailers/PKGBUILD
@@ -1,18 +1,18 @@
-# $Id$
+# $Id: PKGBUILD 198965 2013-11-05 20:21:59Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdesdk-thumbnailers
-pkgver=4.11.2
+pkgver=4.11.3
 pkgrel=1
 pkgdesc='Plugins for the thumbnailing system'
-url='http://kde.org/applications/development/cervisia/'
+url='https://projects.kde.org/projects/kde/kdesdk/kdesdk-thumbnailers'
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL' 'LGPL' 'FDL')
 groups=('kde' 'kdesdk')
 depends=('kdebase-runtime')
 makedepends=('cmake' 'automoc4')
 source=("http://download.kde.org/stable/${pkgver}/src/kdesdk-thumbnailers-${pkgver}.tar.xz")
-sha1sums=('b4f2c15838bdb21c807b0317f505ad6209829e5a')
+sha1sums=('cd3aeee2dbb685ec5d6eaccc513ac3571c1a20bb')
 
 build() {
   mkdir build
diff --git a/extra/kdesdk-umbrello/PKGBUILD b/extra/kdesdk-umbrello/PKGBUILD
index 8b6081cab..0e0603afd 100644
--- a/extra/kdesdk-umbrello/PKGBUILD
+++ b/extra/kdesdk-umbrello/PKGBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdesdk-umbrello
-pkgver=4.11.2
+pkgver=4.11.3
 pkgrel=1
 pkgdesc='UML Modeller'
 url='http://kde.org/applications/development/umbrello/'
@@ -14,7 +14,7 @@ makedepends=('cmake' 'automoc4' 'boost')
 optdepends=('ruby')
 install=${pkgname}.install
 source=("http://download.kde.org/stable/${pkgver}/src/umbrello-${pkgver}.tar.xz")
-sha1sums=('8a42f8188608610062bebd2243b88b6145a3af0a')
+sha1sums=('98274cfe91db7b56429a9de0d23ae490adee9ce0')
 
 build() {
   mkdir build
diff --git a/extra/kdetoys-amor/PKGBUILD b/extra/kdetoys-amor/PKGBUILD
index 38cc0c33f..27b4196f1 100644
--- a/extra/kdetoys-amor/PKGBUILD
+++ b/extra/kdetoys-amor/PKGBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdetoys-amor
-pkgver=4.11.2
+pkgver=4.11.3
 pkgrel=1
 pkgdesc='On-Screen Creature'
 url='https://projects.kde.org/projects/kde/kdetoys/amor'
@@ -13,7 +13,7 @@ depends=('kdebase-runtime')
 makedepends=('cmake' 'automoc4')
 install=${pkgname}.install
 source=("http://download.kde.org/stable/${pkgver}/src/amor-${pkgver}.tar.xz")
-sha1sums=('67fe2a99457f6fc7b7dd7b84e4f6690d9134ce45')
+sha1sums=('b118d2fbee168d5bfd386ea67994f9730e80c5dc')
 
 build() {
   mkdir build
diff --git a/extra/kdetoys-kteatime/PKGBUILD b/extra/kdetoys-kteatime/PKGBUILD
index 426f20cf7..c92f0c375 100644
--- a/extra/kdetoys-kteatime/PKGBUILD
+++ b/extra/kdetoys-kteatime/PKGBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdetoys-kteatime
-pkgver=4.11.2
+pkgver=4.11.3
 pkgrel=1
 pkgdesc='Tea Cooker'
 url='http://kde.org/applications/games/kteatime/'
@@ -13,7 +13,7 @@ depends=('kdebase-runtime')
 makedepends=('cmake' 'automoc4')
 install=${pkgname}.install
 source=("http://download.kde.org/stable/${pkgver}/src/kteatime-${pkgver}.tar.xz")
-sha1sums=('253b2a66d9095ce9af969b8cfe5b0f83573e1b5c')
+sha1sums=('5359a97a9a46ca75cd1ed7173182f838d929a4f5')
 
 build() {
   mkdir build
diff --git a/extra/kdetoys-ktux/PKGBUILD b/extra/kdetoys-ktux/PKGBUILD
index f044d66f4..a03f5e915 100644
--- a/extra/kdetoys-ktux/PKGBUILD
+++ b/extra/kdetoys-ktux/PKGBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdetoys-ktux
-pkgver=4.11.2
+pkgver=4.11.3
 pkgrel=1
 pkgdesc='A Tux-in-a-spaceship screen saver'
 url='https://projects.kde.org/projects/kde/kdetoys/ktux'
@@ -13,7 +13,7 @@ depends=('kdebase-workspace')
 makedepends=('cmake' 'automoc4')
 install=${pkgname}.install
 source=("http://download.kde.org/stable/${pkgver}/src/ktux-${pkgver}.tar.xz")
-sha1sums=('6012c3ada2dd4096c435bf45222021c9ec989b2f')
+sha1sums=('333b912e51ec5c57d3346d8b7c609cc284d41e08')
 
 build() {
   mkdir build
diff --git a/extra/kdeutils-filelight/PKGBUILD b/extra/kdeutils-filelight/PKGBUILD
index 3bbeaf21d..de0f2147c 100644
--- a/extra/kdeutils-filelight/PKGBUILD
+++ b/extra/kdeutils-filelight/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 195796 2013-10-01 15:37:12Z svenstaro $
+# $Id: PKGBUILD 198971 2013-11-05 20:24:57Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdeutils-filelight
-pkgver=4.11.2
+pkgver=4.11.3
 pkgrel=1
 pkgdesc='View disk usage information'
 url='http://kde.org/applications/utilities/filelight'
@@ -15,7 +15,7 @@ replaces=('filelight')
 conflicts=('filelight')
 install=${pkgname}.install
 source=("http://download.kde.org/stable/${pkgver}/src/filelight-${pkgver}.tar.xz")
-sha1sums=('58141b28830c223314377e0f71e09fdf0d7a67fc')
+sha1sums=('70b950c66d3eb517b59aac5119150b14ef7cb467')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/kdeutils-kcalc/PKGBUILD b/extra/kdeutils-kcalc/PKGBUILD
index d2410dc5b..1476d580e 100644
--- a/extra/kdeutils-kcalc/PKGBUILD
+++ b/extra/kdeutils-kcalc/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 195798 2013-10-01 15:37:21Z svenstaro $
+# $Id: PKGBUILD 198972 2013-11-05 20:25:05Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdeutils-kcalc
-pkgver=4.11.2
+pkgver=4.11.3
 pkgrel=1
 pkgdesc='Scientific Calculator'
 url='http://kde.org/applications/utilities/kcalc/'
@@ -13,7 +13,7 @@ makedepends=('cmake' 'automoc4')
 groups=('kde' 'kdeutils')
 install=${pkgname}.install
 source=("http://download.kde.org/stable/${pkgver}/src/kcalc-${pkgver}.tar.xz")
-sha1sums=('371aee1cd09cae646cfe2ed98bfca5074af8173c')
+sha1sums=('a62a37a16a699fdba715cda33b9f75755d81cb76')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/kdeutils-kcharselect/PKGBUILD b/extra/kdeutils-kcharselect/PKGBUILD
index 1aaf50a5b..334730c67 100644
--- a/extra/kdeutils-kcharselect/PKGBUILD
+++ b/extra/kdeutils-kcharselect/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 195800 2013-10-01 15:37:29Z svenstaro $
+# $Id: PKGBUILD 198973 2013-11-05 20:25:14Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdeutils-kcharselect
-pkgver=4.11.2
+pkgver=4.11.3
 pkgrel=1
 pkgdesc='Character Selector'
 url="http://kde.org/applications/utilities/kcharselect/"
@@ -12,7 +12,7 @@ depends=('kdebase-runtime')
 makedepends=('cmake' 'automoc4')
 groups=('kde' 'kdeutils')
 source=("http://download.kde.org/stable/${pkgver}/src/kcharselect-${pkgver}.tar.xz")
-sha1sums=('cdec14bedb6d436e21611c71c787d5b4ad24a2f6')
+sha1sums=('7fd5c926fc4d3c94690d03c883e5efd5a97d5b89')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/kdeutils-kdf/PKGBUILD b/extra/kdeutils-kdf/PKGBUILD
index 1f666aecf..1240c41fe 100644
--- a/extra/kdeutils-kdf/PKGBUILD
+++ b/extra/kdeutils-kdf/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 195802 2013-10-01 15:37:37Z svenstaro $
+# $Id: PKGBUILD 198974 2013-11-05 20:25:21Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdeutils-kdf
-pkgver=4.11.2
+pkgver=4.11.3
 pkgrel=1
 url="http://kde.org/applications/system/kdiskfree/"
 arch=('i686' 'x86_64' 'mips64el')
@@ -13,7 +13,7 @@ makedepends=('cmake' 'automoc4')
 groups=('kde' 'kdeutils')
 install=${pkgname}.install
 source=("http://download.kde.org/stable/${pkgver}/src/kdf-${pkgver}.tar.xz")
-sha1sums=('4bf2e637c31916dc51682cd0174ba7391458e185')
+sha1sums=('acd04e1fff3d410e2e3766871cac7bb086091c49')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/kdeutils-kfloppy/PKGBUILD b/extra/kdeutils-kfloppy/PKGBUILD
index ac76da662..d59673532 100644
--- a/extra/kdeutils-kfloppy/PKGBUILD
+++ b/extra/kdeutils-kfloppy/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 195804 2013-10-01 15:37:44Z svenstaro $
+# $Id: PKGBUILD 198975 2013-11-05 20:25:29Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdeutils-kfloppy
-pkgver=4.11.2
+pkgver=4.11.3
 pkgrel=1
 pkgdesc='Floppy Formatter'
 url='http://kde.org/applications/utilities/kfloppy/'
@@ -13,7 +13,7 @@ makedepends=('cmake' 'automoc4')
 groups=('kde' 'kdeutils')
 install=${pkgname}.install
 source=("http://download.kde.org/stable/${pkgver}/src/kfloppy-${pkgver}.tar.xz")
-sha1sums=('6c09ec058822e742b1a34c3d720996c0208f023c')
+sha1sums=('2e1588840cb5fd396c21d69ae3011efdcb6cf043')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/kdeutils-kgpg/PKGBUILD b/extra/kdeutils-kgpg/PKGBUILD
index e97c30ddd..2390382d1 100644
--- a/extra/kdeutils-kgpg/PKGBUILD
+++ b/extra/kdeutils-kgpg/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 195806 2013-10-01 15:37:52Z svenstaro $
+# $Id: PKGBUILD 198976 2013-11-05 20:25:37Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdeutils-kgpg
-pkgver=4.11.2
+pkgver=4.11.3
 pkgrel=1
 pkgdesc='A GnuPG frontend'
 url='http://kde.org/applications/utilities/kgpg/'
@@ -13,7 +13,7 @@ makedepends=('cmake' 'automoc4')
 groups=('kde' 'kdeutils')
 install=${pkgname}.install
 source=("http://download.kde.org/stable/${pkgver}/src/kgpg-${pkgver}.tar.xz")
-sha1sums=('a48013a5da3499d72e8edce0fd4917b2fd0bb315')
+sha1sums=('8b2172abb9ee002d1ac65d77363f29ece238aeb4')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/kdeutils-kremotecontrol/PKGBUILD b/extra/kdeutils-kremotecontrol/PKGBUILD
index de1ed00e0..1bb885a7c 100644
--- a/extra/kdeutils-kremotecontrol/PKGBUILD
+++ b/extra/kdeutils-kremotecontrol/PKGBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdeutils-kremotecontrol
-pkgver=4.11.2
+pkgver=4.11.3
 pkgrel=1
 pkgdesc='Configure your remote controls for use with applications'
 url='http://kde.org/applications/utilities/kremotecontrol/'
@@ -15,7 +15,7 @@ replaces=('kdeutils-kdelirc')
 conflicts=('kdeutils-kdelirc')
 install=${pkgname}.install
 source=("http://download.kde.org/stable/${pkgver}/src/kremotecontrol-${pkgver}.tar.xz")
-sha1sums=('a129eb1d9c268d77caa713ab0a16e791811606f2')
+sha1sums=('deddf6f8e2310d955902d49c8b6b73fae635fd77')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/kdeutils-ktimer/PKGBUILD b/extra/kdeutils-ktimer/PKGBUILD
index c5dd4d318..634a66be4 100644
--- a/extra/kdeutils-ktimer/PKGBUILD
+++ b/extra/kdeutils-ktimer/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 195810 2013-10-01 15:38:07Z svenstaro $
+# $Id: PKGBUILD 198978 2013-11-05 20:25:54Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdeutils-ktimer
-pkgver=4.11.2
+pkgver=4.11.3
 pkgrel=1
 pkgdesc='Countdown Launcher'
 url='http://kde.org/applications/utilities/ktimer/'
@@ -13,7 +13,7 @@ makedepends=('cmake' 'automoc4')
 groups=('kde' 'kdeutils')
 install=${pkgname}.install
 source=("http://download.kde.org/stable/${pkgver}/src/ktimer-${pkgver}.tar.xz")
-sha1sums=('d05ed7f30847046cd04f0f69848b07223c05e994')
+sha1sums=('f6d8f80ecb79a4baf26ae54f681026a2c9363319')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/kdeutils-kwallet/PKGBUILD b/extra/kdeutils-kwallet/PKGBUILD
index 5fede273b..78f71dc51 100644
--- a/extra/kdeutils-kwallet/PKGBUILD
+++ b/extra/kdeutils-kwallet/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 195812 2013-10-01 15:38:15Z svenstaro $
+# $Id: PKGBUILD 198979 2013-11-05 20:26:01Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdeutils-kwallet
-pkgver=4.11.2
+pkgver=4.11.3
 pkgrel=1
 pkgdesc='Wallet Management Tool'
 url='http://kde.org/applications/system/kwalletmanager/'
@@ -13,7 +13,7 @@ makedepends=('cmake' 'automoc4')
 groups=('kde' 'kdeutils')
 install=${pkgname}.install
 source=("http://download.kde.org/stable/${pkgver}/src/kwallet-${pkgver}.tar.xz")
-sha1sums=('bf72073284d6e12763eb7a02a3f8742839da9cf7')
+sha1sums=('7d9a7cfdec09d7acf662aba75478bbd41b52e1ad')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/kdeutils-print-manager/PKGBUILD b/extra/kdeutils-print-manager/PKGBUILD
index e10750c6c..39e061087 100644
--- a/extra/kdeutils-print-manager/PKGBUILD
+++ b/extra/kdeutils-print-manager/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 195814 2013-10-01 15:38:23Z svenstaro $
+# $Id: PKGBUILD 198980 2013-11-05 20:26:10Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdeutils-print-manager
-pkgver=4.11.2
+pkgver=4.11.3
 pkgrel=1
 pkgdesc="A tool for managing print jobs and printers"
 arch=('i686' 'x86_64' 'mips64el')
@@ -15,7 +15,7 @@ replaces=('print-manager' 'kdeutils-printer-applet' 'kdeadmin-system-config-prin
 conflicts=('print-manager')
 groups=('kde' 'kdeutils')
 source=("http://download.kde.org/stable/${pkgver}/src/print-manager-${pkgver}.tar.xz")
-sha1sums=('955be477961aed2cbcdb7a69c845fed2e8d0698a')
+sha1sums=('d477e8cf7ea96ba0b1c842e557ca2860cec37df5')
 
 build() {
   mkdir build
diff --git a/extra/kdeutils-superkaramba/PKGBUILD b/extra/kdeutils-superkaramba/PKGBUILD
index 5547364ab..b8cc0b1f3 100644
--- a/extra/kdeutils-superkaramba/PKGBUILD
+++ b/extra/kdeutils-superkaramba/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 195816 2013-10-01 15:38:31Z svenstaro $
+# $Id: PKGBUILD 198981 2013-11-05 20:26:18Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdeutils-superkaramba
-pkgver=4.11.2
+pkgver=4.11.3
 pkgrel=1
 pkgdesc='An engine for cool desktop eyecandy'
 url='http://kde.org/applications/utilities/superkaramba/'
@@ -13,7 +13,7 @@ makedepends=('cmake' 'automoc4')
 groups=('kde' 'kdeutils')
 install=${pkgname}.install
 source=("http://download.kde.org/stable/${pkgver}/src/superkaramba-${pkgver}.tar.xz")
-sha1sums=('2be1b912a0908bc8b43d3a401786ec58d0584f2a')
+sha1sums=('19211613d819f79fae23c726e123fd25d65f2ca6')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/kdeutils-sweeper/PKGBUILD b/extra/kdeutils-sweeper/PKGBUILD
index 44897a8c6..de7b8b918 100644
--- a/extra/kdeutils-sweeper/PKGBUILD
+++ b/extra/kdeutils-sweeper/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 195818 2013-10-01 15:38:38Z svenstaro $
+# $Id: PKGBUILD 198982 2013-11-05 20:27:12Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdeutils-sweeper
-pkgver=4.11.2
+pkgver=4.11.3
 pkgrel=1
 pkgdesc='System Cleaner'
 url='http://kde.org/applications/utilities/sweeper'
@@ -12,7 +12,7 @@ depends=('kdebase-runtime')
 makedepends=('cmake' 'automoc4')
 groups=('kde' 'kdeutils')
 source=("http://download.kde.org/stable/${pkgver}/src/sweeper-${pkgver}.tar.xz")
-sha1sums=('e310f79fa232518b3b413b62162127e37bd1e146')
+sha1sums=('f2badf883646ff5a12c4f4daf309a87dba0e8af9')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/kdevelop-php/PKGBUILD b/extra/kdevelop-php/PKGBUILD
index bb1540cb2..a7125d836 100644
--- a/extra/kdevelop-php/PKGBUILD
+++ b/extra/kdevelop-php/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 186676 2013-05-30 12:44:27Z andrea $
+# $Id: PKGBUILD 198620 2013-10-30 22:42:00Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdevelop-php
-pkgver=1.5.1
-_pkgver=4.5.1
+pkgver=1.5.2
+_pkgver=4.5.2
 pkgrel=1
-pkgdesc="PHP language and documentation plugin for KDevelop/Quanta"
+pkgdesc="PHP language and documentation plugin for KDevelop"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.kdevelop.org/"
 license=('GPL')
@@ -13,12 +13,16 @@ depends=('kdevelop')
 makedepends=('cmake' 'automoc4' 'kdevelop-pg-qt')
 replaces=('kdevelop-php-docs')
 conflicts=('kdevelop-php-docs')
-source=(http://download.kde.org/stable/kdevelop/${_pkgver}/src/${pkgname}-{,docs-}${pkgver}.tar.bz2)
-sha1sums=('c047724c255417b361d3ce1898555c2b9183f5b2'
-          '9bdb654373970f46d01359fdcae6d879c405760a')
+source=(http://download.kde.org/stable/kdevelop/${_pkgver}/src/${pkgname}-{,docs-}${pkgver}.tar.xz)
+sha1sums=('784f76dd12ee0ab443fa0f9d05d0e3062aafdb38'
+          '44e737743d0c9663912480508adac0ccbb826a56')
 
-build() {
+prepare() {
   mkdir build
+  mkdir build-docs
+}
+
+build() {
   cd build
   cmake ../${pkgname}-${pkgver} \
     -DCMAKE_INSTALL_PREFIX=/usr \
@@ -27,7 +31,6 @@ build() {
   cd ../
 
   # kdevelop-php-docs
-  mkdir build-docs
   cd build-docs
   cmake ../${pkgname}-docs-${pkgver} \
     -DCMAKE_INSTALL_PREFIX=/usr \
diff --git a/extra/kdevelop-python/PKGBUILD b/extra/kdevelop-python/PKGBUILD
index 394399342..4dc31ff6f 100644
--- a/extra/kdevelop-python/PKGBUILD
+++ b/extra/kdevelop-python/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 186211 2013-05-22 06:00:43Z andrea $
+# $Id: PKGBUILD 197794 2013-10-30 08:55:59Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdevelop-python
-pkgver=1.5.1
+pkgver=1.5.2
 pkgrel=1
 pkgdesc="Python language and documentation plugin for KDevelop"
 arch=('i686' 'x86_64' 'mips64el')
@@ -10,11 +10,14 @@ url="http://www.kdevelop.org/"
 license=('GPL')
 depends=('kdevelop')
 makedepends=('cmake' 'automoc4' 'kdevelop-pg-qt')
-source=("http://download.kde.org/stable/kdevelop/kdev-python/${pkgver}/src/kdev-python-v${pkgver}.tar.bz2")
-sha1sums=('accc8950a380e663bcfe3f51e4e5a6653ff8c146')
+source=("http://download.kde.org/stable/kdevelop/kdev-python/${pkgver}/src/kdev-python-v${pkgver}.tar.xz")
+sha1sums=('aa08a4f164fabde363b1bc5141e1f673405949f3')
 
-build() {
+prepare() {
   mkdir build
+}
+
+build() {
   cd build
   cmake ../kdev-python-v${pkgver} \
     -DCMAKE_INSTALL_PREFIX=/usr \
diff --git a/extra/kdevelop/PKGBUILD b/extra/kdevelop/PKGBUILD
index 0ed239bc9..abdaad6a2 100644
--- a/extra/kdevelop/PKGBUILD
+++ b/extra/kdevelop/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 186674 2013-05-30 12:43:58Z andrea $
+# $Id: PKGBUILD 198618 2013-10-30 22:40:58Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Giovanni Scafora <giovanni@archlinux.org>
 
 pkgname=kdevelop
-pkgver=4.5.1
+pkgver=4.5.2
 pkgrel=1
 pkgdesc="A C/C++ development environment for KDE"
 arch=('i686' 'x86_64' 'mips64el')
@@ -11,18 +11,24 @@ url="http://www.kdevelop.org/"
 license=('GPL')
 depends=('kdebase-workspace' 'kdevplatform' 'kdebase-katepart')
 makedepends=('cmake' 'automoc4' 'kdesdk-okteta')
-optdepends=('kdesdk-okteta: hex editor'
+optdepends=('kdesdk-okteta: hex editor integration'
             'kdebase-konsole: embedded terminal'
-            'git: git support'
-            'gdb: gdb support'
-            'qt-doc: qt documentation integration')
+            'git: Git support'
+            'subversion: SVN support'
+            'cvs: Concurrent Versions System support'
+            'gdb: GNU Debugger support'
+            'qt5-doc: Qt documentation integration'
+            'cmake: cmake integration')
 install="${pkgname}.install"
-source=("http://download.kde.org/stable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2")
-sha1sums=('e27b77bca0b4c466f66b24167ec416f20b353f6f')
+source=("http://download.kde.org/stable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.xz")
+sha1sums=('3bd354ca9ff8562c8099a41836ccd72456561409')
 
-build() {
+prepare() {
   mkdir build
-  cd build 
+}
+
+build() {
+  cd build
   cmake ../${pkgname}-${pkgver} \
     -DCMAKE_INSTALL_PREFIX=/usr \
     -DCMAKE_BUILD_TYPE=Release
diff --git a/extra/kdevplatform/PKGBUILD b/extra/kdevplatform/PKGBUILD
index 03ef9b94b..d7be656c0 100644
--- a/extra/kdevplatform/PKGBUILD
+++ b/extra/kdevplatform/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 186672 2013-05-30 12:43:39Z andrea $
+# $Id: PKGBUILD 198616 2013-10-30 22:25:51Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Giovanni Scafora <giovanni@archlinux.org>
 
 pkgname=kdevplatform
-pkgver=1.5.1
-_pkgver=4.5.1
+pkgver=1.5.2
+_pkgver=4.5.2
 pkgrel=1
 pkgdesc="A C/C++ development platform for KDE"
 arch=('i686' 'x86_64' 'mips64el')
@@ -13,13 +13,16 @@ license=('GPL')
 depends=('kdelibs' 'subversion' 'qjson')
 optdepends=("kdesdk-kompare: difference checking")
 makedepends=('cmake' 'automoc4' 'boost')
-install=${pkgname}.install
-source=("http://download.kde.org/stable/kdevelop/${_pkgver}/src/${pkgname}-${pkgver}.tar.bz2")
-sha1sums=('af3e78b55c4aec97e271bc06c59186cdf77fe3d1')
+install="${pkgname}.install"
+source=("http://download.kde.org/stable/kdevelop/${_pkgver}/src/${pkgname}-${pkgver}.tar.xz")
+sha1sums=('a2fa1f765e992739546fa04d0aaffc4f2200c520')
 
-build() {
+prepare() {
   mkdir build
-  cd build 
+}
+
+build() {
+  cd build
   cmake ../${pkgname}-${pkgver} \
     -DCMAKE_INSTALL_PREFIX=/usr \
     -DCMAKE_SKIP_RPATH=ON \
diff --git a/extra/kdewebdev/PKGBUILD b/extra/kdewebdev/PKGBUILD
index abe2a28bd..a1725fd2b 100644
--- a/extra/kdewebdev/PKGBUILD
+++ b/extra/kdewebdev/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 195820 2013-10-01 15:38:47Z svenstaro $
+# $Id: PKGBUILD 198983 2013-11-05 20:28:42Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 
@@ -7,7 +7,7 @@ pkgname=('kdewebdev-kfilereplace'
          'kdewebdev-kimagemapeditor'
          'kdewebdev-klinkstatus'
          'kdewebdev-kommander')
-pkgver=4.11.2
+pkgver=4.11.3
 pkgrel=1
 arch=('i686' 'x86_64' 'mips64el')
 url='http://www.kde.org'
@@ -15,7 +15,7 @@ license=('GPL' 'LGPL' 'FDL')
 groups=('kde' 'kdewebdev')
 makedepends=('cmake' 'automoc4' 'ruby' 'tidyhtml' 'kdepimlibs' 'boost')
 source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.xz")
-sha1sums=('331006c8e7b6eea5558f2d3869499484bdce1411')
+sha1sums=('2178b219f0220592e039b337529a5962acf97db1')
 
 build() {
 	cd $srcdir
diff --git a/extra/kino/PKGBUILD b/extra/kino/PKGBUILD
index 29087cc23..b107e8a9d 100644
--- a/extra/kino/PKGBUILD
+++ b/extra/kino/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 155907 2012-04-09 00:36:43Z giovanni $
+# $Id: PKGBUILD 198121 2013-10-30 12:54:59Z allan $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Robert Emil Berge <robert@rebi.no>
 
@@ -11,7 +11,6 @@ url="http://www.kinodv.org/"
 license=('GPL')
 depends=('libavc1394' 'libiec61883' 'libdv' 'libglade' 'libxv' 'libsamplerate' 'libsm' 'desktop-file-utils')
 makedepends=('intltool' 'v4l-utils')
-options=('!libtool')
 install=kino.install
 source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz"
         'videodev-header.patch')
diff --git a/extra/konversation/PKGBUILD b/extra/konversation/PKGBUILD
index 92423728f..acc05d9bb 100644
--- a/extra/konversation/PKGBUILD
+++ b/extra/konversation/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 186022 2013-05-20 14:06:29Z stephane $
+# $Id: PKGBUILD 196549 2013-10-15 07:10:19Z allan $
 # Maintainer: Stéphane Gaudreault <stephane@archlinux.org>
 # Contributor: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: James Rayner <iphitus@gmail.com>
@@ -6,7 +6,7 @@
 
 pkgname=konversation
 pkgver=1.4
-pkgrel=6
+pkgrel=7
 pkgdesc="A user friendly IRC client for KDE"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://konversation.kde.org"
@@ -21,11 +21,6 @@ options=('!makeflags')
 source=("http://download.kde.org/download.php?url=stable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.xz")
 sha1sums=('90741721f68a02d4345b9006a8ae53bc49ef3777')
 
-prepare() {
-  cd "$srcdir/$pkgname-$pkgver"
-  # libpng16 fix
-  find -name '*.png' -exec optipng -quiet -force -fix {} +
-}
 
 build() {
   cd "${srcdir}"
diff --git a/extra/kte-collaborative/PKGBUILD b/extra/kte-collaborative/PKGBUILD
new file mode 100644
index 000000000..c6cfb42d5
--- /dev/null
+++ b/extra/kte-collaborative/PKGBUILD
@@ -0,0 +1,32 @@
+# $Id: PKGBUILD 197748 2013-10-29 07:58:30Z andrea $
+# Maintainer: Andrea Scarpino <andrea@archlinux.org>
+# Contributor: Antonio Rojas <nqn1976 @ gmail.com>
+
+pkgname=kte-collaborative
+pkgver=0.2.0
+pkgrel=1
+pkgdesc="A plugin for KTextEditor which allows to edit text documents collaboratively"
+arch=('i686' 'x86_64')
+url='https://projects.kde.org/projects/playground/network/kte-collaborative'
+license=('GPL')
+depends=('libqinfinity' 'telepathy-kde-common-internals')
+makedepends=('cmake' 'automoc4')
+source=("http://download.kde.org/stable/${pkgname}/${pkgver}/src/${pkgname}-v${pkgver}.tar.xz")
+md5sums=('e96718ed62b3bb315364fd03a4f2b463')
+
+prepare() {
+  mkdir build
+}
+
+build() {
+  cd build
+  cmake ../${pkgname}-v${pkgver} \
+    -DCMAKE_BUILD_TYPE=Release \
+    -DCMAKE_INSTALL_PREFIX=/usr
+  make
+}
+
+package() {
+  cd build
+  make DESTDIR="${pkgdir}" install
+}
diff --git a/extra/lablgtk/PKGBUILD b/extra/lablgtk/PKGBUILD
deleted file mode 100644
index e48745faf..000000000
--- a/extra/lablgtk/PKGBUILD
+++ /dev/null
@@ -1,29 +0,0 @@
-# $Id: PKGBUILD 177911 2013-02-10 17:58:16Z eric $
-#Maintainer: Tobias Powalowski <tpowa@archlinux.org>
-
-pkgname=lablgtk
-pkgver=1.2.7
-pkgrel=9
-pkgdesc=" An Objective Caml interface to gtk+"
-arch=(i686 x86_64 'mips64el')
-url="http://wwwfun.kurims.kyoto-u.ac.jp/soft/olabl/lablgtk.html"
-license=('LGPL')
-depends=('gtk')
-makedepends=('ocaml')
-options=('!makeflags')
-source=(http://wwwfun.kurims.kyoto-u.ac.jp/soft/olabl/dist/$pkgname-$pkgver.tar.gz)
-md5sums=('73a797e3a459190fdcaa8288935f6fb9')
-
-build() {
-  cd "$srcdir"/$pkgname-$pkgver
-  make configure 
-  make 
-  make opt 
-}
-
-package() {
-  cd "$srcdir"/$pkgname-$pkgver
-  make  PREFIX="$pkgdir"/usr LIBDIR="$pkgdir"/usr/lib/ocaml BINDIR="$pkgdir"/usr/bin \
-    INSTALLDIR="$pkgdir"/usr/lib/ocaml/lablgtk DLLDIR="$pkgdir"/usr/lib/ocaml/stublibs install
-  rm -r "$pkgdir"/usr/bin
-}
diff --git a/extra/lablgtk2/PKGBUILD b/extra/lablgtk2/PKGBUILD
index 63fc1edac..54680c0ee 100644
--- a/extra/lablgtk2/PKGBUILD
+++ b/extra/lablgtk2/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 195987 2013-10-07 07:06:22Z tpowa $
+# $Id: PKGBUILD 197222 2013-10-24 08:15:10Z tpowa $
 #Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 
 pkgname=lablgtk2
 pkgver=2.16.0
-pkgrel=3
+pkgrel=5
 pkgdesc=" An Objective Caml interface to gtk2"
 arch=(i686 x86_64 'mips64el')
 license=('LGPL')
@@ -13,7 +13,7 @@ makedepends=('ocaml')
 optdepends=('ocaml: for using the tools')
 DLAGENTS=('https::/usr/bin/curl -fLC - --insecure --retry 3 --retry-delay 3 -o %o %u')
 source=(https://forge.ocamlcore.org/frs/download.php/979/lablgtk-${pkgver}.tar.gz)
-options=(!makeflags)
+options=(!makeflags staticlibs)
 
 build() {
   cd "${srcdir}/lablgtk-${pkgver}"
diff --git a/extra/lame/PKGBUILD b/extra/lame/PKGBUILD
index 68bd0114d..9d034a627 100644
--- a/extra/lame/PKGBUILD
+++ b/extra/lame/PKGBUILD
@@ -1,18 +1,17 @@
-# $Id: PKGBUILD 151868 2012-03-03 15:54:16Z schiv $
+# $Id: PKGBUILD 197314 2013-10-25 02:23:01Z allan $
 # Maintainer: Ray Rashif <schiv@archlinux.org>
 # Contributor:	Ionut Biru <ibiru@archlinux.org>
 # Contributor: Hugo Doria <hugo@archlinux.org>
 
 pkgname=lame
 pkgver=3.99.5
-pkgrel=1.1
+pkgrel=2
 pkgdesc="A high quality MPEG Audio Layer III (MP3) encoder"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://lame.sourceforge.net/"
 depends=('ncurses')
 makedepends=('nasm')
 license=('LGPL')
-options=('!libtool')
 source=("http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz")
 md5sums=('84835b313d4a8b68f5349816d33e07ce')
 
diff --git a/extra/lapack/PKGBUILD b/extra/lapack/PKGBUILD
index 14b50033c..b76ee52a4 100644
--- a/extra/lapack/PKGBUILD
+++ b/extra/lapack/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 171531 2012-11-18 12:48:44Z ronald $
+# $Id: PKGBUILD 198759 2013-11-03 11:28:03Z ronald $
 # Maintainer: Ronald van Haren <ronald.archlinux.org>
 # Contributor: Jan de Groot <jgc@archlinux.org>
 # Contributor: damir <damir@archlinux.org>
@@ -7,7 +7,7 @@
 pkgbase=lapack
 pkgname=('lapack' 'blas')
 pkgver=3.4.2
-pkgrel=1
+pkgrel=2
 url="http://www.netlib.org/lapack"
 pkgdesc="Linear Algebra PACKage"
 makedepends=('gcc-fortran' 'cmake')
@@ -29,23 +29,25 @@ build() {
     -DCMAKE_SKIP_RPATH=ON \
     -DBUILD_SHARED_LIBS=ON \
     -DCMAKE_INSTALL_PREFIX=/usr \
-    -DCMAKE_Fortran_COMPILER=gfortran
+    -DCMAKE_Fortran_COMPILER=gfortran \
+    -DLAPACKE=ON
   make
 }
 
 package_lapack() {
   depends=("blas=${pkgver}")
 
-  install -m755 -d ${pkgdir}/usr/{lib,bin}
+  install -m755 -d ${pkgdir}/usr/{lib,bin,include}
   
-  for libname in liblapack libtmglib; do
+  for libname in liblapack libtmglib liblapacke; do
     install -m755 "${srcdir}/build/lib/${libname}.so" \
       "${pkgdir}/usr/lib/"
-    ln -sf liblapack.so "${pkgdir}/usr/lib/${libname}.so.${pkgver}"
-    ln -sf liblapack.so "${pkgdir}/usr/lib/${libname}.so.3"
+    ln -sf ${libname}.so "${pkgdir}/usr/lib/${libname}.so.${pkgver}"
+    ln -sf ${libname}.so "${pkgdir}/usr/lib/${libname}.so.3"
   done
   
   install -m755 ${srcdir}/build/bin/* ${pkgdir}/usr/bin
+  install -m644 ${srcdir}/build/include/* ${pkgdir}/usr/include
   install -m755 -d "${pkgdir}/usr/share/licenses/lapack"
   install -m644 "${srcdir}/${pkgname}-${pkgver}/LICENSE" \
     "${pkgdir}/usr/share/licenses/lapack/"
diff --git a/extra/lcms/PKGBUILD b/extra/lcms/PKGBUILD
index 75683cabc..2017ee8b5 100644
--- a/extra/lcms/PKGBUILD
+++ b/extra/lcms/PKGBUILD
@@ -1,16 +1,15 @@
-# $Id: PKGBUILD 193922 2013-09-06 07:11:54Z bpiotrowski $
+# $Id: PKGBUILD 197316 2013-10-25 02:23:38Z allan $
 # Maintainer: Tobias Kieslich <neri@archlinux.org>
 # Contributor: Ben <contrasutra@myrealbox.com>
 
 pkgname=lcms
 pkgver=1.19
-pkgrel=4
+pkgrel=5
 pkgdesc="Lightweight color management development library/engine"
 arch=('i686' 'x86_64' 'mips64el')
 license=('custom')
 depends=('libtiff')
 url="http://www.littlecms.com"
-options=('!libtool')
 source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.gz
         cve-2013-4276.patch)
 md5sums=('8af94611baf20d9646c7c2c285859818'
diff --git a/extra/lcms2/PKGBUILD b/extra/lcms2/PKGBUILD
index 2521472b1..1cace6db4 100644
--- a/extra/lcms2/PKGBUILD
+++ b/extra/lcms2/PKGBUILD
@@ -1,16 +1,14 @@
-# $Id: PKGBUILD 189259 2013-07-01 18:54:09Z eric $
+# $Id: PKGBUILD 197253 2013-10-24 19:34:40Z eric $
 # Maintainer: Eric Bélanger <eric@archlinux.org>
-# Contributor: Lukas Jirkovsky <l.jirkovsky@gmail.com>
 
 pkgname=lcms2
 pkgver=2.5
-pkgrel=1
+pkgrel=2
 pkgdesc="Small-footprint color management engine, version 2"
 arch=('i686' 'x86_64' 'mips64el')
+url="http://www.littlecms.com"
 license=('MIT')
 depends=('libtiff')
-url="http://www.littlecms.com"
-options=('!libtool')
 source=(http://downloads.sourceforge.net/sourceforge/lcms/${pkgname}-${pkgver}.tar.gz)
 sha1sums=('bab3470471fc7756c5fbe71be9a3c7d677d2ee7b')
 
diff --git a/extra/lesstif/PKGBUILD b/extra/lesstif/PKGBUILD
index ceda6b8a8..26bd0627a 100644
--- a/extra/lesstif/PKGBUILD
+++ b/extra/lesstif/PKGBUILD
@@ -1,16 +1,16 @@
-# $Id: PKGBUILD 195188 2013-09-27 04:29:31Z eric $
-# Maintainer:
+# $Id: PKGBUILD 197577 2013-10-27 02:25:22Z eric $
+# Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgname=lesstif
 pkgver=0.95.2
-pkgrel=5
+pkgrel=6
 pkgdesc="LGPL'd re-implementation of Motif"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://sourceforge.net/projects/lesstif/"
 license=('LGPL' 'MIT')
 depends=('freetype2' 'libxt' 'libxp')
-[ "$CARCH" = "mips64el" ] && options=('!libtool')
-[ "$CARCH" = "mips64el" ] || options=('!libtool' '!buildflags')
+[ "$CARCH" = "mips64el" ] && options=('!makeflags')
+[ "$CARCH" = "mips64el" ] || options=('!makeflags' '!buildflags')
 source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2"
         'LICENSE'
         '040_fedora_XxxxProperty-64bit.diff')
@@ -19,14 +19,14 @@ md5sums=('754187dbac09fcf5d18296437e72a32f'
          '30e2c0babc84696af089d55cb9cb2908')
 
 prepare() {
-  cd "${srcdir}"/${pkgname}-${pkgver}
+  cd ${pkgname}-${pkgver}
 
   # https://bugs.archlinux.org/task/17712
   patch -p1 -i "${srcdir}"/040_fedora_XxxxProperty-64bit.diff
 }
 
 build() {
-  cd "${srcdir}"/${pkgname}-${pkgver}
+  cd ${pkgname}-${pkgver}
 
   ./configure --prefix=/usr \
     --enable-production \
@@ -34,8 +34,7 @@ build() {
     --enable-editres \
     --with-xdnd \
     --enable-build-21 \
-    --disable-debug \
-    --enable-static
+    --disable-debug
 
   # fix linkage against already installed version
   perl -pi -e 's/^(hardcode_into_libs)=.*/$1=no/' libtool
@@ -51,7 +50,7 @@ build() {
 }
 
 package() {
-  cd "${srcdir}"/${pkgname}-${pkgver}
+  cd ${pkgname}-${pkgver}
 
   make -C lib/Mrm-2.1 DESTDIR="${pkgdir}" install
   make DESTDIR="${pkgdir}" appdir=/usr/share/X11/app-defaults rootdir=/usr/share/doc/LessTif install
diff --git a/extra/leveldb/PKGBUILD b/extra/leveldb/PKGBUILD
index 614aadc62..c54f661fa 100644
--- a/extra/leveldb/PKGBUILD
+++ b/extra/leveldb/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 195162 2013-09-25 22:08:21Z dreisner $
+# $Id: PKGBUILD 196888 2013-10-20 21:56:36Z dreisner $
 # Maintainer: Dave Reisner <dreisner@archlinux.org>
 # Contributor: feydaykyn <feydaykyn@yahoo.fr>
 
 pkgname=leveldb
 pkgver=1.14.0
-pkgrel=1
+pkgrel=2
 pkgdesc="A fast and lightweight key/value database library"
 arch=('i686' 'x86_64')
 url="https://code.google.com/p/leveldb/"
diff --git a/community/libaccounts-glib/PKGBUILD b/extra/libaccounts-glib/PKGBUILD
index eee7fa588..800256354 100644
--- a/community/libaccounts-glib/PKGBUILD
+++ b/extra/libaccounts-glib/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 96927 2013-09-08 17:56:34Z bgyorgy $
+# $Id: PKGBUILD 198122 2013-10-30 12:55:21Z allan $
 # Maintainer: Balló György <ballogyor+arch at gmail dot com>
 
 pkgname=libaccounts-glib
@@ -10,7 +10,6 @@ url="http://code.google.com/p/accounts-sso/"
 license=('LGPL')
 depends=('dbus-glib' 'libxml2' 'sqlite3')
 makedepends=('python2-gobject')
-options=('!libtool')
 source=(http://accounts-sso.googlecode.com/files/$pkgname-$pkgver.tar.gz)
 sha1sums=('165e0b89a0bc47459711b1e7e077fb9e14848503')
 
diff --git a/community/libaccounts-qt/PKGBUILD b/extra/libaccounts-qt/PKGBUILD
index 957e8403a..231fdbddc 100644
--- a/community/libaccounts-qt/PKGBUILD
+++ b/extra/libaccounts-qt/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 96784 2013-09-04 22:27:13Z bgyorgy $
+# $Id: PKGBUILD 197627 2013-10-27 14:38:36Z andrea $
 # Maintainer: Balló György <ballogyor+arch at gmail dot com>
 
 pkgbase=libaccounts-qt
diff --git a/extra/libaio/PKGBUILD b/extra/libaio/PKGBUILD
index ac29bc982..01ddc86bb 100644
--- a/extra/libaio/PKGBUILD
+++ b/extra/libaio/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 186545 2013-05-28 18:17:04Z tpowa $
+# $Id: PKGBUILD 196999 2013-10-21 12:33:19Z tpowa $
 # Maintainer:  Bartłomiej Piotrowski <barthalion@gmail.com>
 # Contributor: Thomas S Hatch <thatch45 at gmail dot com>
 
 pkgname=libaio
 pkgver=0.3.109
 _patchver=${pkgver}-2
-pkgrel=6
+pkgrel=7
 pkgdesc="The Linux-native asynchronous I/O facility (aio) library"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://lse.sourceforge.net/io/aio.html"
diff --git a/extra/libao/PKGBUILD b/extra/libao/PKGBUILD
index ef95c76a7..76779a511 100644
--- a/extra/libao/PKGBUILD
+++ b/extra/libao/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 175921 2013-01-25 01:07:36Z bisson $
+# $Id: PKGBUILD 198123 2013-10-30 12:55:41Z allan $
 # Contributor: dorphell <dorphell@archlinux.org>
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
 
@@ -9,7 +9,6 @@ pkgdesc='Cross-platform audio output library and plugins'
 url='http://xiph.org/ao/'
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
-options=('!libtool')
 depends=('alsa-lib')
 makedepends=('libpulse')
 backup=('etc/libao.conf')
diff --git a/extra/libart-lgpl/PKGBUILD b/extra/libart-lgpl/PKGBUILD
index 9b978f0ab..f375d7904 100644
--- a/extra/libart-lgpl/PKGBUILD
+++ b/extra/libart-lgpl/PKGBUILD
@@ -1,20 +1,19 @@
-# $Id: PKGBUILD 150419 2012-02-17 12:52:28Z allan $
+# $Id: PKGBUILD 198124 2013-10-30 12:56:03Z allan $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=libart-lgpl
 pkgver=2.3.21
-pkgrel=2.2
+pkgrel=3
 pkgdesc="A library for high-performance 2D graphics"
 url="http://www.levien.com/libart/"
 arch=('i686' 'x86_64' 'mips64el')
 license=('LGPL')
 source=(http://ftp.gnome.org/pub/GNOME/sources/libart_lgpl/2.3/libart_lgpl-${pkgver}.tar.bz2)
-options=('!libtool')
 sha256sums=('fdc11e74c10fc9ffe4188537e2b370c0abacca7d89021d4d303afdf7fd7476fa')
 
 build() {
   cd "${srcdir}/libart_lgpl-${pkgver}"
-  ./configure --prefix=/usr
+  ./configure --prefix=/usr --disable-static
   make
 }
 
diff --git a/extra/libass/PKGBUILD b/extra/libass/PKGBUILD
index 36ae62b0d..7841be2f2 100644
--- a/extra/libass/PKGBUILD
+++ b/extra/libass/PKGBUILD
@@ -1,19 +1,18 @@
-# $Id: PKGBUILD 174504 2013-01-05 07:26:20Z giovanni $
+# $Id: PKGBUILD 197391 2013-10-25 11:10:08Z giovanni $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: G_Syme <demichan(at)mail(dot)upb(dot)de>
 
 pkgname=libass
-pkgver=0.10.1
-pkgrel=1.1
+pkgver=0.10.2
+pkgrel=1
 pkgdesc="A portable library for SSA/ASS subtitles rendering"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://code.google.com/p/libass/"
 license=('BSD')
 depends=('enca' 'fontconfig' 'fribidi')
 makedepends=('pkg-config')
-options=(!libtool)
 source=("http://libass.googlecode.com/files/${pkgname}-${pkgver}.tar.xz")
-md5sums=('0f54b1f3a24fa897ebbbcc5bc744b32a')
+md5sums=('ce672ed5629c9708b3401b976f516744')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/libasyncns/PKGBUILD b/extra/libasyncns/PKGBUILD
index 3da9256ca..2604dde50 100644
--- a/extra/libasyncns/PKGBUILD
+++ b/extra/libasyncns/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 149434 2012-02-07 17:05:44Z heftig $
+# $Id: PKGBUILD 198125 2013-10-30 12:56:24Z allan $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Contributor: Corrado Primier <bardo@aur.archlinux.org>
 # Contributor: Eric Belanger <belanger@astro.umontreal.ca>
@@ -7,12 +7,11 @@
 
 pkgname=libasyncns
 pkgver=0.8
-pkgrel=4.1
+pkgrel=5
 pkgdesc="A C library for executing name service queries asynchronously"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://0pointer.de/lennart/projects/libasyncns"
 license=('LGPL')
-options=('!libtool')
 depends=('glibc')
 source=("$url/$pkgname-$pkgver.tar.gz")
 md5sums=('1f553d6ce1ad255bc83b3d8e9384f515')
diff --git a/extra/libatasmart/PKGBUILD b/extra/libatasmart/PKGBUILD
index 0b8127c56..920ad0382 100644
--- a/extra/libatasmart/PKGBUILD
+++ b/extra/libatasmart/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 187061 2013-06-03 11:16:38Z allan $
+# $Id: PKGBUILD 198126 2013-10-30 12:56:47Z allan $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=libatasmart
@@ -9,7 +9,6 @@ arch=('i686' 'x86_64' 'mips64el')
 license=('LGPL')
 depends=('udev')
 url="http://0pointer.de/blog/projects/being-smart.html"
-options=('!libtool')
 source=("http://0pointer.de/public/${pkgname}-${pkgver}.tar.xz")
 md5sums=('53afe2b155c36f658e121fe6def33e77')
 
diff --git a/extra/libavc1394/PKGBUILD b/extra/libavc1394/PKGBUILD
index f08598f97..8a45812dc 100644
--- a/extra/libavc1394/PKGBUILD
+++ b/extra/libavc1394/PKGBUILD
@@ -1,22 +1,21 @@
-# $Id: PKGBUILD 137687 2011-09-10 12:13:56Z pierre $
+# $Id: PKGBUILD 198127 2013-10-30 12:57:09Z allan $
 # Maintainer: damir <damir@archlinux.org>
 # Contributor: Robert Emil Berge <robert@rebi.no>
 
 pkgname=libavc1394
 pkgver=0.5.4
-pkgrel=1.1
+pkgrel=2
 pkgdesc="A library to control A/V devices using the 1394ta AV/C commands."
 arch=("i686" "x86_64" 'mips64el')
 url="http://sourceforge.net/projects/libavc1394/"
 license=('LGPL')
 depends=('libraw1394')
-options=('!libtool')
 source=("http://downloads.sourceforge.net/sourceforge/libavc1394/${pkgname}-${pkgver}.tar.gz")
 md5sums=('caf0db059d8b8d35d6f08e6c0e1c7dfe')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr --mandir=/usr/share/man
+  ./configure --prefix=/usr --mandir=/usr/share/man --disable-static
   make
 }
 
diff --git a/extra/libbluray/PKGBUILD b/extra/libbluray/PKGBUILD
index 1f4d9c706..9a5788976 100644
--- a/extra/libbluray/PKGBUILD
+++ b/extra/libbluray/PKGBUILD
@@ -1,21 +1,21 @@
-# $Id: PKGBUILD 186521 2013-05-28 10:28:20Z ioni $
-# Maintainer: Ionut Biru <ibiru@archlinux.org>
+# $Id: PKGBUILD 198685 2013-11-02 07:22:33Z bpiotrowski $
+# Maintainer:  Ionut Biru <ibiru@archlinux.org>
+# Maintainer:  Bartłomiej Piotrowski <nospam@bpiotrowski.pl>
 # Contributor: Andrew Cook <ariscop@gmail.com>
 
 pkgname=libbluray
-pkgver=0.3.0
+pkgver=0.4.0
 pkgrel=1
-pkgdesc="Library to access Blu-Ray disks for video playback"
+pkgdesc='Library to access Blu-Ray disks for video playback'
 arch=('i686' 'x86_64' 'mips64el')
-url="http://www.videolan.org/developers/libbluray.html"
+url='http://www.videolan.org/developers/libbluray.html'
 license=('LGPL2.1')
 depends=('libxml2' 'freetype2')
-options=(!libtool)
 source=(ftp://ftp.videolan.org/pub/videolan/$pkgname/$pkgver/$pkgname-$pkgver.tar.bz2)
-sha512sums=('96eedf23ff756e97fa64d9624a49608daccbac169714b9b231a284ed4eb63c77ee2ecbdfc42c311781571146cfa0fe340854ac831d3fe1312131e1742a4a7b02')
+sha256sums=('63a3218d69f179f4834ef3b48bfa95268ad62c302ff38bfc052e2fc6916ae3f8')
 
 build() {
-  cd "$pkgname-$pkgver"
+  cd $pkgname-$pkgver
 
   ./configure --prefix=/usr \
     --disable-static
@@ -23,7 +23,7 @@ build() {
 }
 
 package() {
-  cd "$pkgname-$pkgver"
+  cd $pkgname-$pkgver
   make DESTDIR="$pkgdir" install
 }
 
diff --git a/extra/libbonobo/PKGBUILD b/extra/libbonobo/PKGBUILD
index 4a2759600..600bac7e2 100644
--- a/extra/libbonobo/PKGBUILD
+++ b/extra/libbonobo/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 187062 2013-06-03 11:16:40Z allan $
+# $Id: PKGBUILD 198129 2013-10-30 12:57:52Z allan $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=libbonobo
@@ -9,7 +9,6 @@ arch=(i686 x86_64 'mips64el')
 license=('GPL' 'LGPL')
 depends=('orbit2' 'libxml2' 'glib2' 'popt')
 makedepends=('intltool' 'pkgconfig')
-options=('!libtool')
 backup=('etc/bonobo-activation/bonobo-activation-config.xml')
 url="http://www.gnome.org"
 source=(http://ftp.gnome.org/pub/gnome/sources/libbonobo/2.32/libbonobo-${pkgver}.tar.bz2
diff --git a/extra/libbonoboui/PKGBUILD b/extra/libbonoboui/PKGBUILD
index d97478ff7..bbd8bc2f0 100644
--- a/extra/libbonoboui/PKGBUILD
+++ b/extra/libbonoboui/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 148814 2012-02-05 11:51:34Z ibiru $
+# $Id: PKGBUILD 198130 2013-10-30 12:58:13Z allan $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=libbonoboui
@@ -9,7 +9,7 @@ arch=('i686' 'x86_64' 'mips64el')
 license=('GPL' 'LGPL')
 depends=('libgnomecanvas' 'libgnome')
 makedepends=('intltool' 'pkg-config')
-options=('!libtool' '!emptydirs')
+options=('!emptydirs')
 url="http://www.gnome.org"
 source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/2.24/${pkgname}-${pkgver}.tar.bz2)
 sha256sums=('fab5f2ac6c842d949861c07cb520afe5bee3dce55805151ce9cd01be0ec46fcd')
diff --git a/extra/libbsd/PKGBUILD b/extra/libbsd/PKGBUILD
index 89e029458..a01c8ad13 100644
--- a/extra/libbsd/PKGBUILD
+++ b/extra/libbsd/PKGBUILD
@@ -1,16 +1,16 @@
-# $Id: PKGBUILD 193609 2013-08-25 22:20:49Z allan $
+# $Id: PKGBUILD 197324 2013-10-25 02:28:32Z allan $
 # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
 # Contributor: Gerardo Exequiel Pozzi <vmlinuz386@yahoo.com.ar>
 
 pkgname=libbsd
 pkgver=0.6.0
-pkgrel=1
+pkgrel=2
 pkgdesc="Provides useful functions commonly found on BSD systems like strlcpy()"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://libbsd.freedesktop.org"
 license=('custom')
 depends=('glibc')
-options=('!libtool')
+options=('staticlibs')
 source=(http://libbsd.freedesktop.org/releases/$pkgname-$pkgver.tar.xz{,.asc})
 md5sums=('f6c75f0a9818e323a589bcbd560a0eb4'
          'SKIP')
@@ -32,6 +32,7 @@ package() {
   cd $pkgname-$pkgver
 
   make DESTDIR="$pkgdir" install
+  rm "${pkgdir}"/usr/lib/libbsd.a
   install -D -m644 COPYING "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
 }
 
diff --git a/extra/libburn/PKGBUILD b/extra/libburn/PKGBUILD
index ef67f8080..9e098c77b 100644
--- a/extra/libburn/PKGBUILD
+++ b/extra/libburn/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 192276 2013-08-09 14:16:57Z andyrtr $
+# $Id: PKGBUILD 198131 2013-10-30 12:58:36Z allan $
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 # Contributor: William Rea <sillywilly@gmail.com>
 
@@ -11,7 +11,7 @@ url="http://libburnia-project.org"
 license=('GPL')
 depends=('glibc')
 source=(http://files.libburnia-project.org/releases/${pkgname}-${pkgver}.tar.gz{,.sig})
-options=('!libtool' '!emptydirs')
+options=('!emptydirs')
 md5sums=('3c6ee25f172ff28e7b5e5de4f9f26ba9'
          'SKIP')
 
diff --git a/extra/libcaca/PKGBUILD b/extra/libcaca/PKGBUILD
index bde93f54a..4e0e37f70 100644
--- a/extra/libcaca/PKGBUILD
+++ b/extra/libcaca/PKGBUILD
@@ -1,27 +1,28 @@
-# $Id: PKGBUILD 158970 2012-05-13 20:58:29Z jgc $
+# $Id: PKGBUILD 198132 2013-10-30 12:58:57Z allan $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=libcaca
 pkgver=0.99.beta18
-pkgrel=1.1
+pkgrel=2
 pkgdesc="Color AsCii Art library"
 arch=('i686' 'x86_64' 'mips64el')
-license=('LGPL')
+license=('custom:WTFPL')
 url="http://caca.zoy.org/wiki/libcaca"
 depends=('imlib2' 'ncurses')
-options=(!libtool !emptydirs)
+options=(!emptydirs)
 source=(http://libcaca.zoy.org/files/libcaca/${pkgname}-${pkgver}.tar.gz)
 md5sums=('93d35dbdb0527d4c94df3e9a02e865cc')
 
 build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+  cd $pkgname-$pkgver
   ./configure --prefix=/usr --mandir=/usr/share/man \
     --enable-shared --disable-doc \
-    --disable-cxx --disable-gl --disable-csharp
+    --disable-cxx --disable-gl --disable-csharp --disable-static
   make
 }
 
 package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+  cd $pkgname-$pkgver
   make DESTDIR="${pkgdir}" install
+  install -Dm644 COPYING "${pkgdir}/usr/share/licenses/libcaca/COPYING"
 }
diff --git a/extra/libcap-ng/PKGBUILD b/extra/libcap-ng/PKGBUILD
index 1033cff4b..154d7396d 100644
--- a/extra/libcap-ng/PKGBUILD
+++ b/extra/libcap-ng/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 171546 2012-11-19 03:43:07Z dan $
+# $Id: PKGBUILD 198133 2013-10-30 12:59:19Z allan $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 # Contributor: Gerardo Exequiel Pozzi <vmlinuz386@yahoo.com.ar>
 
@@ -10,7 +10,6 @@ arch=('i686' 'x86_64' 'mips64el')
 url="http://people.redhat.com/sgrubb/libcap-ng/"
 license=('GPL2' 'LGPL2.1')
 depends=('glibc')
-options=('!libtool')
 source=(http://people.redhat.com/sgrubb/$pkgname/$pkgname-$pkgver.tar.gz)
 md5sums=('610afb774f80a8032b711281df126283')
 
diff --git a/extra/libcdaudio/PKGBUILD b/extra/libcdaudio/PKGBUILD
index ef4974c50..c1e4a03b1 100644
--- a/extra/libcdaudio/PKGBUILD
+++ b/extra/libcdaudio/PKGBUILD
@@ -1,16 +1,15 @@
-# $Id: PKGBUILD 150528 2012-02-18 12:08:44Z pierre $
+# $Id: PKGBUILD 197332 2013-10-25 02:34:27Z allan $
 # Maintainer: 
 # Contributor Sarah Hay <sarahhay@mb.sympatico.ca>
 
 pkgname=libcdaudio
 pkgver=0.99.12
-pkgrel=6
+pkgrel=7
 pkgdesc="Library for controlling Audio CDs and interacting with CDDB"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://libcdaudio.sourceforge.net/"
 license=('GPL')
 depends=('glibc')
-options=('!libtool')
 source=("http://downloads.sourceforge.net/sourceforge/libcdaudio/${pkgname}-${pkgver}.tar.gz"
         '01-cddb-bufferoverflow.patch'
         '02-cddb-bufferoverflow.patch')
diff --git a/extra/libcddb/PKGBUILD b/extra/libcddb/PKGBUILD
index ad9c5a293..22abc1cd0 100644
--- a/extra/libcddb/PKGBUILD
+++ b/extra/libcddb/PKGBUILD
@@ -1,15 +1,14 @@
-# $Id: PKGBUILD 137919 2011-09-12 12:54:52Z pierre $
+# $Id: PKGBUILD 198134 2013-10-30 12:59:40Z allan $
 # Maintainer: Hugo Doria <hugo@archlinux.org>
 # Contributor: Sarah Hay <sarahhay@mb.sympatico.ca>
 
 pkgname=libcddb
 pkgver=1.3.2
-pkgrel=3.1
+pkgrel=4
 arch=('i686' 'x86_64' 'mips64el')
 pkgdesc="Library that implements the different protocols (CDDBP, HTTP, SMTP) to access data on a CDDB server (e.g. http://freedb.org)."
 url="http://sourceforge.net/projects/libcddb/"
 license=('LGPL')
-options=('!libtool')
 depends=('glibc')
 source=("http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.bz2")
 md5sums=('8bb4a6f542197e8e9648ae597cd6bc8a')
diff --git a/extra/libcdio-paranoia/PKGBUILD b/extra/libcdio-paranoia/PKGBUILD
index b57d888fe..03edceb66 100644
--- a/extra/libcdio-paranoia/PKGBUILD
+++ b/extra/libcdio-paranoia/PKGBUILD
@@ -10,7 +10,6 @@ arch=('i686' 'x86_64' 'mips64el')
 license=('GPL' 'LGPL')
 url="http://www.gnu.org/software/libcdio/"
 depends=('libcdio')
-options=('!libtool')
 source=(http://ftp.gnu.org/gnu/libcdio/${pkgname}-${pkgver}.tar.bz2{,.sig})
 md5sums=('e79e196864dd3b1ca87a01345abbda07'
          'SKIP')
diff --git a/extra/libcdio/PKGBUILD b/extra/libcdio/PKGBUILD
index 9c9c4b7db..21586ea1b 100644
--- a/extra/libcdio/PKGBUILD
+++ b/extra/libcdio/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 175152 2013-01-15 11:44:42Z jgc $
+# $Id: PKGBUILD 198135 2013-10-30 13:00:01Z allan $
 # Maintainer:
 # Contributor: damir <damir@archlinux.org>
 
@@ -10,7 +10,6 @@ arch=('i686' 'x86_64' 'mips64el')
 license=('GPL3')
 url="http://www.gnu.org/software/libcdio/"
 depends=('libcddb' 'ncurses' 'gcc-libs')
-options=('!libtool')
 install=libcdio.install
 source=(http://ftp.gnu.org/gnu/libcdio/${pkgname}-${pkgver}.tar.gz{,.sig}
         libcdio-0.83-linking.patch
diff --git a/extra/libchamplain/PKGBUILD b/extra/libchamplain/PKGBUILD
index a79985526..a5c88d06c 100644
--- a/extra/libchamplain/PKGBUILD
+++ b/extra/libchamplain/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 196110 2013-10-07 11:52:47Z jgc $
+# $Id: PKGBUILD 198137 2013-10-30 13:00:52Z allan $
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 # Contributor: Michael Kanis <mkanis@gmx.de>
 
@@ -9,7 +9,6 @@ pkgdesc="Gtk3 widget for displaying rasterized maps"
 url="http://projects.gnome.org/libchamplain/"
 license=('LGPL')
 arch=('i686' 'x86_64' 'mips64el')
-options=('!libtool')
 depends=('clutter-gtk' 'libsoup' 'cairo' 'sqlite')
 makedepends=('gobject-introspection' 'gtk-doc' 'vala')
 source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz)
diff --git a/extra/libchewing/PKGBUILD b/extra/libchewing/PKGBUILD
index 84f145044..56af292e3 100644
--- a/extra/libchewing/PKGBUILD
+++ b/extra/libchewing/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 194021 2013-09-10 06:55:01Z bisson $
+# $Id: PKGBUILD 198138 2013-10-30 13:01:13Z allan $
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
 # Contributor: whisky <archlinux.cle(at)gmail.com>
 # Contributor: damir <damir@archlinux.org>
@@ -10,7 +10,6 @@ pkgdesc='Intelligent Chinese phonetic input method'
 url='http://chewing.im/'
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
-options=('!libtool')
 source=("http://chewing.googlecode.com/files/${pkgname}-${pkgver}.tar.bz2")
 sha1sums=('5ee3941f0f62fa14fbda53e1032970b04a7a88b7')
 
diff --git a/extra/libconfig/PKGBUILD b/extra/libconfig/PKGBUILD
index f51543e1c..1ec4c0c54 100644
--- a/extra/libconfig/PKGBUILD
+++ b/extra/libconfig/PKGBUILD
@@ -12,7 +12,7 @@ url="http://hyperrealm.com/libconfig/libconfig.html"
 license=('LGPL')
 depends=('gcc-libs' 'texinfo')
 install=$pkgname.install
-options=('!libtool' '!emptydirs' 'zipman')
+options=('!emptydirs' 'zipman')
 source=("http://www.hyperrealm.com/libconfig/$pkgname-$pkgver.tar.gz")
 md5sums=('b6ee0ce2b3ef844bad7cac2803a90634')
 
diff --git a/extra/libcroco/PKGBUILD b/extra/libcroco/PKGBUILD
index b3c2e3935..04eeacbf3 100644
--- a/extra/libcroco/PKGBUILD
+++ b/extra/libcroco/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 169947 2012-10-30 22:46:28Z heftig $
+# $Id: PKGBUILD 198140 2013-10-30 13:01:56Z allan $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=libcroco
@@ -9,7 +9,6 @@ arch=('x86_64' 'i686' 'mips64el')
 depends=('glib2' 'libxml2')
 makedepends=('intltool')
 license=('LGPL')
-options=('!libtool')
 source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/0.6/$pkgname-$pkgver.tar.xz)
 url="http://www.gnome.org"
 sha256sums=('ea6e1b858c55219cefd7109756bff5bc1a774ba7a55f7d3ccd734d6b871b8570')
diff --git a/extra/libcryptui/PKGBUILD b/extra/libcryptui/PKGBUILD
index e610adb9d..700cff9a1 100644
--- a/extra/libcryptui/PKGBUILD
+++ b/extra/libcryptui/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 196111 2013-10-07 11:52:48Z jgc $
+# $Id: PKGBUILD 198141 2013-10-30 13:02:16Z allan $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Contributor: Balló György <ballogyor+arch at gmail dot com>
 
 pkgname=libcryptui
-pkgver=3.10.0
+pkgver=3.10.1
 pkgrel=1
 pkgdesc="Library for OpenPGP prompts"
 arch=('i686' 'x86_64' 'mips64el')
@@ -11,10 +11,9 @@ url="http://git.gnome.org/browse/libcryptui/"
 license=('GPL')
 depends=('gtk3' 'gpgme' 'dbus-glib' 'libnotify' 'libgnome-keyring' 'dconf')
 makedepends=('intltool' 'gobject-introspection')
-options=('!libtool')
 install=$pkgname.install
 source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('ceeba7ebdcda768d671e9df9332b18d4f25edd1f4d91e86a241c3c1f3ffc6332')
+sha256sums=('5e3e82e647ac4fb74ed46b4fffbf89e80198f856e1509f5edcd47dd2751a4be0')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
diff --git a/extra/libcue/PKGBUILD b/extra/libcue/PKGBUILD
index 740ad9dd9..ce757c039 100644
--- a/extra/libcue/PKGBUILD
+++ b/extra/libcue/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 149035 2012-02-05 15:06:24Z bisson $
+# $Id: PKGBUILD 198142 2013-10-30 13:02:40Z allan $
 # Contributor: said <atvordhosbn[at]gmail[dot]com>
 # Maintainer: Gaetan Bisson <bisson@archlinux.org> 
 
@@ -10,7 +10,6 @@ url='http://sourceforge.net/projects/libcue/'
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL2')
 depends=('glibc')
-options=('!libtool')
 source=("http://downloads.sourceforge.net/libcue/${pkgname}-${pkgver}.tar.bz2")
 sha1sums=('3fd31f2da7c0e3967d5f56363f3051a85a8fd50d')
 
diff --git a/extra/libdaemon/PKGBUILD b/extra/libdaemon/PKGBUILD
index ac91300b2..a6b8dcb40 100644
--- a/extra/libdaemon/PKGBUILD
+++ b/extra/libdaemon/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 149075 2012-02-05 16:45:57Z bisson $
+# $Id: PKGBUILD 198143 2013-10-30 13:03:04Z allan $
 # Contributor: Manolis Tzanidakis
 # Contributor: Mark Rosenstand <mark@archlinux.org>
 # Contributor: Thayer Williams <thayer@archlinux.org>
@@ -12,7 +12,6 @@ url='http://0pointer.de/lennart/projects/libdaemon/'
 license=('LGPL')
 arch=('i686' 'x86_64' 'mips64el')
 source=("http://0pointer.de/lennart/projects/libdaemon/${pkgname}-${pkgver}.tar.gz")
-options=('!libtool')
 sha1sums=('78a4db58cf3a7a8906c35592434e37680ca83b8f')
 
 build() {
diff --git a/extra/libdatrie/PKGBUILD b/extra/libdatrie/PKGBUILD
index 6116bead8..170e1b070 100644
--- a/extra/libdatrie/PKGBUILD
+++ b/extra/libdatrie/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 191328 2013-07-23 16:51:26Z jgc $
+# $Id: PKGBUILD 198144 2013-10-30 13:03:26Z allan $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: Chaiwat Suttipongsakul <cwt114@gmail.com>
 
@@ -10,7 +10,7 @@ url="http://linux.thai.net/projects/datrie"
 license=('LGPL')
 arch=('i686' 'x86_64' 'mips64el')
 depends=('glibc')
-options=('!libtool' '!emptydirs')
+options=('!emptydirs')
 source=(http://linux.thai.net/pub/thailinux/software/libthai/${pkgname}-${pkgver}.tar.xz)
 md5sums=('e253eb2433045f6e224c7fa44f9796e1')
 
diff --git a/extra/libdc1394/PKGBUILD b/extra/libdc1394/PKGBUILD
index 45290239b..331aeed15 100644
--- a/extra/libdc1394/PKGBUILD
+++ b/extra/libdc1394/PKGBUILD
@@ -1,21 +1,21 @@
-# $Id: PKGBUILD 180144 2013-03-18 09:10:25Z jgc $
+# $Id: PKGBUILD 198145 2013-10-30 13:03:52Z allan $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=libdc1394
 pkgver=2.2.1
-pkgrel=1
+pkgrel=2
 pkgdesc="High level programming interface to control IEEE 1394 based cameras"
 arch=('i686' 'x86_64' 'mips64el')
 license=('LGPL')
 url="http://sourceforge.net/projects/libdc1394/"
-depends=('libraw1394' 'libusb')
-options=('!libtool' '!emptydirs')
+depends=('libraw1394' 'libusbx')
+options=('!emptydirs')
 source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz)
 md5sums=('5c4b78bb8265d6dc971433ec1da381ab')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr
+  ./configure --prefix=/usr --disable-static
   make
 }
 
diff --git a/extra/libdc1394/rename-usb_init.patch b/extra/libdc1394/rename-usb_init.patch
deleted file mode 100644
index 44e1a5de3..000000000
--- a/extra/libdc1394/rename-usb_init.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-From 13b85d2d23548682b617ddc1196f5560a27998bd Mon Sep 17 00:00:00 2001
-From: Damien Douxchamps <ddsf@douxchamps.net>
-Date: Sun, 21 Aug 2011 16:03:22 +0900
-Subject: [PATCH] fix usb_init function name conflict
-
----
- libdc1394/dc1394/control.c     |    2 +-
- libdc1394/dc1394/internal.h    |    2 +-
- libdc1394/dc1394/usb/control.c |    2 +-
- 3 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/libdc1394/dc1394/control.c b/libdc1394/dc1394/control.c
-index c62e0e2..f250f6a 100644
---- a/libdc1394/dc1394/control.c
-+++ b/libdc1394/dc1394/control.c
-@@ -1955,7 +1955,7 @@ dc1394_new (void)
-     windows_init (d);
- #endif
- #ifdef HAVE_LIBUSB
--    usb_init (d);
-+    dc1394_usb_init (d);
- #endif
- 
-     int i;
-diff --git a/libdc1394/dc1394/internal.h b/libdc1394/dc1394/internal.h
-index b4d295a..c59e5d3 100644
---- a/libdc1394/dc1394/internal.h
-+++ b/libdc1394/dc1394/internal.h
-@@ -74,7 +74,7 @@ void juju_init(dc1394_t *d);
- void linux_init(dc1394_t *d);
- void macosx_init(dc1394_t *d);
- void windows_init(dc1394_t *d);
--void usb_init(dc1394_t *d);
-+void dc1394_usb_init(dc1394_t *d);
- 
- void register_platform (dc1394_t * d, const platform_dispatch_t * dispatch,
-         const char * name);
-diff --git a/libdc1394/dc1394/usb/control.c b/libdc1394/dc1394/usb/control.c
-index 6509452..19a21a6 100644
---- a/libdc1394/dc1394/usb/control.c
-+++ b/libdc1394/dc1394/usb/control.c
-@@ -378,7 +378,7 @@ usb_dispatch = {
- };
- 
- void
--usb_init(dc1394_t * d)
-+dc1394_usb_init(dc1394_t * d)
- {
-     register_platform (d, &usb_dispatch, "usb");
- }
--- 
-1.7.4.1
-
diff --git a/extra/libdc1394/videodev-compile-fix.patch b/extra/libdc1394/videodev-compile-fix.patch
deleted file mode 100644
index 8f234b152..000000000
--- a/extra/libdc1394/videodev-compile-fix.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From 2ee7e7f98dd6225b40d5cd570c240504be7bc86a Mon Sep 17 00:00:00 2001
-From: David Moore <david.moore@gmail.com>
-Date: Sun, 27 Mar 2011 22:48:15 -0700
-Subject: [PATCH] Conditionally compile dc1394_vloopback only when linux/videodev.h exists
-
----
- libdc1394/configure.in         |    3 +++
- libdc1394/examples/Makefile.am |    2 ++
- 2 files changed, 7 insertions(+), 0 deletions(-)
-
-diff --git a/libdc1394/configure.in b/libdc1394/configure.in
-index 69babab..bdddc9b 100644
---- a/libdc1394/configure.in
-+++ b/libdc1394/configure.in
-@@ -75,6 +75,9 @@ AM_CONDITIONAL(HAVE_WINDOWS, test x$have_windows = xtrue)
- AM_CONDITIONAL(HAVE_LIBRAW1394, test x$libraw1394 = xtrue)
- AM_CONDITIONAL(HAVE_LIBUSB, test "x$LIBUSB_LIBS" != "x")
- 
-+AC_CHECK_HEADER([linux/videodev.h], [have_videodev=true])
-+AM_CONDITIONAL(HAVE_VIDEODEV, test x$have_videodev = xtrue)
-+
- AC_ARG_ENABLE([examples], [AS_HELP_STRING([--disable-examples], [don't build example programs])], [build_examples=$enableval], [build_examples=true])
- 
- AM_CONDITIONAL(MAKE_EXAMPLES, test x$build_examples = xtrue)
-diff --git a/libdc1394/examples/Makefile.am b/libdc1394/examples/Makefile.am
-index fcebf18..035612e 100644
---- a/libdc1394/examples/Makefile.am
-+++ b/libdc1394/examples/Makefile.am
-@@ -8,7 +8,9 @@ A = grab_gray_image grab_partial_image grab_color_image \
- B = dc1394_reset_bus
- 
- if HAVE_LINUX
-+if HAVE_VIDEODEV
- B += dc1394_vloopback
-+endif
- if HAVE_XV
- A += dc1394_multiview
- endif
--- 
-1.7.4.1
-
diff --git a/extra/libdca/PKGBUILD b/extra/libdca/PKGBUILD
index 578ca3866..cfac10ae8 100644
--- a/extra/libdca/PKGBUILD
+++ b/extra/libdca/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 137736 2011-09-10 14:39:31Z pierre $
+# $Id: PKGBUILD 198146 2013-10-30 13:04:19Z allan $
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 
 pkgname=libdca
 pkgver=0.0.5
-pkgrel=3.2
+pkgrel=4
 pkgdesc="Free library for decoding DTS Coherent Acoustics streams"
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
@@ -11,23 +11,21 @@ url="http://www.videolan.org/developers/libdca.html"
 depends=('sh')
 provides=('libdts')
 replaces=('libdts')
-options=('!libtool' '!emptydirs')
+options=('!emptydirs')
 source=("http://download.videolan.org/pub/videolan/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.bz2")
 md5sums=('dab6b2795c66a82a6fcd4f8343343021')
 
 build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr --mandir=/usr/share/man
+  cd $pkgname-$pkgver
+  ./configure --prefix=/usr --mandir=/usr/share/man --disable-static
   make
 }
 
 package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+  cd $pkgname-$pkgver
   make DESTDIR="${pkgdir}" install
 
   rm -f "${pkgdir}/usr/share/man/man1"/{extract_dts,dtsdec}.1
   ln -s dcadec.1.gz "${pkgdir}/usr/share/man/man1/dtsdec.1.gz"
   ln -s extract_dca.1.gz "${pkgdir}/usr/share/man/man1/extract_dts.1.gz"
-  # remove dangling symlink
-  rm "${pkgdir}/usr/lib/libdts.a"
 }
diff --git a/extra/libdiscid/PKGBUILD b/extra/libdiscid/PKGBUILD
index 096406399..7bc700b27 100644
--- a/extra/libdiscid/PKGBUILD
+++ b/extra/libdiscid/PKGBUILD
@@ -1,16 +1,15 @@
-# $Id: PKGBUILD 195896 2013-10-03 23:11:52Z eric $
+# $Id: PKGBUILD 197662 2013-10-28 01:29:10Z eric $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Eric Gillingham <sysrq@sysrq.tk>
 
 pkgname=libdiscid
 pkgver=0.6.1
-pkgrel=1
+pkgrel=2
 pkgdesc="A Library for creating MusicBrainz DiscIDs"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://musicbrainz.org/doc/libdiscid"
 license=('LGPL')
 depends=('glibc')
-options=('!libtool')
 source=("http://ftp.musicbrainz.org/pub/musicbrainz/libdiscid/${pkgname}-${pkgver}.tar.gz")
 md5sums=('98c4b281780707e6b446cc526a825e7a')
 
diff --git a/extra/libdmapsharing/PKGBUILD b/extra/libdmapsharing/PKGBUILD
index 8f3a61365..f60c2059c 100644
--- a/extra/libdmapsharing/PKGBUILD
+++ b/extra/libdmapsharing/PKGBUILD
@@ -1,17 +1,16 @@
-# $Id: PKGBUILD 183628 2013-04-25 17:51:21Z ioni $
+# $Id: PKGBUILD 198147 2013-10-30 13:04:44Z allan $
 #Maintainer: Ionut Biru <ibiru@archlinux.org>
 
 pkgname=libdmapsharing
-pkgver=2.9.17
+pkgver=2.9.23
 pkgrel=1
 pkgdesc="A library that implements the DMAP family of protocols"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.flyn.org/projects/libdmapsharing/index.html"
 license=('LGPL2.1')
 depends=('libsoup' 'avahi' 'gst-plugins-base-libs' 'gdk-pixbuf2')
-options=('!libtool')
 source=(http://www.flyn.org/projects/libdmapsharing/$pkgname-$pkgver.tar.gz)
-md5sums=('089e70ed4fb3b92dcd956b80dbf3ffc9')
+md5sums=('7e6bb71f614392e340cac782586072a7')
 
 build() {
   cd $pkgname-$pkgver
diff --git a/extra/libdmtx/PKGBUILD b/extra/libdmtx/PKGBUILD
index a85a15626..54b5311c9 100644
--- a/extra/libdmtx/PKGBUILD
+++ b/extra/libdmtx/PKGBUILD
@@ -1,16 +1,15 @@
-# $Id: PKGBUILD 188766 2013-06-19 20:23:44Z andrea $
+# $Id: PKGBUILD 196974 2013-10-21 12:07:01Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: jose <jose1711 [at] gmail (dot) com>
 
 pkgname=libdmtx
 pkgver=0.7.4
-pkgrel=4
+pkgrel=5
 pkgdesc="A software for reading and writing Data Matrix 2D barcodes"
 url="http://www.libdmtx.org/"
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL2')
 depends=('glibc')
-options=('!libtool')
 source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2")
 md5sums=('d3a4c0becd92895eb606dbdb78b023e2')
 
diff --git a/extra/libdmx/PKGBUILD b/extra/libdmx/PKGBUILD
index 8c7b0a4a1..16301513b 100644
--- a/extra/libdmx/PKGBUILD
+++ b/extra/libdmx/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 186576 2013-05-29 15:18:36Z andyrtr $
+# $Id: PKGBUILD 198148 2013-10-30 13:05:12Z allan $
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 #Maintainer: Jan de Groot <jgc@archlinux.org>
 
@@ -11,7 +11,6 @@ url="http://xorg.freedesktop.org/"
 license=('custom')
 depends=('dmxproto' 'libxext')
 makedepends=('xorg-util-macros')
-options=('!libtool')
 source=("${url}/releases/individual/lib/${pkgname}-${pkgver}.tar.bz2")
 sha256sums=('c97da36d2e56a2d7b6e4f896241785acc95e97eb9557465fd66ba2a155a7b201')
 
diff --git a/extra/libdrm/PKGBUILD b/extra/libdrm/PKGBUILD
index c9b28d1b9..fb01cb3f6 100644
--- a/extra/libdrm/PKGBUILD
+++ b/extra/libdrm/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 194427 2013-09-16 10:28:35Z jgc $
+# $Id: PKGBUILD 198149 2013-10-30 13:05:35Z allan $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=libdrm
-pkgver=2.4.46
-pkgrel=2
+pkgver=2.4.47
+pkgrel=1
 pkgdesc="Userspace interface to kernel DRM services"
 arch=(i686 x86_64 'mips64el')
 license=('custom')
@@ -11,11 +11,10 @@ depends=('glibc' 'libpciaccess')
 checkdepends=('cairo')
 [ "$CARCH" != "mips64el" ] && makedepends+=('clang' 'valgrind')
 replaces=('libdrm-new' 'libdrm-nouveau')
-options=('!libtool')
 url="http://dri.freedesktop.org/"
 source=(http://dri.freedesktop.org/$pkgname/$pkgname-$pkgver.tar.bz2
         COPYING)
-sha256sums=('33cf320dad4e8060768714792e12643ddf6756a719d262ba7d60b39c2b2650f1'
+sha256sums=('c2dac2250adbcea23efb18fa8cf484c0f43c8ffbf5064ec82678bc410084f8e7'
             '9631d4f694952e3e6ae5a05534c2e93e994e47d3413677a3a00e45c8cef6db93')
 
 build() {
diff --git a/extra/libdv/PKGBUILD b/extra/libdv/PKGBUILD
index dc4a66075..10324f642 100644
--- a/extra/libdv/PKGBUILD
+++ b/extra/libdv/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 150457 2012-02-17 23:44:16Z allan $
+# $Id: PKGBUILD 197341 2013-10-25 02:40:30Z allan $
 # Maintainer:
 # Contributor: Tom Newsom <Jeepster@gmx.co.uk>
 
 pkgname=libdv
 pkgver=1.0.0
-pkgrel=4.2
+pkgrel=5
 pkgdesc="The Quasar DV codec (libdv) is a software codec for DV video"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://libdv.sourceforge.net/"
@@ -12,7 +12,6 @@ license=('LGPL')
 depends=('popt')
 makedepends=('pkg-config' 'gtk' 'libxv')
 optdepends=('gtk: for using playdv' 'libxv: for using playdv')
-options=('!libtool')
 source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz)
 md5sums=('f895162161cfa4bb4a94c070a7caa6c7')
 
diff --git a/extra/libdvbpsi/PKGBUILD b/extra/libdvbpsi/PKGBUILD
index c6cedcb9c..0d9e690d3 100644
--- a/extra/libdvbpsi/PKGBUILD
+++ b/extra/libdvbpsi/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 196290 2013-10-10 15:39:09Z giovanni $
+# $Id: PKGBUILD 198150 2013-10-30 13:05:56Z allan $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Gilles CHAUVIN <gcnweb@gmail.com>
 
@@ -10,7 +10,6 @@ pkgdesc="A library designed for decoding and generation of MPEG TS and DVB PSI t
 arch=('i686' 'x86_64' 'mips64el')
 license=('LGPL2.1')
 depends=('glibc')
-options=('!libtool')
 replaces=('libdvbpsi4' 'libdvbpsi5')
 conflicts=('libdvbpsi4' 'libdvbpsi5')
 url="http://developers.videolan.org/libdvbpsi/"
diff --git a/extra/libdvdcss/PKGBUILD b/extra/libdvdcss/PKGBUILD
index 840851852..ac7e003f7 100644
--- a/extra/libdvdcss/PKGBUILD
+++ b/extra/libdvdcss/PKGBUILD
@@ -1,17 +1,18 @@
-# $Id: PKGBUILD 195484 2013-10-01 06:01:26Z bpiotrowski $
+# $Id: PKGBUILD 197664 2013-10-28 02:02:53Z eric $
+# Maintainer:
 # Contributor: Stéphane Gaudreault <stephane@archlinux.org>
 # Contributor: arjan <arjan@archlinux.org>
 # Contributor Sarah Hay <sarahhay@mb.sympatico.ca>
 
 pkgname=libdvdcss
 pkgver=1.2.13
-pkgrel=2
+pkgrel=3
 pkgdesc="Portable abstraction library for DVD decryption"
 url="http://www.videolan.org/libdvdcss"
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 depends=('glibc')
-options=('!libtool' '!docs' '!emptydirs')
+options=('!docs' '!emptydirs')
 source=(http://download.videolan.org/pub/$pkgname/$pkgver/$pkgname-$pkgver.tar.bz2)
 sha1sums=('1a4a5e55c7529da46386c1c333340eee2c325a77')
 
diff --git a/extra/libdvdnav/PKGBUILD b/extra/libdvdnav/PKGBUILD
index 57df9ae33..04bbb764b 100644
--- a/extra/libdvdnav/PKGBUILD
+++ b/extra/libdvdnav/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 145184 2011-12-19 11:48:47Z jgc $
+# $Id: PKGBUILD 198151 2013-10-30 13:06:17Z allan $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: Arjan <arjan@archlinux.org>
 # contributor Sarah Hay <sarahhay@mb.sympatico.ca>
@@ -11,7 +11,6 @@ arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 url="http://dvdnav.mplayerhq.hu/"
 depends=('libdvdread')
-options=(!libtool)
 source=(http://dvdnav.mplayerhq.hu/releases/${pkgname}-${pkgver}.tar.bz2)
 sha256sums=('8c971b08276c89ddcecd26fc44204460fd250dc57346f03476d3077188c47550')
 
diff --git a/extra/libdvdread/PKGBUILD b/extra/libdvdread/PKGBUILD
index 259acd58d..14f8ce163 100644
--- a/extra/libdvdread/PKGBUILD
+++ b/extra/libdvdread/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 144377 2011-12-05 12:49:24Z jgc $
+# $Id: PKGBUILD 198152 2013-10-30 13:06:40Z allan $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: Thomas Baechler <thomas@archlinux.org>
 # Contributor: Tom Newsom <Jeepster@gmx.co.uk>
@@ -13,7 +13,6 @@ license=('GPL')
 depends=('glibc')
 makedepends=('libdvdcss')
 optdepends=('libdvdcss: for decoding encrypted DVDs')
-options=('!libtool')
 source=(http://dvdnav.mplayerhq.hu/releases/${pkgname}-${pkgver}.tar.bz2)
 sha256sums=('0bea15da842a4b04a482b009d72dcc6d9c9524ccc1bf67e5748319ec5ada8097')
 
diff --git a/extra/libebml/PKGBUILD b/extra/libebml/PKGBUILD
index b898acb29..c9e2aad45 100644
--- a/extra/libebml/PKGBUILD
+++ b/extra/libebml/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 180600 2013-03-24 12:10:12Z giovanni $
+# $Id: PKGBUILD 197369 2013-10-25 03:00:48Z bisson $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: 03/08/04 <lefungus@altern.org>
 
 pkgname=libebml
 pkgver=1.3.0
-pkgrel=1
+pkgrel=2
 pkgdesc="Extensible Binary Meta Language library"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://dl.matroska.org/downloads/libebml/"
diff --git a/extra/libepc/PKGBUILD b/extra/libepc/PKGBUILD
index 57c3baa17..84d590cb0 100644
--- a/extra/libepc/PKGBUILD
+++ b/extra/libepc/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 148403 2012-01-31 11:38:44Z ibiru $
+# $Id: PKGBUILD 198153 2013-10-30 13:07:09Z allan $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=libepc
@@ -10,7 +10,6 @@ license=('LGPL')
 url="http://live.gnome.org/libepc"
 depends=('gtk3' 'avahi' 'libsoup')
 makedepends=('intltool')
-options=('!libtool')
 source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/0.4/$pkgname-$pkgver.tar.xz)
 sha256sums=('4f98fc306c0f9d361e1381484744246efd084053732924741078270c49afc33b')
 
diff --git a/extra/libetpan/PKGBUILD b/extra/libetpan/PKGBUILD
index 6368d0052..f947a2a74 100644
--- a/extra/libetpan/PKGBUILD
+++ b/extra/libetpan/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 193410 2013-08-19 17:39:35Z andyrtr $
+# $Id: PKGBUILD 198154 2013-10-30 13:07:31Z allan $
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 
 pkgname=libetpan
@@ -9,7 +9,6 @@ arch=('i686' 'x86_64' 'mips64el')
 url="http://www.etpan.org/"
 license=("custom:etpan")
 depends=('libsasl' 'curl' 'expat')
-options=('!libtool')
 source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.gz)
 md5sums=('6fee60d08506e941642b8fa087e60b07')
 
diff --git a/extra/libevdev/PKGBUILD b/extra/libevdev/PKGBUILD
index 4a398cb83..4835f8cf0 100644
--- a/extra/libevdev/PKGBUILD
+++ b/extra/libevdev/PKGBUILD
@@ -10,7 +10,6 @@ url="http://www.freedesktop.org/wiki/Software/libevdev/"
 license=(custom:X11)
 depends=('glibc')
 makedepends=('python')
-options=('!libtool')
 source=(http://freedesktop.org/software/$pkgname/$pkgname-$pkgver.tar.xz)
 sha256sums=('ba6becd3f41430aa290ddf53694909fb46b9a65d5fe264e5fc2a4f5169484f42')
 
diff --git a/extra/libexif/PKGBUILD b/extra/libexif/PKGBUILD
index 5526df989..bf66b8731 100644
--- a/extra/libexif/PKGBUILD
+++ b/extra/libexif/PKGBUILD
@@ -1,16 +1,15 @@
-# $Id: PKGBUILD 165030 2012-08-09 08:16:11Z jgc $
+# $Id: PKGBUILD 198156 2013-10-30 13:08:14Z allan $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: Tobias Kieslich <tobias@justdreams.de>
 
 pkgname=libexif
 pkgver=0.6.21
-pkgrel=1
+pkgrel=2
 pkgdesc="A library to parse an EXIF file and read the data from those tags"
 arch=(i686 x86_64 'mips64el')
 license=('LGPL')
 url="http://sourceforge.net/projects/libexif"
 depends=('glibc')
-options=('!libtool')
 source=(http://downloads.sf.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.bz2)
 md5sums=('27339b89850f28c8f1c237f233e05b27')
 
diff --git a/extra/libfontenc/PKGBUILD b/extra/libfontenc/PKGBUILD
index a38f23821..05b02923c 100644
--- a/extra/libfontenc/PKGBUILD
+++ b/extra/libfontenc/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 183670 2013-04-26 12:46:35Z andyrtr $
+# $Id: PKGBUILD 198157 2013-10-30 13:08:37Z allan $
 #Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=libfontenc
@@ -10,7 +10,6 @@ url="http://xorg.freedesktop.org/"
 license=('custom')
 depends=('zlib')
 makedepends=('pkgconfig' 'xproto>=7.0.18')
-options=('!libtool')
 source=(${url}/releases/individual/lib/${pkgname}-${pkgver}.tar.bz2)
 sha256sums=('a9a4efed3359b2e80161bb66b65038fac145137fa134e71335264cbc23b02f62')
 
diff --git a/extra/libfprint/PKGBUILD b/extra/libfprint/PKGBUILD
index 9a01f299d..c898cdb14 100644
--- a/extra/libfprint/PKGBUILD
+++ b/extra/libfprint/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 193152 2013-08-17 10:24:46Z heftig $
+# $Id: PKGBUILD 198158 2013-10-30 13:08:58Z allan $
 # Maintainer: Tom Gundersen <teg@jklm.no>
 # Contributor: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Contributor: Thomas Baechler <thomas@archlinux.org>
@@ -12,7 +12,7 @@ url="http://www.freedesktop.org/wiki/Software/fprint/libfprint"
 license=(LGPL)
 depends=(libusb nss gdk-pixbuf2)
 groups=(fprint)
-options=(!libtool !emptydirs)
+options=(!emptydirs)
 source=(http://people.freedesktop.org/~hadess/$pkgname-$pkgver.tar.xz)
 md5sums=('f52ac662d89fb82a441dacb0bac36c13')
 
diff --git a/extra/libfs/PKGBUILD b/extra/libfs/PKGBUILD
index a06ca8611..95ace5f52 100644
--- a/extra/libfs/PKGBUILD
+++ b/extra/libfs/PKGBUILD
@@ -1,17 +1,16 @@
-# $Id: PKGBUILD 186578 2013-05-29 15:21:31Z andyrtr $
+# $Id: PKGBUILD 197087 2013-10-21 18:34:58Z andyrtr $
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=libfs
 pkgver=1.0.5
-pkgrel=1
+pkgrel=2
 pkgdesc="X11 Font Services Library"
 arch=('i686' 'x86_64' 'mips64el')
 license=('custom')
 url="http://xorg.freedesktop.org/"
 depends=('glibc' 'xproto' 'fontsproto')
 makedepends=('xorg-util-macros' 'xtrans')
-options=('!libtool')
 source=("${url}/releases/individual/lib/libFS-${pkgver}.tar.bz2")
 sha256sums=('22eb3005dd8053aef7ff82758da5dd59ca9738410bcf847e675780e3a1f96107')
 
diff --git a/extra/libftdi/PKGBUILD b/extra/libftdi/PKGBUILD
index dc380353c..33529c424 100644
--- a/extra/libftdi/PKGBUILD
+++ b/extra/libftdi/PKGBUILD
@@ -1,16 +1,15 @@
-# $Id: PKGBUILD 153977 2012-03-21 07:09:24Z eric $
+# $Id: PKGBUILD 197346 2013-10-25 02:47:00Z allan $
 # Contributor: Tobias Powalowski <tpowa@archlinux.org>
 
 pkgname=libftdi
 pkgver=0.20
-pkgrel=1
+pkgrel=2
 pkgdesc="A library to talk to FTDI chips"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.intra2net.com/en/developer/libftdi/download.php"
 license=('GPL2' 'LGPL2.1')
 depends=('libusb-compat' 'gcc-libs')
 makedepends=('boost')
-options=('!libtool')
 source=(http://www.intra2net.com/en/developer/libftdi/download/$pkgname-$pkgver.tar.gz{,.sig})
 sha1sums=('4bc6ce70c98a170ada303fbd00b8428d8a2c1aa2'
           '807d145147c9bee08b4cea4d7ca82ccaf1330f02')
diff --git a/extra/libgadu/PKGBUILD b/extra/libgadu/PKGBUILD
index 1ac53074a..4856e5591 100644
--- a/extra/libgadu/PKGBUILD
+++ b/extra/libgadu/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 162324 2012-06-25 04:48:31Z eric $
+# $Id: PKGBUILD 198159 2013-10-30 13:09:19Z allan $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Mateusz Herych <heniekk@gmail.com>
 
@@ -10,7 +10,6 @@ arch=('i686' 'x86_64' 'mips64el')
 url="http://toxygen.net/libgadu/"
 license=('LGPL2.1')
 depends=('openssl')
-options=('!libtool')
 source=("http://toxygen.net/${pkgname}/files/${pkgname}-${pkgver}.tar.gz")
 md5sums=('832432fef251f69f31e68574c17f0c51')
 
diff --git a/extra/libgda/PKGBUILD b/extra/libgda/PKGBUILD
index 84c993286..356f93787 100644
--- a/extra/libgda/PKGBUILD
+++ b/extra/libgda/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 184204 2013-05-03 19:46:09Z heftig $
+# $Id: PKGBUILD 198160 2013-10-30 13:09:39Z allan $
 # Maintainer: tobias <tobias@archlinux.org>
 # Contributor: Tobias Kieslich <tobias@justdreams.de>
 
@@ -13,7 +13,6 @@ depends=('gtksourceview3' 'libxslt' 'json-glib' 'db' 'ncurses' 'libsoup'
          'hicolor-icon-theme' 'desktop-file-utils' 'graphviz' 'gdk-pixbuf2'
          'iso-codes' 'openssl' 'libgcrypt' 'libldap')
 makedepends=('intltool' 'gobject-introspection' 'gtk-doc' 'vala')
-options=('!libtool')
 url="http://www.gnome-db.org"
 install=libgda.install
 source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz)
diff --git a/extra/libgdata/PKGBUILD b/extra/libgdata/PKGBUILD
index a08e9273d..e4c19b657 100644
--- a/extra/libgdata/PKGBUILD
+++ b/extra/libgdata/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 192056 2013-08-05 13:43:53Z jgc $
+# $Id: PKGBUILD 198161 2013-10-30 13:09:59Z allan $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=libgdata
@@ -10,7 +10,6 @@ license=('GPL')
 depends=('libsoup' 'liboauth' 'gcr' 'gnome-online-accounts')
 makedepends=('intltool' 'gobject-introspection')
 url="http://www.gnome.org"
-options=('!libtool')
 source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
 sha256sums=('ae405145bb6a2109488b7123206b469b141f17317066471dd485b4ea50499c83')
 
diff --git a/extra/libgdiplus/PKGBUILD b/extra/libgdiplus/PKGBUILD
index 8a92d5f29..aadb73f5f 100644
--- a/extra/libgdiplus/PKGBUILD
+++ b/extra/libgdiplus/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 193216 2013-08-19 09:25:42Z jgc $
+# $Id: PKGBUILD 198162 2013-10-30 13:10:21Z allan $
 # Maintainer: Daniel Isenmann <daniel@archlinux.org>
 
 pkgname=libgdiplus
@@ -9,7 +9,6 @@ arch=(i686 x86_64 'mips64el')
 license=('MPL' 'LGPL')
 url="http://www.mono-project.com"
 depends=('libtiff' 'cairo' 'giflib' 'glib2' 'libexif')
-options=('!libtool')
 source=(http://download.mono-project.com/sources/${pkgname}/${pkgname}-${pkgver}.tar.bz2
         libpng15.patch
         libgdiplus0-giflib5.patch
diff --git a/extra/libgee/PKGBUILD b/extra/libgee/PKGBUILD
index d54504e49..28bf4bd6a 100644
--- a/extra/libgee/PKGBUILD
+++ b/extra/libgee/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 196112 2013-10-07 11:52:50Z jgc $
+# $Id: PKGBUILD 198163 2013-10-30 13:10:44Z allan $
 # Maintainer : Ionut Biru <ibiru@archlinux.org>
 # Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com>
 
@@ -11,7 +11,6 @@ license=(LGPL2.1)
 arch=(i686 x86_64 mips64el)
 depends=(glib2)
 makedepends=(gobject-introspection vala)
-options=('!libtool')
 source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
 sha256sums=('d106ed63fe0da5d5ee89aa8197a373cf9a2b96688cc3060144bfc0a022496ea5')
 
diff --git a/extra/libgee06/PKGBUILD b/extra/libgee06/PKGBUILD
index a5419fab7..2b92e61df 100644
--- a/extra/libgee06/PKGBUILD
+++ b/extra/libgee06/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 183430 2013-04-21 22:11:17Z heftig $
+# $Id: PKGBUILD 198164 2013-10-30 13:11:04Z allan $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Contributor: Ionut Biru <ibiru@archlinux.org>
 # Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com>
@@ -13,7 +13,6 @@ license=(LGPL2.1)
 arch=(i686 x86_64 mips64el)
 depends=(glib2)
 makedepends=(gobject-introspection)
-options=('!libtool')
 source=(http://ftp.gnome.org/pub/GNOME/sources/$_pkgname/${pkgver::3}/$_pkgname-$pkgver.tar.xz)
 sha256sums=('a61f8d796173d41f6144a030d4bd22461f0bb3fa18a3ebe02341b315feebf5d3')
 
diff --git a/extra/libgksu/PKGBUILD b/extra/libgksu/PKGBUILD
index 614346b97..8ee4d6b39 100644
--- a/extra/libgksu/PKGBUILD
+++ b/extra/libgksu/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 160761 2012-06-05 08:03:43Z jgc $
+# $Id: PKGBUILD 198165 2013-10-30 13:11:26Z allan $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=libgksu
@@ -10,7 +10,7 @@ url="http://www.nongnu.org/gksu/index.html"
 license=(GPL)
 depends=('gconf' 'gtk2' 'libgnome-keyring' 'libgtop' 'startup-notification')
 makedepends=('intltool' 'gtk-doc')
-options=('!libtool' '!emptydirs')
+options=('!emptydirs')
 install=libgksu.install
 source=(http://people.debian.org/~kov/gksu/${pkgname}-${pkgver}.tar.gz
         libgksu-2.0.0-fbsd.patch
diff --git a/extra/libglade/PKGBUILD b/extra/libglade/PKGBUILD
index 802d07e19..d997a18dc 100644
--- a/extra/libglade/PKGBUILD
+++ b/extra/libglade/PKGBUILD
@@ -1,16 +1,15 @@
-# $Id: PKGBUILD 151071 2012-02-24 17:50:27Z ibiru $
+# $Id: PKGBUILD 197694 2013-10-28 14:56:48Z jgc $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=libglade
 pkgver=2.6.4
-pkgrel=3.1
+pkgrel=5
 pkgdesc="Allows you to load glade interface files in a program at runtime"
 arch=(i686 x86_64 'mips64el')
 license=('LGPL')
 depends=('gtk2>=2.16.0' 'libxml2>=2.7.3')
 makedepends=('python2' 'pkgconfig')
 optdepends=('python2: libglade-convert script')
-options=('!libtool')
 install=glade.install
 source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/2.6/${pkgname}-${pkgver}.tar.bz2
 	libglade-2.0.1-nowarning.patch)
@@ -18,15 +17,19 @@ url="http://www.gnome.org"
 md5sums=('d1776b40f4e166b5e9c107f1c8fe4139'
          '4f879c0ce550004905aa0fb24f25c353')
 
+prepare() {
+  cd $pkgname-$pkgver
+  patch -Np1 -i ../libglade-2.0.1-nowarning.patch
+}
+
 build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  patch -Np1 -i "${srcdir}/libglade-2.0.1-nowarning.patch"
-  PYTHON=python2 ./configure --sysconfdir=/etc --prefix=/usr --localstatedir=/var
+  cd $pkgname-$pkgver
+  PYTHON=/usr/bin/python2 ./configure --sysconfdir=/etc --prefix=/usr --localstatedir=/var
   make
 }
 
 package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+  cd $pkgname-$pkgver
   make DESTDIR="${pkgdir}" install
   install -m755 libglade-convert "${pkgdir}/usr/bin/"
 }
diff --git a/extra/libglademm/PKGBUILD b/extra/libglademm/PKGBUILD
index b84eba3b1..deb3a2385 100644
--- a/extra/libglademm/PKGBUILD
+++ b/extra/libglademm/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 137593 2011-09-10 00:04:11Z allan $
+# $Id: PKGBUILD 198166 2013-10-30 13:11:47Z allan $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: Kritoke <typeolinux@yahoo.com>
 
@@ -11,7 +11,6 @@ url="http://gtkmm.sourceforge.net/"
 license=('LGPL')
 depends=('libglade>=2.6.3' 'gtkmm>=2.14.1')
 makedepends=('pkgconfig')
-options=('!libtool')
 source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/2.6/${pkgname}-${pkgver}.tar.bz2)
 md5sums=('f9ca5b67f6c551ea98790ab5f21c19d0')
 
diff --git a/extra/libgnome-keyring/PKGBUILD b/extra/libgnome-keyring/PKGBUILD
index 1cb9f768d..520f00c3f 100644
--- a/extra/libgnome-keyring/PKGBUILD
+++ b/extra/libgnome-keyring/PKGBUILD
@@ -1,8 +1,8 @@
-#$Id: PKGBUILD 196113 2013-10-07 11:52:52Z jgc $
+#$Id: PKGBUILD 198171 2013-10-30 13:14:09Z allan $
 #Maintainer: Jan De Groot <jgc@archlinux.org>
 
 pkgname=libgnome-keyring
-pkgver=3.10.0
+pkgver=3.10.1
 pkgrel=1
 pkgdesc="GNOME keyring client library"
 arch=(i686 x86_64 'mips64el')
@@ -10,10 +10,10 @@ license=('GPL' 'LGPL')
 depends=('dbus-core' 'glib2' 'libgcrypt')
 makedepends=('intltool' 'gobject-introspection')
 optdepends=('gnome-keyring: key storage service (or use any other service implementing org.freedesktop.secrets)')
-options=('!libtool' '!emptydirs')
+options=('!emptydirs')
 url="http://www.gnome.org"
 source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('3984e99338e6e610af320a637fa84fb9e795226cfd633d7c0db452c5ae43b560')
+sha256sums=('052cf1121ba823359afe534c425f7e216c6a2b1a2b316dee279dcf9032423772')
 
 build() {
   cd "$pkgname-$pkgver"
diff --git a/extra/libgnome/PKGBUILD b/extra/libgnome/PKGBUILD
index f34b4214c..4b856115d 100644
--- a/extra/libgnome/PKGBUILD
+++ b/extra/libgnome/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 178221 2013-02-18 14:05:53Z jgc $ 
+# $Id: PKGBUILD 198167 2013-10-30 13:12:08Z allan $ 
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgbase=libgnome
@@ -8,7 +8,7 @@ pkgrel=4
 arch=('i686' 'x86_64' 'mips64el')
 license=('LGPL')
 makedepends=('intltool' 'gnome-vfs' 'libbonobo' 'gconf' 'gvfs' 'libcanberra')
-options=('!libtool' '!emptydirs')
+options=('!emptydirs')
 url="http://www.gnome.org"
 source=(http://ftp.gnome.org/pub/gnome/sources/${pkgbase}/2.32/${pkgbase}-${pkgver}.tar.bz2)
 sha256sums=('b2c63916866485793b87398266dd7778548c1734923c272a94d84ee011b6f7a4')
diff --git a/extra/libgnomecanvas/PKGBUILD b/extra/libgnomecanvas/PKGBUILD
index eab871f90..fae1b4c71 100644
--- a/extra/libgnomecanvas/PKGBUILD
+++ b/extra/libgnomecanvas/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 148820 2012-02-05 11:51:45Z ibiru $
+# $Id: PKGBUILD 198168 2013-10-30 13:12:34Z allan $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=libgnomecanvas
@@ -9,7 +9,6 @@ arch=(i686 x86_64 'mips64el')
 license=('LGPL')
 depends=('libglade>=2.6.4' 'libart-lgpl>=2.3.21')
 makedepends=('pkg-config' 'intltool')
-options=('!libtool')
 url="http://www.gnome.org"
 source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/2.30/${pkgname}-${pkgver}.tar.bz2)
 sha256sums=('859b78e08489fce4d5c15c676fec1cd79782f115f516e8ad8bed6abcb8dedd40')
diff --git a/extra/libgnomecanvasmm/PKGBUILD b/extra/libgnomecanvasmm/PKGBUILD
index 707c7d120..686540cdb 100644
--- a/extra/libgnomecanvasmm/PKGBUILD
+++ b/extra/libgnomecanvasmm/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 137754 2011-09-10 15:22:05Z pierre $
+# $Id: PKGBUILD 198169 2013-10-30 13:12:54Z allan $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: Kritoke <typeolinux@yahoo.com>
 
@@ -10,7 +10,6 @@ arch=('i686' 'x86_64' 'mips64el')
 license=('LGPL')
 depends=('gtkmm' 'libgnomecanvas')
 makedepends=('pkgconfig')
-options=('!libtool')
 url="http://gtkmm.sourceforge.net/"
 source=("http://ftp.gnome.org/pub/gnome/sources/${pkgname}/2.26/${pkgname}-${pkgver}.tar.bz2")
 md5sums=('a148c99311d46397de6e4a31736771ab')
diff --git a/extra/libgnomekbd/PKGBUILD b/extra/libgnomekbd/PKGBUILD
index c3cd7b5ec..54e853604 100644
--- a/extra/libgnomekbd/PKGBUILD
+++ b/extra/libgnomekbd/PKGBUILD
@@ -1,16 +1,16 @@
-# $Id: PKGBUILD 169950 2012-10-30 22:46:37Z heftig $
+# $Id: PKGBUILD 198170 2013-10-30 13:13:14Z allan $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=libgnomekbd
 pkgver=3.6.0
-pkgrel=1
+pkgrel=2
 pkgdesc="Gnome keyboard library"
 url="http://gswitchit.sourceforge.net"
 arch=('i686' 'x86_64' 'mips64el')
 license=('LGPL')
 depends=('libxklavier' 'gtk3' 'dconf')
 makedepends=('intltool' 'gobject-introspection')
-options=('!libtool' '!emptydirs')
+options=('!emptydirs')
 install=libgnomekbd.install
 source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver:0:3}/$pkgname-$pkgver.tar.xz)
 sha256sums=('c41ea5b0f64da470925ba09f9f1b46b26b82d4e433e594b2c71eab3da8856a09')
@@ -18,7 +18,7 @@ sha256sums=('c41ea5b0f64da470925ba09f9f1b46b26b82d4e433e594b2c71eab3da8856a09')
 build() {
   cd "$pkgname-$pkgver"
   ./configure --prefix=/usr --sysconfdir=/etc \
-      --disable-schemas-compile
+      --disable-schemas-compile --disable-static
   make
 }
 
diff --git a/extra/libgnomemm/PKGBUILD b/extra/libgnomemm/PKGBUILD
index b3c0cf70c..6568dffaf 100644
--- a/extra/libgnomemm/PKGBUILD
+++ b/extra/libgnomemm/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 150399 2012-02-17 11:55:36Z allan $
+# $Id: PKGBUILD 198172 2013-10-30 13:14:34Z allan $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: Kritoke <typeolinux@yahoo.com>
 
@@ -10,7 +10,6 @@ arch=('i686' 'x86_64' 'mips64el')
 license=('LGPL')
 depends=('libgnome>=2.28.0' 'gtkmm>=2.20.0')
 makedepends=('pkgconfig')
-options=('!libtool')
 url="http://gtkmm.sourceforge.net/"
 source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/2.30/${pkgname}-${pkgver}.tar.bz2)
 sha256sums=('2a01f068ff73a1985d050e75f899fec34ac13622e2ead43523a4e2b0875042cf')
diff --git a/extra/libgnomeui/PKGBUILD b/extra/libgnomeui/PKGBUILD
index 1fd7ac8b7..f9bee4449 100644
--- a/extra/libgnomeui/PKGBUILD
+++ b/extra/libgnomeui/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 148824 2012-02-05 11:51:52Z ibiru $
+# $Id: PKGBUILD 198173 2013-10-30 13:14:57Z allan $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=libgnomeui
@@ -9,7 +9,6 @@ arch=('i686' 'x86_64' 'mips64el')
 license=('LGPL')
 depends=('libbonoboui' 'libgnome-keyring' 'libsm')
 makedepends=('intltool' 'pkg-config')
-options=('!libtool')
 url="http://www.gnome.org"
 source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/2.24/$pkgname-$pkgver.tar.bz2)
 sha256sums=('ae352f2495889e65524c979932c909f4629a58e64290fb0c95333373225d3c0f')
diff --git a/extra/libgnomeuimm/PKGBUILD b/extra/libgnomeuimm/PKGBUILD
index 4c69b4b32..d7f484252 100644
--- a/extra/libgnomeuimm/PKGBUILD
+++ b/extra/libgnomeuimm/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 140505 2011-10-16 04:27:15Z eric $
+# $Id: PKGBUILD 198174 2013-10-30 13:15:24Z allan $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: Kritoke <typeolinux@yahoo.com>
 
@@ -10,7 +10,6 @@ arch=(i686 x86_64 'mips64el')
 url="http://gtkmm.sourceforge.net/"
 license=('GPL')
 depends=('libgnomeui>=2.24.4' 'libgnomecanvasmm>=2.26.0' 'libgnomemm>=2.30.0' 'libglademm>=2.6.7' 'gconfmm>=2.28.2' 'gnome-vfsmm>=2.26.0')
-options=('!libtool')
 source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/2.28/${pkgname}-${pkgver}.tar.bz2)
 sha256sums=('6cb46494913f1e5e34b94a0f5b9ff8ef238bb71e3b08d0ef0ab7f4a7c88211d3')
 
diff --git a/extra/libgpod/PKGBUILD b/extra/libgpod/PKGBUILD
index 7af0fbfc8..993eee3c0 100644
--- a/extra/libgpod/PKGBUILD
+++ b/extra/libgpod/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 185166 2013-05-11 16:16:30Z tomegun $
+# $Id: PKGBUILD 198175 2013-10-30 13:15:45Z allan $
 # Maintainer: Daniel Isenmann <daniel@archlinux.org>
 # Contributor: William Rea <sillywilly@gmail.com>
 
@@ -17,7 +17,7 @@ if [ "$CARCH" != "mips64el" ]; then
 fi
 url="http://www.gtkpod.org/libgpod/"
 source=(http://downloads.sourceforge.net/sourceforge/gtkpod/${pkgname}-${pkgver}.tar.bz2)
-options=('!libtool' '!emptydirs')
+options=('!emptydirs')
 md5sums=('ff0fd875fa08f2a6a49dec57ce3367ab')
 
 build() {
diff --git a/extra/libgsf/PKGBUILD b/extra/libgsf/PKGBUILD
index 30a01ffdd..905b3eff8 100644
--- a/extra/libgsf/PKGBUILD
+++ b/extra/libgsf/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 193624 2013-08-26 08:14:46Z jgc $
+# $Id: PKGBUILD 198176 2013-10-30 13:16:07Z allan $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: Sarah Hay <sarahhay@mb.sympatico.ca>
 
@@ -9,7 +9,6 @@ arch=(i686 x86_64 mips64el)
 pkgdesc="The GNOME Structured File Library is a utility library for reading and writing structured file formats"
 url="http://www.gnome.org/"
 license=('GPL' 'LGPL')
-options=('!libtool')
 depends=('libxml2' 'gdk-pixbuf2' 'bzip2')
 makedepends=('intltool' 'gobject-introspection')
 source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/1.14/$pkgname-$pkgver.tar.xz)
diff --git a/extra/libgtkhtml/PKGBUILD b/extra/libgtkhtml/PKGBUILD
deleted file mode 100644
index 82a8a5a5a..000000000
--- a/extra/libgtkhtml/PKGBUILD
+++ /dev/null
@@ -1,27 +0,0 @@
-# $Id: PKGBUILD 148828 2012-02-05 11:51:59Z ibiru $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=libgtkhtml
-pkgver=2.11.1
-pkgrel=4.2
-pkgdesc="An HTML library for GTK"
-arch=(i686 x86_64 'mips64el')
-license=('LGPL')
-depends=('gtk2>=2.22.1' 'libxml2>=2.7.8')
-makedepends=('perlxml')
-options=('!libtool')
-url="http://www.gnome.org"
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/2.11/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('a1d1a197dcff8c4571659deef5495e24')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr --sysconfdir=/etc \
-              --localstatedir=/var --disable-static
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/extra/libgtop/PKGBUILD b/extra/libgtop/PKGBUILD
index e2e8aa631..794f10d45 100644
--- a/extra/libgtop/PKGBUILD
+++ b/extra/libgtop/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 193440 2013-08-20 08:09:13Z jgc $
+# $Id: PKGBUILD 198177 2013-10-30 13:16:35Z allan $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=libgtop
@@ -11,7 +11,6 @@ depends=('glib2' 'libxau' 'texinfo')
 makedepends=('intltool' 'gobject-introspection')
 install=libgtop.install
 source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/2.28/${pkgname}-${pkgver}.tar.xz)
-options=('!libtool')
 url="http://www.gnome.org/"
 sha256sums=('c812c174e44a8971a1f33265437cfd10f1e99869c7f5c05f8ee95846a70a3342')
 
diff --git a/extra/libgusb/PKGBUILD b/extra/libgusb/PKGBUILD
index 500d0b250..f5d2c4a65 100644
--- a/extra/libgusb/PKGBUILD
+++ b/extra/libgusb/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 183627 2013-04-25 17:50:55Z ioni $
+# $Id: PKGBUILD 198178 2013-10-30 13:16:56Z allan $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 
 pkgname=libgusb
@@ -11,7 +11,6 @@ license=('LGPL2.1')
 depends=('udev' 'libusbx')
 makedepends=('gobject-introspection')
 source=(http://people.freedesktop.org/~hughsient/releases/$pkgname-$pkgver.tar.xz)
-options=('!libtool')
 sha256sums=('900103ff24a851ef8395b992236ced0aedb4c265ef2264f6ad8349300095198b')
 
 build() {
diff --git a/extra/libgweather/PKGBUILD b/extra/libgweather/PKGBUILD
index 5527147f5..ab8619abc 100644
--- a/extra/libgweather/PKGBUILD
+++ b/extra/libgweather/PKGBUILD
@@ -1,19 +1,19 @@
-# $Id: PKGBUILD 196114 2013-10-07 11:52:53Z jgc $
+# $Id: PKGBUILD 198179 2013-10-30 13:17:18Z allan $
 # Maintainer: Jan de Groot  <jgc@archlinux.org>
 
 pkgname=libgweather
-pkgver=3.10.0
+pkgver=3.10.1
 pkgrel=1
 pkgdesc="Provides access to weather information from the net"
 arch=('i686' 'x86_64' 'mips64el')
 license=('LGPL')
 depends=('libsoup' 'gnome-icon-theme' 'gtk3')
 makedepends=('intltool' 'gobject-introspection' 'vala')
-options=('!libtool' '!emptydirs')
+options=('!emptydirs')
 url="http://www.gnome.org/"
 install=libgweather.install
 source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('4feab6e5c6eb4df85e7d134982a18a6196e63bc8179cfe5a25fc727482c52996')
+sha256sums=('ae8e785f6798b4fe4cf1461c57faf1c0625716ccb92ea927e091840a1205cfc7')
 
 build() {
     cd "$pkgname-$pkgver"
diff --git a/extra/libgxps/PKGBUILD b/extra/libgxps/PKGBUILD
index 9ef1a03ab..173e9107e 100644
--- a/extra/libgxps/PKGBUILD
+++ b/extra/libgxps/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 184403 2013-05-06 19:38:20Z foutrelis $
+# $Id: PKGBUILD 198180 2013-10-30 13:17:39Z allan $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 
 pkgname=libgxps
@@ -9,7 +9,6 @@ arch=(i686 x86_64 'mips64el')
 url="https://live.gnome.org/libgxps"
 license=('GPL2')
 depends=('cairo' 'libarchive' 'libjpeg-turbo' 'libtiff' 'lcms2')
-options=(!libtool)
 source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
 sha256sums=('39d104739bf0db43905c315de1d8002460f1a098576f4418f69294013a5820be')
 
diff --git a/extra/libhangul/PKGBUILD b/extra/libhangul/PKGBUILD
index a10af3943..e38f6c328 100644
--- a/extra/libhangul/PKGBUILD
+++ b/extra/libhangul/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 188501 2013-06-15 04:42:48Z bisson $
+# $Id: PKGBUILD 198181 2013-10-30 13:17:59Z allan $
 # Contributor: damir <damir@archlinux.org>
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
 
@@ -12,7 +12,6 @@ arch=('i686' 'x86_64' 'mips64el')
 source=("http://${pkgname}.googlecode.com/files/${pkgname}-${pkgver}.tar.gz")
 sha1sums=('9c6f3a82f2d4068771215f1b9f13a0d4bdbbfc77')
 
-options=('!libtool')
 
 build() {
 	cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/libical/PKGBUILD b/extra/libical/PKGBUILD
index 810e82fa0..ca392591a 100644
--- a/extra/libical/PKGBUILD
+++ b/extra/libical/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 185545 2013-05-14 21:40:24Z andrea $
+# $Id: PKGBUILD 196976 2013-10-21 12:11:03Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 
 pkgname=libical
 pkgver=1.0
-pkgrel=2
+pkgrel=3
 pkgdesc="An open source reference implementation of the icalendar data type and serialization format"
 arch=('i686' 'x86_64' 'mips64el')
 url='http://sourceforge.net/projects/freeassociation/'
@@ -14,8 +14,11 @@ makedepends=('cmake')
 source=("http://downloads.sourceforge.net/freeassociation/${pkgname}-${pkgver}.tar.gz")
 md5sums=('4438c31d00ec434f02867a267a92f8a1')
 
+prepare() {
+  mkdir build
+}
+
 build() {
-  mkdir -p build
   cd build
   cmake ../${pkgname}-${pkgver} \
     -DCMAKE_BUILD_TYPE=Release \
diff --git a/extra/libice/PKGBUILD b/extra/libice/PKGBUILD
index 1e02e04eb..00ae95446 100644
--- a/extra/libice/PKGBUILD
+++ b/extra/libice/PKGBUILD
@@ -1,28 +1,27 @@
-# $Id: PKGBUILD 151848 2012-03-03 13:42:06Z andyrtr $
+# $Id: PKGBUILD 197088 2013-10-21 18:34:59Z andyrtr $
 # Contributor: Alexander Baldeck <alexander@archlinux.org>
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=libice
 pkgver=1.0.8
-pkgrel=1.1
+pkgrel=2
 pkgdesc="X11 Inter-Client Exchange library"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://xorg.freedesktop.org/"
 depends=('glibc' 'xproto>=7.0.18')
-makedepends=('pkgconfig' 'xtrans>=1.2.5')
-options=('!libtool')
+makedepends=('xtrans>=1.2.5')
 source=(${url}/releases/individual/lib/libICE-${pkgver}.tar.bz2)
 license=('custom')
 sha1sums=('ddb14df8bbc43df7322978f5f9f802936e2a7324')
 
 build() {
-  cd "${srcdir}/libICE-${pkgver}"
+  cd libICE-${pkgver}
   ./configure --prefix=/usr --sysconfdir=/etc
   make
 }
 
 package() {
-  cd "${srcdir}/libICE-${pkgver}"
+  cd libICE-${pkgver}
   make DESTDIR="${pkgdir}" install
 
   install -Dm644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/COPYING"
diff --git a/extra/libid3tag/PKGBUILD b/extra/libid3tag/PKGBUILD
index 9c61f20db..3ce9de19a 100644
--- a/extra/libid3tag/PKGBUILD
+++ b/extra/libid3tag/PKGBUILD
@@ -1,17 +1,16 @@
-# $Id: PKGBUILD 150540 2012-02-18 12:17:15Z pierre $
+# $Id: PKGBUILD 198182 2013-10-30 13:18:20Z allan $
 # Maintainer:
 # Contributor: dorphell <dorphell@archlinux.org>
 
 pkgname=libid3tag
 pkgver=0.15.1b
-pkgrel=7.1
+pkgrel=8
 pkgdesc="library for id3 tagging"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.underbit.com/products/mad/"
 license=('GPL')
 depends=('zlib')
 makedepends=('gperf')
-options=('!libtool')
 source=("ftp://ftp.mars.org/pub/mpeg/${pkgname}-${pkgver}.tar.gz"
 	'id3tag.pc'
 	'10_utf16.diff' '11_unknown_encoding.diff' 'CVE-2008-2109.patch')
diff --git a/extra/libidl2/PKGBUILD b/extra/libidl2/PKGBUILD
index 238e6d546..6ed52c03f 100644
--- a/extra/libidl2/PKGBUILD
+++ b/extra/libidl2/PKGBUILD
@@ -1,17 +1,17 @@
-# $Id: PKGBUILD 150449 2012-02-17 23:08:28Z allan $
+# $Id: PKGBUILD 197354 2013-10-25 02:51:47Z allan $
 # Maintainer: 
 # Committer: Judd Vinet <jvinet@zeroflux.org>
 
 pkgname=libidl2
 pkgver=0.8.14
-pkgrel=2.1
+pkgrel=3
 pkgdesc="A front-end for CORBA 2.2 IDL and Netscape's XPIDL"
 arch=('i686' 'x86_64' 'mips64el')
 license=('LGPL')
 depends=('glib2' 'texinfo')
 makedepends=('pkg-config')
 install=libidl2.install
-options=('!libtool' '!emptydirs')
+options=('!emptydirs')
 source=(http://ftp.gnome.org/pub/gnome/sources/libIDL/0.8/libIDL-${pkgver}.tar.bz2)
 url="http://www.gnome.org"
 sha256sums=('c5d24d8c096546353fbc7cedf208392d5a02afe9d56ebcc1cccb258d7c4d2220')
diff --git a/extra/libidn/PKGBUILD b/extra/libidn/PKGBUILD
index 358abdbd2..45c6b40fd 100644
--- a/extra/libidn/PKGBUILD
+++ b/extra/libidn/PKGBUILD
@@ -1,18 +1,17 @@
-# $Id: PKGBUILD 194235 2013-09-11 07:58:33Z bpiotrowski $
+# $Id: PKGBUILD 198183 2013-10-30 13:18:43Z allan $
 # Maintainer: Ronald van Haren <ronald.archlinux.org>
 # Contributor: Jan de Groot <jgc.archlinux.org>
 # Contributor: Eric Johnson <eric.archlinux.org>
 
 pkgname=libidn
 pkgver=1.28
-pkgrel=1
+pkgrel=2
 pkgdesc="Implementation of the Stringprep, Punycode and IDNA specifications"
 url="http://www.gnu.org/software/libidn/"
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL3' 'LGPL')
 depends=('glibc' 'texinfo')
 makedepends=('pkgconfig')
-options=('!libtool')
 source=(http://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.gz)
 install=libidn.install
 sha1sums=('725587211b229c156e29fa2ad116b0ef71a7ca17')
diff --git a/extra/libiec61883/PKGBUILD b/extra/libiec61883/PKGBUILD
index c994c91bf..6c086997e 100644
--- a/extra/libiec61883/PKGBUILD
+++ b/extra/libiec61883/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 144006 2011-12-01 16:55:03Z giovanni $
+# $Id: PKGBUILD 198184 2013-10-30 13:19:06Z allan $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Jason Chu <jason@archlinux.org>
 # Contributor: Jaroslaw Swierczynski <swiergot@juvepoland.com>
@@ -12,7 +12,6 @@ arch=('i686' 'x86_64' 'mips64el')
 url="http://www.kernel.org/pub/linux/libs/ieee1394/"
 license=('LGPL')
 depends=('libraw1394')
-options=('!libtool')
 source=("http://ftp.osuosl.org/pub/linux/libs/ieee1394/${pkgname}-${pkgver}.tar.gz")
 md5sums=('8af39fff74988073c3ad53fbab147da9')
 
diff --git a/extra/libieee1284/PKGBUILD b/extra/libieee1284/PKGBUILD
index c100ba289..c0867657b 100644
--- a/extra/libieee1284/PKGBUILD
+++ b/extra/libieee1284/PKGBUILD
@@ -1,26 +1,25 @@
-# $Id: PKGBUILD 150619 2012-02-18 23:03:40Z pierre $
+# $Id: PKGBUILD 197666 2013-10-28 02:14:49Z eric $
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 # Contributor: Manolis Tzanidakis <manolis@archlinux.org>
 
 pkgname=libieee1284
 pkgver=0.2.11
-pkgrel=4.1
-pkgdesc="A library to query devices connected in parallel port."
+pkgrel=5
+pkgdesc="A library to query devices connected in parallel port"
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL2')
 url="http://cyberelk.net/tim/libieee1284"
 depends=('python2')
-options=('!libtool')
 source=("http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.bz2")
 md5sums=('b8fff9f3d121531bc17430e3f4ea6ed0')
 
 build() {
-  cd $srcdir/$pkgname-$pkgver
-  ./configure --prefix=/usr --mandir=/usr/share/man PYTHON=/usr/bin/python2
+  cd $pkgname-$pkgver
+  ./configure --prefix=/usr --mandir=/usr/share/man
   make
 }
 
 package() {
-  cd $srcdir/$pkgname-$pkgver
+  cd $pkgname-$pkgver
   make DESTDIR="$pkgdir"/ install
 }
diff --git a/extra/libifp/PKGBUILD b/extra/libifp/PKGBUILD
index b2febe4c8..e931f5398 100644
--- a/extra/libifp/PKGBUILD
+++ b/extra/libifp/PKGBUILD
@@ -1,16 +1,15 @@
-# $Id: PKGBUILD 149577 2012-02-08 14:57:04Z tpowa $
+# $Id: PKGBUILD 198185 2013-10-30 13:19:26Z allan $
 # Maintainer: damir <damir@archlinux.org>
 # Contributor: Mark Rosenstand <mark@borkware.net>
 
 pkgname=libifp
 pkgver=1.0.0.2
-pkgrel=4
+pkgrel=5
 pkgdesc="General-purpose library-driver for iRiver's iFP portable audio players"
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 url="http://ifp-driver.sourceforge.net/libifp/"
 depends=('libusb-compat')
-options=('!libtool')
 source=(http://downloads.sourceforge.net/sourceforge/ifp-driver/${pkgname}-${pkgver}.tar.gz)
 md5sums=('d4114794b13bd32b6b767e0870df6fc4')
 
diff --git a/extra/libimobiledevice/PKGBUILD b/extra/libimobiledevice/PKGBUILD
index 6a9235a71..656d81e52 100644
--- a/extra/libimobiledevice/PKGBUILD
+++ b/extra/libimobiledevice/PKGBUILD
@@ -1,17 +1,16 @@
-# $Id: PKGBUILD 185167 2013-05-11 16:16:32Z tomegun $
+# $Id: PKGBUILD 197450 2013-10-26 06:44:55Z allan $
 # Maintainer : Tom Gundersen <teg@jklm.no>
 # Maintainer : Ionut Biru <ibiru@archlinux.org>
 # Contributor: Gabriel Martinez < reitaka at gmail dot com >
 
 pkgname=libimobiledevice
 pkgver=1.1.5
-pkgrel=1
+pkgrel=2
 pkgdesc="Is a software library that talks the protocols to support iPhone and iPod Touch devices on Linux"
 url="http://libimobiledevice.org/"
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL2' 'LGPL2.1')
 depends=('usbmuxd' 'gnutls' 'libgcrypt')
-options=('!libtool')
 source=(http://libimobiledevice.org/downloads/$pkgname-$pkgver.tar.bz2)
 
 build() {
diff --git a/extra/libindi/PKGBUILD b/extra/libindi/PKGBUILD
index f5954e389..b0e8a4d22 100644
--- a/extra/libindi/PKGBUILD
+++ b/extra/libindi/PKGBUILD
@@ -1,17 +1,17 @@
-# $Id: PKGBUILD 190040 2013-07-13 12:41:09Z svenstaro $
+# $Id: PKGBUILD 198755 2013-11-03 09:14:05Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Tobias Powalowski <tpowa@archlinux.org>
 
 pkgname=libindi
 pkgver=0.9.6
-pkgrel=3
+pkgrel=5
 pkgdesc="A distributed control protocol designed to operate astronomical instrumentation"
 url="http://www.indilib.org/index.php?title=Main_Page"
 license=('GPL2')
 arch=('i686' 'x86_64' 'mips64el')
 depends=('libnova' 'cfitsio' 'boost-libs' 'libusb-compat')
 makedepends=('cmake' 'boost')
-options=('!libtool')
+options=('staticlibs') # libindiclient builds as static only
 source=("http://downloads.sourceforge.net/indi/${pkgname}_${pkgver}.tar.gz")
 md5sums=('c1456544a36f543e2884f88913cf3eb0')
 
diff --git a/extra/libiodbc/PKGBUILD b/extra/libiodbc/PKGBUILD
index 6b6227807..01abdabeb 100644
--- a/extra/libiodbc/PKGBUILD
+++ b/extra/libiodbc/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 188768 2013-06-19 20:32:16Z andrea $
+# $Id: PKGBUILD 198186 2013-10-30 13:19:46Z allan $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 # Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com>
@@ -12,7 +12,6 @@ url="http://www.iodbc.org/dataspace/iodbc/wiki/iODBC/"
 license=('LGPL')
 depends=('sh')
 makedepends=('chrpath')
-options=('!libtool')
 source=("http://downloads.sourceforge.net/iodbc/${pkgname}-${pkgver}.tar.gz")
 md5sums=('9889f95f632f10895ff53b8a22162810')
 
diff --git a/extra/libirman/PKGBUILD b/extra/libirman/PKGBUILD
index f241a02cd..29787fa07 100644
--- a/extra/libirman/PKGBUILD
+++ b/extra/libirman/PKGBUILD
@@ -8,7 +8,6 @@ pkgdesc="Irman driver lcd library"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.lirc.org"
 license=('LGPL')
-options=('!libtool')
 backup=('etc/irman.conf')
 depends=('glibc')
 source=("http://downloads.sourceforge.net/lirc/${pkgname}-${pkgver}.tar.bz2")
diff --git a/extra/libiscsi/PKGBUILD b/extra/libiscsi/PKGBUILD
index 022c26a78..fe3e37e19 100644
--- a/extra/libiscsi/PKGBUILD
+++ b/extra/libiscsi/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 187826 2013-06-06 15:44:51Z tpowa $
+# $Id: PKGBUILD 198188 2013-10-30 13:20:31Z allan $
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 pkgname=libiscsi
 pkgver=1.7.0
@@ -9,7 +9,6 @@ arch=(i686 x86_64)
 url="https://github.com/sahlberg/libiscsi"
 license=('LGPL')
 source=(https://github.com/downloads/sahlberg/${pkgname}/${pkgname}-${pkgver}.tar.gz)
-options=(!libtool)
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/libisoburn/PKGBUILD b/extra/libisoburn/PKGBUILD
index 8c8c9f278..839a5ad5a 100644
--- a/extra/libisoburn/PKGBUILD
+++ b/extra/libisoburn/PKGBUILD
@@ -1,16 +1,18 @@
-# $Id: PKGBUILD 192280 2013-08-09 14:22:03Z andyrtr $
+# $Id: PKGBUILD 197415 2013-10-25 18:23:05Z andyrtr $
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 # Contributor: Gour <Gour <gour@mail.inet.hr>
 
 pkgname=libisoburn
 pkgver=1.3.2
-pkgrel=1
+pkgrel=3
 pkgdesc="frontend for libraries libburn and libisofs"
 url="http://libburnia-project.org"
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL2')
 depends=('libburn>=1.3.2' 'libisofs>=1.3.2' 'readline')
-options=('!libtool')
+optdepends=('tk:      for xorriso-tcltk frontend'
+            'bwidget: for xorriso-tcltk frontend')
+provides=('xorriso' 'xorriso-tcltk')
 install=${pkgname}.install
 source=(http://files.libburnia-project.org/releases/${pkgname}-${pkgver}.tar.gz{,.sig})
 md5sums=('7ebee7c1d4e09565daddca15467035af'
diff --git a/extra/libisofs/PKGBUILD b/extra/libisofs/PKGBUILD
index 8e9d86495..335b4d930 100644
--- a/extra/libisofs/PKGBUILD
+++ b/extra/libisofs/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 192278 2013-08-09 14:19:12Z andyrtr $
+# $Id: PKGBUILD 198189 2013-10-30 13:20:51Z allan $
 # Maintainer: AndyRTR <andyrtr@archlinux.org>
 # Contributor: Hugo Doria <hugodoria@gmail.com>
 # Contributor: Bjorn Martensen
@@ -12,7 +12,6 @@ url="http://libburnia-project.org"
 license=('GPL')
 depends=('acl' 'zlib')
 source=(http://files.libburnia-project.org/releases/${pkgname}-${pkgver}.tar.gz{,.sig})
-options=('!libtool')
 md5sums=('3dfdaaf964ed7a779bc23de50c5f2175'
          'SKIP')
 
diff --git a/extra/libjpeg-turbo/PKGBUILD b/extra/libjpeg-turbo/PKGBUILD
index 306bd875e..4690791fb 100644
--- a/extra/libjpeg-turbo/PKGBUILD
+++ b/extra/libjpeg-turbo/PKGBUILD
@@ -1,45 +1,43 @@
-# $Id: PKGBUILD 186466 2013-05-26 22:08:45Z eric $
-# Maintainer: Allan McRae <allan@archlinux.org>
+# $Id: PKGBUILD 198190 2013-10-30 13:21:13Z allan $
+# Maintainer: Gaetan Bisson <bisson@archlinux.org>
+# Contributor: Allan McRae <allan@archlinux.org>
 # Contributor: Simone Sclavi 'Ito' <darkhado@gmail.com>
 
 pkgname=libjpeg-turbo
 pkgver=1.3.0
-pkgrel=2
-pkgdesc="libjpeg derivative with accelerated baseline JPEG compression and decompression"
-arch=('i686' 'x86_64' 'mips64el')
-url="http://libjpeg-turbo.virtualgl.org/"
+pkgrel=3
+pkgdesc='JPEG image codec with accelerated baseline compression and decompression'
+url='http://libjpeg-turbo.virtualgl.org/'
 license=('GPL' 'custom')
-depends=('glibc')
+arch=('i686' 'x86_64' 'mips64el')
 makedepends=('nasm')
+source=("http://downloads.sourceforge.net/project/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.gz")
+sha1sums=('1792c964b35604cebd3a8846f1ca6de5976e9c28')
+
 provides=('libjpeg=8.0.2' 'turbojpeg')
 conflicts=('libjpeg' 'turbojpeg')
 replaces=('libjpeg' 'turbojpeg')
-options=('!libtool')
-source=(http://sourceforge.net/projects/$pkgname/files/$pkgver/$pkgname-$pkgver.tar.gz)
-sha1sums=('1792c964b35604cebd3a8846f1ca6de5976e9c28')
 
 build() {
-  cd $pkgname-$pkgver
-  ./configure --prefix=/usr --with-jpeg8 --mandir=/usr/share/man
-  make
+	cd "${srcdir}/${pkgname}-${pkgver}"
+	./configure --prefix=/usr --with-jpeg8 --mandir=/usr/share/man
+	make
 }
 
 check() {
-  cd "$srcdir/$pkgname-$pkgver"
-  make test
+	cd "${srcdir}/${pkgname}-${pkgver}"
+	make test
 }
 
 package() {
-  cd $pkgname-$pkgver
-  make DESTDIR="$pkgdir/" docdir=/usr/share/doc/libjpeg-turbo \
-    exampledir=/usr/share/doc/libjpeg-turbo install
-  
-  # provide jpegint.h as it is required by various software
-  install -m644 jpegint.h "$pkgdir/usr/include/"
-  
-  install -dm755 "$pkgdir/usr/share/licenses/libjpeg-turbo/"
-  ln -s ../../doc/libjpeg-turbo/README \
-    "$pkgdir/usr/share/licenses/libjpeg-turbo/README"
-  ln -s ../../doc/libjpeg-turbo/README-turbo.txt \
-    "$pkgdir/usr/share/licenses/libjpeg-turbo/README-turbo.txt"
+	cd "${srcdir}/${pkgname}-${pkgver}"
+	make \
+		DESTDIR="${pkgdir}" \
+		docdir="/usr/share/doc/${pkgname}" \
+		exampledir="/usr/share/doc/${pkgname}" \
+		install
+	
+	install -d "${pkgdir}/usr/share/licenses/libjpeg-turbo"
+	ln -t "${pkgdir}/usr/share/licenses/libjpeg-turbo" -s ../../doc/libjpeg-turbo/README{,-turbo.txt}
+	install -m644 jpegint.h "${pkgdir}/usr/include" # required by other software
 }
diff --git a/extra/libkate/PKGBUILD b/extra/libkate/PKGBUILD
index 3e2f79409..b61f04b98 100644
--- a/extra/libkate/PKGBUILD
+++ b/extra/libkate/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 184404 2013-05-06 19:38:23Z foutrelis $
+# $Id: PKGBUILD 198191 2013-10-30 13:21:33Z allan $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: N30N <archlinux@alunamation.com>
 # Contributor: linkmauve <linkmauve@linkmauve.fr>
@@ -15,7 +15,6 @@ depends=('libpng' 'libogg' 'python2')
 makedepends=('pkg-config')
 optdepends=('wxpython: for KateDJ'
             'liboggz: for KateDJ')
-options=('!libtool')
 source=("http://libkate.googlecode.com/files/${pkgname}-${pkgver}.tar.gz")
 md5sums=('1dfdbdeb2fa5d07063cf5b8261111fca')
 
diff --git a/extra/libkcddb/PKGBUILD b/extra/libkcddb/PKGBUILD
index 9886e7ffd..fa4a8f5b3 100644
--- a/extra/libkcddb/PKGBUILD
+++ b/extra/libkcddb/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 195548 2013-10-01 15:17:30Z svenstaro $
+# $Id: PKGBUILD 198845 2013-11-05 19:48:35Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=libkcddb
-pkgver=4.11.2
+pkgver=4.11.3
 pkgrel=1
 pkgdesc="KDE CDDB library"
 url='https://projects.kde.org/projects/kde/kdemultimedia/libkcddb'
@@ -13,7 +13,7 @@ makedepends=('cmake' 'automoc4')
 replaces=('kdemultimedia-kioslave')
 conflicts=('kdemultimedia-kioslave')
 source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz")
-sha1sums=('8d2a6774f96ae08666bbfe117c77e63a4e789457')
+sha1sums=('2e1b5381d704445d08a87353c2b1528349dfcbd0')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/libkcompactdisc/PKGBUILD b/extra/libkcompactdisc/PKGBUILD
index 53ba20837..b4ba341f0 100644
--- a/extra/libkcompactdisc/PKGBUILD
+++ b/extra/libkcompactdisc/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 195550 2013-10-01 15:17:40Z svenstaro $
+# $Id: PKGBUILD 198846 2013-11-05 19:48:45Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=libkcompactdisc
-pkgver=4.11.2
+pkgver=4.11.3
 pkgrel=1
 pkgdesc="A library for interfacing with CDs"
 url='https://projects.kde.org/projects/kde/kdemultimedia/libkcompactdisc'
@@ -13,7 +13,7 @@ makedepends=('cmake' 'automoc4')
 replaces=('kdemultimedia-kioslave')
 conflicts=('kdemultimedia-kioslave')
 source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz")
-sha1sums=('bca14ffe1defbfd194f9429d051af5cb0545cede')
+sha1sums=('e8c3e8efe5454538a7e7538355d099ebdbf6ac2b')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/libkdcraw/PKGBUILD b/extra/libkdcraw/PKGBUILD
index 20f392fef..99ed4d169 100644
--- a/extra/libkdcraw/PKGBUILD
+++ b/extra/libkdcraw/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 195538 2013-10-01 15:16:44Z svenstaro $
+# $Id: PKGBUILD 198840 2013-11-05 19:47:41Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=libkdcraw
-pkgver=4.11.2
+pkgver=4.11.3
 pkgrel=1
 pkgdesc="A C++ interface used to decode RAW picture"
 url="https://projects.kde.org/projects/kde/kdegraphics/libs/libkdcraw"
@@ -14,7 +14,7 @@ replaces=('kdegraphics-libs')
 conflicts=('kdegraphics-libs')
 install=${pkgname}.install
 source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz")
-sha1sums=('51680e9653bc7e00bb71a3744702c7f52570c672')
+sha1sums=('c6eb63d1675aa028b1217b79958e1c63c245ca77')
 
 build() {
   mkdir build
diff --git a/extra/libkdeedu/PKGBUILD b/extra/libkdeedu/PKGBUILD
index f0aaf9993..dd725401e 100644
--- a/extra/libkdeedu/PKGBUILD
+++ b/extra/libkdeedu/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 195534 2013-10-01 15:16:27Z svenstaro $
+# $Id: PKGBUILD 198838 2013-11-05 19:47:18Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=libkdeedu
-pkgver=4.11.2
+pkgver=4.11.3
 pkgrel=1
 pkgdesc="Libraries used by KDE Education applications"
 url="https://projects.kde.org/projects/kde/kdeedu/libkdeedu"
@@ -12,8 +12,9 @@ depends=('kdelibs')
 makedepends=('cmake' 'automoc4')
 install=${pkgname}.install
 replaces=('kdeedu-libkdeedu' 'kdeedu-data')
+options=('staticlibs') # libqtmmlwidget.a needed by KAlgebra
 source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz")
-sha1sums=('23daf0f0371b1c7e40a376fba627bc42afeeb5a2')
+sha1sums=('5db8e436ac5a77c3dacaf8279988e0121df10cd8')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/libkdegames/PKGBUILD b/extra/libkdegames/PKGBUILD
index 5ca097c62..aff0e9f59 100644
--- a/extra/libkdegames/PKGBUILD
+++ b/extra/libkdegames/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 195552 2013-10-01 15:17:47Z svenstaro $
+# $Id: PKGBUILD 198847 2013-11-05 19:48:57Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=libkdegames
-pkgver=4.11.2
+pkgver=4.11.3
 pkgrel=1
 pkgdesc="Common code and data for many KDE games"
 url="https://projects.kde.org/projects/kde/kdegames/libkdegames"
@@ -13,7 +13,7 @@ makedepends=('cmake' 'automoc4')
 replaces=('kdegames-libkdegames')
 conflicts=('kdegames-libkdegames')
 source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz")
-sha1sums=('f8a9f1ec6f92dd04bcdb7b929cf62b594e7cf641')
+sha1sums=('df08248949aa8e0df3ec6cba3ca228078abe980d')
 
 build() {
   mkdir build
diff --git a/extra/libkexiv2/PKGBUILD b/extra/libkexiv2/PKGBUILD
index fe07d34bc..3ae406dd8 100644
--- a/extra/libkexiv2/PKGBUILD
+++ b/extra/libkexiv2/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 195540 2013-10-01 15:16:52Z svenstaro $
+# $Id: PKGBUILD 198841 2013-11-05 19:47:52Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=libkexiv2
-pkgver=4.11.2
+pkgver=4.11.3
 pkgrel=1
 pkgdesc="A library to manipulate pictures metadata"
 url="https://projects.kde.org/projects/kde/kdegraphics/libs/libkexiv2"
@@ -13,7 +13,7 @@ makedepends=('cmake' 'automoc4')
 replaces=('kdegraphics-libs')
 conflicts=('kdegraphics-libs')
 source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz")
-sha1sums=('51e75f8e6db99a6fd7ca8956a16636c790a9f81c')
+sha1sums=('7095a438080173a2c5bd77fe57f59580056d1a4c')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/libkeybinder3/PKGBUILD b/extra/libkeybinder3/PKGBUILD
index 86d377687..fd2f7fb9b 100644
--- a/extra/libkeybinder3/PKGBUILD
+++ b/extra/libkeybinder3/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 188643 2013-06-17 09:55:24Z eric $
+# $Id: PKGBUILD 198192 2013-10-30 13:21:58Z allan $
 # Maintainer: Eric Bélanger <eric@archlinux.org>
 # Contributor: speps <speps at aur dot archlinux dot org>
 
@@ -12,7 +12,6 @@ license=('MIT')
 depends=('gtk3')
 makedepends=('gtk-doc' 'gobject-introspection')
 optdepends=('lua-lgi: lua bindings')
-options=('!libtool')
 source=(http://archive.ubuntu.com/ubuntu/pool/universe/k/keybinder-3.0/keybinder-3.0_${pkgver}.orig.tar.gz)
 sha1sums=('53167d295ffa1d356bfad6f9360b90bd85e8fb26')
 
diff --git a/extra/libkipi/PKGBUILD b/extra/libkipi/PKGBUILD
index 90d879a95..2cd942a48 100644
--- a/extra/libkipi/PKGBUILD
+++ b/extra/libkipi/PKGBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=libkipi
-pkgver=4.11.2
+pkgver=4.11.3
 pkgrel=1
 pkgdesc="An interface to use kipi-plugins from a KDE application"
 url="https://projects.kde.org/projects/kde/kdegraphics/libs/libkipi"
@@ -14,7 +14,7 @@ replaces=('kdegraphics-libs')
 conflicts=('kdegraphics-libs')
 install=${pkgname}.install
 source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz")
-sha1sums=('291dd7ad892b2c0598642b006ad4709d669b7271')
+sha1sums=('8fa8453b4314521e41d51972cec628c3ebd4294d')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/libkmahjongg/PKGBUILD b/extra/libkmahjongg/PKGBUILD
index 9a65a926b..e93dc88e0 100644
--- a/extra/libkmahjongg/PKGBUILD
+++ b/extra/libkmahjongg/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 195554 2013-10-01 15:17:56Z svenstaro $
+# $Id: PKGBUILD 198848 2013-11-05 19:49:09Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=libkmahjongg
-pkgver=4.11.2
+pkgver=4.11.3
 pkgrel=1
 pkgdesc="Common code, backgrounds and tile sets for games using Mahjongg tiles"
 url="https://projects.kde.org/projects/kde/kdegames/libmahjongg"
@@ -13,7 +13,7 @@ makedepends=('cmake' 'automoc4')
 replaces=('kdegames-libkmahjongg')
 conflicts=('kdegames-libkmahjongg')
 source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz")
-sha1sums=('f2594a7047d228160241d1aa2dd7f307dfb15921')
+sha1sums=('d0018922e1b7b05847b544fd4f365da196f0f812')
 
 build() {
   mkdir build
diff --git a/extra/libkpeople/PKGBUILD b/extra/libkpeople/PKGBUILD
new file mode 100644
index 000000000..544b62054
--- /dev/null
+++ b/extra/libkpeople/PKGBUILD
@@ -0,0 +1,32 @@
+# $Id: PKGBUILD 197593 2013-10-27 13:36:10Z andrea $
+# Maintainer: Andrea Scarpino <andrea@archlinux.org>
+# Contributor: Antonio Rojas <nqn1976 @ gmail.com>
+
+pkgname=libkpeople
+pkgver=0.1.0
+pkgrel=2
+pkgdesc="A contact aggregation library for KDE"
+arch=('i686' 'x86_64')
+url='http://community.kde.org/KTp/libkpeople'
+license=('LGPL')
+depends=('nepomuk-core')
+makedepends=('cmake' 'automoc4')
+source=("http://download.kde.org/unstable/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.bz2")
+sha1sums=('6ab54b3ba203ff06d17f101060ed277696dfbaad')
+
+prepare() {
+  mkdir build
+}
+
+build() {
+  cd build
+  cmake ../${pkgname}-${pkgver} \
+    -DCMAKE_BUILD_TYPE=Release \
+    -DCMAKE_INSTALL_PREFIX=/usr
+  make
+}
+
+package() {
+  cd build
+  make DESTDIR="${pkgdir}/" install
+}
diff --git a/extra/libksane/PKGBUILD b/extra/libksane/PKGBUILD
index ee8e732b4..348b95332 100644
--- a/extra/libksane/PKGBUILD
+++ b/extra/libksane/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 195544 2013-10-01 15:17:09Z svenstaro $
+# $Id: PKGBUILD 198843 2013-11-05 19:48:13Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=libksane
-pkgver=4.11.2
+pkgver=4.11.3
 pkgrel=1
 pkgdesc="An image scanning library"
 url="https://projects.kde.org/projects/kde/kdegraphics/libs/libksane"
@@ -14,7 +14,7 @@ replaces=('kdegraphics-libs')
 conflicts=('kdegraphics-libs')
 install=${pkgname}.install
 source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz")
-sha1sums=('9f617633c6770f0db426362df78c6dc564601533')
+sha1sums=('e52dd9db0c5222ba6febe96dec9362b46f7453f4')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/liblo/PKGBUILD b/extra/liblo/PKGBUILD
index 46af636cb..636dfed05 100644
--- a/extra/liblo/PKGBUILD
+++ b/extra/liblo/PKGBUILD
@@ -1,19 +1,19 @@
-# $Id: PKGBUILD 186897 2013-05-31 15:30:05Z schiv $
+# $Id: PKGBUILD 197527 2013-10-26 14:48:03Z schiv $
 # Maintainer: Ray Rashif <schiv@archlinux.org>
 # Contributor: damir <damir@archlinux.org>
 # Contributor: Pajaro
 
 pkgname=liblo
-pkgver=0.27
-pkgrel=1
-pkgdesc="Lightweight OSC implementation: an implementation of the Open Sound Control protocol for POSIX systems"
+pkgver=0.26
+pkgrel=2
+epoch=1
+pkgdesc="A lightweight OSC (Open Sound Control) implementation"
 arch=(i686 x86_64 'mips64el')
-url="http://plugin.org.uk/liblo/"
+url="http://liblo.sourceforge.net/"
 license=('GPL')
 depends=('glibc')
-options=('!libtool')
 source=("http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz")
-md5sums=('e4317bab5b16003df350adfe2c181364')
+md5sums=('5351de14262560e15e7f23865293b16f')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
@@ -27,3 +27,5 @@ package() {
 
   make DESTDIR="$pkgdir" install
 }
+
+# vim:set ts=2 sw=2 et:
diff --git a/extra/liblouis/PKGBUILD b/extra/liblouis/PKGBUILD
index 13984580f..ac470d207 100644
--- a/extra/liblouis/PKGBUILD
+++ b/extra/liblouis/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 183433 2013-04-21 22:11:25Z heftig $
+# $Id: PKGBUILD 198193 2013-10-30 13:22:18Z allan $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 
 pkgname=liblouis
@@ -10,7 +10,6 @@ url="http://code.google.com/p/liblouis/"
 license=('GPL3')
 depends=(glibc)
 makedepends=(help2man python2 python)
-options=(!libtool)
 install=liblouis.install
 source=(http://liblouis.googlecode.com/files/$pkgname-$pkgver.tar.gz)
 sha1sums=('   93437f3c3a9a178ad08bdf6daca2a82cf3df2cc2')
diff --git a/extra/liblqr/PKGBUILD b/extra/liblqr/PKGBUILD
index 798a2c6e2..4abc0f0cd 100644
--- a/extra/liblqr/PKGBUILD
+++ b/extra/liblqr/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 182915 2013-04-16 05:57:47Z eric $
+# $Id: PKGBUILD 198194 2013-10-30 13:22:45Z allan $
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 
 pkgname=liblqr
@@ -10,7 +10,7 @@ url="http://liblqr.wikidot.com/"
 license=('GPL')
 depends=('glib2')
 makedepends=('pkgconfig')
-options=('!libtool' '!emptydirs')
+options=('!emptydirs')
 source=("http://liblqr.wikidot.com/local--files/en:download-page/$pkgname-1-$pkgver.tar.bz2")
 md5sums=('915643d993da97e10665d48c0bf8f3d0')
 
diff --git a/extra/liblrdf/PKGBUILD b/extra/liblrdf/PKGBUILD
index 4186550d4..48068e01f 100644
--- a/extra/liblrdf/PKGBUILD
+++ b/extra/liblrdf/PKGBUILD
@@ -1,16 +1,14 @@
-# $Id: PKGBUILD 161476 2012-06-11 19:18:53Z eric $
+# $Id: PKGBUILD 197453 2013-10-26 06:52:09Z allan $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 
 pkgname=liblrdf
 pkgver=0.5.0
-pkgrel=1
+pkgrel=2
 pkgdesc="A library for the manipulation of RDF file in LADSPA plugins"
 arch=('i686' 'x86_64' 'mips64el')
 url="https://github.com/swh/LRDF"
 depends=('raptor' 'ladspa')
 license=('GPL')
-options=('!libtool')
-groups=('ladspa-plugins')
 source=(${pkgname}-${pkgver}.tar.gz::https://github.com/swh/LRDF/tarball/${pkgver})
 md5sums=('005ea24152620da7f2ee80a78e17f784')
 
diff --git a/extra/libmad/PKGBUILD b/extra/libmad/PKGBUILD
index f0715b130..5822c0230 100644
--- a/extra/libmad/PKGBUILD
+++ b/extra/libmad/PKGBUILD
@@ -1,15 +1,14 @@
-# $Id: PKGBUILD 149402 2012-02-07 14:56:23Z eric $
+# $Id: PKGBUILD 197260 2013-10-24 19:49:09Z eric $
 # Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgname=libmad
 pkgver=0.15.1b
-pkgrel=6.1
+pkgrel=7
 pkgdesc="A high-quality MPEG audio decoder"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.underbit.com/products/mad/"
 license=('GPL')
 depends=('glibc')
-options=('!libtool')
 source=(http://downloads.sourceforge.net/sourceforge/mad/${pkgname}-${pkgver}.tar.gz{,.sign}
         libmad.patch amd64-64bit.diff frame_length.diff optimize.diff)
 sha1sums=('cac19cd00e1a907f3150cc040ccc077783496d76'
@@ -19,12 +18,16 @@ sha1sums=('cac19cd00e1a907f3150cc040ccc077783496d76'
           'b9c61ecacc6a6d47425d66f33327e0634cd8a33c'
           '3d5b958244ef0395ccdcb00344f2cf301ca07e34')
 
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+prepare() {
+  cd ${pkgname}-${pkgver}
   patch -p1 -i "${srcdir}/libmad.patch"
   patch -p1 -i "${srcdir}/amd64-64bit.diff"
   patch -p1 -i "${srcdir}/frame_length.diff"
   patch -p1 -i "${srcdir}/optimize.diff"
+}
+
+build() {
+  cd ${pkgname}-${pkgver}
   CFLAGS="$CFLAGS -ftree-vectorize -ftree-vectorizer-verbose=1"
   autoconf
   ./configure --prefix=/usr --enable-fpm=default
@@ -32,6 +35,6 @@ build() {
 }
 
 package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+  cd ${pkgname}-${pkgver}
   make DESTDIR="${pkgdir}" install
 }
diff --git a/extra/libmatroska/PKGBUILD b/extra/libmatroska/PKGBUILD
index 56203f478..046883ed8 100644
--- a/extra/libmatroska/PKGBUILD
+++ b/extra/libmatroska/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 180602 2013-03-24 12:53:07Z giovanni $
+# $Id: PKGBUILD 197633 2013-10-27 14:48:10Z giovanni $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor 03/08/04 <lefungus@altern.org>
 
 pkgname=libmatroska
-pkgver=1.4.0
+pkgver=1.4.1
 pkgrel=1
 pkgdesc="Matroska library"
 arch=('i686' 'x86_64' 'mips64el')
@@ -11,7 +11,7 @@ url="http://dl.matroska.org/downloads/libmatroska/"
 license=('LGPL')
 depends=('libebml')
 source=("http://dl.matroska.org/downloads/${pkgname}/${pkgname}-${pkgver}.tar.bz2")
-md5sums=('5b83155019589b04a49f9db923b5bf74')
+md5sums=('f61b2e5086f4bb9d24a43cc8af43a719')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}/make/linux"
diff --git a/extra/libmbim/PKGBUILD b/extra/libmbim/PKGBUILD
index ee212be87..5772ef490 100644
--- a/extra/libmbim/PKGBUILD
+++ b/extra/libmbim/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 191189 2013-07-19 12:04:24Z heftig $
+# $Id: PKGBUILD 198195 2013-10-30 13:23:07Z allan $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 
 pkgname=libmbim
@@ -10,7 +10,6 @@ url="http://www.freedesktop.org/wiki/Software/libmbim/"
 license=(GPL2)
 depends=(glib2 bash systemd)
 makedepends=(gtk-doc python)
-options=('!libtool')
 source=(http://www.freedesktop.org/software/$pkgname/$pkgname-$pkgver.tar.xz)
 sha256sums=('a7fa909df229574eb11baac89075ac1366a2ac1670f586483bdf0173257cf781')
 
diff --git a/extra/libmcrypt/PKGBUILD b/extra/libmcrypt/PKGBUILD
index acc93967d..0fbdac604 100644
--- a/extra/libmcrypt/PKGBUILD
+++ b/extra/libmcrypt/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 136970 2011-09-04 11:35:09Z pierre $
+# $Id: PKGBUILD 198196 2013-10-30 13:23:27Z allan $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Jan de Groot <jgc@archlinux.org>
 # Contributor: Tom Newsom <Jeepster@gmx.co.uk>
@@ -11,7 +11,7 @@ url="http://mcrypt.sourceforge.net/"
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 depends=('glibc')
-options=('!libtool' '!emptydirs')
+options=('!emptydirs')
 source=("http://downloads.sourceforge.net/mcrypt/${pkgname}-${pkgver}.tar.bz2")
 md5sums=('c4f491dd411a09e9de3b8702ea6f73eb')
 
diff --git a/extra/libmikmod/PKGBUILD b/extra/libmikmod/PKGBUILD
index e9cd58290..18fbfe4d5 100644
--- a/extra/libmikmod/PKGBUILD
+++ b/extra/libmikmod/PKGBUILD
@@ -1,39 +1,36 @@
-# $Id: PKGBUILD 170549 2012-11-08 15:28:36Z heftig $
+# $Id: PKGBUILD 198197 2013-10-30 13:23:49Z allan $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Contributor: Allan McRae <allan@archlinux.org>
 # Contributor: Tom Newsom <Jeepster@gmx.co.uk>
 
 pkgname=libmikmod
-pkgver=3.2.0
+pkgver=3.3.3
 pkgrel=1
 pkgdesc="A portable sound library"
-license=('GPL' 'LGPL')
+license=(GPL LGPL)
 url="http://mikmod.shlomifish.org/"
 arch=('i686' 'x86_64' 'mips64el')
-depends=('glibc' 'sh')
-makedepends=('alsa-lib')
-options=('!libtool')
+depends=(openal sh)
+makedepends=(alsa-lib)
 install=$pkgname.install
-source=($url/files/$pkgname-$pkgver.tar.gz
-        libmikmod-3.2.0-64bit-fix.diff
-        libmikmod-3.1.12-loopingvolume-fix.diff)
-md5sums=('96e9820d72a41fe27ff304071739696c'
-         '0bb09aac6e83e0a7fd6535961b3cff4c'
-         'a837fd876cbd2ac27419b802504489db')
+source=($url/files/$pkgname-$pkgver.tar.gz)
+sha256sums=('79f02478c5abd8b2af73df4cc5f9d52625aa044327c01563168e270cf79b2437')
 
-build() {
-  cd $pkgname-$pkgver
+prepare() {
+  mkdir build
+}
 
-  # patches from sdl_mixer-1.2.11 source
-  patch -Np1 -i $srcdir/libmikmod-3.2.0-64bit-fix.diff
-  patch -Np1 -i $srcdir/libmikmod-3.1.12-loopingvolume-fix.diff
-  
-  ./configure --prefix=/usr --mandir=/usr/share/man --infodir=/usr/share/info --disable-static
+build() {
+  cd build
+  ../$pkgname-$pkgver/configure \
+    --prefix=/usr \
+    --enable-openal \
+    --disable-static
   make
 }
 
 package() {
-  cd $pkgname-$pkgver
+  cd build
   make DESTDIR="$pkgdir" install
 }
 
diff --git a/extra/libmms/PKGBUILD b/extra/libmms/PKGBUILD
index f8e0f3771..495367939 100644
--- a/extra/libmms/PKGBUILD
+++ b/extra/libmms/PKGBUILD
@@ -1,4 +1,4 @@
-#$Id: PKGBUILD 134220 2011-08-02 15:22:22Z jgc $
+#$Id: PKGBUILD 198198 2013-10-30 13:24:10Z allan $
 #Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=libmms
@@ -9,7 +9,6 @@ arch=(i686 x86_64 'mips64el')
 url="http://sourceforge.net/projects/libmms/"
 license=(LGPL)
 depends=('glib2')
-options=('!libtool')
 source=(http://download.sourceforge.net/libmms/${pkgname}-${pkgver}.tar.gz)
 md5sums=('9f63aa363deb4874e072a45850161bff')
 
diff --git a/extra/libmng/PKGBUILD b/extra/libmng/PKGBUILD
index c6b4a626b..c4092c07d 100644
--- a/extra/libmng/PKGBUILD
+++ b/extra/libmng/PKGBUILD
@@ -1,15 +1,14 @@
-# $Id: PKGBUILD 193685 2013-08-28 00:06:03Z eric $
+# $Id: PKGBUILD 197262 2013-10-24 20:00:46Z eric $
 # Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgname=libmng
 pkgver=2.0.2
-pkgrel=2
+pkgrel=3
 pkgdesc="A collection of routines used to create and manipulate MNG format graphics files"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.libmng.com/"
 license=('custom')
 depends=('lcms2')
-options=('!libtool')
 source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.xz{,.asc}
         libmng-stdio.patch)
 sha1sums=('7dd35369ff5916e1823cbacef984ab1b87714b69'
diff --git a/extra/libmodplug/PKGBUILD b/extra/libmodplug/PKGBUILD
index a63647ad9..023922281 100644
--- a/extra/libmodplug/PKGBUILD
+++ b/extra/libmodplug/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 193909 2013-09-05 20:04:00Z eric $
+# $Id: PKGBUILD 198199 2013-10-30 13:24:33Z allan $
 # Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgname=libmodplug
@@ -9,7 +9,6 @@ arch=(i686 x86_64 'mips64el')
 url="http://modplug-xmms.sourceforge.net/"
 license=('custom')
 depends=('gcc-libs')
-options=('!libtool')
 source=(http://downloads.sourceforge.net/modplug-xmms/${pkgname}-${pkgver}.tar.gz
         libmodplug-CVE-2013-4233-Fix.patch libmodplug-CVE-2013-4234-Fix.patch)
 sha1sums=('df4deffe542b501070ccb0aee37d875ebb0c9e22'
diff --git a/extra/libmowgli/PKGBUILD b/extra/libmowgli/PKGBUILD
index 9e2193e8b..60b63a0b1 100644
--- a/extra/libmowgli/PKGBUILD
+++ b/extra/libmowgli/PKGBUILD
@@ -1,19 +1,19 @@
-# $Id: PKGBUILD 176308 2013-01-29 11:24:40Z bisson $
-
+# $Id: PKGBUILD 198675 2013-11-01 21:30:25Z bisson $
+# Maintainer: Gaetan Bisson <bisson@archlinux.org>
 # Contributor: Alexander Fehr <pizzapunk gmail com>
 # Contributor: Brad Gordon <brad@rpgcyco.net>
-# Maintainer: Gaetan Bisson <bisson@archlinux.org>
 
 pkgname=libmowgli
 pkgver=2.0.0
-pkgrel=1
+pkgrel=2
 pkgdesc='Performance and usability-oriented extensions to C'
 url='http://www.atheme.org/project/mowgli'
 license=('custom')
-depends=('glibc')
 arch=('i686' 'x86_64' 'mips64el')
-source=("ftp://ftp.archlinux.org/other/packages/${pkgname}/${pkgname}-${pkgver}.tar.gz")
-sha1sums=('5a697380f253f0456a5d8a38006a9d12847fb538')
+depends=('openssl')
+makedepends=('git')
+source=("${pkgname}-${pkgver}::git+https://github.com/atheme/libmowgli-2.git#tag=${pkgname}-${pkgver}")
+sha1sums=('SKIP')
 
 build() {
 	cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/libmp3splt/PKGBUILD b/extra/libmp3splt/PKGBUILD
index c7018b2f7..75d46755a 100644
--- a/extra/libmp3splt/PKGBUILD
+++ b/extra/libmp3splt/PKGBUILD
@@ -1,16 +1,15 @@
-# $Id: PKGBUILD 191705 2013-07-29 10:07:56Z tpowa $
+# $Id: PKGBUILD 198200 2013-10-30 13:25:00Z allan $
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 
 pkgname=libmp3splt
 pkgver=0.9.0
-pkgrel=1
+pkgrel=2
 pkgdesc="Library for splitting mp3 and ogg files without decoding"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://mp3splt.sourceforge.net"
 license=('GPL')
 depends=('flac' 'libmad' 'libvorbis' 'libid3tag' 'pcre' 'libltdl')
 makedepends=('libtool')
-options=('!libtool')
 source=("http://downloads.sourceforge.net/sourceforge/mp3splt/$pkgname-$pkgver.tar.gz")
 
 prepare() {
diff --git a/extra/libmp4v2/PKGBUILD b/extra/libmp4v2/PKGBUILD
index c5b765fc1..df8c470df 100644
--- a/extra/libmp4v2/PKGBUILD
+++ b/extra/libmp4v2/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 163965 2012-07-23 03:02:46Z allan $
+# $Id: PKGBUILD 198201 2013-10-30 13:25:21Z allan $
 # Maintainer: Tom Gundersen <teg@jklm.no>
 # Contributor: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Jan de Groot <jgc@archlinux.org>
@@ -11,7 +11,6 @@ arch=('i686' 'x86_64' 'mips64el')
 license=('MPL')
 url="http://code.google.com/p/mp4v2/"
 depends=('gcc-libs')
-options=('!libtool')
 source=("http://mp4v2.googlecode.com/files/mp4v2-${pkgver}.tar.bz2")
 
 build() {
diff --git a/extra/libmpcdec/PKGBUILD b/extra/libmpcdec/PKGBUILD
index c47c3ea4a..39f9cfe2b 100644
--- a/extra/libmpcdec/PKGBUILD
+++ b/extra/libmpcdec/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 141656 2011-11-01 10:26:35Z pierre $
+# $Id: PKGBUILD 198202 2013-10-30 13:25:43Z allan $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=libmpcdec
@@ -9,7 +9,6 @@ arch=('i686' 'x86_64' 'mips64el')
 url="http://musepack.net/"
 license=('custom')
 depends=('glibc')
-options=('!libtool')
 source=("http://files.musepack.net/source/${pkgname}-${pkgver}.tar.bz2")
 md5sums=('7f7a060e83b4278acf4b77d7a7b9d2c0')
 
diff --git a/extra/libmpd/PKGBUILD b/extra/libmpd/PKGBUILD
index f7a4017a7..7892d0992 100644
--- a/extra/libmpd/PKGBUILD
+++ b/extra/libmpd/PKGBUILD
@@ -1,26 +1,25 @@
-# $Id: PKGBUILD 136733 2011-08-31 19:31:16Z eric $
+# $Id: PKGBUILD 197668 2013-10-28 02:28:33Z eric $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: tobias <tobias@archlinux.org>
 
 pkgname=libmpd
 pkgver=11.8.17
-pkgrel=1.2
+pkgrel=2
 pkgdesc="Signal based wrapper around libmpdclient"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://gmpc.wikia.com/wiki/Gnome_Music_Player_Client"
 license=('GPL')
 depends=('glib2')
-options=('!libtool')
 source=(http://download.sarine.nl/Programs/gmpc/${pkgver%.*}/${pkgname}-${pkgver}.tar.gz)
 md5sums=('5ae3d87467d52aef3345407adb0a2488')
 
 build() {
-  cd "${srcdir}/$pkgname-$pkgver"
+  cd $pkgname-$pkgver
   ./configure --prefix=/usr
   make
 }
 
 package() {
-  cd "${srcdir}/$pkgname-$pkgver"
+  cd $pkgname-$pkgver
   make DESTDIR="${pkgdir}" install
 }
diff --git a/extra/libmpdclient/PKGBUILD b/extra/libmpdclient/PKGBUILD
index b69acc914..a429287a5 100644
--- a/extra/libmpdclient/PKGBUILD
+++ b/extra/libmpdclient/PKGBUILD
@@ -1,22 +1,20 @@
-# $Id: PKGBUILD 182606 2013-04-10 23:43:13Z bisson $
-# Contributor: Andrea Scarpino <andrea@archlinux.org>
+# $Id: PKGBUILD 198596 2013-10-30 16:56:01Z bisson $
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
+# Contributor: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=libmpdclient
-pkgver=2.8
+pkgver=2.9
 pkgrel=1
 pkgdesc='Asynchronous API library for interfacing MPD in the C, C++ & Objective C languages'
 url='http://www.musicpd.org/libs/libmpdclient/'
 license=('custom:BSD')
 arch=('i686' 'x86_64' 'mips64el')
-source=("http://www.musicpd.org/download/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2")
-sha1sums=('7e23c760296fe47e9e4108a0eba6fef08cfe4db8')
-
-options=('!libtool')
+source=("http://www.musicpd.org/download/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz")
+sha1sums=('1a3557d4d1f78085db6285a8c8cb9085c300d9d3')
 
 build() {
 	cd "${srcdir}/${pkgname}-${pkgver}"
-	./configure --prefix=/usr --disable-static --disable-documentation
+	./configure --prefix=/usr --disable-documentation
 	make
 }
 
diff --git a/extra/libmpeg2/PKGBUILD b/extra/libmpeg2/PKGBUILD
index 2954e7bd1..960dc5f18 100644
--- a/extra/libmpeg2/PKGBUILD
+++ b/extra/libmpeg2/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 177015 2013-02-04 08:35:17Z jgc $
+# $Id: PKGBUILD 198204 2013-10-30 13:26:26Z allan $
 # Contributor: Sarah Hay <sarah@archlinux.org>
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 
@@ -15,7 +15,6 @@ optdepends=('sdl: required for mpeg2dec'
 source=(http://libmpeg2.sourceforge.net/files/${pkgname}-${pkgver}.tar.gz
         libmpeg2-0.5.1-gcc4.6.patch)
 license=('GPL2')
-options=(!libtool)
 provides=('mpeg2dec')
 md5sums=('0f92c7454e58379b4a5a378485bbd8ef'
          '8b36660297e6ffde6aa9733136bff405')
diff --git a/extra/libmspack/PKGBUILD b/extra/libmspack/PKGBUILD
index f180b2a97..dc735d64a 100644
--- a/extra/libmspack/PKGBUILD
+++ b/extra/libmspack/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 189640 2013-07-03 19:24:42Z andyrtr $
+# $Id: PKGBUILD 198205 2013-10-30 13:26:47Z allan $
 # Maintainer: AndyRTR <andyrtr@archlinux.org>
 
 pkgname=libmspack
@@ -10,7 +10,6 @@ url="http://www.cabextract.org.uk/libmspack/"
 license=('GPL')
 depends=('glibc')
 makedepends=()
-options=('!libtool')
 source=(http://www.cabextract.org.uk/libmspack/$pkgname-$pkgver.tar.gz)
 md5sums=('1ab10b507259993c74b4c41a88103b59')
 
diff --git a/extra/libmtp/PKGBUILD b/extra/libmtp/PKGBUILD
index 27ab1f9f9..5c1dec838 100644
--- a/extra/libmtp/PKGBUILD
+++ b/extra/libmtp/PKGBUILD
@@ -1,27 +1,34 @@
-# $Id: PKGBUILD 180848 2013-03-26 23:07:40Z tomegun $
+# $Id: PKGBUILD 198802 2013-11-04 17:57:04Z andyrtr $
 # Maintainer: Tom Gundersen <teg@jklm.no>
 # Contributor: damir <damir@archlinux.org>
 # Contributor: Kevin Edmonds <edmondskevin@hotmail.com>
 
 pkgname=libmtp
 pkgver=1.1.6
-pkgrel=1
+pkgrel=3
 pkgdesc="Library implementation of the Media Transfer Protocol"
 arch=("i686" "x86_64" "mips64el")
 url="http://libmtp.sourceforge.net"
 license=('LGPL')
 depends=('libusb' 'libgcrypt')
-options=('!libtool')
 source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz")
+md5sums=('87835626dbcf39e62bfcdd4ae6da2063')
 
 build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+  cd ${pkgname}-${pkgver}
   ./configure --prefix=/usr --with-udev=/usr/lib/udev
   make
 }
 
+check() {
+  cd $pkgname-$pkgver
+  make -k check
+}
+
 package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+  cd ${pkgname}-${pkgver}
   make DESTDIR="${pkgdir}" install
+  
+  # fix broken udev rule
+  sed -i "/^Unable to open/d" ${pkgdir}/usr/lib/udev/rules.d/69-libmtp.rules
 }
-md5sums=('87835626dbcf39e62bfcdd4ae6da2063')
diff --git a/extra/libmythes/PKGBUILD b/extra/libmythes/PKGBUILD
index d57a1363c..7f9fa7348 100644
--- a/extra/libmythes/PKGBUILD
+++ b/extra/libmythes/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 162736 2012-06-29 10:55:24Z andyrtr $
+# $Id: PKGBUILD 198206 2013-10-30 13:27:08Z allan $
 # Maintainer: AndyRTR <andyrtr@archlinux.org>
 
 pkgname=libmythes
@@ -11,7 +11,6 @@ url="http://hunspell.sourceforge.net/ "
 license=('custom')
 depends=('glibc' 'perl')
 makedepends=('hunspell')
-options=('!libtool')
 provides=('mythes')
 source=(http://downloads.sourceforge.net/hunspell/${pkgname/lib/}-${pkgver}.tar.gz)
 md5sums=('46e92b68e31e858512b680b3b61dc4c1')
diff --git a/extra/libnet/PKGBUILD b/extra/libnet/PKGBUILD
index 629647397..1d8c4c0e8 100644
--- a/extra/libnet/PKGBUILD
+++ b/extra/libnet/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 170191 2012-11-04 17:11:22Z giovanni $
+# $Id: PKGBUILD 198207 2013-10-30 13:27:29Z allan $
 # Maintainer:
 # Contributor: damir <damir@archlinux.org>
 
@@ -10,7 +10,6 @@ arch=('i686' 'x86_64' 'mips64el')
 url="http://sourceforge.net/projects/libnet-dev/"
 license=('BSD')
 depends=('glibc' 'sh')
-options=('!libtool')
 source=("http://downloads.sourceforge.net/libnet-dev/${pkgname}-${pkgver}.tar.gz")
 md5sums=('710296fe424a49344e5fcc0d09e53317')
 
diff --git a/extra/libnice/PKGBUILD b/extra/libnice/PKGBUILD
index b84b61ecf..ea2d29c04 100644
--- a/extra/libnice/PKGBUILD
+++ b/extra/libnice/PKGBUILD
@@ -12,7 +12,6 @@ license=('LGPL')
 depends=('glib2')
 makedepends=('gstreamer' 'gstreamer0.10')
 optdepends=('gstreamer' 'gstreamer0.10')
-options=('!libtool')
 source=(http://nice.freedesktop.org/releases/$pkgname-$pkgver.tar.gz)
 md5sums=('315c457b092980a4a9a0bea9f0723cce')
 
diff --git a/extra/libnm-qt/PKGBUILD b/extra/libnm-qt/PKGBUILD
index fb085736d..65855e02c 100644
--- a/extra/libnm-qt/PKGBUILD
+++ b/extra/libnm-qt/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 196395 2013-10-12 17:08:13Z andrea $
+# $Id: PKGBUILD 196551 2013-10-15 09:59:45Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=libnm-qt
-pkgver=0.9.0
+pkgver=0.9.0.1
 pkgrel=1
 pkgdesc='Qt-only wrapper for NetworkManager DBus API'
 arch=('i686' 'x86_64')
@@ -10,8 +10,8 @@ url='https://projects.kde.org/projects/extragear/libs/libnm-qt'
 license=('LGPL')
 depends=('libmm-qt' 'networkmanager')
 makedepends=('cmake')
-source=("http://download.kde.org/unstable/networkmanagement/${pkgver}/src/${pkgname}-${pkgver}.tar.xz")
-sha256sums=('1afc4b21efd656b34f45692e2c40c0337ca44d7238a56b4318f3bb6fc7df6e22')
+source=("http://download.kde.org/unstable/networkmanager-qt/${pkgver}/src/${pkgname}-${pkgver}.tar.xz")
+sha256sums=('88239444df7fb7bbbadbe4bff50f68bcb7debe5efb101300aeb1b1e3cbb192cf')
 
 prepare() {
   mkdir -p build
diff --git a/extra/libnotify/PKGBUILD b/extra/libnotify/PKGBUILD
index 3ea034dae..043222891 100644
--- a/extra/libnotify/PKGBUILD
+++ b/extra/libnotify/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 196115 2013-10-07 11:52:55Z jgc $
+# $Id: PKGBUILD 198209 2013-10-30 13:28:13Z allan $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=libnotify
@@ -10,7 +10,6 @@ url="http://library.gnome.org/devel/notification-spec/"
 license=('LGPL')
 depends=('gdk-pixbuf2')
 makedepends=('gtk3' 'gobject-introspection')
-options=('!libtool')
 source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/0.7/${pkgname}-${pkgver}.tar.xz)
 sha256sums=('0ef61ca400d30e28217979bfa0e73a7406b19c32dd76150654ec5b2bdf47d837')
 
diff --git a/extra/libnova/PKGBUILD b/extra/libnova/PKGBUILD
index 997fb645b..89992d5f4 100644
--- a/extra/libnova/PKGBUILD
+++ b/extra/libnova/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 150247 2012-02-15 21:09:27Z ronald $
+# $Id: PKGBUILD 198210 2013-10-30 13:28:34Z allan $
 # Maintainer: Ronald van Haren <ronald@archlinux.org>
 # Contributor: Tobias Powalowski <tpowa@archlinux.org>
 
@@ -12,7 +12,6 @@ arch=('i686' 'x86_64' 'mips64el')
 depends=('glibc')
 makedepends=('pkgconfig')
 source=(http://downloads.sourceforge.net/sourceforge/libnova/$pkgname-$pkgver.tar.gz)
-options=(!libtool)
 sha1sums=('4ea7034a907d0578646b0d12fc4a095de8b23f51')
 
 build() {
diff --git a/extra/liboauth/PKGBUILD b/extra/liboauth/PKGBUILD
index 4472590fd..b3af99263 100644
--- a/extra/liboauth/PKGBUILD
+++ b/extra/liboauth/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 183475 2013-04-21 22:15:57Z heftig $
+# $Id: PKGBUILD 198211 2013-10-30 13:28:54Z allan $
 # Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com>
 # Contributor: Kaiting Chen <kaitocracy@gmail.com>
 # Contributor: Martin Häger <martin.haeger@gmail.com>
@@ -11,7 +11,6 @@ arch=(mips64el)
 url='http://liboauth.sourceforge.net'
 license=('MIT')
 depends=('curl')
-options=('!libtool')
 source=("$url/pool/$pkgname-$pkgver.tar.gz")
 sha256sums=('5087d32fe1db7b588246a7de64fc0c2464c95efdebb2c7fe6f482d9b00e68d8b')
 
diff --git a/extra/libofa/PKGBUILD b/extra/libofa/PKGBUILD
index 7ae65d413..86aff404a 100644
--- a/extra/libofa/PKGBUILD
+++ b/extra/libofa/PKGBUILD
@@ -1,44 +1,46 @@
-# $Id: PKGBUILD 150605 2012-02-18 22:48:27Z pierre $
+# $Id: PKGBUILD 197670 2013-10-28 02:51:05Z eric $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Tobias Powalowski <tpowa@archlinux.org>
 
 pkgname=libofa
 pkgver=0.9.3
-pkgrel=4.1
+pkgrel=5
 pkgdesc="An open-source audio fingerprint by MusicIP"
 arch=(i686 x86_64 'mips64el')
 url="http://code.google.com/p/musicip-libofa/"
 license=('GPL2' 'custom')
 depends=('expat' 'curl' 'fftw')
-makedepends=('pkgconfig')
-options=('!libtool')
 source=("http://musicip-libofa.googlecode.com/files/$pkgname-$pkgver.tar.gz"
         'gcc-4.patch'
         'gcc4.3.patch'
         'gcc4.5.patch'
-	'gcc47.patch'
-        'libofa-0.9.3-curl-7.21.patch')
+        'libofa-0.9.3-curl-7.21.patch'
+	'libofa-0.9.3-gcc-4.7.patch')
 md5sums=('51507d2c4b432bd2755f48d58471696e'
          'a6f78b90bd0f4354d022a71c3e58ef6c'
          'dd57db13770b8f8d196e8a3d3a50e713'
          'c245363368d0e6fa2b4676364b81b74f'
-         '5b571a09118131d7f7c8b84617efba71'
-         '2e1579d74613cfbb1799d0ab5f1a4cba')
+         '2e1579d74613cfbb1799d0ab5f1a4cba'
+         'a53a0104f9b5bba220322c6d0b68bf96')
+
+prepare() {
+  cd ${pkgname}-${pkgver}
+  patch -p0 -i "${srcdir}/gcc-4.patch"
+  patch -p1 -i "${srcdir}/gcc4.3.patch"
+  patch -p1 -i "${srcdir}/gcc4.5.patch"
+  patch -p1 -i "${srcdir}/libofa-0.9.3-gcc-4.7.patch"
+  patch -p1 -i "${srcdir}/libofa-0.9.3-curl-7.21.patch"
+}
 
 build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  patch -p0 -i ${srcdir}/gcc-4.patch
-  patch -p1 -i ${srcdir}/gcc4.3.patch
-  patch -p1 -i ${srcdir}/gcc4.5.patch
-  patch -p1 -i ${srcdir}/gcc47.patch
-  patch -p1 -i ${srcdir}/libofa-0.9.3-curl-7.21.patch
+  cd ${pkgname}-${pkgver}
   ./configure --prefix=/usr
   make
 }
 
 package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR=${pkgdir} install
+  cd ${pkgname}-${pkgver}
+  make DESTDIR="${pkgdir}" install
 
   install -D -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
 }
diff --git a/extra/libofa/libofa-0.9.3-gcc-4.7.patch b/extra/libofa/libofa-0.9.3-gcc-4.7.patch
new file mode 100644
index 000000000..c5ab09876
--- /dev/null
+++ b/extra/libofa/libofa-0.9.3-gcc-4.7.patch
@@ -0,0 +1,22 @@
+diff -up libofa-0.9.3/examples/uselame.cpp.gcc47 libofa-0.9.3/examples/uselame.cpp
+--- libofa-0.9.3/examples/uselame.cpp.gcc47	2012-01-14 09:35:24.343146853 -0600
++++ libofa-0.9.3/examples/uselame.cpp	2012-01-14 09:35:49.956826634 -0600
+@@ -12,6 +12,7 @@
+ #else
+ #include <sys/wait.h>
+ #endif
++#include <unistd.h>
+ 
+ AudioData *loadWaveFile(char *file);
+ 
+diff -up libofa-0.9.3/examples/wavefile.cpp.gcc47 libofa-0.9.3/examples/wavefile.cpp
+--- libofa-0.9.3/examples/wavefile.cpp.gcc47	2012-01-14 09:35:24.344146841 -0600
++++ libofa-0.9.3/examples/wavefile.cpp	2012-01-14 16:00:54.414981160 -0600
+@@ -11,6 +11,7 @@
+ #include "io.h"
+ #endif
+ #include <fcntl.h>
++#include <unistd.h>
+ 
+ static bool readBytes(int fd, unsigned char *buf, int size) {
+     int ct = 0;
diff --git a/extra/libofx/PKGBUILD b/extra/libofx/PKGBUILD
index f4b69312f..2e30a7041 100644
--- a/extra/libofx/PKGBUILD
+++ b/extra/libofx/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 183162 2013-04-18 06:30:55Z eric $
+# $Id: PKGBUILD 198655 2013-11-01 13:54:40Z eric $
 # Maintainer: Aaron Griffin <aaron@archlinux.org>
 
 pkgbase=libofx
 pkgname=('libofx' 'libofx-doc')
-pkgver=0.9.8
+pkgver=0.9.9
 pkgrel=1
 pkgdesc="API for the OFX banking standard"
 arch=('i686' 'x86_64' 'mips64el')
@@ -12,23 +12,23 @@ license=('GPL')
 depends=('opensp' 'curl' 'libxml++')
 checkdepends=('gnupg')
 source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz)
-sha1sums=('e0159d77c4458eb937871373db85c9f392e86554')
+sha1sums=('b8ea875cee16953166449de8ddd1b69fb181f61b')
 
 build() {
-  cd "$srcdir/$pkgbase-$pkgver"
+  cd $pkgbase-$pkgver
   ./configure --prefix=/usr
   make
 }
 
 check() {
-  cd "$srcdir/$pkgbase-$pkgver"
+  cd $pkgbase-$pkgver
   make check
 }
 
 package_libofx() {
-  options=('!libtool' '!docs')
+  options=('!docs')
 
-  cd "$srcdir/$pkgbase-$pkgver"
+  cd $pkgbase-$pkgver
   make DESTDIR="$pkgdir" install
 }
 
@@ -36,7 +36,7 @@ package_libofx-doc() {
   pkgdesc="Documention of the OFX banking standard API"
   depends=()
 
-  cd "$srcdir/$pkgbase-$pkgver"
+  cd $pkgbase-$pkgver
   make DESTDIR="$pkgdir" install-docDATA
   make -C doc DESTDIR="$pkgdir" install
 }
diff --git a/extra/libogg/PKGBUILD b/extra/libogg/PKGBUILD
index 8aa2a1105..11af89a4a 100644
--- a/extra/libogg/PKGBUILD
+++ b/extra/libogg/PKGBUILD
@@ -1,16 +1,15 @@
-# $Id: PKGBUILD 186983 2013-06-02 16:07:31Z tomegun $
+# $Id: PKGBUILD 198213 2013-10-30 13:29:40Z allan $
 # Maintainer:  Tom Gundersen <teg@jklm.no>
 # Contributor: John Proctor <jproctor@prium.net>
 
 pkgname=libogg
 pkgver=1.3.1
-pkgrel=1
+pkgrel=2
 pkgdesc="Ogg bitstream and framing library"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.xiph.org/ogg/"
 license=('BSD')
 depends=('glibc')
-options=('!libtool')
 source=(http://downloads.xiph.org/releases/ogg/$pkgname-$pkgver.tar.xz
         config_types.h)
 
diff --git a/extra/liboil/PKGBUILD b/extra/liboil/PKGBUILD
index 9ec93a1a9..acff18b74 100644
--- a/extra/liboil/PKGBUILD
+++ b/extra/liboil/PKGBUILD
@@ -1,21 +1,22 @@
-# $Id: PKGBUILD 150459 2012-02-17 23:55:27Z allan $
+# $Id: PKGBUILD 198214 2013-10-30 13:30:04Z allan $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=liboil
 pkgver=0.3.17
-pkgrel=2.2
+pkgrel=3
 pkgdesc="Library of simple functions that are optimized for various CPUs."
 arch=('i686' 'x86_64' 'mips64el')
 license=('custom')
 url="http://liboil.freedesktop.org/"
+depends=('glibc')
 makedepends=('glib2' 'pkgconfig' 'docbook-xsl')
-options=('!libtool' '!makeflags')
+options=('!makeflags')
 source=(${url}/download/${pkgname}-${pkgver}.tar.gz)
 md5sums=('47dc734f82faeb2964d97771cfd2e701')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr
+  ./configure --prefix=/usr --disable-static
   make
 }
 
diff --git a/extra/libotf/PKGBUILD b/extra/libotf/PKGBUILD
index 0003de2dd..9b4c978ce 100644
--- a/extra/libotf/PKGBUILD
+++ b/extra/libotf/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 172457 2012-12-03 05:46:28Z bisson $
+# $Id: PKGBUILD 198215 2013-10-30 13:30:39Z allan $
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
 # Contributor: Ashish Shukla <wahjava.ml@gmail.com>
 
@@ -8,7 +8,6 @@ pkgrel=1
 pkgdesc='OpenType Font library'
 url='http://www.nongnu.org/m17n/'
 license=('LGPL')
-options=('!libtool')
 arch=('i686' 'x86_64' 'mips64el')
 depends=('libxaw' 'freetype2')
 source=("http://download.savannah.gnu.org/releases/m17n//${pkgname}-${pkgver}.tar.gz")
diff --git a/extra/libotr/PKGBUILD b/extra/libotr/PKGBUILD
index 7ede4a447..fefd8b62b 100644
--- a/extra/libotr/PKGBUILD
+++ b/extra/libotr/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 170571 2012-11-09 00:21:42Z eric $
+# $Id: PKGBUILD 198216 2013-10-30 13:31:00Z allan $
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 # Contributor: Bug <Bug2000@gmail.com>
@@ -11,7 +11,6 @@ url='http://www.cypherpunks.ca/otr/'
 license=('GPL' 'LGPL')
 arch=('i686' 'x86_64' 'mips64el')
 depends=('libgcrypt')
-options=('!libtool')
 source=("http://www.cypherpunks.ca/otr/${pkgname}-${pkgver}.tar.gz")
 sha1sums=('8865e9011b8674290837afcf7caf90c492ae09cc')
 
diff --git a/extra/libotr3/PKGBUILD b/extra/libotr3/PKGBUILD
index 69a69b597..a05a3dd28 100644
--- a/extra/libotr3/PKGBUILD
+++ b/extra/libotr3/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 170574 2012-11-09 00:22:47Z eric $
+# $Id: PKGBUILD 198217 2013-10-30 13:31:22Z allan $
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 # Contributor: Bug <Bug2000@gmail.com>
@@ -11,7 +11,6 @@ url='http://www.cypherpunks.ca/otr/'
 license=('GPL' 'LGPL')
 arch=('i686' 'x86_64' 'mips64el')
 depends=('libgcrypt')
-options=('!libtool')
 source=("http://www.cypherpunks.ca/otr/libotr-${pkgver}.tar.gz" "libotr3-soname.patch")
 sha1sums=('898bf00d019f49ca34cd0116dd2e22685c67c394'
           '08c85f20fa1a0c5e8935d9a3f00b1d4e37f1b2d1')
diff --git a/extra/libots/PKGBUILD b/extra/libots/PKGBUILD
index ea0ec73c9..785f6a42f 100644
--- a/extra/libots/PKGBUILD
+++ b/extra/libots/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 149081 2012-02-05 16:59:38Z bisson $
+# $Id: PKGBUILD 198218 2013-10-30 13:31:42Z allan $
 # Contributor: Jan de Groot <jgc@archlinux.org>
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
 
@@ -10,7 +10,7 @@ url='http://libots.sourceforge.net/'
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 depends=('libxml2' 'glib2')
-options=('!libtool' '!makeflags')
+options=('!makeflags')
 source=("http://downloads.sourceforge.net/sourceforge/${pkgname}/ots-${pkgver}.tar.gz")
 sha1sums=('4468bc06470734848c2369a37c84f76ca4ac3f9a')
 
diff --git a/extra/libpano13/PKGBUILD b/extra/libpano13/PKGBUILD
index 1ca765d69..469d5e3bf 100644
--- a/extra/libpano13/PKGBUILD
+++ b/extra/libpano13/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 184405 2013-05-06 19:38:25Z foutrelis $
+# $Id: PKGBUILD 198219 2013-10-30 13:32:02Z allan $
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
 # Contributor: Tobias Kieslich <tobias@justdreams.de>
 
@@ -14,7 +14,6 @@ depends=('libpng' 'libtiff')
 source=("http://downloads.sourceforge.net/sourceforge/panotools/${pkgname}-${pkgver}.tar.gz")
 sha1sums=('23849bdbdfc9176a2b53d157e58bd24aa0e7276e')
 
-options=('!libtool')
 
 build() {
 	cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/libpciaccess/PKGBUILD b/extra/libpciaccess/PKGBUILD
index ba3bf2ddb..67ddf8971 100644
--- a/extra/libpciaccess/PKGBUILD
+++ b/extra/libpciaccess/PKGBUILD
@@ -4,24 +4,23 @@
 
 pkgname=libpciaccess
 pkgver=0.13.2
-pkgrel=1
+pkgrel=2
 pkgdesc="X11 PCI access library"
 arch=(i686 x86_64 'mips64el')
 license=('custom')
 url="http://xorg.freedesktop.org/"
 depends=('glibc')
-makedepends=('pkgconfig' 'xorg-util-macros')
-options=('!libtool')
+makedepends=('xorg-util-macros')
 source=(${url}/releases/individual/lib/${pkgname}-${pkgver}.tar.bz2)
 sha256sums=('abab8c2b050afb89bc29280e9c6b50ec5867174960d88bfb81a01036ec20de19')
 
 build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+  cd ${pkgname}-${pkgver}
   ./configure --prefix=/usr --sysconfdir=/etc
   make
 }
 package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+  cd ${pkgname}-${pkgver}
   make DESTDIR="${pkgdir}" install
   install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
   install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"
diff --git a/extra/libpeas/PKGBUILD b/extra/libpeas/PKGBUILD
index bb1e32b4e..48746ad8f 100644
--- a/extra/libpeas/PKGBUILD
+++ b/extra/libpeas/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 196116 2013-10-07 11:52:58Z jgc $
+# $Id: PKGBUILD 198220 2013-10-30 13:32:24Z allan $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 
 pkgname=libpeas
@@ -15,7 +15,6 @@ if [ "$CARCH" != "mips64el" ]; then
   makedepends+=(gjs)
   optdepends+=('gjs: gobject-based plugin engine - gjs runtime loader')
 fi
-options=('!libtool')
 install=libpeas.install
 source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-${pkgver}.tar.xz)
 sha256sums=('008747ccdf954dc7b8e3207fffede527a589363541873f906c8e0166f6f7df8d')
diff --git a/extra/libpng/PKGBUILD b/extra/libpng/PKGBUILD
index b5473089a..506212bfd 100644
--- a/extra/libpng/PKGBUILD
+++ b/extra/libpng/PKGBUILD
@@ -1,29 +1,28 @@
-# $Id: PKGBUILD 194432 2013-09-16 10:42:02Z jgc $
+# $Id: PKGBUILD 198221 2013-10-30 13:32:47Z allan $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: dorphell <dorphell@archlinux.org>
 # Contributor: Travis Willard <travis@archlinux.org>
 # Contributor: Douglas Soares de Andrade <douglas@archlinux.org>
 
 pkgname=libpng
-pkgver=1.6.5
-_apngver=1.6.3
+pkgver=1.6.6
+_apngver=1.6.6
 pkgrel=1
 pkgdesc="A collection of routines used to create PNG format graphics files"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.libpng.org/pub/png/libpng.html"
 license=('custom')
 depends=('zlib' 'sh')
-options=('!libtool')
 source=(http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.xz{,.asc}
         http://downloads.sourceforge.net/sourceforge/libpng-apng/libpng-$_apngver-apng.patch.gz)
-md5sums=('dec292dd99b094cea03bdd7232f5a80c'
+md5sums=('3a41dcd58bcac7cc191c2ec80c7fb2ac'
          'SKIP'
-         '57007fc121baa2cdc48abcfb26300e78')
+         '8af242769611daf62a8a17349b6059f7')
 
 prepare() {
   cd $pkgname-$pkgver
 
-  # Add animated PNG (apng) support
+  # Add animated PNG (apng) support. Required by Firefox
   # see http://sourceforge.net/projects/libpng-apng/
   patch -Np1 -i ../libpng-$_apngver-apng.patch
 }
@@ -31,7 +30,7 @@ prepare() {
 build() {
   cd $pkgname-$pkgver
 
-  ./configure --prefix=/usr
+  ./configure --prefix=/usr --disable-static
   make
 }
 
diff --git a/extra/libproxy/PKGBUILD b/extra/libproxy/PKGBUILD
index 7bcc2a9a5..c46f13a9b 100644
--- a/extra/libproxy/PKGBUILD
+++ b/extra/libproxy/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 186388 2013-05-26 09:24:47Z bluewind $
+# $Id: PKGBUILD 198222 2013-10-30 13:33:08Z allan $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=libproxy
@@ -15,7 +15,6 @@ optdepends=('kdelibs: KDE configuration module'
 makedepends=('cmake' 'networkmanager' 'automoc4' 'python2' 'kdelibs' 'perl')
 url="http://libproxy.googlecode.com"
 source=(http://libproxy.googlecode.com/files/${pkgname}-${pkgver}.tar.gz)
-options=('!libtool')
 md5sums=('3cd1ae2a4abecf44b3f24d6639d2cd84')
 
 build() {
diff --git a/extra/libpst/PKGBUILD b/extra/libpst/PKGBUILD
index f11ef2bd8..73abae98e 100644
--- a/extra/libpst/PKGBUILD
+++ b/extra/libpst/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 183115 2013-04-17 16:05:23Z jgc $
+# $Id: PKGBUILD 198223 2013-10-30 13:33:34Z allan $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgbase=libpst
@@ -23,7 +23,7 @@ package_libpst() {
   pkgdesc="Outlook .pst file converter"
   depends=('gcc-libs' 'libgsf')
   optdepends=('boost-libs: for libpst python interface')
-  options=('!libtool' '!docs')
+  options=('!docs')
 
   cd "${srcdir}/${pkgbase}-${pkgver}"
   make DESTDIR="${pkgdir}" install
@@ -31,7 +31,7 @@ package_libpst() {
 
 package_libpst-docs() {
   pkgdesc="Documentation for Outlook .pst file converter"
-  options=('!libtool' 'docs')
+  options=('docs')
 
   cd "${srcdir}/${pkgbase}-${pkgver}"
   make DESTDIR="${pkgdir}" install-htmlDATA
diff --git a/extra/libpwquality/PKGBUILD b/extra/libpwquality/PKGBUILD
index 84eccf83c..6875a11f7 100644
--- a/extra/libpwquality/PKGBUILD
+++ b/extra/libpwquality/PKGBUILD
@@ -1,28 +1,29 @@
-# $Id: PKGBUILD 189651 2013-07-04 03:57:29Z eric $
+# $Id: PKGBUILD 198657 2013-11-01 14:49:41Z eric $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=libpwquality
-pkgver=1.2.2
+pkgver=1.2.3
 pkgrel=1
 pkgdesc="Library for password quality checking and generating random passwords"
 arch=('i686' 'x86_64' 'mips64el')
 url="https://fedorahosted.org/libpwquality/"
 license=('GPL')
-options=('!libtool')
 depends=('cracklib')
 optdepends=('python2: Python bindings')
 makedepends=('python2')
 source=(https://fedorahosted.org/releases/l/i/libpwquality/$pkgname-$pkgver.tar.bz2)
-md5sums=('2105bb893791fe27efc20441e617f385')
+md5sums=('a8d4cf5d40a1c301f965432e6f3b821b')
 
-build() {
+prepare() {
     cd "$pkgname-$pkgver"
     sed -i -e 's/python setup.py/python2 setup.py/' python/Makefile.in
+}
 
+build() {
+    cd "$pkgname-$pkgver"
     PYTHON=python2 ./configure --prefix=/usr \
         --sysconfdir=/etc \
         --localstatedir=/var \
-        --disable-static \
         --with-python-rev=2.7
     make
 }
diff --git a/extra/libqalculate/PKGBUILD b/extra/libqalculate/PKGBUILD
index 641c5f4af..68de1dab8 100644
--- a/extra/libqalculate/PKGBUILD
+++ b/extra/libqalculate/PKGBUILD
@@ -1,27 +1,29 @@
-# $Id: PKGBUILD 149451 2012-02-08 01:06:52Z eric $
+# $Id: PKGBUILD 197265 2013-10-24 20:11:40Z eric $
 # Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgname=libqalculate
 pkgver=0.9.7
-pkgrel=3.1
+pkgrel=4
 pkgdesc="Multi-purpose desktop calculator"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://qalculate.sourceforge.net/"
 license=('GPL')
 depends=('libxml2' 'cln' 'glib2')
 makedepends=('perl-xml-parser')
-optdepends=('gnuplot: for plotting support' 'wget: for retrieval of exchange rates (not needed if you use one of the GUI)' 'gnome-vfs: for retrieval of exchange rates (not needed if you use one of the GUI)')
-options=('!libtool' '!makeflags')
+optdepends=('gnuplot: for plotting support' 
+            'wget: for retrieval of exchange rates (not needed if you use one of the GUI)'
+            'gnome-vfs: for retrieval of exchange rates (not needed if you use one of the GUI)')
+options=('!makeflags')
 source=(http://downloads.sourceforge.net/sourceforge/qalculate/${pkgname}-${pkgver}.tar.gz)
 sha1sums=('c15f7f3a97995decf62cc964956fc1e374ecd78c')
 
 build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+  cd ${pkgname}-${pkgver}
   ./configure --prefix=/usr
   make
 }
 
 package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+  cd ${pkgname}-${pkgver}
   make DESTDIR="${pkgdir}" install
 }
diff --git a/extra/libqinfinity/PKGBUILD b/extra/libqinfinity/PKGBUILD
new file mode 100644
index 000000000..51afc1839
--- /dev/null
+++ b/extra/libqinfinity/PKGBUILD
@@ -0,0 +1,32 @@
+# $Id: PKGBUILD 197746 2013-10-29 07:56:59Z andrea $
+# Maintainer: Andrea Scarpino <andrea@archlinux.org>
+# Contributor: Antonio Rojas <nqn1976 @ gmail.com>
+
+pkgname=libqinfinity
+pkgver=0.5.2
+pkgrel=1
+pkgdesc="Qt wrapper around libinfinity, a library for collaborative editing"
+arch=('i686' 'x86_64')
+url='https://projects.kde.org/projects/playground/libs/libqinfinity'
+license=('LGPL')
+depends=('libinfinity' 'qt4')
+makedepends=('cmake')
+source=("http://download.kde.org/stable/${pkgname}/${pkgver}/src/${pkgname}-v${pkgver}.tar.xz")
+md5sums=('de78878142b492e2f9c79c3684ac2d23')
+
+prepare() {
+	mkdir build
+}
+
+build() {
+	cd build
+	cmake ../${pkgname}-v${pkgver} \
+    -DCMAKE_BUILD_TYPE=Release \
+    -DCMAKE_INSTALL_PREFIX=/usr
+	make
+}
+
+package() {
+	cd build
+	make DESTDIR="${pkgdir}/" install
+}
diff --git a/extra/libqmi/PKGBUILD b/extra/libqmi/PKGBUILD
index 458310cc6..fe83c4cb8 100644
--- a/extra/libqmi/PKGBUILD
+++ b/extra/libqmi/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 191190 2013-07-19 12:11:16Z heftig $
+# $Id: PKGBUILD 198225 2013-10-30 13:34:34Z allan $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 
 pkgname=libqmi
@@ -10,7 +10,6 @@ url="http://www.freedesktop.org/wiki/Software/libqmi/"
 license=(GPL2)
 depends=(glib2 bash)
 makedepends=(gtk-doc python)
-options=('!libtool')
 source=(http://www.freedesktop.org/software/$pkgname/$pkgname-$pkgver.tar.xz)
 sha256sums=('812515c36fd77c5f7eb9d52804e9666c4341e8c7dd3d932ca1e607b467831af3')
 
diff --git a/extra/libquvi/PKGBUILD b/extra/libquvi/PKGBUILD
index 8d78ab2b2..7a309d73c 100644
--- a/extra/libquvi/PKGBUILD
+++ b/extra/libquvi/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 196117 2013-10-07 11:52:59Z jgc $
+# $Id: PKGBUILD 198226 2013-10-30 13:34:55Z allan $
 # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de>
 
 pkgname=libquvi
@@ -10,7 +10,6 @@ url='http://quvi.sourceforge.net/'
 license=('AGPL3')
 depends=('libquvi-scripts' 'curl' 'lua51' 'libproxy' 'libgcrypt' 'glib2')
 conflicts=('quvi<0.9.0')
-options=('!libtool')
 source=("http://downloads.sourceforge.net/sourceforge/quvi/${pkgname}-${pkgver}.tar.xz"{,.sig})
 md5sums=('12a62c4fcde9b6109193191b7bd3d685'
          'SKIP')
diff --git a/extra/libraw1394/PKGBUILD b/extra/libraw1394/PKGBUILD
index ad2963bdb..4ad0af84f 100644
--- a/extra/libraw1394/PKGBUILD
+++ b/extra/libraw1394/PKGBUILD
@@ -1,17 +1,16 @@
-# $Id: PKGBUILD 180142 2013-03-18 09:02:21Z jgc $
+# $Id: PKGBUILD 198228 2013-10-30 13:35:37Z allan $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Tom Newsom <Jeepster@gmx.co.uk>
 
 pkgname=libraw1394
 pkgver=2.1.0
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64' 'mips64el')
 license=('LGPL2.1')
 pkgdesc="Provides an API to the Linux IEEE1394 (FireWire) driver"
 depends=('glibc')
 makedepends=('pkgconfig')
 url="https://ieee1394.wiki.kernel.org/index.php/Main_Page"
-options=(!libtool)
 source=(ftp://ftp.kernel.org/pub/linux/libs/ieee1394/${pkgname}-${pkgver}.tar.xz)
 sha256sums=('0b3126d8158d156de9da2ff4d861c47857acc4318a7ac260258015a22071964f')
 
diff --git a/extra/libreoffice/PKGBUILD b/extra/libreoffice/PKGBUILD
index 36ebc53ff..d1c61c515 100644
--- a/extra/libreoffice/PKGBUILD
+++ b/extra/libreoffice/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 196169 2013-10-07 14:33:01Z andyrtr $
+# $Id: PKGBUILD 198659 2013-11-01 15:09:06Z andyrtr $
 # Maintainer: AndyRTR <andyrtr@archlinux.org>
 # Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl>
 
@@ -19,8 +19,8 @@ pkgname=('libreoffice-common'
 	'libreoffice-extension-presentation-minimizer'
 	'libreoffice-extension-wiki-publisher'
 	'libreoffice-extension-nlpsolver') # svn up -r 142692 (last one with all extensions built)
-_LOver=4.1.2.3
-pkgver=4.1.2
+_LOver=4.1.3.2
+pkgver=4.1.3
 pkgrel=1
 arch=('i686' 'x86_64')
 license=('LGPL3')
@@ -33,10 +33,14 @@ makedepends=( # makedepends
              'clucene' 'bluez-libs' 'harfbuzz-icu'
              # the runtime dependencies
              "curl>=7.20.0" "hunspell>=1.2.8" "python>=3.3" 'libwpd>=0.9.2' 'libwps' 'libxaw' "neon>=0.28.6"
-             'pango' 'nspr' 'libjpeg' 'libxrandr' 'libgl' 'dbus-glib' 'libxslt' 'librsvg' "icu>=51.1" 
+             'pango' 'nspr' 'libjpeg' 'libxrandr' 'libgl' 'dbus-glib' 'libxslt' 'librsvg' "icu>=52.1" 
              'redland' 'hyphen' 'lpsolve' 'gcc-libs' 'sh'  'libtextcat' 'graphite' 'lcms2' 'poppler>=0.24.0' 
              'hicolor-icon-theme' 'desktop-file-utils' 'shared-mime-info' 'gtk2' 'orbit2' 'translate-toolkit' 'xdg-utils'
 	         'ttf-dejavu') # to satisfy regression tests
+# there's only one single static library in libreoffice-sdk,
+# the next build that removes it may lead to trouble if people may use it
+# -rw-r--r-- 1 root root 5,1K 12. Okt 23:34 /usr/lib/libreoffice/sdk/lib/libsalcpprt.a
+# options=('staticlibs') 
 
 # http://download.documentfoundation.org/mirrors/all.html
 # http://wiki.documentfoundation.org/Mirrors
@@ -78,7 +82,7 @@ source=(${_mirror}/${pkgbase}{,-help,-translations}-${_LOver}.tar.xz
 	${_additional_source_url}/8473296c671b6e3dd8197f4145e0854b-libodfgen-0.0.2.tar.bz2
 	${_additional_source_url}/libcdr-0.0.14.tar.bz2
 	${_additional_source_url}/libmspub-0.0.6.tar.bz2
-	${_additional_source_url}/libmwaw-0.1.10.tar.bz2
+	${_additional_source_url}/libmwaw-0.1.11.tar.bz2
 	${_additional_source_url}/libvisio-0.0.31.tar.bz2
 	make-pyuno-work-with-system-wide-module-install.diff
 	libreoffice-common.sh libreoffice-common.csh)
@@ -114,11 +118,11 @@ noextract=(f02578f5218f217a9f20e9c30e119c6a-boost_1_44_0.tar.bz2
 	8473296c671b6e3dd8197f4145e0854b-libodfgen-0.0.2.tar.bz2
 	libcdr-0.0.14.tar.bz2
 	libmspub-0.0.6.tar.bz2
-	libmwaw-0.1.10.tar.bz2
+	libmwaw-0.1.11.tar.bz2
 	libvisio-0.0.31.tar.bz2	)
-md5sums=('bb2fe0056ae92e70ee8816a36dd0696c'
-         '761323fae73ef156f5cf188d8bd983f1'
-         '54f36cf305ae018ad685c331587d83e3'
+md5sums=('7c5248b9141df6c4844c81515a41942f'
+         'c5a692983c429a142b1c109fd28425fa'
+         'f5131da6395034246eb26aa94c7de8b2'
          'f02578f5218f217a9f20e9c30e119c6a'
          '1f24ab1d39f4a51faf22244c94a6203f'
          '35c94d2df8893241173de1d16b6034c0'
@@ -151,7 +155,7 @@ md5sums=('bb2fe0056ae92e70ee8816a36dd0696c'
          '8473296c671b6e3dd8197f4145e0854b'
          'd88f9b94df880d2c05be943b000ca112'
          '1120705cd0f0d9bd5506360bf57b6c2e'
-         '2289bb137bbba9b473ce60168895c036'
+         '828dd03510791fbe037081a2b4a1a8ff'
          '82628333418f101a20cd21f980cf9f40'
          '07d2bf5ad839a394cca008b3ec6e7bb1'
          '4195735a80876ae812fca5736b50192a'
@@ -160,7 +164,7 @@ md5sums=('bb2fe0056ae92e70ee8816a36dd0696c'
 prepare() {
 
     cd libreoffice-$_LOver
-    
+
     # fix exttextcat build error
     # /usr/include/features.h:330:4: error: #warning _FORTIFY_SOURCE requires compiling with optimization (-O) [-Werror=cpp]
     unset CPPFLAGS
@@ -284,7 +288,7 @@ package_libreoffice-common() {
  pkgdesc="common files for LibreOffice - a productivity suite that is compatible with other major office suites"
  install=libreoffice-common.install
  depends=('libreoffice-langpack' "hunspell>=1.2.8" "python>=3.3" "neon>=0.28.6" 'dbus-glib' 'librsvg' 'libcups'
-          'nss' 'libsm' 'redland' 'hyphen' 'graphite' "icu>=51.1" 'clucene' 'lcms2' "poppler>=0.24.0"
+          'nss' 'libsm' 'redland' 'hyphen' 'graphite' "icu>=52.1" 'clucene' 'lcms2' "poppler>=0.24.0"
           'harfbuzz-icu' 'hicolor-icon-theme' 'desktop-file-utils' 'shared-mime-info' 'xdg-utils')
  optdepends=('libreoffice-langpack: additional language support'
              'java-runtime:     adds java support'
@@ -300,7 +304,9 @@ package_libreoffice-common() {
              'gtk2:             for browser plugin')
  backup=(etc/libreoffice/sofficerc
          etc/libreoffice/bootstraprc
-         etc/libreoffice/psprint.conf)
+         etc/libreoffice/psprint.conf
+         etc/profile.d/libreoffice-common.sh
+         etc/profile.d/libreoffice-common.csh)
  groups=('libreoffice')
  provides=('go-openoffice' 'libreoffice-extension-pdfimport' 'libreoffice-extension-presenter-screen'
            'libreoffice-scripting-beanshell' 'libreoffice-scripting-javascript'	'libreoffice-extension-scripting-python'
@@ -354,10 +360,6 @@ package_libreoffice-common() {
   
  # workaround all packages now depend on that file
  cp ${srcdir}/fakeinstall/usr/lib/libreoffice/share/registry/writer.xcd ${pkgdir}/usr/lib/libreoffice/share/registry/writer.xcd
- 
- # move dicts to en-US langpack to avoid file conflicts with en-GBen-ZA packages
- mv ${pkgdir}/usr/lib/libreoffice/share/wordbook/en-GB.dic ${srcdir}/
- mv ${pkgdir}/usr/lib/libreoffice/share/wordbook/en-US.dic ${srcdir}/
 }
 
 package_libreoffice-base() {
@@ -451,7 +453,9 @@ package_libreoffice-draw() {
 
 package_libreoffice-gnome() {
  pkgdesc="Plug-in for LibreOffice that enables integration into the Gnome and other gtk desktop environment."
- depends=('libreoffice-common' 'gconf' 'gtk3')
+ depends=('libreoffice-common' 'gconf')
+ optdepends=('gtk3: for gtk3 Gnome integration'
+             'gtk2: for older gtk2 desktop integration')
  groups=('libreoffice')
  
  # create directories from *list.txt file
@@ -620,11 +624,6 @@ package_libreoffice-en-US() {
    # mv file from fakeinstall to pkgdir
    mv ${srcdir}/fakeinstall${file} ${pkgdir}$file
  done
- 
- # move dicts to en-US langpack to avoid file conflicts with en-GBen-ZA packages
- install -dm755 ${pkgdir}/usr/lib/libreoffice/share/wordbook
- mv ${srcdir}/en-GB.dic ${pkgdir}/usr/lib/libreoffice/share/wordbook/en-GB.dic
- mv ${srcdir}/en-US.dic ${pkgdir}/usr/lib/libreoffice/share/wordbook/en-US.dic
 }
 
 package_libreoffice-extension-presentation-minimizer() {
diff --git a/extra/librsvg/PKGBUILD b/extra/librsvg/PKGBUILD
index 14627fe1a..deb28ce24 100644
--- a/extra/librsvg/PKGBUILD
+++ b/extra/librsvg/PKGBUILD
@@ -1,22 +1,21 @@
-# $Id: PKGBUILD 196119 2013-10-07 11:53:02Z jgc $
+# $Id: PKGBUILD 198229 2013-10-30 13:35:58Z allan $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=librsvg
-pkgver=2.39.0
-pkgrel=2
+pkgver=2.40.0
+pkgrel=1
 epoch=1
 pkgdesc="A SVG viewing library"
 arch=(i686 x86_64 'mips64el')
 license=('LGPL')
 depends=('gdk-pixbuf2' 'pango' 'libcroco')
-makedepends=('intltool' 'gtk2' 'gtk3' 'gobject-introspection')
-optdepends=('gtk3: for rsvg-view-3'
-            'gtk2: gtk2 SVG engine module')
-options=('!libtool' '!emptydirs')
+makedepends=('intltool' 'gtk3' 'gobject-introspection')
+optdepends=('gtk3: for rsvg-view-3')
+options=('!emptydirs')
 url="https://live.gnome.org/LibRsvg"
 install=librsvg.install
-source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('aa47dcde0128eee6e3595d203bc673d9c27389588842f401bf585f31fc65095f')
+source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver:0:4}/$pkgname-$pkgver.tar.xz)
+sha256sums=('8f7db31df235813dbd035888035cf862d682e7cc5706c4e7ec05750d3f64a2f9')
 
 build() {
   cd $pkgname-$pkgver
diff --git a/extra/libsamplerate/PKGBUILD b/extra/libsamplerate/PKGBUILD
index 848c8a990..c10947e42 100644
--- a/extra/libsamplerate/PKGBUILD
+++ b/extra/libsamplerate/PKGBUILD
@@ -1,15 +1,14 @@
-# $Id: PKGBUILD 192312 2013-08-10 02:16:26Z eric $
+# $Id: PKGBUILD 197267 2013-10-24 20:17:46Z eric $
 # Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgname=libsamplerate
 pkgver=0.1.8
-pkgrel=2
+pkgrel=3
 pkgdesc="Secret Rabbit Code - aka Sample Rate Converter for audio"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.mega-nerd.com/SRC/index.html"
 license=('GPL')
 depends=('libsndfile')
-options=('!libtool')
 source=(http://www.mega-nerd.com/SRC/libsamplerate-${pkgver}.tar.gz{,.asc})
 sha1sums=('e5fe82c4786be2fa33ca6bd4897db4868347fe70'
           'SKIP')
diff --git a/extra/libsecret/PKGBUILD b/extra/libsecret/PKGBUILD
index 4b002f3dd..cd60dea18 100644
--- a/extra/libsecret/PKGBUILD
+++ b/extra/libsecret/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 196120 2013-10-07 11:53:04Z jgc $
+# $Id: PKGBUILD 198230 2013-10-30 13:36:21Z allan $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=libsecret
@@ -11,7 +11,6 @@ url="https://live.gnome.org/Libsecret"
 depends=('glib2' 'libgcrypt')
 makedepends=('intltool' 'docbook-xsl' 'gobject-introspection' 'vala')
 optdepends=('gnome-keyring: key storage service (or use any other service implementing org.freedesktop.secrets)')
-options=('!libtool')
 source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/$pkgver/$pkgname-$pkgver.tar.xz)
 sha256sums=('b859406c490a2011b35f5940235304315b343f2efd554800285f24b95e14f218')
 
diff --git a/extra/libsexy/PKGBUILD b/extra/libsexy/PKGBUILD
index 66cc9df8a..89f89fc7b 100644
--- a/extra/libsexy/PKGBUILD
+++ b/extra/libsexy/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 149220 2012-02-06 13:45:35Z ibiru $
+# $Id: PKGBUILD 198231 2013-10-30 13:36:45Z allan $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=libsexy
@@ -10,7 +10,6 @@ license=('GPL')
 url="http://chipx86.com/wiki/Libsexy"
 depends=('gtk2' 'libxml2')
 makedepends=('iso-codes' 'pkgconfig')
-options=('!libtool')
 source=("http://releases.chipx86.com/libsexy/libsexy/${pkgname}-${pkgver}.tar.gz")
 md5sums=('33c079a253270ec8bfb9508e4bb30754')
 
diff --git a/extra/libshout/PKGBUILD b/extra/libshout/PKGBUILD
index 3a9561708..4022f7d0a 100644
--- a/extra/libshout/PKGBUILD
+++ b/extra/libshout/PKGBUILD
@@ -1,17 +1,17 @@
-# $Id: PKGBUILD 168008 2012-10-05 06:33:28Z eric $
+# $Id: PKGBUILD 198232 2013-10-30 13:37:05Z allan $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: arjan <arjan@archlinux.org>
 # Contributor: Jason Chu <jchu@xentac.net>
 
 pkgname=libshout
 pkgver=2.3.1
-pkgrel=1
+pkgrel=2
 epoch=1
 pkgdesc="Library for accessing a shoutcast/icecast server"
 arch=('i686' 'x86_64' 'mips64el')
 depends=('libvorbis' 'libtheora' 'speex')
 url="http://www.icecast.org/"
-options=('!libtool' '!emptydirs')
+options=('!emptydirs')
 license=('LGPL')
 source=("http://downloads.xiph.org/releases/${pkgname}/${pkgname}-${pkgver}.tar.gz")
 md5sums=('11765b2592e7ea623ccd93d3f8df172c')
diff --git a/extra/libsidplay/PKGBUILD b/extra/libsidplay/PKGBUILD
index fc1089abe..774482c0d 100644
--- a/extra/libsidplay/PKGBUILD
+++ b/extra/libsidplay/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 150451 2012-02-17 23:16:31Z allan $
+# $Id: PKGBUILD 198233 2013-10-30 13:37:26Z allan $
 # Maintainer:
 # Contributor: Kritoke <kritoke@gamebox.net>
 
@@ -9,7 +9,6 @@ pkgdesc="A library for playing SID music files."
 arch=('i686' 'x86_64' 'mips64el')
 url="http://critical.ch/distfiles/"
 license=('GPL')
-options=('!libtool')
 source=(http://critical.ch/distfiles/${pkgname}-${pkgver}.tgz libsidplay-1.36.59-gcc43.patch)
 md5sums=('37c51ba4bd57164b1b0bb7b43b9adece' 'c24d7bca2639f4fee03c40c7dcaadfee')
 
diff --git a/extra/libsidplayfp/PKGBUILD b/extra/libsidplayfp/PKGBUILD
index 257d2643a..00c22e095 100644
--- a/extra/libsidplayfp/PKGBUILD
+++ b/extra/libsidplayfp/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 195480 2013-10-01 01:48:17Z bisson $
+# $Id: PKGBUILD 198234 2013-10-30 13:37:47Z allan $
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
 # Contributor: Simon Perry <aur [at] sanxion [dot] net>
 # Contributor: Jonas Nyrén <jonas.nyren*mindkiller.com>
@@ -15,7 +15,7 @@ optdepends=('vice: better SID support')
 source=("http://downloads.sourceforge.net/project/sidplay-residfp/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.gz")
 sha1sums=('6c3617fcbd94fd364f3305a1c4d88485911110c7')
 
-options=('!libtool' '!staticlibs')
+options=('!staticlibs')
 
 build() {
 	cd "${pkgname}-${pkgver}"
diff --git a/extra/libsigc++/PKGBUILD b/extra/libsigc++/PKGBUILD
index 47e2fd029..e276328d6 100644
--- a/extra/libsigc++/PKGBUILD
+++ b/extra/libsigc++/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 183319 2013-04-21 22:06:38Z heftig $
+# $Id: PKGBUILD 198235 2013-10-30 13:38:07Z allan $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: Tom Newsom <Jeepster@gmx.co.uk>
 
@@ -10,7 +10,7 @@ arch=('i686' 'x86_64' 'mips64el')
 license=('LGPL')
 url="http://libsigc.sourceforge.net/"
 makedepends=('gcc-libs')
-options=('!libtool' '!emptydirs')
+options=('!emptydirs')
 source=("http://ftp.gnome.org/pub/GNOME/sources/${pkgbase}/2.3/${pkgbase}-${pkgver}.tar.xz")
 sha256sums=('67d05852b31fdb267c9fdcecd40b046a11aa54d884435e99e3c60dd20cd60393')
 
diff --git a/extra/libsigsegv/PKGBUILD b/extra/libsigsegv/PKGBUILD
index a969250b2..4ba90b054 100644
--- a/extra/libsigsegv/PKGBUILD
+++ b/extra/libsigsegv/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 154929 2012-03-31 09:05:33Z ronald $
+# $Id: PKGBUILD 198236 2013-10-30 13:38:33Z allan $
 # Maintainer: Ronald van Haren <ronald.archlinux.org>
 # Contributor: Johannes Weiner <hannes@saeurebad.de>
 
@@ -10,7 +10,6 @@ pkgdesc="Page fault detection library"
 url="http://www.gnu.org/software/libsigsegv/"
 license=('GPL2')
 depends=('glibc')
-options=('!libtool')
 source=("http://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.gz")
 sha1sums=('b75a647a9ebda70e7a3b33583efdd550e0eac094')
 
diff --git a/extra/libsm/PKGBUILD b/extra/libsm/PKGBUILD
index 1a6a1bd94..1731fa5c0 100644
--- a/extra/libsm/PKGBUILD
+++ b/extra/libsm/PKGBUILD
@@ -1,27 +1,26 @@
-# $Id: PKGBUILD 194298 2013-09-13 07:26:46Z andyrtr $
+# $Id: PKGBUILD 197091 2013-10-21 18:35:02Z andyrtr $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=libsm
 pkgver=1.2.2
-pkgrel=1
+pkgrel=2
 pkgdesc="X11 Session Management library"
 arch=('i686' 'x86_64' 'mips64el')
 license=('custom')
 url="http://xorg.freedesktop.org/"
 depends=('libice' 'util-linux')
 makedepends=('xorg-util-macros' 'xtrans')
-options=('!libtool')
 source=(${url}/releases/individual/lib/libSM-${pkgver}.tar.bz2)
 sha256sums=('0baca8c9f5d934450a70896c4ad38d06475521255ca63b717a6510fdb6e287bd')
 
 build() {
-  cd "${srcdir}/libSM-${pkgver}"
+  cd libSM-${pkgver}
   ./configure --prefix=/usr --sysconfdir=/etc
   make
 }
 
 package() {
-  cd "${srcdir}/libSM-${pkgver}"
+  cd libSM-${pkgver}
   make DESTDIR="${pkgdir}" install
 
   install -Dm644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/COPYING"
diff --git a/extra/libsmbios/PKGBUILD b/extra/libsmbios/PKGBUILD
index d7dab5cf0..be9f2197d 100644
--- a/extra/libsmbios/PKGBUILD
+++ b/extra/libsmbios/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 187063 2013-06-03 11:16:41Z allan $
+# $Id: PKGBUILD 198237 2013-10-30 13:38:54Z allan $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: Alessio 'mOLOk' Bolognino <themolok@gmail.com>
 # Contributor: daniel g. siegel <dgsiegel@gmail.com> 
@@ -14,7 +14,6 @@ depends=('gcc-libs')
 makedepends=('libxml2' 'python2' 'chrpath')
 optdepends=('python2: tools')
 source=(http://linux.dell.com/libsmbios/download/${pkgname}/${pkgname}-${pkgver}/${pkgname}-${pkgver}.tar.bz2)
-options=('!libtool')
 md5sums=('4e167e8d108e287defc3c461f50ef159')
 
 build() {
diff --git a/extra/libsndfile/PKGBUILD b/extra/libsndfile/PKGBUILD
index 3c408ba4c..ab28ddd1f 100644
--- a/extra/libsndfile/PKGBUILD
+++ b/extra/libsndfile/PKGBUILD
@@ -1,34 +1,37 @@
-# $Id: PKGBUILD 149407 2012-02-07 15:40:58Z eric $
+# $Id: PKGBUILD 197269 2013-10-24 20:25:13Z eric $
 # Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgname=libsndfile
 pkgver=1.0.25
-pkgrel=2.2
+pkgrel=3
 pkgdesc="A C library for reading and writing files containing sampled sound"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.mega-nerd.com/libsndfile"
 license=('LGPL')
 depends=('alsa-lib' 'flac' 'libvorbis')
 checkdepends=('python2')
-options=('!libtool')
 source=(http://www.mega-nerd.com/libsndfile/files/${pkgname}-${pkgver}.tar.gz{,.asc})
 sha1sums=('e95d9fca57f7ddace9f197071cbcfb92fa16748e'
           'a93d26016730cb9fa214c753d079ee77dca1f326')
 
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+prepare() {
+  cd ${pkgname}-${pkgver}
   sed -i 's|#!/usr/bin/python|#!/usr/bin/python2|' src/binheader_writef_check.py \
     src/create_symbols_file.py programs/test-sndfile-metadata-set.py
+}
+
+build() {
+  cd ${pkgname}-${pkgver}
   ./configure --prefix=/usr --disable-sqlite
   make
 }
 
 check() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+  cd ${pkgname}-${pkgver}
   make check
 }
 
 package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+  cd ${pkgname}-${pkgver}
   make DESTDIR="${pkgdir}" install
 }
diff --git a/extra/libsocialweb/PKGBUILD b/extra/libsocialweb/PKGBUILD
index 4802c033a..11ef9a21b 100644
--- a/extra/libsocialweb/PKGBUILD
+++ b/extra/libsocialweb/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 183438 2013-04-21 22:11:34Z heftig $
+# $Id: PKGBUILD 198238 2013-10-30 13:39:14Z allan $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 
 pkgname=libsocialweb
@@ -11,7 +11,6 @@ license=(GPL2)
 depends=(glib2 gconf 'libsoup>=2.24.0' rest dbus-glib libgnome-keyring
          json-glib networkmanager)
 makedepends=(intltool gtk-doc vala gobject-introspection)
-options=('!libtool')
 source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz
        libsocialweb-gir-fix.patch)
 sha256sums=('f676567640cede66b6ff62f440c968943c2f3a164dd5f26155b6154ab93bf687'
diff --git a/extra/libsoup/PKGBUILD b/extra/libsoup/PKGBUILD
index dff130218..93f77e6d2 100644
--- a/extra/libsoup/PKGBUILD
+++ b/extra/libsoup/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 196121 2013-10-07 11:53:05Z jgc $
+# $Id: PKGBUILD 198239 2013-10-30 13:39:34Z allan $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=libsoup
-pkgver=2.44.0
+pkgver=2.44.1
 pkgrel=1
 pkgdesc="GNOME HTTP Library"
 arch=('i686' 'x86_64' 'mips64el')
@@ -14,9 +14,9 @@ checkdepends=(apache php php-apache)
 provides=("libsoup-gnome=$pkgver-$pkgrel")
 conflicts=(libsoup-gnome)
 replaces=(libsoup-gnome)
-options=('!libtool' '!emptydirs')
+options=('!emptydirs')
 source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('2ed9b200bda39c686d19eb4a0a5464e9166d09cbb3ced5a689c78214e83b5c27')
+sha256sums=('c532c331dd5f7eb78438867302ed6897a847c82b287ed9347bea8d1937974c1d')
 
 build() {
   cd $pkgname-$pkgver
diff --git a/extra/libspectre/PKGBUILD b/extra/libspectre/PKGBUILD
index fddc1b1c3..37bee0358 100644
--- a/extra/libspectre/PKGBUILD
+++ b/extra/libspectre/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 165038 2012-08-09 11:32:27Z jgc $
+# $Id: PKGBUILD 198240 2013-10-30 13:39:56Z allan $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=libspectre
@@ -9,7 +9,6 @@ arch=('i686' 'x86_64' 'mips64el')
 license=('GPL2')
 url="http://www.freedesktop.org/wiki/Software/libspectre"
 depends=('ghostscript>=9.00')
-options=('!libtool')
 source=(http://libspectre.freedesktop.org/releases/${pkgname}-${pkgver}.tar.gz)
 sha1sums=('a7efd97b82b84ff1bb7a0d88c7e35ad10cc84ea8')
 
diff --git a/extra/libspiro/PKGBUILD b/extra/libspiro/PKGBUILD
index 3ff349f22..391ec2576 100644
--- a/extra/libspiro/PKGBUILD
+++ b/extra/libspiro/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 188499 2013-06-15 04:42:05Z bisson $
+# $Id: PKGBUILD 198241 2013-10-30 13:40:21Z allan $
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
 # Contributor: Rémy Oudompheng <oudomphe@clipper.ens.fr>
 
@@ -12,7 +12,6 @@ arch=('i686' 'x86_64' 'mips64el')
 source=("http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}_src-${pkgver}.tar.bz2")
 sha1sums=('d8b407b835b35289af2914877a4c6000b4fdd382')
 
-options=('!libtool')
 
 build() {
 	cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/libsrtp/PKGBUILD b/extra/libsrtp/PKGBUILD
index 5515fee4b..31b918850 100644
--- a/extra/libsrtp/PKGBUILD
+++ b/extra/libsrtp/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 188535 2013-06-15 10:01:17Z andrea $
+# $Id: PKGBUILD 197763 2013-10-29 19:24:02Z eric $
 # Maintainer:
 # Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Yejun Yang <yejunx AT gmail DOT com>
@@ -6,7 +6,7 @@
 
 pkgname=libsrtp
 pkgver=15.1c9bd90
-pkgrel=1
+pkgrel=2
 pkgdesc="Open-source implementation of the Secure Real-time Transport Protocol (SRTP)"
 url="http://srtp.sourceforge.net/srtp.html"
 arch=('i686' 'x86_64' 'mips64el')
diff --git a/extra/libstdc++5/PKGBUILD b/extra/libstdc++5/PKGBUILD
index 461240c0e..4ee89346a 100644
--- a/extra/libstdc++5/PKGBUILD
+++ b/extra/libstdc++5/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 137600 2011-09-10 01:24:58Z allan $
+# $Id: PKGBUILD 198242 2013-10-30 13:40:46Z allan $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=libstdc++5
@@ -10,7 +10,7 @@ url="http://gcc.gnu.org"
 license=('GPL' 'LGPL')
 depends=('gcc-libs')
 makedepends=('binutils' 'gcc')
-options=('!libtool' '!makeflags')
+options=('!makeflags')
 source=(ftp://gcc.gnu.org/pub/gcc/releases/gcc-${pkgver}/gcc-{core,g++}-${pkgver}.tar.bz2
         'gcc-3.4.3-no_multilib_amd64.patch')
 md5sums=('18c52e6fb8966b7700665dca289d077f'
diff --git a/extra/libstroke/PKGBUILD b/extra/libstroke/PKGBUILD
index 518544cec..0bf57cf3f 100644
--- a/extra/libstroke/PKGBUILD
+++ b/extra/libstroke/PKGBUILD
@@ -1,44 +1,40 @@
-# $Id: PKGBUILD 137618 2011-09-10 07:13:27Z eric $
+# $Id: PKGBUILD 197273 2013-10-24 21:52:00Z eric $
 # Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgname=libstroke
 pkgver=0.5.1
-pkgrel=5.1
+pkgrel=6
 pkgdesc="A stroke (mouse gesture) translation library"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://etla.net/libstroke/"
 license=('GPL2')
 depends=('glibc')
-makedepends=('libx11' 'gtk')
-options=('!libtool')
-source=(http://etla.net/libstroke/${pkgname}-${pkgver}.tar.gz \
-        libgstroke-Makefile.am.patch libstroke-Makefile.am.patch \
-        libstroke-0.5.1-m4_syntax.patch)
-md5sums=('51b9a4e309ac15cfcab96191eed03cb2'
-         '60bbaf355355c3c66c8015b0f7feca85'
-         '96413a77e1d39d1a3223e8eb6be8ef01'
-         '93c47eef46a0cc4011a246485c5a6620')
+makedepends=('libx11')
+source=(http://etla.net/libstroke/${pkgname}-${pkgver}.tar.gz
+        libgstroke-Makefile.am.patch libstroke-Makefile.am.patch
+        libstroke-0.5.1-m4_syntax.patch libstroke-0.5.1-no_gtk1.patch)
 sha1sums=('48bd2b98faa8681ccd97eda7a09442845dbf1b7b'
           'a0c3bd9e894650475ba3049b0ef3d7f9580c203d'
           'ee5a3635c31dba00b070a942c512cc0d53056188'
-          'c9240937776b0572e3927e1c56d78309413c5209')
+          'c9240937776b0572e3927e1c56d78309413c5209'
+          'c79acd9712fa5c6b9a9ac21621c6858ec10d84dd')
 
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  patch -p1 < ../libgstroke-Makefile.am.patch
-  patch -p1 < ../libstroke-Makefile.am.patch
-  patch -p1 < ../libstroke-0.5.1-m4_syntax.patch
-
-  libtoolize --force --copy
-  aclocal
-  autoconf
-  automake --add-missing --force --copy
+prepare() {
+  cd ${pkgname}-${pkgver}
+  patch -p1 -i "${srcdir}/libgstroke-Makefile.am.patch"
+  patch -p1 -i "${srcdir}/libstroke-Makefile.am.patch"
+  patch -p1 -i "${srcdir}/libstroke-0.5.1-m4_syntax.patch"
+  patch -p1 -i "${srcdir}/libstroke-0.5.1-no_gtk1.patch"
+}
 
+build() {
+  cd ${pkgname}-${pkgver}
+  autoreconf --force --install
   ./configure --prefix=/usr
   make
 }
 
 package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+  cd ${pkgname}-${pkgver}
   make DESTDIR="${pkgdir}" install
 }
diff --git a/extra/libstroke/libstroke-0.5.1-no_gtk1.patch b/extra/libstroke/libstroke-0.5.1-no_gtk1.patch
new file mode 100644
index 000000000..a099fb991
--- /dev/null
+++ b/extra/libstroke/libstroke-0.5.1-no_gtk1.patch
@@ -0,0 +1,33 @@
+--- libstroke-0.5.1/configure.in	2001-08-07 07:08:05.000000000 +0100
++++ libstroke-0.5.1b/configure.in	2006-11-28 01:49:26.000000000 +0000
+@@ -81,16 +81,9 @@
+ [  --with-mouse-footprints  Draw mouse footprints in X],
+ [AC_DEFINE(STROKE_MOUSE_FOOTPRINTS)])
+ 
+-dnl check for GTK
+-dnl we won't build libgstroke if it's not found
+-AC_MSG_CHECKING(gtk+ library)
+-AM_PATH_GTK(1.2.7, HAVE_LIBGTK=yes
+-  AC_DEFINE(HAVE_LIBGTK, 1, [Define if libgtk is available]),
+-  AC_MSG_WARN(
+-***** NOTE: The GNOME stroke support won't be built
+-)
+-  HAVE_LIBGTK=no,
+-)
++GTK_CFLAGS=""
++AC_SUBST(GTK_CFLAGS)
++HAVE_LIBGTK=no
+ AM_CONDITIONAL(HAVE_LIBGTK,        test "x$HAVE_LIBGTK" = "xyes")
+ 
+ 
+--- libstroke-0.5.1/Makefile.am	2001-08-07 07:03:12.000000000 +0100
++++ libstroke-0.5.1b/Makefile.am	2006-11-28 02:00:55.000000000 +0000
+@@ -10,7 +10,7 @@
+ EXTRA_DIST = COPYRIGHT CREDITS README.javastroke README.libgstroke
+ 
+ m4datadir=$(datadir)/aclocal
+-m4data_DATA=libstroke.m4 libgstroke.m4
++m4data_DATA=libstroke.m4
+ 
+ MOSTLYCLEANFILES = core *~
+ CLEANFILES = core *~
diff --git a/extra/libtar/PKGBUILD b/extra/libtar/PKGBUILD
index e8379a7d0..27f35fd4c 100644
--- a/extra/libtar/PKGBUILD
+++ b/extra/libtar/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 196404 2013-10-12 18:57:59Z giovanni $
+# $Id: PKGBUILD 198243 2013-10-30 13:41:08Z allan $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org> 
 # Contributor: Biru Ionut <ionut@archlinux.ro>
 # Contributor: Eric Belanger <eric@archlinux.org>
@@ -12,7 +12,6 @@ arch=('i686' 'x86_64' 'mips64el')
 url="http://repo.or.cz/w/libtar.git/"
 license=('BSD')
 depends=('zlib')
-options=('!libtool')
 source=("http://pkgbuild.com/~giovanni/${pkgname}/${pkgname}-${pkgver}.tar.gz"
         'libtar-1.2.20-free.patch')
 md5sums=('32cd952ff74f1c78c06ffff5c0695b90'
diff --git a/extra/libtasn1/PKGBUILD b/extra/libtasn1/PKGBUILD
index 26476cc91..de8317c64 100644
--- a/extra/libtasn1/PKGBUILD
+++ b/extra/libtasn1/PKGBUILD
@@ -1,23 +1,22 @@
-# $Id: PKGBUILD 183190 2013-04-18 16:15:55Z andyrtr $
+# $Id: PKGBUILD 197093 2013-10-21 18:40:47Z andyrtr $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: judd <jvinet@zeroflux.org>
 
 pkgname=libtasn1
 pkgver=3.3
-pkgrel=1
+pkgrel=2
 pkgdesc="The ASN.1 library used in GNUTLS"
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL3' 'LGPL')
 url="http://www.gnu.org/software/libtasn1/"
 depends=('glibc' 'texinfo')
-options=('!libtool')
 install=libtasn1.install
 source=(http://ftp.gnu.org/gnu/libtasn1/${pkgname}-${pkgver}.tar.gz{,.sig})
 md5sums=('2bdd687f487c50a0382b99553866a6e0'
          'SKIP')
 
 build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+  cd ${pkgname}-${pkgver}
   ./configure --prefix=/usr \
       --with-packager=Archlinux \
       --with-packager-bug-reports="http://bugs.archlinux.org/" \
@@ -26,11 +25,11 @@ build() {
 }
 
 check() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+  cd ${pkgname}-${pkgver}
   make check
 }
 
 package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+  cd ${pkgname}-${pkgver}
   make DESTDIR="${pkgdir}" install
 }
diff --git a/extra/libtextcat/PKGBUILD b/extra/libtextcat/PKGBUILD
index 2b505d012..083b477b6 100644
--- a/extra/libtextcat/PKGBUILD
+++ b/extra/libtextcat/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 151316 2012-02-25 13:40:31Z allan $
+# $Id: PKGBUILD 198244 2013-10-30 13:41:30Z allan $
 # Maintainer: AndyRTR <andyrtr@archlinux.org>
 # Contributor: Alexander Fehr <pizzapunk gmail com>
 # Contributor: William Rea <sillywilly@gmail.com>
@@ -12,7 +12,6 @@ arch=('i686' 'x86_64' 'mips64el')
 url="http://software.wise-guys.nl/libtextcat/"
 license=('BSD')
 depends=('glibc')
-options=(!libtool)
 source=(http://software.wise-guys.nl/download/${pkgname}-${pkgver}.tar.gz
 	# from http://hg.services.openoffice.org/hg/DEV300/raw-file/tip/libtextcat/data/new_fingerprints/fpdb.conf
 	fpdb.conf
diff --git a/extra/libthai/PKGBUILD b/extra/libthai/PKGBUILD
index ae2c5581e..4f7cb0d58 100644
--- a/extra/libthai/PKGBUILD
+++ b/extra/libthai/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 191330 2013-07-23 16:53:06Z jgc $
+# $Id: PKGBUILD 198245 2013-10-30 13:41:52Z allan $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: Chaiwat Suttipongsakul <cwt114@gmail.com>
 
@@ -11,7 +11,7 @@ arch=('i686' 'x86_64' 'mips64el')
 license=('LGPL')
 depends=('libdatrie')
 makedepends=('pkgconfig')
-options=('!libtool' '!emptydirs')
+options=('!emptydirs')
 source=(http://linux.thai.net/pub/thailinux/software/${pkgname}/${pkgname}-${pkgver}.tar.xz)
 md5sums=('c4a6c3842257889f8f15ae192b66e797')
 
diff --git a/extra/libtheora/PKGBUILD b/extra/libtheora/PKGBUILD
index 9b2a3b59a..d4e806edf 100644
--- a/extra/libtheora/PKGBUILD
+++ b/extra/libtheora/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 189280 2013-07-02 08:08:13Z jgc $
+# $Id: PKGBUILD 198246 2013-10-30 13:42:12Z allan $
 # Maintainer: Tom Killian <tom@archlinux.org>
 # Committer: dorphell <dorphell@archlinux.org>
 
@@ -11,7 +11,6 @@ url="http://www.xiph.org"
 license=('BSD')
 depends=('libogg')
 makedepends=('libvorbis')
-options=('!libtool')
 source=(http://downloads.xiph.org/releases/theora/libtheora-${pkgver}.tar.bz2
         libtheora-1.1.1-libpng16.patch)
 md5sums=('292ab65cedd5021d6b7ddd117e07cd8e'
diff --git a/extra/libtiff/PKGBUILD b/extra/libtiff/PKGBUILD
index bca83965b..cb0e11cd4 100644
--- a/extra/libtiff/PKGBUILD
+++ b/extra/libtiff/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 193540 2013-08-22 21:13:54Z eric $
+# $Id: PKGBUILD 198247 2013-10-30 13:42:37Z allan $
 # Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgname=libtiff
 pkgver=4.0.3
-pkgrel=3
+pkgrel=4
 pkgdesc="Library for manipulation of TIFF images"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.remotesensing.org/libtiff/"
@@ -11,7 +11,6 @@ license=('custom')
 depends=('gcc-libs' 'libjpeg' 'zlib' 'xz')
 makedepends=('freeglut' 'glu' 'mesa')
 optdepends=('freeglut: for using tiffgt')
-options=('!libtool')
 source=(ftp://ftp.remotesensing.org/pub/libtiff/tiff-${pkgver}.tar.gz
         tiff-3.9.7-CVE-2012-4447.patch
 	tiff-3.9.7-CVE-2012-4564.patch
@@ -20,7 +19,8 @@ source=(ftp://ftp.remotesensing.org/pub/libtiff/tiff-${pkgver}.tar.gz
 	tiff-4.0.3-libjpeg-turbo.patch
 	tiff-4.0.3-tiff2pdf-colors.patch
 	tiff-4.0.3-CVE-2013-4231.patch
-	tiff-4.0.3-CVE-2013-4232.patch)
+	tiff-4.0.3-CVE-2013-4232.patch
+	libtiff-CVE-2013-4244.patch)
 sha1sums=('652e97b78f1444237a82cbcfe014310e776eb6f0'
           '41be661638282dae0d07bd2788414cb6650f8981'
           '6cb3d480908132335c05c769b5a51f951413725d'
@@ -29,7 +29,8 @@ sha1sums=('652e97b78f1444237a82cbcfe014310e776eb6f0'
           '02d57835df50d3f84587571ec52b36f5af838de2'
           '23443ad0bc130d70860b6cc6d19b69584ae7a6cc'
           '969f588e9da5991e7f17dddf69ae59424b05fa16'
-          '2a23c55d081bed74ac8dd99541a93d312cc72b64')
+          '2a23c55d081bed74ac8dd99541a93d312cc72b64'
+          '01c6792ba2470493da4d990edae8de6c13bd4670')
 
 prepare() {
   cd tiff-${pkgver}
@@ -39,9 +40,11 @@ prepare() {
   patch -p1 -i "${srcdir}/tiff-4.0.3-CVE-2013-1960.patch"
   patch -p1 -i "${srcdir}/tiff-4.0.3-CVE-2013-1961.patch"
   patch -p1 -i "${srcdir}/tiff-4.0.3-libjpeg-turbo.patch"
+  patch -p1 -i "${srcdir}/libtiff-CVE-2013-4244.patch"
   cd tools
   patch -p0 -i "${srcdir}/tiff-4.0.3-CVE-2013-4231.patch"
   patch -p0 -i "${srcdir}/tiff-4.0.3-CVE-2013-4232.patch"
+
 }
 
 build() {
diff --git a/extra/libtiff/libtiff-CVE-2013-4244.patch b/extra/libtiff/libtiff-CVE-2013-4244.patch
new file mode 100644
index 000000000..792e07698
--- /dev/null
+++ b/extra/libtiff/libtiff-CVE-2013-4244.patch
@@ -0,0 +1,15 @@
+diff --git a/tools/gif2tiff.c b/tools/gif2tiff.c
+index 375b152..2731273 100644
+--- a/tools/gif2tiff.c
++++ b/tools/gif2tiff.c
+@@ -402,6 +402,10 @@ process(register int code, unsigned char** fill)
+     }
+ 
+     if (oldcode == -1) {
++        if (code >= clear) {
++            fprintf(stderr, "bad input: code=%d is larger than clear=%d\n",code, clear);
++            return 0;
++        }
+ 	*(*fill)++ = suffix[code];
+ 	firstchar = oldcode = code;
+ 	return 1;
diff --git a/extra/libtiger/PKGBUILD b/extra/libtiger/PKGBUILD
index 35f4736ce..c218bc8ea 100644
--- a/extra/libtiger/PKGBUILD
+++ b/extra/libtiger/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 151106 2012-02-24 22:13:23Z giovanni $
+# $Id: PKGBUILD 198248 2013-10-30 13:42:59Z allan $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Emmanuel Gil Peyrot <linkmauve@linkmauve.fr>
 
@@ -11,7 +11,6 @@ license=('LGPL')
 arch=('i686' 'x86_64' 'mips64el')
 depends=('pango' 'libkate')
 makedepends=('pkg-config')
-options=('!libtool')
 source=("http://libtiger.googlecode.com/files/${pkgname}-${pkgver}.tar.gz")
 md5sums=("dc1dbeb658c95485ba10b9b2897b4ae2")
 
diff --git a/extra/libtorrent-rasterbar/PKGBUILD b/extra/libtorrent-rasterbar/PKGBUILD
index fe99ba444..aff383828 100644
--- a/extra/libtorrent-rasterbar/PKGBUILD
+++ b/extra/libtorrent-rasterbar/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 190043 2013-07-13 12:41:37Z svenstaro $
+# $Id: PKGBUILD 198715 2013-11-02 08:58:54Z ioni $
 # Maintainer : Ionut Biru <ibiru@archlinux.org>
 # Contributor: Hugo Doria <hugo@archlinux.org>
 
 pkgname=libtorrent-rasterbar
-pkgver=0.16.10
-pkgrel=2
+pkgver=0.16.12
+pkgrel=1
 epoch=1
 pkgdesc="A C++ library that aims to be a good alternative to all the other bittorrent implementations around"
 url="http://www.rasterbar.com/products/libtorrent/"
@@ -12,16 +12,9 @@ arch=('i686' 'x86_64' 'mips64el')
 license=('BSD')
 depends=('boost-libs' 'geoip' 'python2')
 makedepends=('boost')
-options=('!libtool' '!emptydirs')
-source=(http://libtorrent.googlecode.com/files/$pkgname-$pkgver.tar.gz
-        'boost-154.patch')
-sha1sums=('8b24442132e52f8765c79b20ffdea8b33bc5aa42'
-          'b1e66ffbeba5c2b217bc0d02bc2c49aa6b603fa3')
-
-prepare() {
-  cd $pkgname-$pkgver
-  patch -p1 -i "${srcdir}"/boost-154.patch
-}
+options=('!emptydirs')
+source=(http://libtorrent.googlecode.com/files/$pkgname-$pkgver.tar.gz)
+sha1sums=('cd326fd2609c3d00c25dabdd441a0704efbf0207')
 
 build() {
   cd $pkgname-$pkgver
diff --git a/extra/libtorrent-rasterbar/boost-154.patch b/extra/libtorrent-rasterbar/boost-154.patch
deleted file mode 100644
index 5d556310b..000000000
--- a/extra/libtorrent-rasterbar/boost-154.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- libtorrent-rasterbar-0.16.10/include/libtorrent/disk_buffer_pool.hpp~	2013-07-11 07:37:03.057798742 +0000
-+++ libtorrent-rasterbar-0.16.10/include/libtorrent/disk_buffer_pool.hpp	2013-07-11 07:37:27.110960260 +0000
-@@ -33,6 +33,8 @@
- #ifndef TORRENT_DISK_BUFFER_POOL
- #define TORRENT_DISK_BUFFER_POOL
- 
-+#include <boost/noncopyable.hpp>
-+
- #include "libtorrent/config.hpp"
- #include "libtorrent/thread.hpp"
- #include "libtorrent/session_settings.hpp"
diff --git a/extra/libtxc_dxtn/PKGBUILD b/extra/libtxc_dxtn/PKGBUILD
index 289ced445..c476bbac3 100644
--- a/extra/libtxc_dxtn/PKGBUILD
+++ b/extra/libtxc_dxtn/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 190835 2013-07-18 12:20:11Z lcarlier $
+# $Id: PKGBUILD 198250 2013-10-30 13:43:41Z allan $
 # Maintainer: Laurent Carlier <lordheavym@gmail.com>
 # Contributor: Jan "heftig" Steffens <jan.steffens@gmail.com>
 
@@ -10,7 +10,6 @@ pkgdesc="S3 Texture Compression (S3TC) library for Mesa"
 url="http://dri.freedesktop.org/wiki/S3TC"
 license=(custom:BSD)
 depends=(mesa)
-options=(!libtool)
 source=(http://people.freedesktop.org/~cbrill/$pkgname/$pkgname-$pkgver.tar.bz2)
 md5sums=('7105107f07ac49753f4b61ba9d0c79c5')
 
diff --git a/extra/libunique/PKGBUILD b/extra/libunique/PKGBUILD
index ce3e6ca2f..63c228135 100644
--- a/extra/libunique/PKGBUILD
+++ b/extra/libunique/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 143972 2011-12-01 07:46:29Z ibiru $
+# $Id: PKGBUILD 198251 2013-10-30 13:44:03Z allan $
 # Maintainer: Jan de Groot  <jgc@archlinux.org>
 pkgname=libunique
 pkgver=1.1.6
@@ -8,7 +8,6 @@ arch=('i686' 'x86_64' 'mips64el')
 license=('LGPL')
 depends=('gtk2')
 makedepends=('gtk-doc' 'gobject-introspection')
-options=('!libtool')
 url="http://live.gnome.org/LibUnique"
 source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/1.1/${pkgname}-${pkgver}.tar.bz2
         unique-gdbus.patch
diff --git a/extra/libunique3/PKGBUILD b/extra/libunique3/PKGBUILD
index 222720d11..83f4128c0 100644
--- a/extra/libunique3/PKGBUILD
+++ b/extra/libunique3/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 148840 2012-02-05 11:52:26Z ibiru $
+# $Id: PKGBUILD 198252 2013-10-30 13:44:24Z allan $
 # Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com>
 pkgname=libunique3
 pkgver=3.0.2
@@ -8,7 +8,6 @@ arch=('i686' 'x86_64' 'mips64el')
 license=('LGPL')
 depends=('gtk3')
 makedepends=('gtk-doc' 'gobject-introspection')
-options=('!libtool')
 url="http://live.gnome.org/LibUnique"
 source=(http://ftp.gnome.org/pub/gnome/sources/libunique/${pkgver%.*}/libunique-$pkgver.tar.xz)
 sha256sums=('a8f02ce073e2b920cca8ac45d418e7cb64438ad0814780c5912c6d63f8a4e038')
diff --git a/extra/libunistring/PKGBUILD b/extra/libunistring/PKGBUILD
index e4c0d22c5..03cd4d3ca 100644
--- a/extra/libunistring/PKGBUILD
+++ b/extra/libunistring/PKGBUILD
@@ -6,14 +6,13 @@
 
 pkgname=libunistring
 pkgver=0.9.3
-pkgrel=5
+pkgrel=6
 pkgdesc="Library for manipulating Unicode strings and C strings."
 url="http://www.gnu.org/software/libunistring/"
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 depends=('glibc')
 install=${pkgname}.install
-options=('!libtool')
 source=(ftp://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.gz)
 md5sums=('db8eca3b64163abadf8c40e5cecc261f')
 
diff --git a/extra/libupnp/PKGBUILD b/extra/libupnp/PKGBUILD
index 7ac1ab97f..83dcc39d4 100644
--- a/extra/libupnp/PKGBUILD
+++ b/extra/libupnp/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 176510 2013-01-31 14:33:52Z giovanni $
+# $Id: PKGBUILD 198254 2013-10-30 13:45:10Z allan $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org> 
 # Contributor: kastor <kastor@fobos.org.ar>
 
@@ -11,7 +11,6 @@ url="http://pupnp.sourceforge.net/"
 license=('BSD')
 depends=('glibc')
 makedepends=('pkgconfig')
-options=('!libtool')
 source=("http://downloads.sourceforge.net/sourceforge/pupnp/${pkgname}-${pkgver}.tar.bz2")
 md5sums=('11c6484fd2e2927bf3b8d8108407ca56')
 
diff --git a/extra/libusb-compat/PKGBUILD b/extra/libusb-compat/PKGBUILD
index 8094d64fc..dd49fdf9b 100644
--- a/extra/libusb-compat/PKGBUILD
+++ b/extra/libusb-compat/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 188653 2013-06-17 10:53:32Z tomegun $
+# $Id: PKGBUILD 198255 2013-10-30 13:45:30Z allan $
 # Maintainer: Tom Gundersen <teg@jklm.no>
 # Contributor: Tobias Powalowski <tpowa@archlinux.org>
 # Contributor: arjan <arjan@archlinux.org>
@@ -11,7 +11,6 @@ arch=('i686' 'x86_64' 'mips64el')
 url="http://libusb.sourceforge.net/"
 license=('LGPL')
 depends=('libusb' 'sh')
-options=('!libtool')
 source=("http://downloads.sourceforge.net/${pkgname%-*}/${pkgname}-${pkgver%.*}/$pkgname-$pkgver/${pkgname}-${pkgver}.tar.bz2")
 
 build() {
diff --git a/extra/libutempter/PKGBUILD b/extra/libutempter/PKGBUILD
index 17e6b74ff..216e8cf46 100644
--- a/extra/libutempter/PKGBUILD
+++ b/extra/libutempter/PKGBUILD
@@ -3,7 +3,7 @@
 
 pkgname=libutempter
 pkgver=1.1.6
-pkgrel=1
+pkgrel=2
 pkgdesc="Interface for terminal emulators such as screen and xterm to record user sessions to utmp and wtmp files"
 arch=('i686' 'x86_64' 'mips64el')
 url="ftp://ftp.altlinux.org/pub/people/ldv/utempter"
diff --git a/extra/libva-intel-driver/PKGBUILD b/extra/libva-intel-driver/PKGBUILD
index 1bf94b42b..1402cd45d 100644
--- a/extra/libva-intel-driver/PKGBUILD
+++ b/extra/libva-intel-driver/PKGBUILD
@@ -1,18 +1,17 @@
-# $Id: PKGBUILD 188964 2013-06-27 12:37:13Z heftig $
+# $Id: PKGBUILD 198687 2013-11-02 07:27:16Z bpiotrowski $
 # Maintainer : Ionut Biru <ibiru@archlinux.org>
 
 pkgname=libva-intel-driver
-pkgver=1.2.0
+pkgver=1.2.1
 pkgrel=1
-pkgdesc="VA-API implementation for Intel G45 chipsets and Intel HD Graphics for Intel Core processor family."
+pkgdesc='VA-API implementation for Intel G45 and HD Graphics family'
 arch=('i686' 'x86_64')
-url="http://freedesktop.org/wiki/Software/vaapi"
+url='http://freedesktop.org/wiki/Software/vaapi'
 license=('MIT')
 depends=('libva')
-options=('!libtool')
 replaces=('libva-driver-intel')
 source=(http://www.freedesktop.org/software/vaapi/releases/$pkgname/$pkgname-$pkgver.tar.bz2)
-sha1sums=('580c8dc5d2323b1e7dd9506512695001f845c2f1')
+sha1sums=('f65de5edf69162f0731b0ffb7f8d6c17499ae8e3')
 
 build() {
   cd $pkgname-$pkgver
diff --git a/extra/libva-vdpau-driver/PKGBUILD b/extra/libva-vdpau-driver/PKGBUILD
index 4edf7b9c0..114755ba2 100644
--- a/extra/libva-vdpau-driver/PKGBUILD
+++ b/extra/libva-vdpau-driver/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 168382 2012-10-09 16:32:34Z ibiru $
+# $Id: PKGBUILD 198258 2013-10-30 13:46:36Z allan $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 pkgname=libva-vdpau-driver
 pkgver=0.7.4
@@ -10,7 +10,6 @@ license=('GPL')
 depends=('libva' 'libvdpau')
 makedepends=('mesa')
 replaces=('vdpau-video')
-options=('!libtool')
 source=(http://www.freedesktop.org/software/vaapi/releases/$pkgname/$pkgname-$pkgver.tar.bz2)
 sha1sums=('224318f4ea8bafca6a0fec770e388b7d1a1a66b3')
 
diff --git a/extra/libva/PKGBUILD b/extra/libva/PKGBUILD
index bcf5de286..d2ddc2141 100644
--- a/extra/libva/PKGBUILD
+++ b/extra/libva/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 188963 2013-06-27 12:36:37Z heftig $
+# $Id: PKGBUILD 198256 2013-10-30 13:45:51Z allan $
 # Maintainer : Ionut Biru <ibiru@archlinux.org>
 
 pkgname=libva
@@ -12,7 +12,6 @@ depends=('libegl' 'libgl' 'libdrm' 'libxfixes')
 makedepends=('mesa')
 optdepends=('libva-vdpau-driver: vdpau back-end for nvidia'
             'libva-intel-driver: back-end for intel cards')
-options=('!libtool')
 source=(http://www.freedesktop.org/software/vaapi/releases/$pkgname/$pkgname-$pkgver.tar.bz2)
 sha1sums=('f716a4cadd670b14f44a2e833f96a2c509956339')
 
diff --git a/extra/libvdpau/PKGBUILD b/extra/libvdpau/PKGBUILD
index 131314257..0f6c528cc 100644
--- a/extra/libvdpau/PKGBUILD
+++ b/extra/libvdpau/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 192069 2013-08-05 15:40:48Z jgc $
+# $Id: PKGBUILD 198259 2013-10-30 13:46:56Z allan $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=libvdpau
@@ -9,7 +9,6 @@ arch=(i686 x86_64 mips64el)
 url='http://cgit.freedesktop.org/~aplattner/libvdpau'
 depends=('gcc-libs' 'libxext')
 conflicts=('nvidia-utils<190.42-2')
-options=('!libtool')
 license=('custom')
 source=(http://people.freedesktop.org/~aplattner/vdpau/${pkgname}-${pkgver}.tar.gz)
 makedepends=('dri2proto')
diff --git a/extra/libvisual-plugins/PKGBUILD b/extra/libvisual-plugins/PKGBUILD
index db4399246..68940a137 100644
--- a/extra/libvisual-plugins/PKGBUILD
+++ b/extra/libvisual-plugins/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 168607 2012-10-13 11:48:12Z andyrtr $
+# $Id: PKGBUILD 198261 2013-10-30 13:47:39Z allan $
 # Maintainer: damir <damir@archlinux.org>
 
 pkgname=libvisual-plugins
@@ -10,7 +10,6 @@ license=('GPL')
 url="http://www.localhost.nl/~synap/libvisual/"
 depends=('libvisual' 'gtk2' 'glu' 'alsa-lib' 'jack')
 makedepends=('mesa')
-options=(!libtool)
 source=(http://downloads.sourceforge.net/sourceforge/libvisual/libvisual-plugins-${pkgver}.tar.gz
         02_64-bit_JESS_fix.patch
         03_build_against_gl_fixes.patch
diff --git a/extra/libvisual/PKGBUILD b/extra/libvisual/PKGBUILD
index 2209f5fee..f276f9be1 100644
--- a/extra/libvisual/PKGBUILD
+++ b/extra/libvisual/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 150455 2012-02-17 23:29:45Z allan $
+# $Id: PKGBUILD 198260 2013-10-30 13:47:18Z allan $
 # Maintainer: 
 
 pkgname=libvisual
@@ -8,7 +8,6 @@ pkgdesc="Abstraction library that comes between applications and audio visualisa
 arch=("i686" "x86_64" 'mips64el')
 url="http://sourceforge.net/projects/libvisual/"
 license=('LGPL')
-options=('!libtool')
 source=("http://downloads.sourceforge.net/sourceforge/libvisual/libvisual-${pkgver}.tar.gz")
 md5sums=('f4e78547c79ea8a8ad111cf8b85011bb')
 
diff --git a/extra/libvncserver/PKGBUILD b/extra/libvncserver/PKGBUILD
index 147aa5e14..a87787f2e 100644
--- a/extra/libvncserver/PKGBUILD
+++ b/extra/libvncserver/PKGBUILD
@@ -1,27 +1,26 @@
-# $Id: PKGBUILD 158727 2012-05-08 13:54:05Z andrea $
+# $Id: PKGBUILD 196982 2013-10-21 12:18:29Z andrea $
 # Maintainer:
 # Contributor: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Tobias Powalowski <tpowa@archlinux.org>
 
 pkgname=libvncserver
 pkgver=0.9.9
-pkgrel=1.1
+pkgrel=2
 pkgdesc="A cross-platform C libraries that allow you to easily implement VNC server"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://libvncserver.sourceforge.net/"
 license=('GPL')
 depends=('libjpeg' 'gnutls' 'libgcrypt' 'openssl')
-options=('!libtool')
 source=("http://downloads.sourceforge.net/${pkgname}/LibVNCServer-${pkgver}.tar.gz")
 md5sums=('70422169b122765693d2a294d13e3714')
 
 build() {
-  cd "${srcdir}/LibVNCServer-${pkgver}"
+  cd LibVNCServer-${pkgver}
   ./configure --prefix=/usr
   make
 }
 
 package() {
-  cd "${srcdir}/LibVNCServer-${pkgver}"
+  cd LibVNCServer-${pkgver}
   make DESTDIR="${pkgdir}" install
 }
diff --git a/extra/libvorbis/PKGBUILD b/extra/libvorbis/PKGBUILD
index 0dbef78ca..1adb7a786 100644
--- a/extra/libvorbis/PKGBUILD
+++ b/extra/libvorbis/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 149459 2012-02-08 04:00:58Z eric $
+# $Id: PKGBUILD 198262 2013-10-30 13:48:00Z allan $
 # Maintainer: Tobias Kieslich <tobias@archlinux.org>
 # Contributor: dorphell <dorphell@archlinux.org>
 # Contributor: John Proctor <jproctor@prium.net>
@@ -11,7 +11,6 @@ arch=('i686' 'x86_64' 'mips64el')
 url="http://www.xiph.org/vorbis/"
 license=('BSD')
 depends=('libogg')
-options=('!libtool')
 source=(http://downloads.xiph.org/releases/vorbis/${pkgname}-${pkgver}.tar.gz)
 md5sums=('6b1a36f0d72332fae5130688e65efe1f')
 
diff --git a/extra/libvpx/PKGBUILD b/extra/libvpx/PKGBUILD
index 4f2c6fd5d..d784e7086 100644
--- a/extra/libvpx/PKGBUILD
+++ b/extra/libvpx/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 185107 2013-05-11 07:24:48Z bpiotrowski $
+# $Id: PKGBUILD 197350 2013-10-25 02:49:53Z bisson $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 pkgname=libvpx
 pkgver=1.2.0
-pkgrel=1
+pkgrel=2
 pkgdesc="The VP8 Codec SDK"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.webmproject.org/"
diff --git a/extra/libwacom/PKGBUILD b/extra/libwacom/PKGBUILD
index c271d60cf..af8f10312 100644
--- a/extra/libwacom/PKGBUILD
+++ b/extra/libwacom/PKGBUILD
@@ -1,21 +1,20 @@
-# $Id: PKGBUILD 180845 2013-03-26 22:37:55Z eric $
+# $Id: PKGBUILD 198653 2013-11-01 13:53:37Z eric $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 
 pkgname=libwacom
-pkgver=0.7
+pkgver=0.8
 pkgrel=1
 pkgdesc="Library to identify Wacom tablets and their features"
 arch=('x86_64' 'i686' 'mips64el')
 url="http://sourceforge.net/apps/mediawiki/linuxwacom/index.php?title=Libwacom"
 license=('MIT')
 depends=('glib2' 'systemd')
-options=('!libtool')
 source=(http://sourceforge.net/projects/linuxwacom/files/libwacom/$pkgname-$pkgver.tar.bz2)
-sha256sums=('210c48b595461ebee63b1a846a6eb1d8f029b49d02ccbde34eadf551a5a68a78')
+sha256sums=('8a7490b960595366d011787ca4285b8e8b371324849f72c6488f92b2f313d442')
 
 build() {
   cd $pkgname-$pkgver
-  ./configure --prefix=/usr --disable-static
+  ./configure --prefix=/usr
   make
 }
 
diff --git a/extra/libwebp/PKGBUILD b/extra/libwebp/PKGBUILD
index 89c368a36..f99975cc0 100644
--- a/extra/libwebp/PKGBUILD
+++ b/extra/libwebp/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 191925 2013-08-01 06:59:55Z bpiotrowski $
+# $Id: PKGBUILD 198264 2013-10-30 13:48:46Z allan $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Contributor: Alexander Rødseth <rodseth@gmail.com>
 # Contributor: Jon Nordby <jononor@gmail.com>
@@ -13,7 +13,6 @@ license=(BSD)
 depends=(libpng libjpeg libtiff giflib)
 makedepends=(freeglut mesa glu)
 optdepends=('freeglut: vwebp viewer')
-options=('!libtool')
 source=("http://webp.googlecode.com/files/$pkgname-$pkgver.tar.gz")
 sha256sums=('b37932c625322a69fe4e9b88884b5c7aed2b3eaf9fd5e5b480aee339a92e6ee7')
 
diff --git a/extra/libwmf/PKGBUILD b/extra/libwmf/PKGBUILD
index 59f1f85ba..3f78dbae9 100644
--- a/extra/libwmf/PKGBUILD
+++ b/extra/libwmf/PKGBUILD
@@ -1,17 +1,17 @@
-# $Id: PKGBUILD 184410 2013-05-06 19:38:42Z foutrelis $
+# $Id: PKGBUILD 197279 2013-10-25 00:22:10Z eric $
 # Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgname=libwmf
 pkgver=0.2.8.4
-pkgrel=10
+pkgrel=12
 pkgdesc="A library for reading vector images in Microsoft's native Windows Metafile Format (WMF)"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://wvware.sourceforge.net/libwmf.html"
 license=('LGPL')
-depends=('libpng' 'libx11' 'libjpeg' 'gsfonts')
+depends=('libx11' 'libjpeg' 'gsfonts')
 makedepends=('gtk2' 'libxt')
 optdepends=('gdk-pixbuf2: for pixbuf loader')
-options=('!libtool' '!docs' '!emptydirs')
+options=('!docs' '!emptydirs')
 install=libwmf.install
 source=(http://downloads.sourceforge.net/sourceforge/wvware/${pkgname}-${pkgver}.tar.gz
 	libwmf-0.2.8.4-libpng-1.5.patch libwmf-0.2.8.4-useafterfree.patch)
@@ -30,7 +30,7 @@ build() {
   ./configure --prefix=/usr \
               --with-gsfontdir=/usr/share/fonts/Type1 \
 	      --with-fontdir=/usr/share/fonts/Type1 \
-	      --with-gsfontmap=/usr/share/ghostscript/9.07/Resource/Init/Fontmap.GS
+	      --with-gsfontmap=/usr/share/ghostscript/9.10/Resource/Init/Fontmap.GS
   make
 }
 
@@ -39,6 +39,4 @@ package() {
   make DESTDIR="${pkgdir}" install
   #Remove fonts, these are in gsfonts
   rm -rf "${pkgdir}/usr/share/fonts"
-  #Remove static GTK loader, can't use it anyways
-  rm -f "${pkgdir}"/usr/lib/gtk-2.0/*/loaders/io-wmf.a
 }
diff --git a/extra/libwnck/PKGBUILD b/extra/libwnck/PKGBUILD
index ad37e028e..4ca3efba5 100644
--- a/extra/libwnck/PKGBUILD
+++ b/extra/libwnck/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 136665 2011-08-31 12:07:16Z jgc $
+# $Id: PKGBUILD 198265 2013-10-30 13:49:06Z allan $
 # Maintainer: Jan de Groot  <jgc@archlinux.org>
 pkgname=libwnck
 pkgver=2.30.7
@@ -8,7 +8,6 @@ arch=('i686' 'x86_64' 'mips64el')
 license=('LGPL')
 depends=('gtk2' 'startup-notification' 'libxres')
 makedepends=('libxt' 'intltool' 'gobject-introspection')
-options=('!libtool')
 url="http://www.gnome.org/"
 source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/2.30/${pkgname}-${pkgver}.tar.xz)
 sha256sums=('8be84d5333f0ade0e61af9f4cbf7685cb7cce2aa0ee32f53bac32107a81fe194')
diff --git a/extra/libwnck3/PKGBUILD b/extra/libwnck3/PKGBUILD
index c941c0cd3..4bb234bad 100644
--- a/extra/libwnck3/PKGBUILD
+++ b/extra/libwnck3/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 193459 2013-08-20 18:34:44Z heftig $
+# $Id: PKGBUILD 198266 2013-10-30 13:49:27Z allan $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 
 pkgname=libwnck3
@@ -10,7 +10,6 @@ arch=('i686' 'x86_64' 'mips64el')
 license=('LGPL')
 depends=('gtk3' 'startup-notification' 'libxres')
 makedepends=('intltool' 'gobject-introspection')
-options=('!libtool')
 url="http://www.gnome.org/"
 source=(http://ftp.gnome.org/pub/gnome/sources/$_pkgbasename/${pkgver%.*}/$_pkgbasename-$pkgver.tar.xz)
 sha256sums=('d48ac9c7f50c0d563097f63d07bcc83744c7d92a1b4ef65e5faeab32b5ccb723')
diff --git a/extra/libwpd/PKGBUILD b/extra/libwpd/PKGBUILD
index 0d1efbf9b..42e145e17 100644
--- a/extra/libwpd/PKGBUILD
+++ b/extra/libwpd/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 193569 2013-08-24 08:25:38Z andyrtr $
+# $Id: PKGBUILD 198267 2013-10-30 13:49:48Z allan $
 # Maintainer: AndyRTR <andyrtr@archlinux.org>
 
 pkgname=libwpd
@@ -10,7 +10,7 @@ url="http://libwpd.sourceforge.net/"
 license=('LGPL')
 depends=('gcc-libs' 'zlib')
 makedepends=('libgsf>=1.14.26')
-options=('!libtool' '!emptydirs')
+options=('!emptydirs')
 source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.xz)
 md5sums=('6b74a863c957563924546e16cc833591')
 
diff --git a/extra/libwpg/PKGBUILD b/extra/libwpg/PKGBUILD
index 346ac50db..76091c95f 100644
--- a/extra/libwpg/PKGBUILD
+++ b/extra/libwpg/PKGBUILD
@@ -1,25 +1,24 @@
-# $Id: PKGBUILD 185181 2013-05-11 20:24:49Z andyrtr $
+# $Id: PKGBUILD 197095 2013-10-21 18:43:22Z andyrtr $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=libwpg
 pkgver=0.2.2
-pkgrel=1
+pkgrel=2
 pkgdesc="Library for importing and converting Corel WordPerfect(tm) Graphics images."
 arch=('i686' 'x86_64' 'mips64el')
 url="http://libwpg.sourceforge.net/"
 license=('LGPL')
 depends=('libwpd' 'perl')
-options=('!libtool')
 source=("http://downloads.sourceforge.net/libwpg/${pkgname}-${pkgver}.tar.bz2")
 md5sums=('b85436266b2ac91d351ab5684b181151')
 
 build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+  cd ${pkgname}-${pkgver}
   ./configure --prefix=/usr
   make
 }
 
 package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+  cd ${pkgname}-${pkgver}
   make DESTDIR="${pkgdir}" install
 }
diff --git a/extra/libwps/PKGBUILD b/extra/libwps/PKGBUILD
index 4a107f84c..c99aeab4c 100644
--- a/extra/libwps/PKGBUILD
+++ b/extra/libwps/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 186454 2013-05-26 18:05:27Z andyrtr $
+# $Id: PKGBUILD 198268 2013-10-30 13:50:09Z allan $
 # Maintainer: AndyRTR <andyrtr@archlinux.org>
 # Contributor: Robert McCathie <archaur at rmcc dot com dot au>
 
@@ -11,7 +11,6 @@ url="http://libwps.sourceforge.net/"
 license=('LGPL')
 depends=('libwpd>=0.9.6')
 makedepends=('boost')
-options=(!libtool)
 source=("http://downloads.sourceforge.net/project/libwps/$pkgname/$pkgname-$pkgver/$pkgname-$pkgver.tar.bz2")
 md5sums=('46eb0e7f213ad61bd5dee0c494132cb0')
 
diff --git a/extra/libx11/PKGBUILD b/extra/libx11/PKGBUILD
index e60397f1c..ac29f65be 100644
--- a/extra/libx11/PKGBUILD
+++ b/extra/libx11/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 194312 2013-09-13 08:00:26Z andyrtr $
+# $Id: PKGBUILD 198269 2013-10-30 13:50:33Z allan $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=libx11
@@ -9,7 +9,6 @@ arch=(i686 x86_64 'mips64el')
 url="http://xorg.freedesktop.org/"
 depends=('libxcb' 'xproto' 'kbproto')
 makedepends=('xorg-util-macros' 'xextproto' 'xtrans' 'inputproto')
-options=('!libtool')
 license=('custom')
 source=(${url}/releases/individual/lib/libX11-${pkgver}.tar.bz2)
 sha256sums=('2aa027e837231d2eeea90f3a4afe19948a6eb4c8b2bec0241eba7dbc8106bd16')
diff --git a/extra/libxau/PKGBUILD b/extra/libxau/PKGBUILD
index 939afbe5b..3f337d9fb 100644
--- a/extra/libxau/PKGBUILD
+++ b/extra/libxau/PKGBUILD
@@ -1,29 +1,28 @@
-# $Id: PKGBUILD 186350 2013-05-25 08:48:08Z andyrtr $
+# $Id: PKGBUILD 197097 2013-10-21 18:45:00Z andyrtr $
 # Maintainer: AndyRTR <andyrtr@archlinux.org>
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: Alexander Baldeck <alexander@archlinux.org>
 
 pkgname=libxau
 pkgver=1.0.8
-pkgrel=1
+pkgrel=2
 pkgdesc="X11 authorisation library"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://xorg.freedesktop.org/"
 depends=('glibc' 'xproto>=7.0.18')
 makedepends=('pkgconfig')
 license=('custom')
-options=('!libtool')
 source=(${url}/releases/individual/lib/libXau-${pkgver}.tar.bz2)
 sha256sums=('fdd477320aeb5cdd67272838722d6b7d544887dfe7de46e1e7cc0c27c2bea4f2')
 
 build() {
-  cd "${srcdir}/libXau-${pkgver}"
+  cd libXau-${pkgver}
   ./configure --prefix=/usr --sysconfdir=/etc
   make
 }
 
 package() {
-  cd "${srcdir}/libXau-${pkgver}"
+  cd libXau-${pkgver}
   make DESTDIR="${pkgdir}" install
 
   install -Dm644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/COPYING"
diff --git a/extra/libxaw/PKGBUILD b/extra/libxaw/PKGBUILD
index 19bf832eb..f2e1c675e 100644
--- a/extra/libxaw/PKGBUILD
+++ b/extra/libxaw/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 194288 2013-09-13 07:15:28Z andyrtr $
+# $Id: PKGBUILD 198270 2013-10-30 13:50:53Z allan $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=libxaw
@@ -10,7 +10,6 @@ license=('custom')
 url="http://xorg.freedesktop.org/"
 depends=('libxmu' 'libxpm')
 makedepends=('xorg-util-macros')
-options=('!libtool')
 source=(${url}/releases/individual/lib/libXaw-${pkgver}.tar.bz2)
 sha256sums=('96fc314874fce9979556321d1d6ee00b5baf32fb333b7278853b4983bc3cdbf6')
 
diff --git a/extra/libxcb/PKGBUILD b/extra/libxcb/PKGBUILD
index 1742a636e..6869b57ce 100644
--- a/extra/libxcb/PKGBUILD
+++ b/extra/libxcb/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 191295 2013-07-23 11:13:07Z jgc $
+# $Id: PKGBUILD 198271 2013-10-30 13:51:13Z allan $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: Alexander Baldeck <alexander@archlinux.org>
 
@@ -10,7 +10,6 @@ arch=('i686' 'x86_64' 'mips64el')
 url="http://xcb.freedesktop.org/"
 depends=('xcb-proto>=1.8-2' 'libxdmcp' 'libxau')
 makedepends=('pkgconfig' 'libxslt' 'python')
-options=('!libtool')
 license=('custom')
 source=($url/dist/$pkgname-$pkgver.tar.bz2
         libxcb-1.1-no-pthread-stubs.patch
diff --git a/extra/libxcomposite/PKGBUILD b/extra/libxcomposite/PKGBUILD
index 6435034d5..fe5f29293 100644
--- a/extra/libxcomposite/PKGBUILD
+++ b/extra/libxcomposite/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 174258 2013-01-03 11:50:21Z jgc $
+# $Id: PKGBUILD 198272 2013-10-30 13:51:36Z allan $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=libxcomposite
@@ -10,7 +10,6 @@ url="http://xorg.freedesktop.org/"
 license=('custom')
 depends=('libxfixes' 'compositeproto')
 makedepends=('xorg-util-macros')
-options=('!libtool')
 source=("${url}/releases/individual/lib/libXcomposite-${pkgver}.tar.bz2")
 sha256sums=('ede250cd207d8bee4a338265c3007d7a68d5aca791b6ac41af18e9a2aeb34178')
 
diff --git a/extra/libxcursor/PKGBUILD b/extra/libxcursor/PKGBUILD
index c78fcd474..9b7c11c27 100644
--- a/extra/libxcursor/PKGBUILD
+++ b/extra/libxcursor/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 186698 2013-05-30 14:35:12Z andyrtr $
+# $Id: PKGBUILD 198273 2013-10-30 13:51:56Z allan $
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: Alexander Baldeck <alexander@archlinux.org>
@@ -12,7 +12,6 @@ url="http://xorg.freedesktop.org/"
 license=('custom')
 depends=('libxfixes' 'libxrender')
 makedepends=('xorg-util-macros')
-options=('!libtool')
 source=(${url}/releases/individual/lib/libXcursor-${pkgver}.tar.bz2)
 sha256sums=('9bc6acb21ca14da51bda5bc912c8955bc6e5e433f0ab00c5e8bef842596c33df')
 
diff --git a/extra/libxdamage/PKGBUILD b/extra/libxdamage/PKGBUILD
index 558a87bd8..ccb2f7753 100644
--- a/extra/libxdamage/PKGBUILD
+++ b/extra/libxdamage/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 174256 2013-01-03 11:42:05Z jgc $
+# $Id: PKGBUILD 198274 2013-10-30 13:52:16Z allan $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=libxdamage
@@ -10,7 +10,6 @@ url="http://xorg.freedesktop.org/"
 license=('custom')
 depends=('libxfixes>=4.0.4' 'damageproto>=1.2.0')
 makedepends=('pkg-config')
-options=('!libtool')
 source=(${url}/releases/individual/lib/libXdamage-${pkgver}.tar.bz2)
 sha256sums=('7c3fe7c657e83547f4822bfde30a90d84524efb56365448768409b77f05355ad')
 
diff --git a/extra/libxdmcp/PKGBUILD b/extra/libxdmcp/PKGBUILD
index ba75bd2e2..c77a1de73 100644
--- a/extra/libxdmcp/PKGBUILD
+++ b/extra/libxdmcp/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 152771 2012-03-09 16:07:19Z andyrtr $
+# $Id: PKGBUILD 198275 2013-10-30 13:52:38Z allan $
 #Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=libxdmcp
@@ -10,7 +10,6 @@ url="http://xorg.freedesktop.org/"
 license=('custom')
 depends=('xproto' 'glibc')
 makedepends=('xorg-util-macros')
-options=('!libtool')
 source=("${url}/releases/individual/lib/libXdmcp-${pkgver}.tar.bz2")
 sha1sums=('3b63e8fc1600c51d9897d017da190fc6c16245b6')
 
diff --git a/extra/libxevie/PKGBUILD b/extra/libxevie/PKGBUILD
index fd12e2745..39b313d80 100644
--- a/extra/libxevie/PKGBUILD
+++ b/extra/libxevie/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 151414 2012-02-26 10:40:20Z pierre $
+# $Id: PKGBUILD 198276 2013-10-30 13:52:59Z allan $
 #Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=libxevie
@@ -10,7 +10,6 @@ url="http://xorg.freedesktop.org/"
 license=('custom')
 depends=('libxext')
 makedepends=('xorg-util-macros' 'evieext')
-options=('!libtool')
 source=("${url}/releases/individual/lib/libXevie-${pkgver}.tar.bz2")
 sha1sums=('84e2dc6e35c4a82f1a4d1fe4723fba58364c3bec')
 
diff --git a/extra/libxext/PKGBUILD b/extra/libxext/PKGBUILD
index fc784a468..0d35f36d7 100644
--- a/extra/libxext/PKGBUILD
+++ b/extra/libxext/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 186939 2013-06-01 09:47:26Z andyrtr $
+# $Id: PKGBUILD 198277 2013-10-30 13:53:20Z allan $
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
@@ -11,7 +11,6 @@ url="http://xorg.freedesktop.org/"
 license=('custom')
 depends=('libx11' 'xextproto')
 makedepends=('xorg-util-macros')
-options=('!libtool')
 source=("${url}/releases/individual/lib/libXext-${pkgver}.tar.bz2")
 sha256sums=('f829075bc646cdc085fa25d98d5885d83b1759ceb355933127c257e8e50432e0')
 
diff --git a/extra/libxfce4ui/PKGBUILD b/extra/libxfce4ui/PKGBUILD
index 4d5fcf4e2..8ee41d41b 100644
--- a/extra/libxfce4ui/PKGBUILD
+++ b/extra/libxfce4ui/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 157819 2012-04-30 04:19:30Z foutrelis $
+# $Id: PKGBUILD 198278 2013-10-30 13:53:42Z allan $
 # Maintainer: Evangelos Foutras <evangelos@foutrelis.com>
 # Contributor: Xavier Devlamynck <magicrhesus@ouranos.be>
 
@@ -13,7 +13,6 @@ depends=('libxfce4util' 'gtk2' 'xfconf' 'libsm' 'startup-notification'
          'hicolor-icon-theme')
 makedepends=('intltool' 'gtk-doc')
 #replaces=('libxfcegui4') - later when all is ported
-options=('!libtool')
 install=libxfce4ui.install
 source=(http://archive.xfce.org/src/xfce/$pkgname/4.10/$pkgname-$pkgver.tar.bz2)
 sha256sums=('a2b9fa288ccb5f16fa13264e507ba3f7b8da0176da259a11239f21538c0ea3e2')
diff --git a/extra/libxfce4util/PKGBUILD b/extra/libxfce4util/PKGBUILD
index c4144f1ab..e5cfc50ff 100644
--- a/extra/libxfce4util/PKGBUILD
+++ b/extra/libxfce4util/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 185207 2013-05-12 07:25:42Z foutrelis $
+# $Id: PKGBUILD 198279 2013-10-30 13:54:02Z allan $
 # Maintainer: Evangelos Foutras <evangelos@foutrelis.com>
 # Contributor: tobias <tobias funnychar archlinux.org>
 
@@ -11,7 +11,6 @@ url="http://www.xfce.org/"
 license=('GPL2')
 depends=('glib2')
 makedepends=('pkgconfig' 'intltool' 'gtk-doc')
-options=('!libtool')
 source=(http://archive.xfce.org/src/xfce/$pkgname/4.10/$pkgname-$pkgver.tar.bz2)
 sha256sums=('e82cd1ad715c02a385b3cf6646cb89aa3c4724446dac1d7e424971df12f6cfbb')
 
diff --git a/extra/libxfcegui4/PKGBUILD b/extra/libxfcegui4/PKGBUILD
index 5306a69b6..20cdae023 100644
--- a/extra/libxfcegui4/PKGBUILD
+++ b/extra/libxfcegui4/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 157823 2012-04-30 04:19:35Z foutrelis $
+# $Id: PKGBUILD 198280 2013-10-30 13:54:22Z allan $
 # Maintainer: Evangelos Foutras <evangelos@foutrelis.com>
 # Contributor: Tobias Kieslich <tobias funnychar archlinux.org>
 
@@ -12,7 +12,6 @@ license=('GPL2')
 depends=('startup-notification' 'xfconf' 'libglade' 'libsm'
          'hicolor-icon-theme')
 makedepends=('intltool')
-options=('!libtool')
 install=$pkgname.install
 source=(http://archive.xfce.org/src/xfce/$pkgname/4.10/$pkgname-$pkgver.tar.bz2)
 sha256sums=('2b82f9979175d8856880c8f349e6eede491ca92fe6940c69c8958115418d4533')
diff --git a/extra/libxfixes/PKGBUILD b/extra/libxfixes/PKGBUILD
index c4fc9f965..6d1394651 100644
--- a/extra/libxfixes/PKGBUILD
+++ b/extra/libxfixes/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 186580 2013-05-29 15:23:58Z andyrtr $
+# $Id: PKGBUILD 198281 2013-10-30 13:54:48Z allan $
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
@@ -11,7 +11,6 @@ url="http://xorg.freedesktop.org/"
 license=('custom')
 depends=('libx11' 'fixesproto>=5.0')
 makedepends=('xorg-util-macros')
-options=('!libtool')
 source=("${url}/releases/individual/lib/libXfixes-${pkgver}.tar.bz2")
 sha256sums=('63bec085084fa3caaee5180490dd871f1eb2020ba9e9b39a30f93693ffc34767')
 
diff --git a/extra/libxfont/PKGBUILD b/extra/libxfont/PKGBUILD
index 1a2be3266..2dad72df4 100644
--- a/extra/libxfont/PKGBUILD
+++ b/extra/libxfont/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 191249 2013-07-22 08:12:34Z lcarlier $
+# $Id: PKGBUILD 198282 2013-10-30 13:55:08Z allan $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=libxfont
@@ -10,7 +10,6 @@ url="http://xorg.freedesktop.org/"
 license=('custom')
 depends=('freetype2' 'libfontenc' 'xproto' 'fontsproto')
 makedepends=('xorg-util-macros' 'xtrans')
-options=('!libtool')
 source=(${url}/archive/individual/lib/libXfont-${pkgver}.tar.bz2)
 sha256sums=('d0cbfe4554dc17ceea413cdad5601d35ed8d05d5b880e60931a8775fd1157e9f')
 
diff --git a/extra/libxft/PKGBUILD b/extra/libxft/PKGBUILD
index 62c9f567b..2c1be43f5 100644
--- a/extra/libxft/PKGBUILD
+++ b/extra/libxft/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 160629 2012-06-02 21:27:53Z andyrtr $
+# $Id: PKGBUILD 198283 2013-10-30 13:55:28Z allan $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=libxft
@@ -10,7 +10,6 @@ license=('custom')
 url="http://xorg.freedesktop.org/"
 depends=('fontconfig' 'libxrender')
 makedepends=('pkgconfig')
-options=('!libtool')
 source=("${url}/releases/individual/lib/libXft-${pkgver}.tar.bz2")
 sha256sums=('7fce32b92dcb7b2869bed567af2abc7bbad0d5d6fcf471b8a3e137964a31bbbd')
 
diff --git a/extra/libxi/PKGBUILD b/extra/libxi/PKGBUILD
index 8d7b13e69..0085e86b8 100644
--- a/extra/libxi/PKGBUILD
+++ b/extra/libxi/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 189335 2013-07-03 08:11:31Z lcarlier $
+# $Id: PKGBUILD 198284 2013-10-30 13:55:49Z allan $
 # Maintainer: AndyRTR <andyrtr@archlinux.org>
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
@@ -10,7 +10,6 @@ arch=('i686' 'x86_64' 'mips64el')
 url="http://xorg.freedesktop.org"
 depends=('libxext' 'inputproto')
 makedepends=('pkgconfig' 'xorg-util-macros' 'libxfixes' 'automake')
-options=(!libtool)
 license=('custom')
 source=(${url}/releases/individual/lib/libXi-${pkgver}.tar.bz2)
 sha256sums=('df24781dc63645e2b561cd0b20bd8a0e7aff02e426a8d2a7641159004d4cb20e')
diff --git a/extra/libxinerama/PKGBUILD b/extra/libxinerama/PKGBUILD
index c5468dacf..443695c66 100644
--- a/extra/libxinerama/PKGBUILD
+++ b/extra/libxinerama/PKGBUILD
@@ -1,29 +1,28 @@
-# $Id: PKGBUILD 186881 2013-05-31 14:01:07Z andyrtr $
+# $Id: PKGBUILD 197099 2013-10-21 18:47:43Z andyrtr $
 # Maintainer: AndyRTR <andyrtr@archlinux.org>
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: Alexander Baldeck <alexander@archlinux.org>
 
 pkgname=libxinerama
 pkgver=1.1.3
-pkgrel=1
+pkgrel=2
 pkgdesc="X11 Xinerama extension library"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://xorg.freedesktop.org/"
 license=('custom')
 depends=('libxext' 'xineramaproto')
 makedepends=('xorg-util-macros')
-options=('!libtool')
 source=("${url}/releases/individual/lib/libXinerama-${pkgver}.tar.bz2")
 sha256sums=('7a45699f1773095a3f821e491cbd5e10c887c5a5fce5d8d3fced15c2ff7698e2')
 
 build() {
-  cd "${srcdir}/libXinerama-${pkgver}"
+  cd libXinerama-${pkgver}
   ./configure --prefix=/usr
   make
 }
 
 package() {
-  cd "${srcdir}/libXinerama-${pkgver}"
+  cd libXinerama-${pkgver}
   make DESTDIR="${pkgdir}" install
   install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
   install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"
diff --git a/extra/libxkbcommon/PKGBUILD b/extra/libxkbcommon/PKGBUILD
index 1651fda73..c6f5655c2 100644
--- a/extra/libxkbcommon/PKGBUILD
+++ b/extra/libxkbcommon/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 188191 2013-06-12 13:53:24Z heftig $
+# $Id: PKGBUILD 198285 2013-10-30 13:56:09Z allan $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Contributor: Daniel Micay <danielmicay@gmail.com>
 # Contributor: Mladen Pejakovic <pejakm@gmail.com>
@@ -12,7 +12,6 @@ url="http://xkbcommon.org/"
 license=(custom)
 depends=(xkeyboard-config)
 makedepends=(doxygen xorg-util-macros)
-options=('!libtool')
 source=("http://xkbcommon.org/download/$pkgname-$pkgver.tar.xz")
 #source=("$pkgname-$pkgver::git://github.com/xkbcommon/$pkgname.git")
 md5sums=('7287ea51df79c0f80e92b970a30b95e9')
diff --git a/extra/libxkbfile/PKGBUILD b/extra/libxkbfile/PKGBUILD
index 4184e47b2..219e7e573 100644
--- a/extra/libxkbfile/PKGBUILD
+++ b/extra/libxkbfile/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 152781 2012-03-09 16:19:36Z andyrtr $
+# $Id: PKGBUILD 198286 2013-10-30 13:56:32Z allan $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=libxkbfile
@@ -10,7 +10,6 @@ license=('custom')
 url="http://xorg.freedesktop.org/"
 depends=('libx11')
 makedepends=('xorg-util-macros')
-options=('!libtool')
 source=("${url}/releases/individual/lib/${pkgname}-${pkgver}.tar.bz2")
 sha1sums=('05139829837c26e3a14a40a700f058c018bc71f5')
 
diff --git a/extra/libxkbui/PKGBUILD b/extra/libxkbui/PKGBUILD
index 6ed803c75..eac86cf42 100644
--- a/extra/libxkbui/PKGBUILD
+++ b/extra/libxkbui/PKGBUILD
@@ -1,29 +1,28 @@
-# $Id: PKGBUILD 151385 2012-02-25 23:56:14Z pierre $
+# $Id: PKGBUILD 197101 2013-10-21 18:50:28Z andyrtr $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=libxkbui
 pkgver=1.0.2
-pkgrel=4.1
+pkgrel=5
 pkgdesc="X11 keyboard UI presentation library"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://xorg.freedesktop.org/"
 license=('custom')
 depends=('libxt' 'libxkbfile')
 makedepends=('pkgconfig')
-options=('!libtool')
 source=("${url}/releases/individual/lib/${pkgname}-${pkgver}.tar.bz2"
         'LICENSE')
 md5sums=('1143e456f7429e18e88f2eadb2f2b6b1'
          'd1efaa1271fc028cd5bec33f836ee9ef')
 
 build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+  cd ${pkgname}-${pkgver}
   ./configure --prefix=/usr
   make
 }
 
 package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+  cd ${pkgname}-${pkgver}
   make DESTDIR="${pkgdir}" install
   install -D -m644 ../LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
 }
diff --git a/extra/libxklavier/PKGBUILD b/extra/libxklavier/PKGBUILD
index cf4d30146..c8c833eb9 100644
--- a/extra/libxklavier/PKGBUILD
+++ b/extra/libxklavier/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 169960 2012-10-30 22:47:14Z heftig $
+# $Id: PKGBUILD 198287 2013-10-30 13:56:54Z allan $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: Arjan Timmerman <arjan@archlinux.org>
 
@@ -10,7 +10,7 @@ arch=(i686 x86_64 'mips64el')
 license=('LGPL')
 depends=('glib2' 'libxkbfile' 'libxml2' 'xkeyboard-config' 'libxi' 'iso-codes')
 makedepends=('gobject-introspection')
-options=('!libtool' '!emptydirs')
+options=('!emptydirs')
 url="http://gswitchit.sourceforge.net"
 source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver::3}/$pkgname-$pkgver.tar.xz)
 sha256sums=('ebec3bc54b5652838502b96223152fb1cd8fcb14ace5cb02d718fc3276bbd404')
diff --git a/extra/libxmi/PKGBUILD b/extra/libxmi/PKGBUILD
index 9d5921c27..0fc134016 100644
--- a/extra/libxmi/PKGBUILD
+++ b/extra/libxmi/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 141631 2011-11-01 00:42:15Z giovanni $
+# $Id: PKGBUILD 198288 2013-10-30 13:57:15Z allan $
 # Maintainer: Ronald van Haren <ronald.archlinux.org>
 # Contributor: Tobias Kieslich [tobias.justdreams.de]
 
@@ -10,7 +10,6 @@ arch=('i686' 'x86_64' 'mips64el')
 url="http://www.gnu.org/software/libxmi/libxmi.html"
 license=('GPL')
 depends=('glibc')
-options=('!libtool')
 install=libxmi.install
 source=(http://mirrors.usc.edu/pub/gnu/${pkgname}/${pkgname}-${pkgver}.tar.gz)
 md5sums=('4e6935484f0ad71b531920bf4c546b47')
diff --git a/extra/libxml++/PKGBUILD b/extra/libxml++/PKGBUILD
index 9caba7996..caa4ecf9b 100644
--- a/extra/libxml++/PKGBUILD
+++ b/extra/libxml++/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 170207 2012-11-05 11:38:10Z jgc $
+# $Id: PKGBUILD 198289 2013-10-30 13:57:37Z allan $
 # Maintainer: damir <damir@archlinux.org>
 
 pkgbase=libxml++
@@ -9,7 +9,7 @@ arch=('i686' 'x86_64' 'mips64el')
 license=('LGPL')
 url="http://libxmlplusplus.sourceforge.net/"
 makedepends=('pkgconfig' 'glibmm-docs' 'libxml2' 'glibmm')
-options=('!libtool' '!emptydirs')
+options=('!emptydirs')
 source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgbase}/2.36/${pkgbase}-${pkgver}.tar.xz)
 sha256sums=('bfdf327bf9ebd12946b7aa6a152045f209d5c9fecd06ebfcdf9b3e7c1af6e2e1')
 
diff --git a/extra/libxml2/PKGBUILD b/extra/libxml2/PKGBUILD
index 89d193dfa..059a422bb 100644
--- a/extra/libxml2/PKGBUILD
+++ b/extra/libxml2/PKGBUILD
@@ -1,39 +1,41 @@
-# $Id: PKGBUILD 187170 2013-06-04 17:39:43Z bpiotrowski $
+# $Id: PKGBUILD 198786 2013-11-04 14:26:01Z heftig $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Maintainer: Tom Gundersen <teg@jklm.no>
 # Contributor: John Proctor <jproctor@prium.net>
 
 pkgname=libxml2
 pkgver=2.9.1
-pkgrel=2
+pkgrel=5
 pkgdesc="XML parsing library, version 2"
 arch=(i686 x86_64 mips64el)
 license=('MIT')
 depends=('zlib' 'readline' 'ncurses' 'xz')
 makedepends=('python2')
-options=('!libtool')
 url="http://www.xmlsoft.org/"
 source=(ftp://ftp.xmlsoft.org/${pkgname}/${pkgname}-${pkgver}.tar.gz
         http://www.w3.org/XML/Test/xmlts20080827.tar.gz)
 md5sums=('9c0cfef285d5c4a5c80d00904ddab380'
          'ae3d1ebe000a3972afa104ca7f0e1b4a')
 
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+prepare() {
+  cd ${pkgname}-${pkgver}
   sed -e 's|/usr/bin/python -u|/usr/bin/python2 -u|g' -e 's|/usr/bin/python$|/usr/bin/python2|g' -i python/tests/*.py
-  ./configure --prefix=/usr --with-threads --with-history \
-     --with-python=/usr/bin/python2
+  mv ../xmlconf .
+}
+
+build() {
+  cd ${pkgname}-${pkgver}
+  ./configure --prefix=/usr --with-threads --with-history --with-python=/usr/bin/python2
   make
 }
 
 check() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  mv "${srcdir}/xmlconf" .
+  cd ${pkgname}-${pkgver}
   make check
 }
 
 package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+  cd ${pkgname}-${pkgver}
   make DESTDIR="${pkgdir}" install
   install -Dm644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/COPYING"
 }
diff --git a/extra/libxmu/PKGBUILD b/extra/libxmu/PKGBUILD
index 00c14986b..f511bd58c 100644
--- a/extra/libxmu/PKGBUILD
+++ b/extra/libxmu/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 194290 2013-09-13 07:18:50Z andyrtr $
+# $Id: PKGBUILD 198291 2013-10-30 13:58:19Z allan $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=libxmu
@@ -10,7 +10,6 @@ url="http://xorg.freedesktop.org/"
 depends=('libxext' 'libxt')
 makedepends=('xorg-util-macros')
 license=('custom')
-options=('!libtool')
 source=("${url}/releases/individual/lib/libXmu-${pkgver}.tar.bz2")
 sha256sums=('756edc7c383254eef8b4e1b733c3bf1dc061b523c9f9833ac7058378b8349d0b')
 
diff --git a/extra/libxp/PKGBUILD b/extra/libxp/PKGBUILD
index cbb27982b..a35dd42e7 100644
--- a/extra/libxp/PKGBUILD
+++ b/extra/libxp/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 186883 2013-05-31 14:02:47Z andyrtr $
+# $Id: PKGBUILD 198292 2013-10-30 13:58:41Z allan $
 # Maintainer: AndyRTR <andyrtr@archlinux.org>
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
@@ -11,7 +11,6 @@ license=('custom')
 url="http://xorg.freedesktop.org/"
 depends=('libxext' 'printproto')
 makedepends=('xorg-util-macros')
-options=('!libtool')
 source=("${url}/releases/individual/lib/libXp-${pkgver}.tar.bz2")
 license=('custom')
 sha256sums=('952fe5b5e90abd2cf04739aef3a9b63a253cd9309ed066a82bab7ca9112fd0b5')
diff --git a/extra/libxpm/PKGBUILD b/extra/libxpm/PKGBUILD
index 78f229bc3..6541a1bc9 100644
--- a/extra/libxpm/PKGBUILD
+++ b/extra/libxpm/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 194292 2013-09-13 07:20:55Z andyrtr $
+# $Id: PKGBUILD 198293 2013-10-30 13:59:02Z allan $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=libxpm
@@ -10,7 +10,6 @@ license=('custom')
 url="http://xorg.freedesktop.org/"
 depends=('libxt' 'libxext')
 makedepends=('xorg-util-macros')
-options=('!libtool')
 source=("${url}/releases/individual/lib/libXpm-${pkgver}.tar.bz2")
 sha256sums=('c5bdafa51d1ae30086fac01ab83be8d47fe117b238d3437f8e965434090e041c')
 
diff --git a/extra/libxrandr/PKGBUILD b/extra/libxrandr/PKGBUILD
index 6fba3d84e..c8df0528f 100644
--- a/extra/libxrandr/PKGBUILD
+++ b/extra/libxrandr/PKGBUILD
@@ -1,29 +1,28 @@
-# $Id: PKGBUILD 194294 2013-09-13 07:22:51Z andyrtr $
+# $Id: PKGBUILD 197103 2013-10-21 18:56:46Z andyrtr $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 # Contributor: Alexander Baldeck <alexander@archlinux.org>
 
 pkgname=libxrandr
 pkgver=1.4.2
-pkgrel=1
+pkgrel=2
 pkgdesc="X11 RandR extension library"
 arch=('i686' 'x86_64' 'mips64el')
 license=('custom')
 url="http://xorg.freedesktop.org/"
 depends=('libxext' 'libxrender' 'randrproto>=1.4.0')
 makedepends=('xorg-util-macros')
-options=('!libtool')
 source=(${url}/releases/individual/lib/libXrandr-${pkgver}.tar.bz2)
 sha256sums=('caa7b31ac769be51a532343c65376f1d4df3f307afaed58e34fb5e82e8b825ad')
 
 build() {
-  cd "${srcdir}/libXrandr-${pkgver}"
+  cd libXrandr-${pkgver}
   ./configure --prefix=/usr --sysconfdir=/etc
   make
 }
 
 package() {
-  cd "${srcdir}/libXrandr-${pkgver}"
+  cd libXrandr-${pkgver}
   make DESTDIR="${pkgdir}" install
 
   install -d -m755 "${pkgdir}/usr/share/licenses/${pkgname}"
diff --git a/extra/libxrender/PKGBUILD b/extra/libxrender/PKGBUILD
index 24785f486..563675c59 100644
--- a/extra/libxrender/PKGBUILD
+++ b/extra/libxrender/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 188444 2013-06-14 06:38:04Z lcarlier $
+# $Id: PKGBUILD 198294 2013-10-30 13:59:22Z allan $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=libxrender
@@ -10,7 +10,6 @@ url="http://xorg.freedesktop.org/"
 license=('custom')
 depends=('libx11>=1.3.4' 'renderproto')
 makedepends=('pkgconfig')
-options=('!libtool')
 source=(${url}/releases/individual/lib/libXrender-${pkgver}.tar.bz2)
 sha256sums=('1d14b02f0060aec5d90dfdcf16a996f17002e515292906ed26e3dcbba0f4fc62')
 
diff --git a/extra/libxres/PKGBUILD b/extra/libxres/PKGBUILD
index f7bbb1b36..9f97d882c 100644
--- a/extra/libxres/PKGBUILD
+++ b/extra/libxres/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 186885 2013-05-31 14:04:26Z andyrtr $
+# $Id: PKGBUILD 198295 2013-10-30 13:59:42Z allan $
 # Maintainer: AndyRTR <andyrtr@archlinux.org>
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
@@ -11,7 +11,6 @@ url="http://xorg.freedesktop.org"
 license=('custom')
 depends=('libxext')
 makedepends=('resourceproto' 'damageproto' 'compositeproto' 'scrnsaverproto' 'xorg-util-macros')
-options=('!libtool')
 source=("${url}/releases/individual/lib/libXres-${pkgver}.tar.bz2")
 sha256sums=('26899054aa87f81b17becc68e8645b240f140464cf90c42616ebb263ec5fa0e5')
 
diff --git a/extra/libxshmfence/COPYING b/extra/libxshmfence/COPYING
new file mode 100644
index 000000000..313c8f18e
--- /dev/null
+++ b/extra/libxshmfence/COPYING
@@ -0,0 +1,21 @@
+/*
+ * Copyright © 2013 Keith Packard
+ *
+ * Permission to use, copy, modify, distribute, and sell this software and its
+ * documentation for any purpose is hereby granted without fee, provided that
+ * the above copyright notice appear in all copies and that both that copyright
+ * notice and this permission notice appear in supporting documentation, and
+ * that the name of the copyright holders not be used in advertising or
+ * publicity pertaining to distribution of the software without specific,
+ * written prior permission.  The copyright holders make no representations
+ * about the suitability of this software for any purpose.  It is provided "as
+ * is" without express or implied warranty.
+ *
+ * THE COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+ * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
+ * EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+ * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+ * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
+ * OF THIS SOFTWARE.
+ */
diff --git a/extra/libxshmfence/PKGBUILD b/extra/libxshmfence/PKGBUILD
new file mode 100644
index 000000000..162aac75d
--- /dev/null
+++ b/extra/libxshmfence/PKGBUILD
@@ -0,0 +1,43 @@
+# $Id: PKGBUILD 198729 2013-11-02 10:02:59Z andyrtr $
+# Maintainer: AndyRTR <andyrtr@archlinux.org>
+
+pkgname=libxshmfence
+pkgver=1.0
+pkgrel=1
+pkgdesc="a library that exposes a event API on top of Linux futexes"
+arch=('i686' 'x86_64')
+url="http://xorg.freedesktop.org/"
+license=('GPL')
+#groups=()
+depends=('glibc')
+makedepends=('xorg-util-macros')
+source=(${url}/releases/individual/lib/${pkgname}-${pkgver}.tar.bz2
+        COPYING)
+sha256sums=('625089553939baa20e665873a6c8f3d694cfde78fb3110aa59da92fd2b14f14f'
+            '5e46864ede2fda46c3cb7cfe3a7b9f9e4bd36d8d21d8010a284caa64b81d465a')
+
+build() {
+	cd $pkgname-$pkgver
+	
+	# fix some libtools errors
+	autoreconf -vfi
+	
+	./configure --prefix=/usr
+	make
+}
+
+check() {
+	cd $pkgname-$pkgver
+	make -k check
+}
+
+package() {
+	cd $pkgname-$pkgver
+	make DESTDIR="$pkgdir/" install
+	
+    # license is still missing
+    # COPYING is taken from top of /usr/include/X11/xshmfence.h
+    install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
+    install -m644 ${srcdir}/COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"
+
+}
diff --git a/extra/libxslt/PKGBUILD b/extra/libxslt/PKGBUILD
index b441e2306..1dc4aff57 100644
--- a/extra/libxslt/PKGBUILD
+++ b/extra/libxslt/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 184790 2013-05-08 14:12:44Z bpiotrowski $
+# $Id: PKGBUILD 198296 2013-10-30 14:00:12Z allan $
 # Maintainer: Eric Belanger <eric@archlinux.org>
 # Contributor: John Proctor <jproctor@prium.net>
 
 pkgname=libxslt
 pkgver=1.1.28
-pkgrel=1
+pkgrel=2
 pkgdesc="XML stylesheet transformation library"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://xmlsoft.org/XSLT/"
@@ -12,7 +12,6 @@ license=('custom')
 depends=('libxml2' 'libgcrypt')
 makedepends=('python2')
 checkdepends=('docbook-xml')
-options=('!libtool')
 source=(ftp://xmlsoft.org/libxslt/${pkgname}-${pkgver}.tar.gz)
 md5sums=('9667bf6f9310b957254fdcf6596600b7')
 
diff --git a/extra/libxss/PKGBUILD b/extra/libxss/PKGBUILD
index 93c296c3c..fca9b7bbc 100644
--- a/extra/libxss/PKGBUILD
+++ b/extra/libxss/PKGBUILD
@@ -1,28 +1,27 @@
-# $Id: PKGBUILD 152791 2012-03-09 16:28:04Z andyrtr $
+# $Id: PKGBUILD 197105 2013-10-21 19:00:07Z andyrtr $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: Alexander Baldeck <alexander@archlinux.org>
 
 pkgname=libxss
 pkgver=1.2.2
-pkgrel=1.1
+pkgrel=2
 pkgdesc="X11 Screen Saver extension library"
 arch=('i686' 'x86_64' 'mips64el')
 license=('custom')
 url="http://xorg.freedesktop.org/"
 depends=('libxext' 'scrnsaverproto')
 makedepends=('xorg-util-macros')
-options=('!libtool')
 source=("${url}/releases/individual/lib/libXScrnSaver-${pkgver}.tar.bz2")
 sha1sums=('7b8298eec371c33a71232e3653370a98f03c6c88')
 
 build() {
-  cd "${srcdir}/libXScrnSaver-${pkgver}"
+  cd libXScrnSaver-${pkgver}
   ./configure --prefix=/usr --sysconfdir=/etc
   make
 }
 
 package() {
-  cd "${srcdir}/libXScrnSaver-${pkgver}"
+  cd libXScrnSaver-${pkgver}
   make DESTDIR="${pkgdir}" install
 
   install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
diff --git a/extra/libxt/PKGBUILD b/extra/libxt/PKGBUILD
index c0b6a26ec..f072fd09d 100644
--- a/extra/libxt/PKGBUILD
+++ b/extra/libxt/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 186887 2013-05-31 14:06:19Z andyrtr $
+# $Id: PKGBUILD 198297 2013-10-30 14:00:39Z allan $
 # Maintainer: AndyRTR <andyrtr@archlinux.org>
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
@@ -11,7 +11,6 @@ url="http://xorg.freedesktop.org/"
 license=('custom')
 depends=('libsm' 'libx11')
 makedepends=('xorg-util-macros')
-options=('!libtool')
 source=("${url}/releases/individual/lib/libXt-${pkgver}.tar.bz2")
 sha256sums=('843a97a988f5654872682a4120486d987d853a71651515472f55519ffae2dd57')
 
diff --git a/extra/libxtst/PKGBUILD b/extra/libxtst/PKGBUILD
index 3921bb8f1..a3fb67387 100644
--- a/extra/libxtst/PKGBUILD
+++ b/extra/libxtst/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 186893 2013-05-31 14:14:53Z andyrtr $
+# $Id: PKGBUILD 198298 2013-10-30 14:01:00Z allan $
 # Maintainer: AndyRTR <andyrtr@archlinux.org>
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
@@ -11,7 +11,6 @@ url="http://xorg.freedesktop.org/"
 license=('custom')
 depends=('libxext' 'libxi' 'recordproto' 'inputproto' 'libxfixes')
 makedepends=('xorg-util-macros')
-options=('!libtool')
 source=("${url}/releases/individual/lib/libXtst-${pkgver}.tar.bz2")
 sha256sums=('ef0a7ffd577e5f1a25b1663b375679529663a1880151beaa73e9186c8309f6d9')
 
diff --git a/extra/libxv/PKGBUILD b/extra/libxv/PKGBUILD
index 36dd7d536..b0b64f8c6 100644
--- a/extra/libxv/PKGBUILD
+++ b/extra/libxv/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 194296 2013-09-13 07:24:42Z andyrtr $
+# $Id: PKGBUILD 198299 2013-10-30 14:01:20Z allan $
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
@@ -11,7 +11,6 @@ license=('custom')
 url="http://xorg.freedesktop.org/"
 depends=('libxext' 'videoproto')
 makedepends=('pkgconfig')
-options=('!libtool')
 source=("${url}/releases/individual/lib/libXv-${pkgver}.tar.bz2")
 sha256sums=('55fe92f8686ce8612e2c1bfaf58c057715534419da700bda8d517b1d97914525')
 
diff --git a/extra/libxvmc/PKGBUILD b/extra/libxvmc/PKGBUILD
index 8b10db470..27b396f6d 100644
--- a/extra/libxvmc/PKGBUILD
+++ b/extra/libxvmc/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 188450 2013-06-14 09:23:32Z lcarlier $
+# $Id: PKGBUILD 198300 2013-10-30 14:01:42Z allan $
 #Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=libxvmc
@@ -10,7 +10,6 @@ url="http://xorg.freedesktop.org/"
 license=('custom')
 depends=('libxv')
 makedepends=('pkgconfig')
-options=('!libtool')
 source=("${url}/releases/individual/lib/libXvMC-${pkgver}.tar.bz2")
 sha256sums=('5e1a401efa433f959d41e17932b8c218c56b931348f494b8fa4656d7d798b204')
 
diff --git a/extra/libxxf86dga/PKGBUILD b/extra/libxxf86dga/PKGBUILD
index 2af625e53..5ad319336 100644
--- a/extra/libxxf86dga/PKGBUILD
+++ b/extra/libxxf86dga/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 186889 2013-05-31 14:07:54Z andyrtr $
+# $Id: PKGBUILD 198301 2013-10-30 14:02:03Z allan $
 # Maintainer: AndyRTR <andyrtr@archlinux.org>
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: Alexander Baldeck <alexander@archlinux.org>
@@ -12,7 +12,6 @@ url="http://xorg.freedesktop.org/"
 license=('custom')
 depends=('libxext' 'xf86dgaproto')
 makedepends=('xorg-util-macros')
-options=('!libtool')
 source=(${url}/releases/individual/lib/libXxf86dga-${pkgver}.tar.bz2)
 sha256sums=('8eecd4b6c1df9a3704c04733c2f4fa93ef469b55028af5510b25818e2456c77e')
 
diff --git a/extra/libxxf86vm/PKGBUILD b/extra/libxxf86vm/PKGBUILD
index 19b6d3bb4..e1f130caf 100644
--- a/extra/libxxf86vm/PKGBUILD
+++ b/extra/libxxf86vm/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 186891 2013-05-31 14:09:38Z andyrtr $
+# $Id: PKGBUILD 198302 2013-10-30 14:02:23Z allan $
 # Maintainer: AndyRTR <andyrtr@archlinux.org>
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
@@ -11,7 +11,6 @@ license=('custom')
 url="http://xorg.freedesktop.org/"
 depends=('libxext' 'xf86vidmodeproto')
 makedepends=('xorg-util-macros')
-options=('!libtool')
 source=(${url}/releases/individual/lib/libXxf86vm-${pkgver}.tar.bz2)
 sha256sums=('da5e86c32ee2069b9e6d820e4c2e4242d4877cb155a2b2fbf2675a1480ec37b8')
 
diff --git a/extra/libytnef/PKGBUILD b/extra/libytnef/PKGBUILD
index a5515ac9a..ca35e0a20 100644
--- a/extra/libytnef/PKGBUILD
+++ b/extra/libytnef/PKGBUILD
@@ -9,7 +9,6 @@ pkgdesc="Yerase's TNEF Stream Reader library (decode winmail.dat)"
 url="http://freshmeat.net/projects/ytnef/"
 license=('GPL')
 arch=('i686' 'x86_64' 'mips64el')
-options=('!libtool')
 depends=('glibc')
 source=("http://downloads.sourceforge.net/ytnef/${pkgname}-${pkgver}.tar.gz")
 md5sums=('6c44b955f33cf714c75a7bbe895cc352')
diff --git a/extra/libzapojit/PKGBUILD b/extra/libzapojit/PKGBUILD
index 30faef378..b32425df0 100644
--- a/extra/libzapojit/PKGBUILD
+++ b/extra/libzapojit/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 183440 2013-04-21 22:11:37Z heftig $
+# $Id: PKGBUILD 198304 2013-10-30 14:03:06Z allan $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 
 pkgname=libzapojit
@@ -10,7 +10,6 @@ license=('GPL')
 depends=('libsoup' 'gnome-online-accounts')
 makedepends=('intltool' 'gobject-introspection')
 url="http://www.gnome.org"
-options=('!libtool')
 source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
 sha256sums=('3d25f99329105abb99d1e9651b0aa1842065456ea54c22970a7330e9f3d1c37e')
 
diff --git a/extra/libzeitgeist/PKGBUILD b/extra/libzeitgeist/PKGBUILD
index 46ce01264..c16701d43 100644
--- a/extra/libzeitgeist/PKGBUILD
+++ b/extra/libzeitgeist/PKGBUILD
@@ -1,29 +1,28 @@
+# $Id: PKGBUILD 197766 2013-10-29 19:55:09Z eric $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: kiefer <jorgelmadrid@gmail.com>
 # Contributor: Alessio Sergi <asergi at archlinux dot us>
 
 pkgname=libzeitgeist
 pkgver=0.3.18
-_pkgmainver=0.3
-pkgrel=3
+pkgrel=4
 pkgdesc="Zeitgeist client library"
 arch=('i686' 'x86_64' 'mips64el')
 url="https://launchpad.net/libzeitgeist"
 license=('LGPL2.1')
 depends=('glib2')
 optdepends=("zeitgeist: zeitgeist framework")
-options=('!libtool')
-source=(http://launchpad.net/${pkgname}/${_pkgmainver}/${pkgver}/+download/${pkgname}-${pkgver}.tar.gz)
+source=(http://launchpad.net/${pkgname}/${pkgver%.*}/${pkgver}/+download/${pkgname}-${pkgver}.tar.gz)
 md5sums=('d63a37295d01a58086d0d4ae26e604c2')
 
 build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+  cd ${pkgname}-${pkgver}
 
   ./configure --prefix=/usr
   make
 }
 
 package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+  cd ${pkgname}-${pkgver}
   make DESTDIR="${pkgdir}" install
 }
diff --git a/extra/libzip/PKGBUILD b/extra/libzip/PKGBUILD
index 8aa3edff2..17b60e395 100644
--- a/extra/libzip/PKGBUILD
+++ b/extra/libzip/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 183834 2013-04-28 07:37:57Z eric $
+# $Id: PKGBUILD 198305 2013-10-30 14:03:27Z allan $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Tobias Powalowski <tpowa@archlinux.org>
 
@@ -10,7 +10,6 @@ url="http://www.nih.at/libzip/index.html"
 license=('BSD')
 arch=('i686' 'x86_64' 'mips64el')
 depends=('zlib')
-options=('!libtool')
 source=("http://www.nih.at/${pkgname}/${pkgname}-${pkgver}.tar.xz"
         'fix-headers.patch')
 md5sums=('87d5ec3629f6ad2a4b01ad961e7f0c19'
diff --git a/extra/libzvt/PKGBUILD b/extra/libzvt/PKGBUILD
index 2cd466883..4043a6370 100644
--- a/extra/libzvt/PKGBUILD
+++ b/extra/libzvt/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 150416 2012-02-17 12:46:43Z allan $
+# $Id: PKGBUILD 198306 2013-10-30 14:03:48Z allan $
 # Contributor: Tobias Kieslich <tobias@justdreams.de>
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
@@ -11,7 +11,6 @@ license=('GPL' 'LGPL')
 url="http://ftp.gnome.org/pub/GNOME/sources/libzvt"
 depends=('gtk2' 'libart-lgpl')
 makedepends=('pkgconfig')
-options=('!libtool')
 source=(ftp://ftp.gnome.org/pub/GNOME/sources/libzvt/2.0/${pkgname}-${pkgver}.tar.bz2
 	libzvt-2.0.1-correct_glib_include.patch)
 md5sums=('4bbea49495a341650fa1f89908e6554e'
diff --git a/extra/licq/PKGBUILD b/extra/licq/PKGBUILD
index 003d8654e..abfe2ab94 100644
--- a/extra/licq/PKGBUILD
+++ b/extra/licq/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 190044 2013-07-13 12:41:46Z svenstaro $
+# $Id: PKGBUILD 198307 2013-10-30 14:04:09Z allan $
 # Maintainer: Juergen Hoetzel <juergen@archlinux.org>
 
 pkgname=licq
@@ -10,7 +10,6 @@ url="http://www.licq.org"
 license=('GPL')
 depends=('boost-libs' 'gpgme' 'libxss' 'qt4')
 makedepends=('cmake' 'boost' 'optipng')
-options=('!libtool')
 source=(http://downloads.sourceforge.net/sourceforge/licq/licq-${pkgver}.tar.bz2)
 md5sums=('701e57efedc2b7ece64c3d2d2e9f9e16')
 
diff --git a/extra/lightsoff/PKGBUILD b/extra/lightsoff/PKGBUILD
index f25e72dca..a6c474b5b 100644
--- a/extra/lightsoff/PKGBUILD
+++ b/extra/lightsoff/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 168943 2012-10-16 16:31:44Z heftig $
+# $Id: PKGBUILD 198309 2013-10-30 14:04:58Z allan $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Contributor: Jan de Groot <jgc@archlinux.org>
 
 pkgname=lightsoff
-pkgver=3.10.0
+pkgver=3.10.1
 pkgrel=1
 pkgdesc="Turn off all the lights"
 arch=('i686' 'x86_64' 'mips64el')
@@ -12,12 +12,12 @@ depends=('desktop-file-utils' 'hicolor-icon-theme' 'clutter-gtk' 'librsvg')
 makedepends=('intltool' 'itstool' 'gobject-introspection')
 conflicts=('gnome-games')
 replaces=('gnome-games')
-options=('!emptydirs' '!libtool')
+options=('!emptydirs')
 install=lightsoff.install
 url="https://live.gnome.org/Lightsoff"
 groups=('gnome-extra')
 source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver:0:4}/$pkgname-$pkgver.tar.xz)
-sha256sums=('920a38ebe320d3882c6a98d073388e64ba9c8bea4414c05fc16a81771b0a64a4')
+sha256sums=('4db69a39a4cceb28e1c8331d65242643d1c7a9fe4c31c42f58f0421a9f205996')
 
 build() {
   cd $pkgname-$pkgver
diff --git a/extra/lighttpd/PKGBUILD b/extra/lighttpd/PKGBUILD
index 1f2b855f8..7c2619757 100644
--- a/extra/lighttpd/PKGBUILD
+++ b/extra/lighttpd/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 195225 2013-09-28 07:19:12Z pierre $
+# $Id: PKGBUILD 198746 2013-11-02 22:40:11Z pierre $
 # Maintainer: Pierre Schmitz <pierre@archlinux.de>
 
 pkgname=lighttpd
 pkgver=1.4.33
-pkgrel=1
+pkgrel=2
 pkgdesc='A secure, fast, compliant and very flexible web-server'
 license=('custom')
 arch=('i686' 'x86_64' 'mips64el')
@@ -15,7 +15,7 @@ optdepends=('libxml2: mod_webdav'
             'libmariadbclient: mod_mysql_vhost'
             'sqlite: mod_webdav')
 backup=('etc/lighttpd/lighttpd.conf' 'etc/logrotate.d/lighttpd')
-options=('!libtool' 'emptydirs')
+options=('emptydirs')
 install='lighttpd.install'
 source=("http://download.lighttpd.net/lighttpd/releases-1.4.x/lighttpd-${pkgver}.tar.xz"
         "http://download.lighttpd.net/lighttpd/releases-1.4.x/lighttpd-${pkgver}.tar.xz.asc"
@@ -23,7 +23,7 @@ source=("http://download.lighttpd.net/lighttpd/releases-1.4.x/lighttpd-${pkgver}
 sha256sums=('2886aedc23857ca44df91b8fe6f36059ec82a859ae0eb230220e42abc331610c'
             'SKIP'
             '41f6c0042bb61021553779f861910e335834f6c15e4411756cdc6233b31076fe'
-            'ee56422fe48f2683ccb5ca2e3dc6bad79ea8e1cbd043b21d2ea73b87018e35aa'
+            'fece4581bebf39768571962dedce176b2b5f487c0abb5c1cfb35395de216c01f'
             'd8a185145a7c08b4fd8c8e6c12dae3e176389dd9b1c66e239757b2ba5108c871'
             '503fd8557297f4fb814d74effcb59633135b3c2407a87f5abe97467f0822c147')
 
diff --git a/extra/lighttpd/lighttpd.conf b/extra/lighttpd/lighttpd.conf
index ed192352a..8ec790941 100644
--- a/extra/lighttpd/lighttpd.conf
+++ b/extra/lighttpd/lighttpd.conf
@@ -9,4 +9,14 @@ server.document-root	= "/srv/http"
 server.errorlog		= "/var/log/lighttpd/error.log"
 dir-listing.activate	= "enable"
 index-file.names	= ( "index.html" )
-mimetype.assign		= ( ".html" => "text/html", ".txt" => "text/plain", ".jpg" => "image/jpeg", ".png" => "image/png", "" => "application/octet-stream" )
+mimetype.assign		= (
+				".html" => "text/html",
+				".txt" => "text/plain",
+				".css" => "text/css",
+				".js" => "application/x-javascript",
+				".jpg" => "image/jpeg",
+				".jpeg" => "image/jpeg",
+				".gif" => "image/gif",
+				".png" => "image/png",
+				"" => "application/octet-stream"
+			)
diff --git a/extra/link-grammar/PKGBUILD b/extra/link-grammar/PKGBUILD
index ce3a26ac5..f7b51428e 100644
--- a/extra/link-grammar/PKGBUILD
+++ b/extra/link-grammar/PKGBUILD
@@ -1,18 +1,18 @@
-# $Id: PKGBUILD 189484 2013-07-03 16:37:06Z giovanni $
+# $Id: PKGBUILD 198311 2013-10-30 14:05:41Z allan $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Jan de Groot <jgc@archlinux.org>
 
 pkgname=link-grammar
-pkgver=4.7.14
+pkgver=4.8.0
 pkgrel=1
 pkgdesc="A Grammar Checking library"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.abisource.com/downloads/link-grammar/"
 license=('BSD')
 depends=('aspell')
-options=('!libtool' '!makeflags')
+options=('!makeflags')
 source=("http://www.abisource.com/downloads/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.gz")
-md5sums=('2d7771d8063aec6efb27a35663d67e9f')
+md5sums=('218a2ee5ffed258bc52a0718811ca66e')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/live-media/PKGBUILD b/extra/live-media/PKGBUILD
index 605c0401f..1f4025a67 100644
--- a/extra/live-media/PKGBUILD
+++ b/extra/live-media/PKGBUILD
@@ -1,17 +1,18 @@
-# $Id: PKGBUILD 194693 2013-09-22 12:59:18Z giovanni $
+# $Id: PKGBUILD 197637 2013-10-27 15:07:22Z giovanni $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Gilles CHAUVIN <gcnweb@gmail.com>
 
 pkgname=live-media
-pkgver=2013.09.18
+pkgver=2013.10.25
 pkgrel=1
 pkgdesc="A set of C++ libraries for multimedia streaming"
 arch=('i686' 'x86_64' 'mips64el')
 license=('LGPL')
 url="http://live555.com/liveMedia"
 depends=('gcc-libs')
+options=('staticlibs')
 source=("http://live555.com/liveMedia/public/live.${pkgver}.tar.gz")
-md5sums=('082ebd8f4cab6194db268b77780056d9')
+md5sums=('43a8d3a622db8a4582174fa2ddc7461b')
 
 build() {
   cd ${srcdir}/live
diff --git a/extra/llvm/PKGBUILD b/extra/llvm/PKGBUILD
index c77faf380..46ce04290 100644
--- a/extra/llvm/PKGBUILD
+++ b/extra/llvm/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 188592 2013-06-16 17:21:04Z foutrelis $
+# $Id: PKGBUILD 197048 2013-10-21 14:52:40Z foutrelis $
 # Maintainer: Evangelos Foutras <evangelos@foutrelis.com>
 # Contributor: Jan "heftig" Steffens <jan.steffens@gmail.com>
 # Contributor: Sebastian Nowicki <sebnow@gmail.com>
@@ -16,6 +16,7 @@ arch=('i686' 'x86_64' 'mips64el')
 url="http://llvm.org/"
 license=('custom:University of Illinois/NCSA Open Source License')
 makedepends=('libffi' 'python2' 'ocaml' 'python-sphinx')
+options=('staticlibs')
 source=(http://llvm.org/releases/$pkgver/llvm-$pkgver.src.tar.gz
         http://llvm.org/releases/$pkgver/cfe-$pkgver.src.tar.gz
         http://llvm.org/releases/$pkgver/compiler-rt-$pkgver.src.tar.gz
diff --git a/extra/loudmouth/PKGBUILD b/extra/loudmouth/PKGBUILD
index cbc3bf1ce..1f2897d7f 100644
--- a/extra/loudmouth/PKGBUILD
+++ b/extra/loudmouth/PKGBUILD
@@ -11,7 +11,6 @@ arch=('i686' 'x86_64' 'mips64el')
 license=('LGPL')
 url="http://groups.google.com/group/loudmouth-dev"
 depends=('glib2' 'gnutls' 'libidn')
-options=('!libtool')
 makedepends=('intltool' 'pkgconfig' 'gtk-doc')
 source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/1.4/${pkgname}-${pkgver}.tar.bz2
         01-fix-sasl-md5-digest-uri.patch
diff --git a/extra/lynx/PKGBUILD b/extra/lynx/PKGBUILD
index d015394b0..714c2c18b 100644
--- a/extra/lynx/PKGBUILD
+++ b/extra/lynx/PKGBUILD
@@ -1,12 +1,11 @@
-# $Id: PKGBUILD 162749 2012-06-29 12:15:20Z pierre $
+# $Id: PKGBUILD 197170 2013-10-23 13:51:58Z pierre $
 # Maintainer:
 # Contributor: Douglas Soares de Andrade <douglas@archlinux.org>
 # Contributor: Tom Newsom <Jeepster@gmx.co.uk>
 
 pkgname=lynx
 pkgver=2.8.7
-_pkgver=2-8-7
-pkgrel=6.1
+pkgrel=7
 pkgdesc="A text browser for the World Wide Web"
 url="http://lynx.isc.org/"
 arch=('i686' 'x86_64' 'mips64el')
@@ -17,10 +16,10 @@ source=("http://lynx.isc.org/release/${pkgname}${pkgver}.tar.gz")
 md5sums=('e36d70f3f09b2d502055ca67f09e363c')
 
 build() {
-  cd ${srcdir}/${pkgname}${_pkgver}
+  cd ${srcdir}/${pkgname}${pkgver//./-}
   ./configure --prefix=/usr \
     --sysconfdir=/etc \
-    --with-ssl \
+    --with-ssl=/usr \
     --enable-nls \
     --enable-ipv6 \
     --mandir=/usr/share/man \
@@ -29,7 +28,7 @@ build() {
 }
 
 package() {
-  cd ${srcdir}/${pkgname}${_pkgver}
+  cd ${srcdir}/${pkgname}${pkgver//./-}
   make DESTDIR=${pkgdir} install
 
   # FS#20404 - points to local help
diff --git a/extra/lzo/PKGBUILD b/extra/lzo/PKGBUILD
index db181a0e0..8eb151a27 100644
--- a/extra/lzo/PKGBUILD
+++ b/extra/lzo/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 150589 2012-02-18 15:59:31Z pierre $
+# $Id: PKGBUILD 197768 2013-10-29 20:44:43Z eric $
 # Maintainer:
 # Contributor: Low Kian Seong <fastmail_low@speedymail.org>
 # Contributor: Judd Vinet <jvinet@zeroflux.org>
@@ -6,30 +6,31 @@
 
 pkgname=lzo
 pkgver=1.08
-pkgrel=7
+pkgrel=8
 pkgdesc='A portable lossless data compression library written in ANSI C'
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 url='http://www.oberhumer.com/opensource/lzo'
 depends=('glibc')
 makedepends=('nasm')
-options=('!libtool')
 source=("http://www.oberhumer.com/opensource/lzo/download/LZO-v1/${pkgname}-${pkgver}.tar.gz"
         'nasm-gcc3.patch')
 md5sums=('ab94d3da364c7cbd5b78d76f1875b0f6'
          '43fb13762383b572d22152f8815ea4a5')
 
-build() {
-	cd "${srcdir}"/${pkgname}-${pkgver}
+prepare() {
+  cd ${pkgname}-${pkgver}
+  patch -p0 -i "${srcdir}"/nasm-gcc3.patch
+}
 
-	patch -p0 -i "${srcdir}"/nasm-gcc3.patch
-	autoconf
+build() {
+  cd ${pkgname}-${pkgver}
+  autoconf
 	./configure --prefix=/usr --enable-shared --build=$CHOST
-	make
+  make
 }
 
 package() {
-	cd "${srcdir}"/${pkgname}-${pkgver}
-
-	make DESTDIR="${pkgdir}" install
+  cd ${pkgname}-${pkgver}
+  make DESTDIR="${pkgdir}" install
 }
diff --git a/extra/m17n-lib/PKGBUILD b/extra/m17n-lib/PKGBUILD
index d1bc53d7a..5f15d7d50 100644
--- a/extra/m17n-lib/PKGBUILD
+++ b/extra/m17n-lib/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 189865 2013-07-10 07:26:56Z bpiotrowski $
+# $Id: PKGBUILD 198314 2013-10-30 14:06:49Z allan $
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
 # Contributor: Camille Moncelier <pix@devlife.org>
 
@@ -11,7 +11,7 @@ arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 depends=('libxft' 'm17n-db' 'fribidi' 'libxml2' 'gd' 'libotf')
 optdepends=('anthy: to use the anthy input method')
-options=('!makeflags' '!libtool' '!emptydirs')
+options=('!makeflags' '!emptydirs')
 source=("http://download.savannah.gnu.org/releases/m17n/${pkgname}-${pkgver}.tar.gz")
 sha1sums=('83f2fc4facfd70a580bb95d9381eac7472d85171')
 
diff --git a/extra/mariadb/PKGBUILD b/extra/mariadb/PKGBUILD
index 61d894d9f..0910aaf7c 100644
--- a/extra/mariadb/PKGBUILD
+++ b/extra/mariadb/PKGBUILD
@@ -1,16 +1,15 @@
-# $Id: PKGBUILD 195113 2013-09-25 07:07:22Z bpiotrowski $
+# $Id: PKGBUILD 198814 2013-11-05 17:28:31Z bpiotrowski $
 # Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl>
 
 pkgbase=mariadb
 pkgname=('libmariadbclient' 'mariadb-clients' 'mytop' 'mariadb')
 pkgver=5.5.33.a
 _pkgver=${pkgver/.a/a}
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 url='http://mariadb.org/'
 makedepends=('cmake' 'openssl' 'zlib')
-options=('!libtool')
 source=(http://mirrors.supportex.net/$pkgbase/$pkgbase-$_pkgver/kvm-tarbake-jaunty-x86/$pkgbase-$_pkgver.tar.gz
         mariadb.service
         mariadb-post.sh
diff --git a/extra/mash/PKGBUILD b/extra/mash/PKGBUILD
index 4059c82a2..8ad7fdbb2 100644
--- a/extra/mash/PKGBUILD
+++ b/extra/mash/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 196123 2013-10-07 11:53:08Z jgc $
+# $Id: PKGBUILD 198316 2013-10-30 14:07:33Z allan $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 
 pkgname=mash
@@ -7,7 +7,6 @@ pkgrel=3
 pkgdesc="A small library for using 3D models within a Clutter scene"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://clutter-project.org/"
-options=('!libtool')
 license=('LGPL')
 depends=('clutter')
 makedepends=('gtk-doc' 'gobject-introspection')
diff --git a/extra/mcpp/PKGBUILD b/extra/mcpp/PKGBUILD
index 5a0aa05f5..62c8e011d 100644
--- a/extra/mcpp/PKGBUILD
+++ b/extra/mcpp/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 159222 2012-05-18 11:58:32Z jgc $
+# $Id: PKGBUILD 198317 2013-10-30 14:07:54Z allan $
 # Maintainer: Alexander Baldeck <alexander@archlinux.org>
 # Contributor: Jan de Groot <jgc@archlinux.org>
 
@@ -10,7 +10,6 @@ arch=('i686' 'x86_64' 'mips64el')
 license=('custom')
 url="http://mcpp.sourceforge.net"
 depends=('glibc')
-options=('!libtool')
 source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz
         namlen.patch
         fs28284.patch)
diff --git a/extra/mediastreamer/PKGBUILD b/extra/mediastreamer/PKGBUILD
index 5d01dd9e4..90def1a60 100644
--- a/extra/mediastreamer/PKGBUILD
+++ b/extra/mediastreamer/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 194257 2013-09-11 19:36:47Z andrea $
+# $Id: PKGBUILD 198318 2013-10-30 14:08:15Z allan $
 # Maintainer:
 # Contributor: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com>
@@ -14,7 +14,6 @@ license=('GPL')
 depends=('ortp' 'ffmpeg' 'libxv' 'libupnp')
 # xxd from Vim is needed to build
 makedepends=('intltool' 'vim')
-options=('!libtool')
 source=("http://download-mirror.savannah.gnu.org/releases/linphone/${pkgname}/${pkgname}-${pkgver}.tar.gz"{,.sig})
 md5sums=('f2ea0fe731a363749a81b6eaac22a62c'
          'SKIP')
diff --git a/extra/mercurial/PKGBUILD b/extra/mercurial/PKGBUILD
index d42e69a3e..6607a487c 100644
--- a/extra/mercurial/PKGBUILD
+++ b/extra/mercurial/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 196286 2013-10-10 15:22:37Z giovanni $
+# $Id: PKGBUILD 198757 2013-11-03 10:27:39Z giovanni $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Douglas Soares de Andrade <douglas@archlinux.org>
 
 pkgname=mercurial
-pkgver=2.7.2
+pkgver=2.8
 pkgrel=1
 pkgdesc="A scalable distributed SCM tool"
 arch=('i686' 'x86_64' 'mips64el')
@@ -14,7 +14,7 @@ optdepends=('tk: for the hgk GUI')
 backup=('etc/mercurial/hgrc')
 source=("http://mercurial.selenic.com/release/${pkgname}-${pkgver}.tar.gz"
         'mercurial.profile')
-md5sums=('ec00ddc6aadfea1e11b23650cb741d53'
+md5sums=('76b565f48000e9f331356ab107a5bcbb'
          '43e1d36564d4c7fbe9a091d3ea370a44')
 
 package() {
diff --git a/extra/mesa/PKGBUILD b/extra/mesa/PKGBUILD
index 1951f3148..eba327774 100644
--- a/extra/mesa/PKGBUILD
+++ b/extra/mesa/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 196157 2013-10-07 12:17:10Z jgc $
+# $Id: PKGBUILD 198319 2013-10-30 14:08:41Z allan $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 
 pkgbase=mesa
 pkgname=('mesa' 'mesa-libgl')
-pkgver=9.2.1
+pkgver=9.2.2
 pkgrel=1
 arch=('i686' 'x86_64' 'mips64el')
 makedepends=('python2' 'libxml2' 'libx11' 'glproto' 'libdrm' 'dri2proto' 'libxxf86vm' 'libxdamage'
@@ -15,10 +15,9 @@ if [ "$CARCH" != "mips64el" ]; then
 fi
 url="http://mesa3d.sourceforge.net"
 license=('custom')
-options=('!libtool')
 source=(ftp://ftp.freedesktop.org/pub/mesa/${pkgver}/MesaLib-${pkgver}.tar.bz2
         LICENSE)
-md5sums=('dd4c82667d9c19c28a553b12eba3f8a0'
+md5sums=('20887f8020db7d1736a01ae9cd5d8c38'
          '5c65a0fe315dd347e09b1f2826a1df5a')
 
 build() {
diff --git a/extra/mhash/PKGBUILD b/extra/mhash/PKGBUILD
index 7e035e605..732f2d0c7 100644
--- a/extra/mhash/PKGBUILD
+++ b/extra/mhash/PKGBUILD
@@ -1,27 +1,26 @@
-# $Id: PKGBUILD 122885 2011-05-07 03:21:34Z eric $
+# $Id: PKGBUILD 197559 2013-10-26 22:44:00Z eric $
 # Contributor: gregor <gregor@archlinux.org>
 # Contributor: Tom Newsom <Jeepster@gmx.co.uk>
 # Maintainer: Daniel J Griffiths <ghost1227@archlinux.us>
 
 pkgname=mhash
 pkgver=0.9.9.9
-pkgrel=2.1
+pkgrel=3
 pkgdesc="A thread-safe hash library which provides a uniform interface to hash algorithms (MD5, SHA1, HAVAL, etc)"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://mhash.sourceforge.net/"
 license=('LGPL')
 depends=('glibc')
-options=('!libtool')
 source=(http://downloads.sourceforge.net/sourceforge/mhash/${pkgname}-${pkgver}.tar.bz2)
 md5sums=('f91c74f9ccab2b574a98be5bc31eb280')
 
 build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr --enable-static
+  cd ${pkgname}-${pkgver}
+  ./configure --prefix=/usr
   make
 }
 
 package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+  cd ${pkgname}-${pkgver}
   make DESTDIR="${pkgdir}" install
 }
diff --git a/extra/misdnuser/PKGBUILD b/extra/misdnuser/PKGBUILD
index ed7751ba4..a336e3106 100644
--- a/extra/misdnuser/PKGBUILD
+++ b/extra/misdnuser/PKGBUILD
@@ -1,16 +1,16 @@
-# $Id: PKGBUILD 186032 2013-05-20 17:17:10Z tpowa $
+# $Id: PKGBUILD 198320 2013-10-30 14:09:04Z allan $
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 
 pkgname=misdnuser
 pkgver=2.0.17_20120917
-pkgrel=2
+pkgrel=3
 pkgdesc="Tools and library for mISDN"
 arch=('i686' 'x86_64')
 url="http://www.misdn.org"
 license=('GPL')
 depends=('isdn4k-utils' 'spandsp')
 backup=('etc/capi20.conf') 
-options=('!makeflags' '!libtool' '!strip')
+options=('!makeflags' '!strip')
 source=(ftp://ftp.archlinux.org/other/misdnuser/${pkgname}-${pkgver}.tar.gz
         mISDNcapid.service
         c2faxrecv-mISDNcapid.service
diff --git a/extra/mjpegtools/PKGBUILD b/extra/mjpegtools/PKGBUILD
index f2a4f89ac..48a5577e3 100644
--- a/extra/mjpegtools/PKGBUILD
+++ b/extra/mjpegtools/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 184411 2013-05-06 19:38:45Z foutrelis $
+# $Id: PKGBUILD 198321 2013-10-30 14:09:25Z allan $
 # Contributor: Damir Perisa <damir.perisa@bluewin.ch>
 # Maintainer: Roberto Carvajal <roberto@archlinux.org>
 
@@ -12,7 +12,7 @@ url="http://mjpeg.sourceforge.net/"
 depends=('libjpeg' 'libpng' 'sdl' 'gcc-libs' 'libdv')
 makedepends=('gtk2' 'v4l-utils')
 optdepends=('gtk2: glav GUI')
-options=('!makeflags' '!libtool')
+options=('!makeflags')
 install=mjpegtools.install
 source=(http://downloads.sourceforge.net/sourceforge/mjpeg/${pkgname}-${pkgver}.tar.gz
         mjpegtools-v4l-2.6.38.patch
diff --git a/extra/mkvtoolnix/PKGBUILD b/extra/mkvtoolnix/PKGBUILD
index bf219caff..e99537856 100644
--- a/extra/mkvtoolnix/PKGBUILD
+++ b/extra/mkvtoolnix/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 194528 2013-09-17 13:02:47Z giovanni $
+# $Id: PKGBUILD 197567 2013-10-27 00:07:32Z giovanni $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: xduugu <xduugu@gmx.com>
 
 pkgbase=mkvtoolnix
 pkgname=('mkvtoolnix-cli' 'mkvtoolnix-gtk')
-pkgver=6.4.1
+pkgver=6.5.0
 pkgrel=1
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
@@ -12,7 +12,7 @@ url="http://www.bunkus.org/videotools/mkvtoolnix/index.html"
 makedepends=('libmatroska' 'flac' 'libvorbis' 'file' 'wxgtk'
              'boost-libs' 'lzo2' 'xdg-utils' 'boost' 'ruby')
 source=("http://www.bunkus.org/videotools/${pkgbase}/sources/${pkgbase}-${pkgver}.tar.xz")
-md5sums=('1e878646b34eb2c32772d05b91f84f4c')
+md5sums=('e2d8d539b8cb9249b6c398690bc61c78')
 
 build() {
   cd "${srcdir}/${pkgbase}-${pkgver}"
@@ -52,6 +52,7 @@ package_mkvtoolnix-cli() {
   install -Dm755 src/mkvinfo-cli "${pkgdir}"/usr/bin/mkvinfo
 
   rm -rf "${pkgdir}"/usr/bin/mmg
+  rm -rf "${pkgdir}"/usr/share/man/de/man1/mmg.1
   rm -rf "${pkgdir}"/usr/share/man/ja/man1/mmg.1
   rm -rf "${pkgdir}"/usr/share/man/man1/mmg.1
   rm -rf "${pkgdir}"/usr/share/man/nl/man1/mmg.1
@@ -76,6 +77,7 @@ package_mkvtoolnix-gtk() {
 
   rm -rf "${pkgdir}"/usr/share/doc
   rm -rf "${pkgdir}"/usr/share/locale
+  rm -rf "${pkgdir}"/usr/share/man/de/man1/mkv*
   rm -rf "${pkgdir}"/usr/share/man/ja/man1/mkv*
   rm -rf "${pkgdir}"/usr/share/man/man1/mkv*
   rm -rf "${pkgdir}"/usr/share/man/nl/man1/mkv*
diff --git a/extra/moc/PKGBUILD b/extra/moc/PKGBUILD
index e8530f7bd..0ae7bb0a1 100644
--- a/extra/moc/PKGBUILD
+++ b/extra/moc/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 192415 2013-08-11 01:32:19Z eric $
+# $Id: PKGBUILD 198322 2013-10-30 14:09:45Z allan $
 # Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgname=moc
@@ -18,7 +18,6 @@ optdepends=('speex: for using the speex plugin'
             'wavpack: for using the wavpack plugin' 
             'faad2: for using the aac plugin' 
 	    'libmodplug: for using the modplug plugin')
-options=('!libtool')
 source=(ftp://ftp.daper.net/pub/soft/moc/unstable/moc-2.5.0-beta1.tar.bz2{,.sig} \
         moc-ffmpeg.patch)
 sha1sums=('4030a1fa5c7cfef06909c54d8c7a1fbb93f23caa'
diff --git a/extra/modemmanager/PKGBUILD b/extra/modemmanager/PKGBUILD
index d8dce99af..75fe89169 100644
--- a/extra/modemmanager/PKGBUILD
+++ b/extra/modemmanager/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 191191 2013-07-19 12:16:04Z heftig $
+# $Id: PKGBUILD 198323 2013-10-30 14:10:06Z allan $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 # Contributor: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 
@@ -13,7 +13,6 @@ license=(GPL2)
 depends=(udev ppp libqmi libmbim polkit hicolor-icon-theme)
 makedepends=(intltool gtk-doc)
 optdepends=('usb_modeswitch: install if your modem shows up as a storage drive')
-options=('!libtool')
 install=modemmanager.install
 source=(http://www.freedesktop.org/software/$_realname/$_realname-$pkgver.tar.xz)
 sha256sums=('e0f3bbd9a7353f7d87be2391b8718a81d11f9ff8b1c067d640928322f8808563')
diff --git a/extra/mono/PKGBUILD b/extra/mono/PKGBUILD
index b22cb8b88..6e2ba74c1 100644
--- a/extra/mono/PKGBUILD
+++ b/extra/mono/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 194705 2013-09-22 21:22:23Z daniel $
+# $Id: PKGBUILD 198325 2013-10-30 14:10:51Z allan $
 # Maintainer: Daniel Isenmann <daniel@archlinux.org>
 # Contributor: Brice Carpentier <brice@dlfp.org>
 
@@ -11,7 +11,7 @@ license=('GPL' 'LGPL2' 'MPL' 'custom:MITX11')
 url="http://www.mono-project.com/"
 depends=('zlib' 'libgdiplus>=2.10' 'sh')
 makedepends=('pkgconfig')
-options=('!libtool' '!makeflags')
+options=('!makeflags')
 provides=('monodoc')
 conflicts=('monodoc')
 install=mono.install
diff --git a/extra/monodevelop-debugger-gdb/PKGBUILD b/extra/monodevelop-debugger-gdb/PKGBUILD
index d58895531..32fb6249a 100644
--- a/extra/monodevelop-debugger-gdb/PKGBUILD
+++ b/extra/monodevelop-debugger-gdb/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 194339 2013-09-13 21:42:34Z daniel $
+# $Id: PKGBUILD 197648 2013-10-27 17:35:08Z daniel $
 # Maintainer: Daniel Isenmann <daniel@archlinux.org>
 
 pkgname=monodevelop-debugger-gdb
-pkgver=4.0.12
+pkgver=4.0.13
 pkgrel=1
 pkgdesc="Mono Debugger support"
 arch=('i686' 'x86_64') # also "any" pkg?
@@ -11,8 +11,8 @@ license=('GPL')
 depends=('monodevelop>=4.0.12' 'gdb')
 makedepends=('mono')
 options=('!makeflags')
-source=(http://origin-download.mono-project.com/sources/$pkgname/$pkgname-$pkgver-3.tar.bz2)
-md5sums=('b9c9d12cc73352a208bcdb5ad5949418')
+source=(http://origin-download.mono-project.com/sources/$pkgname/$pkgname-$pkgver-38.tar.bz2)
+md5sums=('d47c712b47cfcbcdc1224825395cdcee')
 
 build() {
   export MONO_SHARED_DIR="${srcdir}/.wabi"
diff --git a/extra/monodevelop/PKGBUILD b/extra/monodevelop/PKGBUILD
index 886f09470..02da29f3e 100644
--- a/extra/monodevelop/PKGBUILD
+++ b/extra/monodevelop/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 194341 2013-09-13 21:42:47Z daniel $
+# $Id: PKGBUILD 197646 2013-10-27 17:34:49Z daniel $
 # Maintainer: Daniel Isenmann <daniel@archlinux.org>
 # Contributor: Timm Preetz <timm@preetz.us>
 # Contributor: Giovanni Scafora <giovanni@archlinux.org>
 
 pkgname=monodevelop
-pkgver=4.0.12
+pkgver=4.0.13
 pkgrel=1
 pkgdesc="An IDE primarily designed for C# and other .NET languages"
 
@@ -17,9 +17,9 @@ depends=('mono>=2.10.8' 'mono-addins>=0.6.2' 'gnome-sharp' 'desktop-file-utils'
 makedepends=('rsync' 'git')
 options=(!makeflags)
 install=monodevelop.install
-source=(http://origin-download.mono-project.com/sources/${pkgname}/${pkgname}-${pkgver}-3.tar.bz2
+source=(http://origin-download.mono-project.com/sources/${pkgname}/${pkgname}-${pkgver}-38.tar.bz2
         monodevelop-core-addins.pc.in.patch)
-md5sums=('5f9cd24d2791054d88b0dcce1259afdb'
+md5sums=('63ea0b389976f72d6f8b131a74c54b93'
          '8466d032735130e37d4091a793a7966c')
 
 build() {
diff --git a/extra/mousepad/PKGBUILD b/extra/mousepad/PKGBUILD
index 1423049fc..9757bf83b 100644
--- a/extra/mousepad/PKGBUILD
+++ b/extra/mousepad/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 174752 2013-01-06 10:43:03Z foutrelis $
+# $Id: PKGBUILD 198326 2013-10-30 14:11:12Z allan $
 # Maintainer: Evangelos Foutras <evangelos@foutrelis.com>
 # Contributor: tobias [tobias at archlinux.org]
 
@@ -12,7 +12,6 @@ license=('GPL2')
 groups=('xfce4-goodies')
 depends=('gtksourceview2' 'dbus-glib' 'desktop-file-utils')
 makedepends=('intltool' 'perl')
-options=('!libtool')
 install=$pkgname.install
 source=(http://archive.xfce.org/src/apps/$pkgname/0.3/$pkgname-$pkgver.tar.bz2)
 sha256sums=('10f27506994d0d0b8f9e02555404a144babedab97517abe3b6be8b2d21ff046d')
diff --git a/extra/mousetweaks/PKGBUILD b/extra/mousetweaks/PKGBUILD
index 96cee75d8..ca56bd002 100644
--- a/extra/mousetweaks/PKGBUILD
+++ b/extra/mousetweaks/PKGBUILD
@@ -11,7 +11,7 @@ license=('GPL3' 'FDL')
 depends=('libxtst' 'gtk3' 'gsettings-desktop-schemas')
 makedepends=('gnome-doc-utils' 'intltool')
 groups=('gnome')
-options=('!libtool' '!emptydirs')
+options=('!emptydirs')
 url="http://www.gnome.org"
 install=mousetweaks.install
 source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz)
diff --git a/extra/mp3splt/PKGBUILD b/extra/mp3splt/PKGBUILD
index 4094cb526..93aa0bec0 100644
--- a/extra/mp3splt/PKGBUILD
+++ b/extra/mp3splt/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 191707 2013-07-29 10:14:24Z tpowa $
+# $Id: PKGBUILD 198328 2013-10-30 14:11:55Z allan $
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 
 pkgname=mp3splt
@@ -10,7 +10,6 @@ license=('GPL')
 url="http://mp3splt.sourceforge.net"
 depends=('libmp3splt')
 source=("http://downloads.sourceforge.net/sourceforge/mp3splt/$pkgname-$pkgver.tar.gz")
-options=('!libtool')
 
 build() {
   cd $srcdir/$pkgname-$pkgver
diff --git a/extra/mpc/PKGBUILD b/extra/mpc/PKGBUILD
index a3969cd1f..0367e36a3 100644
--- a/extra/mpc/PKGBUILD
+++ b/extra/mpc/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 182608 2013-04-10 23:44:08Z bisson $
+# $Id: PKGBUILD 198598 2013-10-30 16:56:48Z bisson $
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
 # Contributor: Angel Velasquez <angvp@archlinux.org>
 # Contributor: Andrea Scarpino <andrea@archlinux.org>
@@ -6,15 +6,15 @@
 # Contributor: Link Dupont <link@subpop.net>
 
 pkgname=mpc
-pkgver=0.23
+pkgver=0.24
 pkgrel=1
 pkgdesc='Minimalist command line interface to MPD'
 url='http://www.musicpd.org/clients/mpc/'
 license=('GPL2')
 arch=('i686' 'x86_64' 'mips64el')
 depends=('libmpdclient')
-source=("http://www.musicpd.org/download/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2")
-sha1sums=('25d217b699fd70fd9b65b8b820addf794a109a9c')
+source=("http://www.musicpd.org/download/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz")
+sha1sums=('d98d9d431e7bcdf9123f18f213b3a1f9a03835f7')
 
 options=('!emptydirs')
 
diff --git a/extra/mpd/PKGBUILD b/extra/mpd/PKGBUILD
index 5fa7ad74f..f180e6361 100644
--- a/extra/mpd/PKGBUILD
+++ b/extra/mpd/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 193202 2013-08-19 06:29:18Z bisson $
+# $Id: PKGBUILD 198643 2013-10-31 16:50:38Z bisson $
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
 # Contributor: Angel Velasquez <angvp@archlinux.org>
 # Contributor: Andrea Scarpino <andrea@archlinux.org>
@@ -6,7 +6,7 @@
 # Contributor: Ben <ben@benmazer.net>
 
 pkgname=mpd
-pkgver=0.17.5
+pkgver=0.18
 pkgrel=1
 pkgdesc='Flexible, powerful, server-side application for playing music'
 url='http://www.musicpd.org/'
@@ -15,18 +15,19 @@ arch=('i686' 'x86_64' 'mips64el')
 depends=('libao' 'ffmpeg' 'libmodplug' 'audiofile' 'libshout' 'libmad' 'curl' 'faad2'
          'sqlite' 'jack' 'libmms' 'wavpack' 'avahi' 'libid3tag' 'yajl')
 makedepends=('doxygen')
-source=("http://www.musicpd.org/download/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz"
-        'tmpfiles.d')
-sha1sums=('a12b78452de5ff876c36827572c6bb4af26e0f7d'
-          'f4d5922abb69abb739542d8e93f4dfd748acdad7')
+source=("http://www.musicpd.org/download/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.xz"
+        'tmpfiles.d'
+        'conf')
+sha1sums=('e3cc99de0c2c595ca576cdb455c6aaedd4f7726a'
+          'f4d5922abb69abb739542d8e93f4dfd748acdad7'
+          '67c145c046cddd885630d72ce8ebe71f8321ff3b')
 
 backup=('etc/mpd.conf')
 install=install
 
 prepare() {
 	cd "${srcdir}/${pkgname}-${pkgver}"
-	sed 's:cdio/paranoia.h:cdio/paranoia/paranoia.h:g' -i src/input/cdio_paranoia_input_plugin.c
-	sed 's:AVCODEC_MAX_AUDIO_FRAME_SIZE:192000:g' -i src/decoder/ffmpeg_decoder_plugin.c
+	sed 's:cdio/paranoia.h:cdio/paranoia/paranoia.h:g' -i src/input/CdioParanoiaInputPlugin.cxx
 }
 
 build() {
@@ -35,7 +36,6 @@ build() {
 		--prefix=/usr \
 		--sysconfdir=/etc \
 		--enable-jack \
-		--enable-lastfm \
 		--enable-soundcloud \
 		--enable-pipe-output \
 		--enable-pulse \
@@ -47,16 +47,9 @@ build() {
 package() {
 	cd "${srcdir}/${pkgname}-${pkgver}"
 	make DESTDIR="${pkgdir}" install
-	install -d "${pkgdir}"/usr/lib/systemd/user
-	install -d -g 45 -o 45 "${pkgdir}"/var/lib/mpd/playlists
-	install -Dm644 doc/mpdconf.example "${pkgdir}"/etc/mpd.conf
+	install -Dm644 ../conf "${pkgdir}"/etc/mpd.conf
 	install -Dm644 ../tmpfiles.d "${pkgdir}"/usr/lib/tmpfiles.d/mpd.conf
+	install -d -g 45 -o 45 "${pkgdir}"/var/lib/mpd/playlists
+	install -d "${pkgdir}"/usr/lib/systemd/user
 	ln -s ../system/mpd.service "${pkgdir}"/usr/lib/systemd/user/mpd.service
-	sed \
-		-e '/^#playlist_directory/c playlist_directory "/var/lib/mpd/playlists"' \
-		-e '/^#db_file/c db_file "/var/lib/mpd/mpd.db"' \
-		-e '/^#pid_file/c pid_file "/run/mpd/mpd.pid"' \
-		-e '/^#state_file/c state_file "/var/lib/mpd/mpdstate"' \
-		-e '/^#user/c user "mpd"' \
-		-i "${pkgdir}"/etc/mpd.conf
 }
diff --git a/extra/mpd/conf b/extra/mpd/conf
new file mode 100644
index 000000000..d23880eb5
--- /dev/null
+++ b/extra/mpd/conf
@@ -0,0 +1,7 @@
+# See: /usr/share/doc/mpd/mpdconf.example
+
+user "mpd"
+pid_file "/run/mpd/mpd.pid"
+db_file "/var/lib/mpd/mpd.db"
+state_file "/var/lib/mpd/mpdstate"
+playlist_directory "/var/lib/mpd/playlists"
diff --git a/extra/mpg123/PKGBUILD b/extra/mpg123/PKGBUILD
index c0b4d752e..a507a7d61 100644
--- a/extra/mpg123/PKGBUILD
+++ b/extra/mpg123/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 196183 2013-10-08 02:41:01Z eric $
+# $Id: PKGBUILD 198329 2013-10-30 14:12:16Z allan $
 # Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgname=mpg123
@@ -13,7 +13,6 @@ makedepends=('sdl' 'jack' 'libpulse')
 optdepends=('sdl: for sdl audio support'
             'jack: for jack audio support'
             'libpulse: for pulse audio support')
-options=('!libtool')
 source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.bz2{,.sig})
 sha1sums=('73105629f8d4b9426ec9fe93455a8271a96c4ae4'
           'SKIP')
diff --git a/extra/mtdev/PKGBUILD b/extra/mtdev/PKGBUILD
index 76c71d19a..17370aca9 100644
--- a/extra/mtdev/PKGBUILD
+++ b/extra/mtdev/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 195256 2013-09-29 09:02:35Z andyrtr $
+# $Id: PKGBUILD 198330 2013-10-30 14:12:39Z allan $
 # Maintainer: AndyRTR <andyrtr@archlinux.org>
 # Contributor: SpepS <dreamspepser at yahoo dot it>
 
@@ -10,7 +10,6 @@ arch=('i686' 'x86_64' 'mips64el')
 url="http://bitmath.org/code/mtdev/"
 license=('custom:MIT')
 depends=('glibc')
-options=('!libtool')
 source=("$url$pkgname-$pkgver.tar.bz2")
 md5sums=('73a915d6075b31db4f08ab8c6d314695')
 
diff --git a/extra/musicbrainz/PKGBUILD b/extra/musicbrainz/PKGBUILD
index 942ba3024..a367e09e7 100644
--- a/extra/musicbrainz/PKGBUILD
+++ b/extra/musicbrainz/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 149574 2012-02-08 14:54:36Z tpowa $
+# $Id: PKGBUILD 198331 2013-10-30 14:13:00Z allan $
 # Maintainer: 
 # Contributor: Alexander Baldeck <alexander@archlinux.org>
 # Contributor: dorphell <dorphell@archlinux.org>
@@ -7,14 +7,13 @@
 
 pkgname=musicbrainz
 pkgver=2.1.5
-pkgrel=5.1
+pkgrel=6
 pkgdesc="The second generation incarnation of the CD Index"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.musicbrainz.org"
 license=('LGPL')
 depends=('expat>=2.0' 'gcc-libs')
 makedepends=('python2')
-options=('!libtool')
 source=(ftp://ftp.musicbrainz.org/pub/$pkgname/libmusicbrainz-${pkgver}.tar.gz
 	'gcc4.3.patch')
 
diff --git a/extra/mutt/PKGBUILD b/extra/mutt/PKGBUILD
index 86a7acdba..6ceef05d2 100644
--- a/extra/mutt/PKGBUILD
+++ b/extra/mutt/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 185574 2013-05-15 08:05:34Z bpiotrowski $
+# $Id: PKGBUILD 196759 2013-10-18 06:54:09Z bisson $
 # Contributor: tobias [tobias [at] archlinux.org]
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
 
 pkgname=mutt
-pkgver=1.5.21
-pkgrel=9
+pkgver=1.5.22
+pkgrel=1
 pkgdesc='Small but very powerful text-based mail client'
 url='http://www.mutt.org/'
 license=('GPL')
@@ -12,19 +12,13 @@ backup=('etc/Muttrc')
 arch=('i686' 'x86_64' 'mips64el')
 optdepends=('smtp-forwarder: to send mail')
 depends=('gpgme' 'ncurses' 'openssl' 'libsasl' 'gdbm' 'libidn' 'mime-types' 'krb5')
-source=("ftp://ftp.mutt.org/mutt/devel/${pkgname}-${pkgver}.tar.gz"
-        'pop-cachedir.patch'
-        'crypt-gpgme.patch')
-sha1sums=('a8475f2618ce5d5d33bff85c0affdf21ab1d76b9'
-          '32dbcafe05e4a919fd00c6a1064c6ecd205e6eb1'
-          '8cf0d4278aab1d162ab7f847f1b917327d630d98')
+source=("ftp://ftp.mutt.org/mutt/devel/${pkgname}-${pkgver}.tar.gz")
+sha1sums=('728a114cb3a44df373dbf1292fc34dd8321057dc')
 
 install=install
 
 build() {
 	cd "${srcdir}/${pkgname}-${pkgver}"
-	patch -i ../pop-cachedir.patch # FS#31536
-	patch -p1 -i ../crypt-gpgme.patch # FS#31735
 	./configure \
 		--prefix=/usr \
 		--sysconfdir=/etc \
@@ -47,8 +41,8 @@ package() {
 	cd "${srcdir}/${pkgname}-${pkgver}"
 	make DESTDIR="${pkgdir}" install
 
+	rm "${pkgdir}"/etc/mime.types{,.dist}
 	rm "${pkgdir}"/usr/bin/{flea,muttbug}
 	rm "${pkgdir}"/usr/share/man/man1/{flea,muttbug}.1
-	rm "${pkgdir}"/etc/mime.types{,.dist}
 	install -Dm644 contrib/gpg.rc "${pkgdir}"/etc/Muttrc.gpg.dist
 }
diff --git a/extra/mutt/crypt-gpgme.patch b/extra/mutt/crypt-gpgme.patch
deleted file mode 100644
index 7ed9348b2..000000000
--- a/extra/mutt/crypt-gpgme.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-# HG changeset patch
-# User Roman Kagan <rkagan@mail.ru>
-# Date 1290506473 -10800
-# Node ID 938f0706311a6ab599d29d35447f0c70972fe7cf
-# Parent  01731fb1884ea0e1eaf9008ea9c70804b66f2363
-crypt-gpgme: actually init gpgme
-
-Recent versions of gpgme (at least the one packaged with Fedora 14,
-gpgme-1.2.0), requires proper initialization of the library before use.
-
-The initialization is done via gpgme_check_version(), and gpgme_set_locale() is
-recommended right afterwards, too (see gpgme manual for details).
-
-Otherwise gpgme_init() fails with "Not operational" error, which makes mutt
-immediately quit.
-
-diff --git a/crypt-gpgme.c b/crypt-gpgme.c
---- a/crypt-gpgme.c
-+++ b/crypt-gpgme.c
-@@ -4191,6 +4191,12 @@
-       if (mutt_any_key_to_continue (NULL) == -1)
- 	mutt_exit(1);
-     }
-+
-+  gpgme_check_version (NULL);
-+  gpgme_set_locale (NULL, LC_CTYPE, setlocale (LC_CTYPE, NULL));
-+#ifdef LC_MESSAGES
-+  gpgme_set_locale (NULL, LC_MESSAGES, setlocale (LC_MESSAGES, NULL));
-+#endif
- }
- 
- void pgp_gpgme_init (void)
diff --git a/extra/mutt/pop-cachedir.patch b/extra/mutt/pop-cachedir.patch
deleted file mode 100644
index ec1bc198a..000000000
--- a/extra/mutt/pop-cachedir.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-Index: muttlib.c

-===================================================================

---- muttlib.c	(revision 6128:eff500f87889)

-+++ muttlib.c	(revision 6161:1a4c43138685)

-@@ -1961,5 +1961,6 @@

-   char *p = safe_strdup (src);

-   int rc = mutt_convert_string (&p, Charset, "utf-8", 0);

--  strfcpy (dest, rc == 0 ? p : src, dlen);

-+  /* `src' may be NULL, such as when called from the pop3 driver. */

-+  strfcpy (dest, (rc == 0) ? NONULL(p) : NONULL(src), dlen);

-   FREE (&p);

- }

diff --git a/extra/mutter-wayland/PKGBUILD b/extra/mutter-wayland/PKGBUILD
index 004ece9dd..1547fc910 100644
--- a/extra/mutter-wayland/PKGBUILD
+++ b/extra/mutter-wayland/PKGBUILD
@@ -1,20 +1,20 @@
-# $Id: PKGBUILD 196008 2013-10-07 11:49:47Z jgc $
+# $Id: PKGBUILD 198333 2013-10-30 14:13:43Z allan $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 
 pkgname=mutter-wayland
-pkgver=3.10.0.1
-pkgrel=2
+pkgver=3.10.1
+pkgrel=1
 pkgdesc="A Wayland compositor for GNOME"
 arch=(i686 x86_64)
 license=(GPL)
 depends=(mutter)
 makedepends=(intltool gnome-doc-utils)
 url="http://www.gnome.org"
-options=('!libtool' '!emptydirs')
+options=('!emptydirs')
 install=mutter-wayland.install
 source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver:0:4}/$pkgname-$pkgver.tar.xz
         mutter-wayland-3.10.0.1-logfile.patch)
-sha256sums=('1d4e3086d9ff26f6ae01c844909db1f4050f2e9aaead1b91a8b6b37f2a241560'
+sha256sums=('bdb6bcc25791309256b09ec9aa7e0be311ef311778450aafccb86caf2753b6b4'
             'b79866b6b3fa6029b35ef2b5c5d0cb92886ec2ed0173f780c4d46a5b8d9a1644')
 
 
diff --git a/extra/mutter/PKGBUILD b/extra/mutter/PKGBUILD
index 00488b85c..27b5d4955 100644
--- a/extra/mutter/PKGBUILD
+++ b/extra/mutter/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 196125 2013-10-07 11:53:12Z jgc $
+# $Id: PKGBUILD 198332 2013-10-30 14:13:20Z allan $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 # Contributor: Michael Kanis <mkanis_at_gmx_dot_de>
 
 pkgname=mutter
-pkgver=3.10.0.1
+pkgver=3.10.1.1
 pkgrel=1
 pkgdesc="A window manager for GNOME"
 arch=(i686 x86_64 mips64el)
@@ -13,10 +13,10 @@ depends=('clutter' 'dconf' 'gobject-introspection' 'gsettings-desktop-schemas' '
 makedepends=('intltool' 'gnome-doc-utils')
 url="http://www.gnome.org"
 groups=('gnome')
-options=('!libtool' '!emptydirs')
+options=('!emptydirs')
 install=mutter.install
 source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver:0:4}/$pkgname-$pkgver.tar.xz)
-sha256sums=('2d1288727d60b45c4d902101b805c89fa93f7a6b147bb4a7d3d99f990680b203')
+sha256sums=('fa05200a367cd72dbba8c023f6828f79db24b8922e51b71f55148d3e35701c00')
 
 build() {
   cd "$pkgname-$pkgver"
diff --git a/extra/nacl-toolchain-newlib/PKGBUILD b/extra/nacl-toolchain-newlib/PKGBUILD
deleted file mode 100644
index 362f962aa..000000000
--- a/extra/nacl-toolchain-newlib/PKGBUILD
+++ /dev/null
@@ -1,79 +0,0 @@
-# $Id: PKGBUILD 193478 2013-08-21 02:11:50Z foutrelis $
-# Maintainer: Evangelos Foutras <evangelos@foutrelis.com>
-# Contributor: Gustavo Alvarez <sl1pkn07@gmail.com>
-
-pkgname=nacl-toolchain-newlib
-pkgver=12029
-pkgrel=1
-_binutilsver=2.20.1
-_newlibver=1.20.0
-_gccver=4.4.3
-pkgdesc="Native Client newlib-based toolchain (only for compiling IRT)"
-arch=('i686' 'x86_64')
-url="http://code.google.com/chrome/nativeclient/"
-license=('BSD' 'GPL3' 'LGPL3' 'GPL2' 'FDL' 'custom')
-depends=('zlib' 'mpfr')
-options=('!strip')
-source=(http://ftp.gnu.org/gnu/binutils/binutils-$_binutilsver.tar.bz2
-        ftp://sources.redhat.com/pub/newlib/newlib-$_newlibver.tar.gz
-        http://ftp.gnu.org/gnu/gcc/gcc-$_gccver/gcc-$_gccver.tar.bz2
-        http://commondatastorage.googleapis.com/nativeclient-archive2/x86_toolchain/r$pkgver/nacltoolchain-buildscripts-r$pkgver.tar.gz
-        http://commondatastorage.googleapis.com/nativeclient-archive2/x86_toolchain/r$pkgver/naclbinutils-$_binutilsver-r$pkgver.patch.bz2
-        http://commondatastorage.googleapis.com/nativeclient-archive2/x86_toolchain/r$pkgver/naclnewlib-$_newlibver-r$pkgver.patch.bz2
-        http://commondatastorage.googleapis.com/nativeclient-archive2/x86_toolchain/r$pkgver/naclgcc-$_gccver-r$pkgver.patch.bz2
-        binutils-texinfo-r0.patch
-        gcc-texinfo-r0.patch)
-sha256sums=('71d37c96451333c5c0b84b170169fdcb138bbb27397dc06281905d9717c8ed64'
-            'c644b2847244278c57bec2ddda69d8fab5a7c767f3b9af69aa7aa3da823ff692'
-            '97ed664694b02b4d58ac2cafe443d02a388f9cb3645e7778843b5086a5fec040'
-            'a77912c4aac01142bd1c2f684f9933d6fcd39f0e67a1058858be50f0db18da7e'
-            '3b0e41b7923a90d611e598b31ed30062cfa3cf2fc2cbe7304e340a0acc780186'
-            '2de88079c500a694b73dab5a6a3690b2126ea0df498f1e27c5819b7d4256cb1a'
-            'c98bda783fbc9726a9d0374118b1315f4ade4fe3bb5cbc96511b7a80b385dd70'
-            '64ba7c3f5edbe33b17312ab6da6c4b9e244e47289bde796a3078bf73072a0139'
-            '7eab20b6db6a7224984fd4b5bff1742571b0429428ea2af02f83f82f3de63070')
-
-prepare() {
-  cd "$srcdir"
-
-  mkdir SRC
-  mv binutils-$_binutilsver SRC/binutils
-  mv newlib-$_newlibver SRC/newlib
-  mv gcc-$_gccver SRC/gcc
-
-  for _patch in *-r$pkgver.patch; do
-    patch -d SRC -Np0 -i "$srcdir/$_patch"
-  done
-
-  cd SRC
-
-  # Fix build with texinfo 5.1
-  patch -d binutils -Np1 -i "$srcdir/binutils-texinfo-r0.patch"
-  patch -d gcc -Np1 -i "$srcdir/gcc-texinfo-r0.patch"
-}
-
-build() {
-  cd "$srcdir"
-
-  CFLAGS+=" $CPPFLAGS"
-  CXXFLAGS+=" $CPPFLAGS"
-  unset CPPFLAGS
-
-  make PREFIX="$srcdir/$pkgname" CANNED_REVISION="yes" build-with-newlib
-}
-
-package() {
-  cd "$srcdir"
-
-  install -d "$pkgdir/usr/lib"
-  mv $pkgname "$pkgdir/usr/lib/$pkgname"
-
-  # NaCL license
-  install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
-
-  # Newlib license
-  install -m644 -t "$pkgdir/usr/share/licenses/$pkgname/" \
-    SRC/newlib/COPYING.{NEWLIB,LIBGLOSS}
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/extra/nacl-toolchain-newlib/binutils-texinfo-r0.patch b/extra/nacl-toolchain-newlib/binutils-texinfo-r0.patch
deleted file mode 100644
index ab81d8a49..000000000
--- a/extra/nacl-toolchain-newlib/binutils-texinfo-r0.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-https://bugs.gentoo.org/show_bug.cgi?id=464168
-
-commit 935f85422863b42b6fbca30885885e3fa28eea36
-Author: Nick Clifton <nickc@redhat.com>
-Date:   Mon Jan 7 12:11:11 2013 +0000
-
-    	* ld.texinfo: Replace @ with @@ when it is part of the text.
-    	Correct ordering of M68HC11 entry.
-    
-    	* doc/binutils.texi: Fix ordering of top level nodes.
-    	Replace erroneous uses of @itemx with @item.
-    
-    	* bfd.texinfo: Replace @ with @@ when it is part of the text.
-
-diff --git a/bfd/doc/bfd.texinfo b/bfd/doc/bfd.texinfo
-index 45ffa73..3aa3300 100644
---- a/bfd/doc/bfd.texinfo
-+++ b/bfd/doc/bfd.texinfo
-@@ -322,7 +324,7 @@ All of BFD lives in one directory.
- @printindex cp
- 
- @tex
--% I think something like @colophon should be in texinfo.  In the
-+% I think something like @@colophon should be in texinfo.  In the
- % meantime:
- \long\def\colophon{\hbox to0pt{}\vfill
- \centerline{The body of this manual is set in}
-@@ -333,7 +335,7 @@ All of BFD lives in one directory.
- \centerline{{\sl\fontname\tensl\/}}
- \centerline{are used for emphasis.}\vfill}
- \page\colophon
--% Blame: doc@cygnus.com, 28mar91.
-+% Blame: doc@@cygnus.com, 28mar91.
- @end tex
- 
- @bye
-diff --git a/ld/ld.texinfo b/ld/ld.texinfo
-index c7ae2a5..4777ad5 100644
---- a/ld/ld.texinfo
-+++ b/ld/ld.texinfo
-@@ -7877,7 +7879,7 @@ If you have more than one @code{SECT} statement for the same
- @printindex cp
- 
- @tex
--% I think something like @colophon should be in texinfo.  In the
-+% I think something like @@colophon should be in texinfo.  In the
- % meantime:
- \long\def\colophon{\hbox to0pt{}\vfill
- \centerline{The body of this manual is set in}
-@@ -7888,7 +7890,7 @@ If you have more than one @code{SECT} statement for the same
- \centerline{{\sl\fontname\tensl\/}}
- \centerline{are used for emphasis.}\vfill}
- \page\colophon
--% Blame: doc@cygnus.com, 28mar91.
-+% Blame: doc@@cygnus.com, 28mar91.
- @end tex
- 
- @bye
diff --git a/extra/nacl-toolchain-newlib/gcc-texinfo-r0.patch b/extra/nacl-toolchain-newlib/gcc-texinfo-r0.patch
deleted file mode 100644
index 852337351..000000000
--- a/extra/nacl-toolchain-newlib/gcc-texinfo-r0.patch
+++ /dev/null
@@ -1,132 +0,0 @@
-https://bugs.gentoo.org/show_bug.cgi?id=464168
-
-commit 85ad240e47dcdc1bf20ef6a95e921ac1f766d995
-Author: schwab <schwab@138bc75d-0d04-0410-961f-82ee72b054a4>
-Date:   Sun Oct 28 09:19:54 2012 +0000
-
-    * doc/cppopts.texi: Fix use of @item vs. @itemx inside @table.
-    * doc/extend.texi: Likewise.
-    * doc/generic.texi: Likewise.
-    * doc/invoke.texi: Likewise.
-    * doc/md.texi: Likewise.
-    * doc/sourcebuild.texi: Likewise.
-    
-    
-    git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@192887 138bc75d-0d04-0410-961f-82ee72b054a4
-
-diff --git a/gcc/doc/cppopts.texi b/gcc/doc/cppopts.texi
-index 27b1095..a2eb79d 100644
---- a/gcc/doc/cppopts.texi
-+++ b/gcc/doc/cppopts.texi
-@@ -805,7 +805,7 @@ Replacement:      [    ]    @{    @}    #    \    ^    |    ~
- Enable special code to work around file systems which only permit very
- short file names, such as MS-DOS@.
- 
--@itemx --help
-+@item --help
- @itemx --target-help
- @opindex help
- @opindex target-help
-diff --git a/gcc/doc/md.texi b/gcc/doc/md.texi
-index dfbdc4c..bca0d8f 100644
---- a/gcc/doc/md.texi
-+++ b/gcc/doc/md.texi
-@@ -4483,8 +4483,8 @@ means of constraints requiring operands 1 and 0 to be the same location.
- @cindex @code{ior@var{m}3} instruction pattern
- @cindex @code{xor@var{m}3} instruction pattern
- @item @samp{ssadd@var{m}3}, @samp{usadd@var{m}3}
--@item @samp{sub@var{m}3}, @samp{sssub@var{m}3}, @samp{ussub@var{m}3}
--@item @samp{mul@var{m}3}, @samp{ssmul@var{m}3}, @samp{usmul@var{m}3}
-+@itemx @samp{sub@var{m}3}, @samp{sssub@var{m}3}, @samp{ussub@var{m}3}
-+@itemx @samp{mul@var{m}3}, @samp{ssmul@var{m}3}, @samp{usmul@var{m}3}
- @itemx @samp{div@var{m}3}, @samp{ssdiv@var{m}3}
- @itemx @samp{udiv@var{m}3}, @samp{usdiv@var{m}3}
- @itemx @samp{mod@var{m}3}, @samp{umod@var{m}3}
-diff --git a/gcc/doc/sourcebuild.texi b/gcc/doc/sourcebuild.texi
-index 89e7712..ec8263f 100644
---- a/gcc/doc/sourcebuild.texi
-+++ b/gcc/doc/sourcebuild.texi
-@@ -691,7 +691,7 @@ standard rule in @file{gcc/Makefile.in} to the variable
- @code{lang_checks}.
- 
- @table @code
--@itemx all.cross
-+@item all.cross
- @itemx start.encap
- @itemx rest.encap
- FIXME: exactly what goes in each of these targets?
---- a/gcc/doc/c-tree.texi
-+++ b/gcc/doc/c-tree.texi
-@@ -2338,13 +2338,13 @@
- not matter.  The type of the operands and that of the result are
- always of @code{BOOLEAN_TYPE} or @code{INTEGER_TYPE}.
- 
--@itemx POINTER_PLUS_EXPR
-+@item POINTER_PLUS_EXPR
- This node represents pointer arithmetic.  The first operand is always
- a pointer/reference type.  The second operand is always an unsigned
- integer type compatible with sizetype.  This is the only binary
- arithmetic operand that can operate on pointer types.
- 
--@itemx PLUS_EXPR
-+@item PLUS_EXPR
- @itemx MINUS_EXPR
- @itemx MULT_EXPR
- These nodes represent various binary arithmetic operations.
---- a/gcc/doc/invoke.texi
-+++ b/gcc/doc/invoke.texi
-@@ -4645,11 +4652,11 @@
- @option{-fdump-rtl-ce3} enable dumping after the three
- if conversion passes. 
- 
--@itemx -fdump-rtl-cprop_hardreg
-+@item -fdump-rtl-cprop_hardreg
- @opindex fdump-rtl-cprop_hardreg
- Dump after hard register copy propagation.
- 
--@itemx -fdump-rtl-csa
-+@item -fdump-rtl-csa
- @opindex fdump-rtl-csa
- Dump after combining stack adjustments.
- 
-@@ -4660,11 +4667,11 @@
- @option{-fdump-rtl-cse1} and @option{-fdump-rtl-cse2} enable dumping after
- the two common sub-expression elimination passes.
- 
--@itemx -fdump-rtl-dce
-+@item -fdump-rtl-dce
- @opindex fdump-rtl-dce
- Dump after the standalone dead code elimination passes.
- 
--@itemx -fdump-rtl-dbr
-+@item -fdump-rtl-dbr
- @opindex fdump-rtl-dbr
- Dump after delayed branch scheduling.
- 
-@@ -4709,7 +4716,7 @@
- @opindex fdump-rtl-initvals
- Dump after the computation of the initial value sets.
- 
--@itemx -fdump-rtl-into_cfglayout
-+@item -fdump-rtl-into_cfglayout
- @opindex fdump-rtl-into_cfglayout
- Dump after converting to cfglayout mode.
- 
-@@ -4739,7 +4746,7 @@
- @opindex fdump-rtl-rnreg
- Dump after register renumbering.
- 
--@itemx -fdump-rtl-outof_cfglayout
-+@item -fdump-rtl-outof_cfglayout
- @opindex fdump-rtl-outof_cfglayout
- Dump after converting from cfglayout mode.
- 
-@@ -4751,7 +4758,7 @@
- @opindex fdump-rtl-postreload
- Dump after post-reload optimizations.
- 
--@itemx -fdump-rtl-pro_and_epilogue
-+@item -fdump-rtl-pro_and_epilogue
- @opindex fdump-rtl-pro_and_epilogue
- Dump after generating the function pro and epilogues.
- 
diff --git a/extra/nautilus-open-terminal/PKGBUILD b/extra/nautilus-open-terminal/PKGBUILD
index 06a0bee40..603a05c35 100644
--- a/extra/nautilus-open-terminal/PKGBUILD
+++ b/extra/nautilus-open-terminal/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 178922 2013-02-28 19:09:50Z ioni $
+# $Id: PKGBUILD 198335 2013-10-30 14:14:24Z allan $
 # Maintainer : Biru Ionut <ionut@archlinux.ro>
 # Contributor: Roman Kyrylych <Roman.Kyrylych@gmail.com>
 # Contributor: William Rea <sillywilly@gmail.com>
@@ -13,7 +13,7 @@ depends=('nautilus' 'gconf')
 makedepends=('pkgconfig' 'gettext' 'intltool')
 install=nautilus-open-terminal.install
 source=(ftp://ftp.gnome.org/pub/GNOME/sources/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.xz)
-options=('!libtool' '!emptydirs')
+options=('!emptydirs')
 sha256sums=('84905e98a13990ef73ce698144bdf0ad9adb1346c22a7d7381a3d65f17a364f0')
 
 build() {
diff --git a/extra/nautilus-sendto/PKGBUILD b/extra/nautilus-sendto/PKGBUILD
index 1b514a9aa..eba6067de 100644
--- a/extra/nautilus-sendto/PKGBUILD
+++ b/extra/nautilus-sendto/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 196127 2013-10-07 11:53:15Z jgc $
+# $Id: PKGBUILD 198336 2013-10-30 14:14:48Z allan $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: Eduardo Romero <eduardo@archlinux.org>
 # Contributor: Tor Krill <tor@krill.nu>
@@ -12,7 +12,7 @@ url="http://download.gnome.org/sources/nautilus-sendto/"
 license=(GPL)
 depends=(glib2)
 makedepends=(gettext intltool gobject-introspection)
-options=('!libtool' '!emptydirs')
+options=('!emptydirs')
 install=nautilus-sendto.install
 groups=('gnome-extra')
 source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
diff --git a/extra/nautilus/PKGBUILD b/extra/nautilus/PKGBUILD
index 3cbd80266..ee035d389 100644
--- a/extra/nautilus/PKGBUILD
+++ b/extra/nautilus/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 196126 2013-10-07 11:53:13Z jgc $
+# $Id: PKGBUILD 198800 2013-11-04 16:55:53Z heftig $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgbase=nautilus
 pkgname=(nautilus libnautilus-extension)
-pkgver=3.10.0
+pkgver=3.10.1
 pkgrel=1
 pkgdesc="GNOME file manager"
 arch=(i686 x86_64 mips64el)
@@ -12,9 +12,9 @@ depends=(libexif gnome-desktop exempi gvfs desktop-file-utils gnome-icon-theme d
          libtracker-sparql libnotify nautilus-sendto)
 makedepends=(intltool gobject-introspection python)
 url="http://www.gnome.org"
-options=('!libtool' '!emptydirs')
+options=('!emptydirs')
 source=(http://download.gnome.org/sources/$pkgbase/${pkgver%.*}/$pkgbase-$pkgver.tar.xz)
-sha256sums=('9b15ccf1c9313631c8cf2ed337e697cd2b32630d2ae36072aa389d64af16d88c')
+sha256sums=('f6a532a170907d116e8ce55847c5c6cd4e03819f5f818087554f2ec2556fc727')
 
 build() {
   cd $pkgbase-$pkgver
diff --git a/extra/nepomuk-core/PKGBUILD b/extra/nepomuk-core/PKGBUILD
index 709300655..9ff6922fb 100644
--- a/extra/nepomuk-core/PKGBUILD
+++ b/extra/nepomuk-core/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 195496 2013-10-01 15:13:09Z svenstaro $
+# $Id: PKGBUILD 198819 2013-11-05 19:40:45Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=nepomuk-core
-pkgver=4.11.2
+pkgver=4.11.3
 pkgrel=1
 pkgdesc="Contains the central Nepomuk services like file indexing, file system monitoring, query, storage, client libraries"
 url="https://projects.kde.org/projects/kde/kdelibs/nepomuk-core"
@@ -11,7 +11,7 @@ license=('GPL' 'LGPL' 'FDL')
 depends=('kdelibs' 'poppler-qt' 'taglib' 'ffmpeg' 'ebook-tools')
 makedepends=('cmake' 'automoc4' 'doxygen')
 source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz")
-sha1sums=('d5a320b39edda61f82ad24da1745238bfcdfe73c')
+sha1sums=('9d97cb731728a43037eb208e2322b6e0b4e8b7e5')
 
 prepare() {
   mkdir build
diff --git a/extra/nepomuk-widgets/PKGBUILD b/extra/nepomuk-widgets/PKGBUILD
index 2c11b7aed..463bbfabb 100644
--- a/extra/nepomuk-widgets/PKGBUILD
+++ b/extra/nepomuk-widgets/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 195530 2013-10-01 15:16:09Z svenstaro $
+# $Id: PKGBUILD 198836 2013-11-05 19:46:51Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=nepomuk-widgets
-pkgver=4.11.2
+pkgver=4.11.3
 pkgrel=1
 pkgdesc="The Library containing the Nepomuk Widgets"
 url="https://projects.kde.org/projects/kde/kdelibs/nepomuk-widgets"
@@ -11,7 +11,7 @@ license=('GPL' 'LGPL' 'FDL')
 depends=('nepomuk-core')
 makedepends=('cmake' 'automoc4')
 source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz")
-sha1sums=('d63ef40b9832fc0f18f981163800a9d5ecd5e29e')
+sha1sums=('d43a410fd9ed02b52e8d4076e080a66a4b2c435a')
 
 build() {
   mkdir build
diff --git a/extra/net-snmp/PKGBUILD b/extra/net-snmp/PKGBUILD
index 1ef2573b0..c7e20e779 100644
--- a/extra/net-snmp/PKGBUILD
+++ b/extra/net-snmp/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 193416 2013-08-20 06:10:03Z angvp $
+# $Id: PKGBUILD 198340 2013-10-30 14:16:21Z allan $
 # Maintainer:
 # Contributor: Dale Blount <dale@archlinux.org>
 
@@ -14,7 +14,7 @@ makedepends=('python2-setuptools')
 optdepends=('perl-term-readkey: for snmpcheck application'
             'perl-tk: for snmpcheck and tkmib applications'
             'python2: for the python modules')
-options=('!libtool' '!emptydirs' '!makeflags')
+options=('!emptydirs' '!makeflags')
 source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz{,.asc}
         snmpd.service snmptrapd.service libnl32.patch)
 sha1sums=('c493027907f32400648244d81117a126aecd27ee'
diff --git a/extra/netcdf-cxx/PKGBUILD b/extra/netcdf-cxx/PKGBUILD
index c6b1c090e..d4fa61d24 100644
--- a/extra/netcdf-cxx/PKGBUILD
+++ b/extra/netcdf-cxx/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 164375 2012-07-31 20:02:04Z ronald $
+# $Id: PKGBUILD 198338 2013-10-30 14:15:40Z allan $
 # Maintainer: Ronald van Haren <ronald.archlinux.org>
 # Contributor: damir <damir@archlinux.org>
 
@@ -9,7 +9,7 @@ pkgdesc="NetCDF c++ bindings"
 arch=("i686" "x86_64" "mips64el")
 url="http://www.unidata.ucar.edu/downloads/netcdf/netcdf-cxx/index.jsp"
 depends=('gcc-libs' 'netcdf' 'curl')
-options=('!libtool' '!makeflags')
+options=('!makeflags')
 license=('custom')
 source=(http://www.unidata.ucar.edu/downloads/netcdf/ftp/netcdf-cxx4-${pkgver}.tar.gz)
 sha1sums=('59628c9f06c211a47517fc00d8b068da159ffa9d')
diff --git a/extra/netcdf-fortran/PKGBUILD b/extra/netcdf-fortran/PKGBUILD
index c0a437a73..ac405d877 100644
--- a/extra/netcdf-fortran/PKGBUILD
+++ b/extra/netcdf-fortran/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 164376 2012-07-31 20:07:54Z ronald $
+# $Id: PKGBUILD 198339 2013-10-30 14:16:00Z allan $
 # Maintainer: Ronald van Haren <ronald.archlinux.org>
 # Contributor: damir <damir@archlinux.org>
 
@@ -9,7 +9,7 @@ pkgdesc="NetCDF fortran bindings"
 arch=("i686" "x86_64" "mips64el")
 url="http://www.unidata.ucar.edu/downloads/netcdf/netcdf-fortran/index.jsp"
 depends=('gcc-libs' 'netcdf' 'curl' 'gcc-fortran')
-options=('!libtool' '!makeflags')
+options=('!makeflags')
 license=('custom')
 install=${pkgname}.install
 source=(http://www.unidata.ucar.edu/downloads/netcdf/ftp/netcdf-fortran-${pkgver}.tar.gz)
diff --git a/extra/netcdf/PKGBUILD b/extra/netcdf/PKGBUILD
index 957759dbc..6454ab5d6 100644
--- a/extra/netcdf/PKGBUILD
+++ b/extra/netcdf/PKGBUILD
@@ -1,19 +1,19 @@
-# $Id: PKGBUILD 178109 2013-02-16 12:42:26Z ronald $
+# $Id: PKGBUILD 198337 2013-10-30 14:15:18Z allan $
 # Maintainer: Ronald van Haren <ronald.archlinux.org>
 # Contributor: damir <damir@archlinux.org>
 
 pkgname=netcdf
-pkgver=4.2.1.1
+pkgver=4.3.0
 pkgrel=1
 pkgdesc="network Common Data Form interface for array-oriented data access and corresponding library"
 arch=("i686" "x86_64" 'mips64el')
 url="http://www.unidata.ucar.edu/downloads/netcdf/index.jsp"
 depends=('gcc-libs' 'hdf5' 'curl')
 optdepends=('netcdf-fortran: fortran bindings' 'netcdf-cxx: c++ bindings')
-options=('!libtool' '!makeflags')
+options=('!makeflags')
 license=('custom')
 source=(http://www.unidata.ucar.edu/downloads/netcdf/ftp/netcdf-${pkgver}.tar.gz)
-sha1sums=('76631cb4e6b767c224338415cf6e5f5ff9bd1238')
+sha1sums=('31b4b3b17146cc8c14a8c7be3fe5f28e5a8a5deb')
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
diff --git a/extra/netpbm/PKGBUILD b/extra/netpbm/PKGBUILD
index 3b8897594..d2804b774 100644
--- a/extra/netpbm/PKGBUILD
+++ b/extra/netpbm/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 184413 2013-05-06 19:38:51Z foutrelis $
+# $Id: PKGBUILD 197557 2013-10-26 21:24:07Z eric $
 # Maintainer: Kevin Piche <kevin@archlinux.org>
 
 pkgname=netpbm
 pkgver=10.61.02
-pkgrel=2
+pkgrel=3
 pkgdesc="A toolkit for manipulation of graphic images"
 arch=('i686' 'x86_64' 'mips64el')
 license=('custom' 'BSD' 'GPL' 'LGPL')
@@ -34,7 +34,7 @@ mksource() {
 }
 
 prepare() {
-  cd "${srcdir}/advanced"
+  cd advanced
 
   patch -p1 < ../netpbm-CAN-2005-2471.patch
   patch -p1 < ../netpbm-security-code.patch
@@ -56,26 +56,22 @@ prepare() {
 }
 
 build() {
-  cd "${srcdir}/advanced"
-
+  cd advanced
   make
-
   # Generating useful man pages with html doc
-  cd  "${srcdir}/doc"
   make MAKEMAN="${srcdir}/advanced/buildtools/makeman" USERGUIDE=. \
-    -f "${srcdir}/advanced/buildtools/manpage.mk" manpages
+    -C ../doc -f "${srcdir}/advanced/buildtools/manpage.mk" manpages
 }
 
 package() {
-  cd "${srcdir}/advanced"
+  cd advanced
   make pkgdir="${pkgdir}/usr" PKGMANDIR=share/man install-run install-dev
 
 # Removing dummy man pages
   rm "${pkgdir}"/usr/share/man/man{1,3,5}/*
 
-  cd  "${srcdir}/doc"
   make MAKEMAN="${srcdir}/advanced/buildtools/makeman" MANDIR="${pkgdir}/usr/share/man" \
-    -f "${srcdir}/advanced/buildtools/manpage.mk" installman
+    -C ../doc -f "${srcdir}/advanced/buildtools/manpage.mk" installman
 
 # Replace obsolete utility
   echo -e '#!/bin/sh\npamditherbw $@ | pamtopnm\n' > "${pkgdir}/usr/bin/pgmtopbm"
diff --git a/extra/network-manager-applet/PKGBUILD b/extra/network-manager-applet/PKGBUILD
index c5b86caf1..12a464bb6 100644
--- a/extra/network-manager-applet/PKGBUILD
+++ b/extra/network-manager-applet/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 196128 2013-10-07 11:53:16Z jgc $
+# $Id: PKGBUILD 198342 2013-10-30 14:17:08Z allan $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: Arjan Timmerman <arjan@archlinux.org>
 # Contributor: Wael Nasreddine <gandalf@siemens-mobiles.org>
@@ -16,7 +16,7 @@ depends=("networkmanager>=${pkgver%.*}" libsecret gtk3 libnotify
          gnome-icon-theme mobile-broadband-provider-info iso-codes)
 makedepends=(intltool gnome-bluetooth gobject-introspection)
 optdepends=('gnome-bluetooth: for PAN/DUN support')
-options=('!libtool' '!emptydirs')
+options=('!emptydirs')
 install=network-manager-applet.install
 source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/0.9/$pkgname-$pkgver.tar.xz)
 sha256sums=('f68849291047c94487279aab4a6cb90945ad351df02da621a73b413e6c6c198c')
diff --git a/extra/networkmanager-openconnect/PKGBUILD b/extra/networkmanager-openconnect/PKGBUILD
index b2e07ad69..8f2e74594 100644
--- a/extra/networkmanager-openconnect/PKGBUILD
+++ b/extra/networkmanager-openconnect/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 194796 2013-09-23 17:23:08Z heftig $
+# $Id: PKGBUILD 198343 2013-10-30 14:17:28Z allan $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 
 pkgname=networkmanager-openconnect
@@ -11,7 +11,6 @@ url="http://www.gnome.org/projects/NetworkManager/"
 depends=("networkmanager>=${pkgver::5}" 'openconnect' 'libgnome-keyring' 'gtk3')
 makedepends=('intltool')
 optdepends=('network-manager-applet: GNOME frontends to NetWorkmanager')
-options=('!libtool')
 install=$pkgname.install
 source=(http://ftp.gnome.org/pub/GNOME/sources/NetworkManager-openconnect/0.9/NetworkManager-openconnect-${pkgver}.tar.xz)
 sha256sums=('99b4dc03da311026eaa4bee2ff3f141270e8ba4bf341762d4eeee7152be387b6')
diff --git a/extra/networkmanager-openvpn/PKGBUILD b/extra/networkmanager-openvpn/PKGBUILD
index 608935066..7e5053f4c 100644
--- a/extra/networkmanager-openvpn/PKGBUILD
+++ b/extra/networkmanager-openvpn/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 194797 2013-09-23 17:23:43Z heftig $
+# $Id: PKGBUILD 198344 2013-10-30 14:17:49Z allan $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 
 pkgname=networkmanager-openvpn
@@ -12,7 +12,6 @@ depends=("networkmanager>=${pkgver}" 'openvpn' 'gtk3' 'libgnome-keyring')
 makedepends=('intltool')
 optdepends=('network-manager-applet: GNOME frontends to NetWorkmanager')
 install=networkmanager-openvpn.install
-options=('!libtool')
 source=(http://ftp.gnome.org/pub/GNOME/sources/NetworkManager-openvpn/0.9/NetworkManager-openvpn-${pkgver}.tar.xz)
 sha256sums=('af8c52b6a61af3c178eed1ea8f1d4704bea87331fde43deb3d4aafe1821e6687')
 
diff --git a/extra/networkmanager-pptp/PKGBUILD b/extra/networkmanager-pptp/PKGBUILD
index 286dc88c2..b470408fd 100644
--- a/extra/networkmanager-pptp/PKGBUILD
+++ b/extra/networkmanager-pptp/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 194798 2013-09-23 17:24:22Z heftig $
+# $Id: PKGBUILD 198345 2013-10-30 14:18:09Z allan $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 
 pkgname=networkmanager-pptp
@@ -11,7 +11,6 @@ url="http://www.gnome.org/projects/NetworkManager/"
 depends=("networkmanager>=${pkgver}" 'pptpclient' 'gtk3' 'libgnome-keyring')
 makedepends=('intltool')
 optdepends=('network-manager-applet: GNOME frontends to NetWorkmanager')
-options=('!libtool')
 install=networkmanager-pptp.install
 source=(http://ftp.gnome.org/pub/GNOME/sources/NetworkManager-pptp/0.9/NetworkManager-pptp-${pkgver}.tar.xz
         gtk_table_to_gtk_grid.patch)
diff --git a/extra/networkmanager-vpnc/PKGBUILD b/extra/networkmanager-vpnc/PKGBUILD
index 740248d8d..73cf23210 100644
--- a/extra/networkmanager-vpnc/PKGBUILD
+++ b/extra/networkmanager-vpnc/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 194799 2013-09-23 17:25:00Z heftig $
+# $Id: PKGBUILD 198346 2013-10-30 14:18:34Z allan $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 
 pkgname=networkmanager-vpnc
@@ -11,7 +11,6 @@ url="http://www.gnome.org/projects/NetworkManager/"
 depends=("networkmanager>=${pkgver%.*}" 'vpnc' 'hicolor-icon-theme' 'gtk3' 'libgnome-keyring')
 makedepends=('intltool')
 optdepends=('network-manager-applet: GNOME frontends to NetWorkmanager')
-options=('!libtool')
 install=networkmanager-vpnc.install
 source=(http://ftp.gnome.org/pub/GNOME/sources/NetworkManager-vpnc/0.9/NetworkManager-vpnc-${pkgver}.tar.xz)
 sha256sums=('40306cd713d4e6e9df6a520d2992664d22173b3327e94df45a6dac23f0a8abd6')
diff --git a/extra/networkmanager/PKGBUILD b/extra/networkmanager/PKGBUILD
index 8ea6c3cf7..4265462e1 100644
--- a/extra/networkmanager/PKGBUILD
+++ b/extra/networkmanager/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 196312 2013-10-11 11:02:08Z heftig $
+# $Id: PKGBUILD 198341 2013-10-30 14:16:46Z allan $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Maintainer: Jan de Groot <jgc@archlinxu.org>
 # Contributor: Wael Nasreddine <gandalf@siemens-mobiles.org>
@@ -22,7 +22,6 @@ optdepends=('dhclient: DHCPv6 support'
             'bluez: Bluetooth support'
             'openresolv: resolvconf support'
             'ppp: Dialup connection support')
-options=('!libtool')
 backup=('etc/NetworkManager/NetworkManager.conf')
 install=networkmanager.install
 #source=(git://anongit.freedesktop.org/NetworkManager/NetworkManager#commit=93c1041
diff --git a/extra/nspr/PKGBUILD b/extra/nspr/PKGBUILD
index 42c9641a3..f9db70957 100644
--- a/extra/nspr/PKGBUILD
+++ b/extra/nspr/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 196165 2013-10-07 12:54:42Z jgc $
+# $Id: PKGBUILD 197714 2013-10-28 19:33:38Z jgc $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: Alexander Baldeck <alexander@archlinux.org>
 
 pkgname=nspr
 pkgver=4.10.1
-pkgrel=1
+pkgrel=2
 pkgdesc="Netscape Portable Runtime"
 arch=(i686 x86_64 'mips64el')
 url="http://www.mozilla.org/projects/nspr/"
@@ -38,7 +38,6 @@ package() {
   cd $pkgname-$pkgver
   make DESTDIR="$pkgdir" install
 
-  chmod 644 "$pkgdir"/usr/lib/*.a
   ln -s nspr.pc "$pkgdir/usr/lib/pkgconfig/mozilla-nspr.pc"
   rm -r "$pkgdir"/usr/bin/{compile-et.pl,prerr.properties} \
          "$pkgdir/usr/include/nspr/md"
diff --git a/extra/nss/PKGBUILD b/extra/nss/PKGBUILD
index 068e90fa8..cac42649f 100644
--- a/extra/nss/PKGBUILD
+++ b/extra/nss/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 196167 2013-10-07 13:20:22Z jgc $
+# $Id: PKGBUILD 197720 2013-10-28 23:19:38Z jgc $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=nss
@@ -11,7 +11,7 @@ license=('MPL' 'GPL')
 _nsprver=4.10
 depends=("nspr>=${_nsprver}" 'sqlite' 'zlib' 'sh')
 makedepends=('perl')
-options=('!strip' '!makeflags')
+options=('!strip' '!makeflags' 'staticlibs')
 source=(ftp://ftp.mozilla.org/pub/security/nss/releases/NSS_${pkgver//./_}_RTM/src/${pkgname}-${pkgver}.tar.gz
         nss.pc.in
         nss-config.in
diff --git a/extra/ntfs-3g_ntfsprogs/PKGBUILD b/extra/ntfs-3g_ntfsprogs/PKGBUILD
index 96d9a654a..143450341 100644
--- a/extra/ntfs-3g_ntfsprogs/PKGBUILD
+++ b/extra/ntfs-3g_ntfsprogs/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 188990 2013-06-27 19:50:33Z bpiotrowski $
+# $Id: PKGBUILD 198347 2013-10-30 14:18:55Z allan $
 # Maintainer: Tom Gundersen <teg@jklm.no>
 # Contributor: Ronald van Haren <ronald.archlinux.org>
 # Contributor: Thomas B�chler <thomas.archlinux.org>
@@ -15,7 +15,6 @@ depends=('util-linux' 'fuse')
 conflicts=('ntfsprogs')
 provides=('ntfsprogs')
 replaces=('ntfsprogs')
-options=('!libtool')
 source=(http://tuxera.com/opensource/$pkgbase-$pkgver.tgz)
 sha1sums=('8c12b7644d90ae9fb8d0aca0d7ebd5f8fac2c818')
 
diff --git a/extra/numactl/PKGBUILD b/extra/numactl/PKGBUILD
index 030e175d4..79086d802 100644
--- a/extra/numactl/PKGBUILD
+++ b/extra/numactl/PKGBUILD
@@ -2,15 +2,15 @@
 # Contributor: Florian Zeitz <florob at babelmonkeys dot de>
 
 pkgname=numactl
-pkgver=2.0.8
-pkgrel=2
+pkgver=2.0.9
+pkgrel=1
 pkgdesc="Simple NUMA policy support"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://oss.sgi.com/projects/libnuma/"
 license=('LGPL2.1' 'GPL2')
 depends=('perl')
 source=(ftp://oss.sgi.com/www/projects/libnuma/download/$pkgname-${pkgver/_/-}.tar.gz)
-sha1sums=('f7bf06caea29669992fd3540a4c864a32615b5a1')
+sha1sums=('7231abc8f49e805225858ac08d801ade722f0b94')
 
 build() {
   cd "$srcdir/$pkgname-${pkgver/_/-}"
diff --git a/extra/obexftp/PKGBUILD b/extra/obexftp/PKGBUILD
index 420eeadb4..43a9b8842 100644
--- a/extra/obexftp/PKGBUILD
+++ b/extra/obexftp/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 186963 2013-06-01 15:32:07Z eric $
+# $Id: PKGBUILD 198348 2013-10-30 14:19:17Z allan $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Alessio 'mOLOk' Bolognino <themolok@gmail.com>
 
@@ -13,7 +13,7 @@ depends=('openobex')
 makedepends=('cmake' 'asciidoc' 'xmlto' 'fuse' 'swig' 'ruby' 'tk')
 optdepends=('ruby: ruby bindings'
             'tk: TCL/Tk bindings')
-options=('!makeflags' '!libtool' '!docs')
+options=('!makeflags' '!docs')
 source=("http://downloads.sourceforge.net/openobex/${pkgname}-${pkgver}-Source.tar.gz")
 md5sums=('31a50dbbd09c63cbb5399772aaff7936')
 
diff --git a/extra/ocaml/PKGBUILD b/extra/ocaml/PKGBUILD
index 12d2daf51..a4cd361d0 100644
--- a/extra/ocaml/PKGBUILD
+++ b/extra/ocaml/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 195984 2013-10-07 07:06:19Z tpowa $
+# $Id: PKGBUILD 197147 2013-10-23 10:26:20Z tpowa $
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 
 pkgbase='ocaml'
@@ -6,7 +6,7 @@ pkgname=('ocaml')
 # Needs optimized build.
 [ "$CARCH" = "mips64el" ] || pkgname+=('ocaml-compiler-libs')
 pkgver=4.01.0
-pkgrel=1
+pkgrel=3
 pkgdesc="A functional language with OO extensions"
 arch=('i686' 'x86_64' 'mips64el')
 license=('LGPL2.1' 'custom: QPL-1.0')
@@ -16,7 +16,7 @@ makedepends=('tk>=8.6.0' 'ncurses>=5.6-7' 'libx11')
 optdepends=('ncurses: advanced ncurses features' 'tk: advanced tk features')
 source=(http://caml.inria.fr/distrib/ocaml-4.01/${pkgname}-${pkgver}.tar.gz
         fix-caml_int64_float_of_bits-n32.patch)
-options=('!makeflags' '!emptydirs')
+options=('!makeflags' '!emptydirs' 'staticlibs')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/octave/PKGBUILD b/extra/octave/PKGBUILD
index 45483af71..b1ca44a0d 100644
--- a/extra/octave/PKGBUILD
+++ b/extra/octave/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 191854 2013-07-31 16:20:12Z bpiotrowski $
+# $Id: PKGBUILD 196805 2013-10-19 13:44:27Z bpiotrowski $
 # Maintainer: Ronald van Haren <ronald.archlinux.org>
 # Contributor : shining <shiningxc.at.gmail.com>
 # Contributor : cyberdune <cyberdune@gmail.com>
 
 pkgname=octave
 pkgver=3.6.4
-pkgrel=3
+pkgrel=4
 pkgdesc="A high-level language, primarily intended for numerical computations."
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.octave.org"
diff --git a/extra/ode/PKGBUILD b/extra/ode/PKGBUILD
index 52c3e697e..ed1abb91b 100644
--- a/extra/ode/PKGBUILD
+++ b/extra/ode/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 174853 2013-01-08 01:15:06Z giovanni $
+# $Id: PKGBUILD 198349 2013-10-30 14:19:37Z allan $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Adam Griffiths <adam_griffithsAATTdart.net.au>
 
@@ -11,7 +11,6 @@ url="http://www.ode.org"
 license=('LGPL' 'BSD')
 depends=('gcc-libs' 'bash')
 source=("http://downloads.sourceforge.net/sourceforge/opende/${pkgname}-${pkgver}.tar.bz2")
-options=('!libtool')
 md5sums=('48fdd41fae1a7e7831feeded09826599')
 
 build() {
diff --git a/extra/opal/PKGBUILD b/extra/opal/PKGBUILD
index 7661155f7..c990b95df 100644
--- a/extra/opal/PKGBUILD
+++ b/extra/opal/PKGBUILD
@@ -1,31 +1,35 @@
-# $Id: PKGBUILD 194345 2013-09-14 08:18:24Z bpiotrowski $
+# $Id: PKGBUILD 197009 2013-10-21 12:41:49Z jgc $
 # Maintainer: Jan de Groot <jan@archlinux.org>
 # Contributor: Tom K <tomk@runbox.com>
 pkgname=opal
-pkgver=3.10.10
-pkgrel=3
+pkgver=3.10.11
+pkgrel=1
 pkgdesc="Open Phone Abstraction Library"
 arch=(i686 x86_64 'mips64el')
 url="http://www.opalvoip.org"
 license=(GPL)
 depends=(ptlib libtheora x264 speex gsm celt)
 makedepends=(ffmpeg)
+optdepends=('ffmpeg: h263 and mpeg4 plugins')
 options=(!makeflags)
-source=(http://ftp.gnome.org/pub/GNOME/sources/opal/${pkgver%.*}/opal-$pkgver.tar.xz
+source=(http://downloads.sourceforge.net/opalvoip/$pkgname-$pkgver.tar.bz2
         opal-ffmpeg.patch)
-sha256sums=('f208985003461b2743575eccac13ad890b3e5baac35b68ddef17162460aff864'
+sha256sums=('f38e7969e88a28dd9a10a6051315aceecde79d0bbd1a35676868dc5787aed706'
             '83f60ecf692e004293ce9dbaae7d7eb64d9713d3bfb71a0e7b1a0d1f936794cd')
 
+prepare() {
+  cd $pkgname-$pkgver
+  patch -Np1 -i ../opal-ffmpeg.patch
+}
+
 build() {
-  cd "${srcdir}/opal-${pkgver}"
-  patch -Np1 -i "${srcdir}/opal-ffmpeg.patch"
+  cd $pkgname-$pkgver
   CXXFLAGS="$CXXFLAGS -fpermissive" \
   ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var
   make
 }
 
 package() {
-  cd "${srcdir}/opal-${pkgver}"
+  cd $pkgname-$pkgver
   make DESTDIR="${pkgdir}" install
-  chmod 644 "${pkgdir}/usr/lib/libopal_s.a"
 }
diff --git a/extra/openal/PKGBUILD b/extra/openal/PKGBUILD
index b80436e78..fd465c6ee 100644
--- a/extra/openal/PKGBUILD
+++ b/extra/openal/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 173158 2012-12-11 21:59:43Z heftig $
+# $Id: PKGBUILD 198350 2013-10-30 14:20:00Z allan $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Contributor: Allan McRae <allan@archlinux.org>
 # Contributor: Jason Chu <jchu@xentac.net>
@@ -12,7 +12,6 @@ url="http://www.openal.org/"
 license=(LGPL)
 depends=(glibc)
 makedepends=(alsa-lib sdl pkgconfig cmake libpulse)
-options=('!libtool')
 source=(http://kcat.strangesoft.net/openal-releases/openal-soft-$pkgver.tar.bz2
 	fpu.patch)
 md5sums=('ea83dec3b9655a27d28e7bc7cae9cd71'
diff --git a/extra/openbabel/PKGBUILD b/extra/openbabel/PKGBUILD
index fee73786c..c64c44fc4 100644
--- a/extra/openbabel/PKGBUILD
+++ b/extra/openbabel/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 171707 2012-11-21 16:07:23Z eric $
+# $Id: PKGBUILD 198351 2013-10-30 14:20:21Z allan $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Damir Perisa <damir.perisa@bluewin.ch>
 
@@ -13,7 +13,6 @@ depends=('gcc-libs' 'libxml2')
 makedepends=('cmake' 'eigen2' 'wxgtk')
 optdepends=('eigen2: to use bindings'
         'wxgtk: GUI interface')
-options=('!libtool')
 source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz")
 md5sums=('9b0007560d9d838b40ab4ad06daf5610')
 
diff --git a/extra/openconnect/PKGBUILD b/extra/openconnect/PKGBUILD
index 26817e76d..f4c108fe7 100644
--- a/extra/openconnect/PKGBUILD
+++ b/extra/openconnect/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 189941 2013-07-11 19:58:49Z ioni $
+# $Id: PKGBUILD 198352 2013-10-30 14:20:43Z allan $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 
 pkgname=openconnect
@@ -11,7 +11,7 @@ license=('GPL')
 url="http://www.infradead.org/openconnect.html"
 depends=('libxml2' 'gnutls' 'libproxy' 'vpnc')
 makedepends=('intltool' 'python2')
-options=('!libtool' '!emptydirs')
+options=('!emptydirs')
 source=(ftp://ftp.infradead.org/pub/$pkgname/$pkgname-$pkgver.tar.gz)
 md5sums=('40b059f0fe955cd4f41d7abb97d84ce8')
 
diff --git a/extra/opencore-amr/PKGBUILD b/extra/opencore-amr/PKGBUILD
index b008c89fe..ca124748a 100644
--- a/extra/opencore-amr/PKGBUILD
+++ b/extra/opencore-amr/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 151248 2012-02-25 09:58:05Z ibiru $
+# $Id: PKGBUILD 198353 2013-10-30 14:21:04Z allan $
 # Maintainer: Ionut Biru <ionut@archlinux.ro>
 # Contributor: WAntilles <wantilles@adslgr.com>
 
@@ -11,7 +11,6 @@ license=('APACHE')
 url="http://opencore-amr.sourceforge.net/"
 source=(http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.gz)
 depends=(glibc)
-options=('!libtool')
 md5sums=('09d2c5dfb43a9f6e9fec8b1ae678e725')
 
 build() {
diff --git a/extra/openjpeg/PKGBUILD b/extra/openjpeg/PKGBUILD
index 6f98310af..b3f6407b3 100644
--- a/extra/openjpeg/PKGBUILD
+++ b/extra/openjpeg/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 184788 2013-05-08 13:56:11Z bpiotrowski $
+# $Id: PKGBUILD 198355 2013-10-30 14:21:56Z allan $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=openjpeg
@@ -9,7 +9,6 @@ arch=(i686 x86_64 'mips64el')
 license=('BSD')
 url="http://www.openjpeg.org"
 depends=('zlib')
-options=('!libtool')
 source=(http://openjpeg.googlecode.com/files/openjpeg-${pkgver}.tar.gz)
 sha1sums=('1b0b74d1af4c297fd82806a9325bb544caf9bb8b')
 
diff --git a/extra/openmpi/PKGBUILD b/extra/openmpi/PKGBUILD
index 06fac5810..bcb38238a 100644
--- a/extra/openmpi/PKGBUILD
+++ b/extra/openmpi/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 189231 2013-06-30 23:32:16Z eric $
+# $Id: PKGBUILD 197773 2013-10-29 21:29:45Z eric $
 # Maintainer: Stéphane Gaudreault <stephane@archlinux.org>
 pkgname=openmpi
 pkgver=1.6.5
@@ -10,7 +10,7 @@ license=('custom')
 depends=('gcc-fortran' 'openssh' 'libltdl' 'hwloc')
 [ "$CARCH" = "mips64el" ] || depends+=('valgrind')
 makedepends=('inetutils')
-options=('!libtool')
+options=('staticlibs')
 source=(http://www.open-mpi.org/software/ompi/v1.6/downloads/${pkgname}-${pkgver}.tar.bz2)
 sha1sums=('93859d515b33dd9a0ee6081db285a2d1dffe21ce')
 
@@ -22,12 +22,11 @@ build() {
    else
      valgrind="--with-valgrind --enable-memchecker"
    fi
-   # Make sure we use the system ltdl librariry rather than the ones in the tarball
+   # Make sure we use the system ltdl library rather than the ones in the tarball
    rm -r opal/libltdl
 
    ./configure --prefix=/usr \
                --sysconfdir=/etc/${pkgname} \
-               --mandir=/usr/share/man \
                --enable-mpi-f90 \
                --libdir=/usr/lib/${pkgname} \
                --with-threads=posix \
diff --git a/extra/openslp/PKGBUILD b/extra/openslp/PKGBUILD
index 987fb71c8..07c8390b7 100644
--- a/extra/openslp/PKGBUILD
+++ b/extra/openslp/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 185723 2013-05-17 17:27:12Z andyrtr $
+# $Id: PKGBUILD 198356 2013-10-30 14:22:17Z allan $
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 
 pkgname=openslp
@@ -10,7 +10,6 @@ url="http://www.openslp.org"
 license=('BSD')
 depends=('bash' 'openssl')
 backup=('etc/slp.conf' 'etc/slp.reg' 'etc/slp.spi')
-options=('!libtool')
 source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.gz
         #https://github.com/lunar-linux/moonbase-other/commit/ae74b5873e639d50db0a563d2424114a530c01ae
         openslp.service)
diff --git a/extra/opensp/PKGBUILD b/extra/opensp/PKGBUILD
index 536bd8ae1..8fe6e0c53 100644
--- a/extra/opensp/PKGBUILD
+++ b/extra/opensp/PKGBUILD
@@ -1,23 +1,22 @@
-# $Id: PKGBUILD 150566 2012-02-18 14:51:32Z pierre $
+# $Id: PKGBUILD 197585 2013-10-27 03:05:15Z eric $
 # Maintainer:
 # Contributor: dorphell <dorphell@archlinux.org>
 # Contributor: Tom Newsom <Jeepster@gmx.co.uk>
 
 pkgname=opensp
 pkgver=1.5.2
-pkgrel=3
+pkgrel=4
 pkgdesc="A library and a set of tools for validating, parsing and manipulating SGML and XML documents"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://openjade.sourceforge.net/"
 license=('BSD')
 depends=('gcc-libs')
 makedepends=('xmlto' 'docbook-xsl')
-options=('!libtool')
 source=("http://download.sourceforge.net/openjade/OpenSP-$pkgver.tar.gz")
 md5sums=('670b223c5d12cee40c9137be86b6c39b')
 
 build() {
-  cd "${srcdir}"/OpenSP-$pkgver
+  cd OpenSP-$pkgver
   ./configure --prefix=/usr \
     --mandir=/usr/share/man \
     --disable-nls \
@@ -29,7 +28,7 @@ build() {
 }
 
 package() {
-  cd "${srcdir}"/OpenSP-$pkgver
+  cd OpenSP-$pkgver
   make DESTDIR="${pkgdir}" install
   install -D -m644 COPYING "${pkgdir}"/usr/share/licenses/$pkgname/LICENSE
 }
diff --git a/extra/opus/PKGBUILD b/extra/opus/PKGBUILD
index 692a2f15f..66dd97e39 100644
--- a/extra/opus/PKGBUILD
+++ b/extra/opus/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 190019 2013-07-12 21:33:32Z heftig $
+# $Id: PKGBUILD 198357 2013-10-30 14:22:43Z allan $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Contributor: Jan de Groot <jgc@archlinux.org>
 # Contributor: DrZaius <lou[at]fakeoutdoorsman[dot]com>
@@ -6,19 +6,18 @@
 
 pkgname=opus
 pkgver=1.0.3
-pkgrel=1
+pkgrel=2
 pkgdesc="Codec designed for interactive speech and audio transmission over the Internet"
 arch=(i686 x86_64 mips64el)
 url="http://www.opus-codec.org/"
 license=(BSD)
 depends=(glibc)
-options=('!libtool')
 source=(http://downloads.us.xiph.org/releases/$pkgname/$pkgname-$pkgver.tar.gz)
 md5sums=('86eedbd3c5a0171d2437850435e6edff')
 
 build() {
   cd $pkgname-$pkgver
-  ./configure --prefix=/usr --enable-custom-modes
+  ./configure --prefix=/usr --enable-custom-modes --disable-static
   make
 }
 
diff --git a/extra/orage/PKGBUILD b/extra/orage/PKGBUILD
index a8cbc854b..3934c60a3 100644
--- a/extra/orage/PKGBUILD
+++ b/extra/orage/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 185546 2013-05-14 21:40:26Z andrea $
+# $Id: PKGBUILD 198358 2013-10-30 14:23:04Z allan $
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 # Contributor: Tobias Kieslich <tobias (at) archlinux.org>
 
@@ -12,7 +12,6 @@ url="http://www.xfce.org/projects/orage/"
 groups=('xfce4-goodies')
 depends=('xfce4-panel' 'libical' 'popt' 'libnotify>=0.7.1' 'hicolor-icon-theme' 'desktop-file-utils')
 makedepends=('intltool' 'xfce4-dev-tools' 'popt')
-options=('!libtool')
 replaces=('xfcalendar')
 install=${pkgname}.install
 source=(http://archive.xfce.org/src/apps/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2)
diff --git a/extra/orbit2/PKGBUILD b/extra/orbit2/PKGBUILD
index 671d26a68..5836a6901 100644
--- a/extra/orbit2/PKGBUILD
+++ b/extra/orbit2/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 151081 2012-02-24 18:27:05Z ibiru $
+# $Id: PKGBUILD 198359 2013-10-30 14:23:25Z allan $
 # Maintainer: Jan de Groot <jan@archlinux.org>
 
 pkgname=orbit2
@@ -8,7 +8,7 @@ pkgdesc="Thin/fast CORBA ORB"
 arch=('i686' 'x86_64' 'mips64el')
 license=('LGPL' 'GPL')
 depends=('libidl2')
-options=('!libtool' '!makeflags')
+options=('!makeflags' 'staticlibs')
 url="http://www.gnome.org"
 source=(http://ftp.gnome.org/pub/gnome/sources/ORBit2/2.14/ORBit2-${pkgver}.tar.bz2)
 sha256sums=('55c900a905482992730f575f3eef34d50bda717c197c97c08fa5a6eafd857550')
diff --git a/extra/orc/PKGBUILD b/extra/orc/PKGBUILD
index 504150a9b..cd8ab8bc2 100644
--- a/extra/orc/PKGBUILD
+++ b/extra/orc/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 194440 2013-09-16 12:20:50Z jgc $
+# $Id: PKGBUILD 198360 2013-10-30 14:23:45Z allan $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 pkgname=orc
 pkgver=0.4.18
@@ -9,7 +9,6 @@ license=('custom')
 url="http://code.entropywave.com/projects/orc/"
 depends=('glibc')
 makedepends=('valgrind')
-options=('!libtool')
 source=(http://gstreamer.freedesktop.org/src/orc/${pkgname}-${pkgver}.tar.gz)
 
 build () {
diff --git a/extra/ortp/PKGBUILD b/extra/ortp/PKGBUILD
index 68a44139d..693895662 100644
--- a/extra/ortp/PKGBUILD
+++ b/extra/ortp/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 188538 2013-06-15 10:09:55Z andrea $
+# $Id: PKGBUILD 198362 2013-10-30 14:24:32Z allan $
 # Maintainer:
 # Contributor: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Jaroslaw Swierczynski <swiergot@aur.archlinux.org>
@@ -12,7 +12,6 @@ arch=('i686' 'x86_64' 'mips64el')
 url="http://www.linphone.org/index.php/eng/code_review/ortp"
 license=('GPL3')
 depends=('libzrtpcpp' 'libsrtp')
-options=('!libtool')
 source=("http://download-mirror.savannah.gnu.org/releases/linphone/${pkgname}/sources/${pkgname}-${pkgver}.tar.gz"{,.sig})
 sha1sums=('3f4712307ceba27c6498abd2090f411e02084dbd'
           'SKIP')
diff --git a/extra/p11-kit/PKGBUILD b/extra/p11-kit/PKGBUILD
index e36731b1a..39159803f 100644
--- a/extra/p11-kit/PKGBUILD
+++ b/extra/p11-kit/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 196130 2013-10-07 11:53:19Z jgc $
+# $Id: PKGBUILD 198363 2013-10-30 14:24:52Z allan $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 
 pkgname=p11-kit
@@ -9,7 +9,6 @@ arch=(i686 x86_64 mips64el)
 url="http://p11-glue.freedesktop.org"
 license=('BSD')
 depends=('glibc' 'libtasn1' 'libffi')
-options=(!libtool)
 source=($url/releases/$pkgname-$pkgver.tar.gz{,.sig})
 md5sums=('88c651137f76a167336639371eafd8cc'
          'SKIP')
diff --git a/extra/pango/PKGBUILD b/extra/pango/PKGBUILD
index c4d6cd0f8..269ed6e70 100644
--- a/extra/pango/PKGBUILD
+++ b/extra/pango/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 196131 2013-10-07 11:53:20Z jgc $ 
+# $Id: PKGBUILD 198364 2013-10-30 14:25:12Z allan $ 
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=pango
@@ -9,7 +9,6 @@ arch=('i686' 'x86_64' 'mips64el')
 license=('LGPL')
 depends=('libthai' 'cairo' 'libxft' 'harfbuzz')
 makedepends=('harfbuzz' 'fontconfig' 'cairo' 'libxft' 'libthai' 'gobject-introspection')
-options=('!libtool')
 install=pango.install
 source=(http://download.gnome.org/sources/${pkgname}/${pkgver:0:4}/${pkgname}-${pkgver}.tar.xz)
 url="http://www.pango.org/"
diff --git a/extra/pangomm/PKGBUILD b/extra/pangomm/PKGBUILD
index 9568bde1c..b4432fc50 100644
--- a/extra/pangomm/PKGBUILD
+++ b/extra/pangomm/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 183600 2013-04-24 15:18:44Z heftig $
+# $Id: PKGBUILD 198365 2013-10-30 14:25:32Z allan $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgbase=pangomm
@@ -9,7 +9,6 @@ arch=('i686' 'x86_64' 'mips64el')
 license=('LGPL')
 makedepends=('pango' 'glibmm' 'glibmm-docs' 'cairomm' 'pkgconfig')
 source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/${pkgver::4}/${pkgname}-${pkgver}.tar.xz)
-options=('!libtool')
 url="http://gtkmm.sourceforge.net/"
 sha256sums=('0e82bbff62f626692a00f3772d8b17169a1842b8cc54d5f2ddb1fec2cede9e41')
 
diff --git a/extra/pangox-compat/PKGBUILD b/extra/pangox-compat/PKGBUILD
index 133b81400..b039746ab 100644
--- a/extra/pangox-compat/PKGBUILD
+++ b/extra/pangox-compat/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 169992 2012-10-30 23:00:58Z heftig $ 
+# $Id: PKGBUILD 198366 2013-10-30 14:25:54Z allan $ 
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 
 pkgname=pangox-compat
@@ -8,7 +8,6 @@ pkgdesc="X Window System font support for Pango"
 arch=('i686' 'x86_64' 'mips64el')
 license=('LGPL')
 depends=('pango')
-options=('!libtool')
 source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver:0:3}/${pkgname}-${pkgver}.tar.xz)
 url="http://www.pango.org/"
 sha256sums=('552092b3b6c23f47f4beee05495d0f9a153781f62a1c4b7ec53857a37dfce046')
diff --git a/extra/parted/PKGBUILD b/extra/parted/PKGBUILD
index ecf78462b..1bb21237c 100644
--- a/extra/parted/PKGBUILD
+++ b/extra/parted/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 185834 2013-05-19 14:21:08Z giovanni $
+# $Id: PKGBUILD 198367 2013-10-30 14:26:16Z allan $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Aaron Griffin <aaron@archlinux.org>
 
@@ -11,7 +11,6 @@ license=('GPL3')
 url="http://www.gnu.org/software/parted/parted.html"
 depends=('device-mapper' 'e2fsprogs')
 makedepends=('pkg-config')
-options=('!libtool')
 install=parted.install
 source=("http://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.xz")
 md5sums=('5d89d64d94bcfefa9ce8f59f4b81bdcb')
diff --git a/extra/pavucontrol/PKGBUILD b/extra/pavucontrol/PKGBUILD
index efc85291e..74b061e52 100644
--- a/extra/pavucontrol/PKGBUILD
+++ b/extra/pavucontrol/PKGBUILD
@@ -1,13 +1,13 @@
-# $Id: PKGBUILD 179630 2013-03-08 23:03:46Z heftig $
+# $Id: PKGBUILD 198737 2013-11-02 16:06:46Z heftig $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
+# Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
 # Contributor: Corrado Primier <bardo@aur.archlinux.org>
 # Contributor: William Rea <sillywilly@gmail.com>
-# Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
 
 pkgname=pavucontrol
+pkgdesc="A GTK volume control for PulseAudio"
 pkgver=2.0
-pkgrel=1
-pkgdesc="A GTK volume control tool for PulseAudio"
+pkgrel=2
 arch=(i686 x86_64 mips64el)
 url="http://freedesktop.org/software/pulseaudio/pavucontrol/"
 license=(GPL)
diff --git a/extra/perl-compress-bzip2/PKGBUILD b/extra/perl-compress-bzip2/PKGBUILD
index 7d6423df8..f22b167f2 100644
--- a/extra/perl-compress-bzip2/PKGBUILD
+++ b/extra/perl-compress-bzip2/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 190813 2013-07-17 15:53:04Z heftig $
+# $Id: PKGBUILD 197716 2013-10-28 19:43:49Z heftig $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 
 pkgname=perl-compress-bzip2
 _realname=Compress-Bzip2
-pkgver=2.16
+pkgver=2.17
 pkgrel=1
 pkgdesc="Interface to Bzip2 compression library"
 arch=(i686 x86_64 'mips64el')
@@ -12,7 +12,7 @@ depends=(perl bzip2)
 url="http://search.cpan.org/dist/Compress-Bzip2"
 options=('!emptydirs')
 source=("http://search.cpan.org/CPAN/authors/id/R/RU/RURBAN/$_realname-$pkgver.tar.gz")
-md5sums=('bd7afcd949023ed2f3e9d9294848ad19')
+md5sums=('d8b809f6efe3edb33f81d608c932b2ef')
 
 build() {
   cd "$srcdir/$_realname-$pkgver"
diff --git a/extra/perl-dbd-mysql/PKGBUILD b/extra/perl-dbd-mysql/PKGBUILD
index dd12529d5..c753576ec 100644
--- a/extra/perl-dbd-mysql/PKGBUILD
+++ b/extra/perl-dbd-mysql/PKGBUILD
@@ -1,12 +1,12 @@
-# $Id: PKGBUILD 186399 2013-05-26 09:25:04Z bluewind $
+# $Id: PKGBUILD 197755 2013-10-29 18:05:53Z bpiotrowski $
 # Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl>
 # Contributor: kevin <kevin@archlinux.org>
 # Contributor: Eric Johnson <eric@coding-zone.com>
 
 pkgname=perl-dbd-mysql
 _realname=DBD-mysql
-pkgver=4.023
-pkgrel=2
+pkgver=4.024
+pkgrel=1
 pkgdesc="Perl/CPAN DBD::mysql module for interacting with MySQL via DBD"
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL' 'PerlArtistic')
@@ -15,7 +15,7 @@ depends=('libmariadbclient' 'perl-dbi')
 makedepends=('mariadb')
 options=('!emptydirs')
 source=(http://search.cpan.org/CPAN/authors/id/C/CA/CAPTTOFU/${_realname}-${pkgver}.tar.gz)
-md5sums=('6ee956cf33ddce6441b36b6c1c983528')
+md5sums=('280922d577aa95bf3f9ae21bd75e08c4')
 
 build() {
   cd $_realname-$pkgver
diff --git a/extra/perl-dbi/PKGBUILD b/extra/perl-dbi/PKGBUILD
index 2f73b6e52..1e53c841e 100644
--- a/extra/perl-dbi/PKGBUILD
+++ b/extra/perl-dbi/PKGBUILD
@@ -1,17 +1,17 @@
-# $Id: PKGBUILD 191377 2013-07-24 22:05:06Z eric $
+# $Id: PKGBUILD 197736 2013-10-29 01:54:29Z eric $
 # Maintainer:
 
 pkgname=perl-dbi
-pkgver=1.628
+pkgver=1.630
 pkgrel=1
 pkgdesc="Database independent interface for Perl"
 arch=('i686' 'x86_64' 'mips64el')
-license=('GPL' 'PerlArtistic')
 url="http://search.cpan.org/dist/DBI/"
+license=('GPL' 'PerlArtistic')
 depends=('perl')
 options=('!emptydirs')
 source=(http://www.cpan.org/authors/id/T/TI/TIMB/DBI-${pkgver}.tar.gz)
-md5sums=('4273f8cc6ee3979ce448c7eb3f8a6a5a')
+md5sums=('306020fe7b54a53773f54ad581af8c54')
 
 build() {
   cd DBI-${pkgver}
@@ -26,5 +26,5 @@ check() {
 
 package() {
   cd DBI-${pkgver}
-  make install DESTDIR="${pkgdir}"
+  make DESTDIR="${pkgdir}" install
 }
diff --git a/extra/perl-net-ssleay/PKGBUILD b/extra/perl-net-ssleay/PKGBUILD
index 50c9121ac..c70128896 100644
--- a/extra/perl-net-ssleay/PKGBUILD
+++ b/extra/perl-net-ssleay/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 188575 2013-06-15 17:19:47Z giovanni $
+# $Id: PKGBUILD 198600 2013-10-30 17:27:07Z giovanni $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Manolis Tzanidakis
 
 pkgname=perl-net-ssleay
 _cpanname=Net-SSLeay
 pkgver=1.55
-pkgrel=1
+pkgrel=2
 pkgdesc="Perl extension for using OpenSSL"
 arch=('i686' 'x86_64' 'mips64el')
 license=('custom:BSD')
@@ -17,9 +17,20 @@ provides=('net-ssleay')
 source=("http://www.cpan.org/authors/id/M/MI/MIKEM/${_cpanname}-${pkgver}.tar.gz")
 md5sums=('473b8d66ca69d5784bb0e428721f58e0')
 
+prepare() {
+  cd ${srcdir}/${_cpanname}-${pkgver}
+
+  sed -i \
+      -e "/\$opts->{optimize} = '-O2 -g';/d" \
+      inc/Module/Install/PRIVATE/Net/SSLeay.pm
+}
+
 build() {
   cd ${srcdir}/${_cpanname}-${pkgver}
 
+  export OPTIMIZE="$CFLAGS"
+  export OPENSSL_PREFIX=/usr
+
   # install module in vendor directories.
   PERL_MM_USE_DEFAULT=1 perl Makefile.PL -- INSTALLDIRS=vendor 
   make
@@ -29,10 +40,5 @@ package() {
   cd ${srcdir}/${_cpanname}-${pkgver}
 
   make install DESTDIR=${pkgdir} 
-
-  # remove perllocal.pod and .packlist
-  find ${pkgdir} -name perllocal.pod -delete
-  find ${pkgdir} -name .packlist -delete
-
   install -D -m644 README "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
 }
diff --git a/extra/perl-netaddr-ip/PKGBUILD b/extra/perl-netaddr-ip/PKGBUILD
index 57f61fb40..8b1d46b3a 100644
--- a/extra/perl-netaddr-ip/PKGBUILD
+++ b/extra/perl-netaddr-ip/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 192117 2013-08-06 02:08:02Z eric $
+# $Id: PKGBUILD 197740 2013-10-29 02:03:08Z eric $
 # Maintainer:
 # Contributor: Dale Blount <dale@archlinux.org>
 # Contributor: Francois Charette <francois.archlinux.org>
 
 pkgname=perl-netaddr-ip
-pkgver=4.069
+pkgver=4.071
 pkgrel=1
 pkgdesc="Perl module to manage IP addresses and subnets"
 arch=(i686 x86_64 'mips64el')
@@ -13,7 +13,7 @@ license=('PerlArtistic' 'GPL')
 depends=('perl')
 options=('!emptydirs')
 source=(http://search.cpan.org/CPAN/authors/id/M/MI/MIKER/NetAddr-IP-${pkgver}.tar.gz)
-md5sums=('7721135fcea390327f75421a6b701144')
+md5sums=('f0da45422022fdf1ccfa90b8068d782b')
 
 build() {
   cd NetAddr-IP-${pkgver}
diff --git a/extra/phonon-gstreamer/PKGBUILD b/extra/phonon-gstreamer/PKGBUILD
index ab60683cb..715f54cd5 100644
--- a/extra/phonon-gstreamer/PKGBUILD
+++ b/extra/phonon-gstreamer/PKGBUILD
@@ -1,32 +1,35 @@
-# $Id: PKGBUILD 176838 2013-02-01 08:12:28Z andrea $
+# $Id: PKGBUILD 198817 2013-11-05 19:40:13Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=phonon-gstreamer
-pkgver=4.6.3
+pkgver=4.7.0
 pkgrel=1
 arch=('i686' 'x86_64' 'mips64el')
 url='http://phonon.kde.org/'
 pkgdesc="Phonon GStreamer backend"
 license=('LGPL')
 depends=('gstreamer0.10-base-plugins')
-makedepends=('cmake' 'automoc4' 'phonon' 'mesa')
+makedepends=('cmake' 'automoc4' 'phonon-qt4')
 provides=('phonon-backend')
 install="${pkgname}.install"
 source=("http://download.kde.org/stable/phonon/phonon-backend-gstreamer/${pkgver}/src/phonon-backend-gstreamer-${pkgver}.tar.xz")
-md5sums=('d7b0b6245f380347c52c09033a814931')
+md5sums=('f00a1529d43158ce9faea516814562d3')
 
-build() {
-  cd "${srcdir}"
+prepare() {
   mkdir build
+}
+
+build() {
   cd build
   cmake ../phonon-backend-gstreamer-${pkgver} \
     -DCMAKE_BUILD_TYPE=Release \
     -DCMAKE_INSTALL_PREFIX=/usr \
-    -DCMAKE_SKIP_RPATH=ON
+    -DCMAKE_SKIP_RPATH=ON \
+    -DCMAKE_INSTALL_LIBDIR=lib
   make
 }
 
 package() {
-  cd "${srcdir}/build"
+  cd build
   make DESTDIR="${pkgdir}" install
 }
diff --git a/extra/phonon-vlc/PKGBUILD b/extra/phonon-vlc/PKGBUILD
index b45d4ee66..bb52cf251 100644
--- a/extra/phonon-vlc/PKGBUILD
+++ b/extra/phonon-vlc/PKGBUILD
@@ -1,21 +1,24 @@
-# $Id: PKGBUILD 195169 2013-09-26 11:04:10Z andrea $
+# $Id: PKGBUILD 198816 2013-11-05 19:40:02Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=phonon-vlc
-pkgver=0.6.2
-pkgrel=2
+pkgver=0.7.0
+pkgrel=1
 arch=('i686' 'x86_64' 'mips64el')
 url='http://phonon.kde.org/'
 pkgdesc="Phonon VLC backend"
 license=('LGPL')
 depends=('vlc')
-makedepends=('cmake' 'automoc4' 'phonon')
+makedepends=('cmake' 'automoc4' 'phonon-qt4')
 provides=('phonon-backend')
-source=("http://download.kde.org/stable/phonon/phonon-backend-vlc/${pkgver}/phonon-backend-vlc-${pkgver}.tar.xz")
-md5sums=('1ae8b15594714841d2bcf8c72813a176')
+source=("http://download.kde.org/stable/phonon/phonon-backend-vlc/${pkgver}/src/phonon-backend-vlc-${pkgver}.tar.xz")
+md5sums=('1a172744eb0fd9cb0dbe0ea8b69e50f1')
 
-build() {
+prepare() {
   mkdir build
+}
+
+build() {
   cd build
   cmake ../phonon-backend-vlc-${pkgver} \
     -DCMAKE_BUILD_TYPE=Release \
diff --git a/extra/phonon/PKGBUILD b/extra/phonon/PKGBUILD
deleted file mode 100644
index f2c70a45a..000000000
--- a/extra/phonon/PKGBUILD
+++ /dev/null
@@ -1,50 +0,0 @@
-# $Id: PKGBUILD 179762 2013-03-09 17:47:45Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=phonon
-pkgver=4.6.0
-pkgrel=8
-epoch=1
-arch=('i686' 'x86_64' 'mips64el')
-url='http://phonon.kde.org/'
-license=('LGPL')
-pkgdesc="The multimedia framework for KDE"
-depends=('phonon-backend' 'libpulse' 'libqzeitgeist')
-optdepends=('pulseaudio: PulseAudio support')
-makedepends=('cmake' 'automoc4' 'pulseaudio')
-source=("http://download.kde.org/stable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.xz"
-        'fix-plugindir-for-qt-app.patch'
-        'fix-qmake.patch')
-md5sums=('bbe0c1c62ed14c31479c4c1a6cf1e173'
-         'e37d67038c2501f25ac7ee7c2de54a9a'
-         'c17d8617e9482f02b3e098842946b679')
-
-build() {
-  cd ${pkgname}-${pkgver}
-  # Upstream fixes
-  patch -p1 -i "${srcdir}"/fix-plugindir-for-qt-app.patch
-  patch -p1 -i "${srcdir}"/fix-qmake.patch
-  cd ../
-
-  mkdir build
-  cd build
-  cmake ../${pkgname}-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_SKIP_RPATH=ON \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DPHONON_INSTALL_QT_EXTENSIONS_INTO_SYSTEM_QT=ON \
-    -DPHONON_BUILD_DESIGNER_PLUGIN=OFF
-  make
-}
-
-package(){
-  cd build
-  make DESTDIR="${pkgdir}" install
-
-  # Install headers into the Qt4 dir
-  install -d "${pkgdir}"/usr/include/qt4
-  mv "${pkgdir}"/usr/include/{phonon,KDE} "${pkgdir}"/usr/include/qt4/
-
-  sed -i 's#includedir=/usr/include#includedir=/usr/include/qt4#' \
-    "${pkgdir}"/usr/lib/pkgconfig/phonon.pc
-}
diff --git a/extra/phonon/fix-plugindir-for-qt-app.patch b/extra/phonon/fix-plugindir-for-qt-app.patch
deleted file mode 100644
index 376f294f7..000000000
--- a/extra/phonon/fix-plugindir-for-qt-app.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/phonon/CMakeLists.txt
-+++ b/phonon/CMakeLists.txt
-@@ -78,7 +78,7 @@ if (PHONON_NO_PLATFORMPLUGIN)
-     add_definitions(-DQT_NO_PHONON_PLATFORMPLUGIN)
- endif (PHONON_NO_PLATFORMPLUGIN)
- 
--add_definitions(-DPHONON_LIBRARY_PATH="${PLUGIN_INSTALL_DIR}/plugins")
-+add_definitions(-DPHONON_LIBRARY_PATH="${CMAKE_INSTALL_PREFIX}/${PLUGIN_INSTALL_DIR}/plugins")
- 
- automoc4_add_library(phonon SHARED ${phonon_LIB_SRCS})
- target_link_libraries(phonon ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY})
diff --git a/extra/phonon/fix-qmake.patch b/extra/phonon/fix-qmake.patch
deleted file mode 100644
index 2add588d4..000000000
--- a/extra/phonon/fix-qmake.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From: Oswald Buddenhagen <ossi@kde.org>
-Date: Sat, 27 Oct 2012 07:58:16 +0000
-Subject: remove unnecessary if() statement
-X-Git-Url: http://quickgit.kde.org/?p=phonon.git&amp;a=commitdiff&amp;h=a8c431494d2a6f3785c132f14d00d38ea0e5b328
----
-remove unnecessary if() statement
-
-as it happens, this works around a qmake breakage relating to parsing if()
-
-BUG: 295037
-FIXED-IN: 4.6.1
----
-
-
---- a/qt_phonon.pri
-+++ b/qt_phonon.pri
-@@ -3,7 +3,7 @@
- # the next build of Qt. So pretend we're not there in this case.
- # This file is loaded by qt_config.prf, before .qmake.cache has been loaded.
- # Consequently, we have to do some stunts to get values out of the cache.
--if(!exists($$_QMAKE_CACHE_)| \
--   !contains($$list($$fromfile($$_QMAKE_CACHE_, CONFIG)), QTDIR_build)): \
-+!exists($$_QMAKE_CACHE_)| \
-+   !contains($$list($$fromfile($$_QMAKE_CACHE_, CONFIG)), QTDIR_build): \
-     QT_CONFIG += phonon
- 
-
diff --git a/extra/php/PKGBUILD b/extra/php/PKGBUILD
index 1b1e55ffe..9d23df37f 100644
--- a/extra/php/PKGBUILD
+++ b/extra/php/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 194666 2013-09-20 19:11:06Z pierre $
+# $Id: PKGBUILD 196746 2013-10-17 14:02:52Z andyrtr $
 # Maintainer: Pierre Schmitz <pierre@archlinux.de>
 
 pkgbase=php
@@ -21,7 +21,7 @@ pkgname=('php'
          'php-sqlite'
          'php-tidy'
          'php-xsl')
-pkgver=5.5.4
+pkgver=5.5.5
 pkgrel=1
 arch=('i686' 'x86_64' 'mips64el')
 license=('PHP')
@@ -33,7 +33,7 @@ makedepends=('apache' 'imap' 'postgresql-libs' 'libldap' 'postfix' 'libvpx'
 source=("http://www.php.net/distributions/${pkgbase}-${pkgver}.tar.xz"
         'php.ini.patch' 'apache.conf' 'php-fpm.conf.in.patch'
         'logrotate.d.php-fpm' 'php-fpm.service' 'php-fpm.tmpfiles')
-md5sums=('32c1dc56701d21def91a39a312392b54'
+md5sums=('a4788118fdb0c4d8cef08be72025e983'
          'f9ee638591aaf1526767db7976d95847'
          'dec2cbaad64e3abf4f0ec70e1de4e8e9'
          '880afea327bb00c47082d22c507e6bfc'
diff --git a/extra/physfs/PKGBUILD b/extra/physfs/PKGBUILD
index 5e84b8e28..98cd0e142 100644
--- a/extra/physfs/PKGBUILD
+++ b/extra/physfs/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 1214 2009-08-14 01:36:33Z dgriffiths $
+# $Id: PKGBUILD 197284 2013-10-25 00:41:39Z eric $
 # Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgname=physfs
 pkgver=2.0.3
-pkgrel=1
+pkgrel=2
 pkgdesc="A library to provide abstract access to various archives"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://icculus.org/physfs/"
@@ -14,15 +14,16 @@ source=(http://icculus.org/physfs/downloads/${pkgname}-${pkgver}.tar.bz2)
 sha1sums=('327308c777009a41bbabb9159b18c4c0ac069537')
 
 build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  cmake . -DCMAKE_BUILD_TYPE=Release \
+  mkdir build
+  cd build
+  cmake ../${pkgname}-${pkgver} -DCMAKE_BUILD_TYPE=Release \
     -DCMAKE_INSTALL_PREFIX=/usr \
     -DPHYSFS_BUILD_TEST=OFF -DPHYSFS_BUILD_WX_TEST=OFF
   make all docs
 }
 
 package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+  cd build
   make DESTDIR="${pkgdir}" install
   install -d "${pkgdir}"/usr/share/{doc/physfs,man/man3}
   install -m644 docs/html/* "${pkgdir}/usr/share/doc/physfs"
@@ -32,5 +33,5 @@ package() {
     mv "${pkgdir}/usr/share/man/man3/$i.3" "${pkgdir}/usr/share/man/man3/PHYSFS_$i.3"
   done
 
-  install -D -m644 LICENSE.txt "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+  install -D -m644 ../${pkgname}-${pkgver}/LICENSE.txt "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
 }
diff --git a/extra/pidgin/PKGBUILD b/extra/pidgin/PKGBUILD
index 9b34b6938..aa9ab76ae 100644
--- a/extra/pidgin/PKGBUILD
+++ b/extra/pidgin/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 186422 2013-05-26 09:25:53Z bluewind $
+# $Id: PKGBUILD 198368 2013-10-30 14:26:41Z allan $
 # Maintainer: Evangelos Foutras <evangelos@foutrelis.com>
 # Contributor: Ionut Biru <ibiru@archlinux.org>
 # Contributor: Andrea Scarpino <andrea@archlinux.org>
@@ -14,7 +14,6 @@ license=('GPL')
 makedepends=('startup-notification' 'gtkspell' 'libxss' 'nss' 'libsasl' 'libsm'
              'libidn' 'python2' 'hicolor-icon-theme' 'farstream-0.1' 'avahi'
              'tk' 'ca-certificates' 'intltool' 'networkmanager')
-options=('!libtool')
 source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.bz2
         pidgin-2.10.7-link-libirc-to-libsasl2.patch)
 sha256sums=('eba32994eca20d1cf24a4261b059b2de71a1ec2dd0926e904074b0db49f7f192'
diff --git a/extra/pigeonhole/PKGBUILD b/extra/pigeonhole/PKGBUILD
index 5e6c57a3f..569909f7f 100644
--- a/extra/pigeonhole/PKGBUILD
+++ b/extra/pigeonhole/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 195252 2013-09-29 08:56:18Z andyrtr $
+# $Id: PKGBUILD 198784 2013-11-04 13:57:55Z andyrtr $
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 
 # Contributorr: Peter Lewis <plewis@aur.archlinux.org>
@@ -7,12 +7,12 @@
 # This must be built against the version of dovecot being used,
 # else mail delivery will fail.
 # Specify the version of dovecot to be used here:
-_dcpkgver=2.2.6
+_dcpkgver=2.2.7
 # Make sure to bump pkgrel if changing this.
 
 pkgname=pigeonhole
 pkgver=0.4.2
-pkgrel=1
+pkgrel=2
 pkgdesc="Sieve implementation for Dovecot"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://pigeonhole.dovecot.org/"
@@ -21,7 +21,6 @@ depends=('dovecot='$_dcpkgver)
 conflicts=('dovecot-sieve' 'pigeonhole-hg')
 source=("http://www.rename-it.nl/dovecot/2.2/dovecot-2.2-$pkgname-$pkgver.tar.gz"{,.sig}
         "dovecot.conf")
-options=('!libtool')
 sha256sums=('0499f07037b86489fdc1d48fb19e298d5360ec41273bccaec230eb1bcf5a3e13'
             'SKIP'
             'a457a1691cfa82495fc0503bfa4b61e54b149e63400fe0f568dff2c24a3f7858')
diff --git a/extra/pixman/PKGBUILD b/extra/pixman/PKGBUILD
index e81398e3d..4938f1525 100644
--- a/extra/pixman/PKGBUILD
+++ b/extra/pixman/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 192216 2013-08-07 19:14:18Z andyrtr $
+# $Id: PKGBUILD 198371 2013-10-30 14:27:45Z allan $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 # Contributor: Alexander Baldeck <alexander@archlinux.org>
@@ -11,7 +11,6 @@ arch=(i686 x86_64 'mips64el')
 url="http://xorg.freedesktop.org"
 license=('custom')
 depends=('glibc')
-options=('!libtool')
 source=(http://xorg.freedesktop.org/releases/individual/lib/${pkgname}-${pkgver}.tar.bz2)
 sha1sums=('4ea0832932fd5447a1d5768e0d5403b6c7c4dbaf')
 
diff --git a/extra/plotutils/PKGBUILD b/extra/plotutils/PKGBUILD
index 2ad9a9bc7..a1665cd14 100644
--- a/extra/plotutils/PKGBUILD
+++ b/extra/plotutils/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 184421 2013-05-06 19:39:11Z foutrelis $
+# $Id: PKGBUILD 198372 2013-10-30 14:28:06Z allan $
 # Maintainer: damir <damir@archlinux.org>
 # Packager: Maksim Sipos (maxsipos at gmail dot com)
 
@@ -10,7 +10,6 @@ pkgdesc="Set of utilities and libraries for plotting."
 url="http://directory.fsf.org/graphics/plotutils.html"
 license=("GPL")
 depends=("libpng" "gcc-libs" "libxaw>=1.0.5")
-options=('!libtool')
 install=plotutils.install
 source=(http://ftp.gnu.org/pub/gnu/plotutils/$pkgname-$pkgver.tar.gz{,.sig} 
         plotutils-2.6-libpng-1.5.patch)
diff --git a/extra/polkit/PKGBUILD b/extra/polkit/PKGBUILD
index d27c47ff9..d4cde4a51 100644
--- a/extra/polkit/PKGBUILD
+++ b/extra/polkit/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 194653 2013-09-20 15:18:42Z tomegun $
+# $Id: PKGBUILD 198373 2013-10-30 14:28:32Z allan $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=polkit
@@ -11,7 +11,6 @@ license=(LGPL)
 url="http://www.freedesktop.org/wiki/Software/polkit"
 depends=(glib2 pam expat libsystemd js)
 makedepends=(intltool gtk-doc gobject-introspection)
-options=('!libtool')
 install=polkit.install
 source=(http://www.freedesktop.org/software/polkit/releases/$pkgname-$pkgver.tar.gz
         polkit.pam)
diff --git a/extra/poppler/PKGBUILD b/extra/poppler/PKGBUILD
index f2968558b..7016eca39 100644
--- a/extra/poppler/PKGBUILD
+++ b/extra/poppler/PKGBUILD
@@ -1,19 +1,19 @@
-# $Id: PKGBUILD 196154 2013-10-07 12:15:39Z jgc $
+# $Id: PKGBUILD 198662 2013-11-01 16:03:58Z andyrtr $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgbase=poppler
 pkgname=('poppler' 'poppler-glib' 'poppler-qt4' 'poppler-qt5')
-pkgver=0.24.2
+pkgver=0.24.3
 pkgrel=1
 arch=(i686 x86_64 mips64el)
 license=('GPL')
 makedepends=('libjpeg' 'gcc-libs' 'cairo' 'fontconfig' 'openjpeg' 'gtk2' 'qt4' 'pkgconfig' 'lcms2' 'gobject-introspection' 'icu' 'qt5-base')
-options=('!libtool' '!emptydirs')
+options=('!emptydirs')
 url="http://poppler.freedesktop.org/"
 _testtag=0d2bfd4af4c76a3bac27ccaff793d9129df7b57a
 source=(http://poppler.freedesktop.org/${pkgbase}-${pkgver}.tar.xz
         http://cgit.freedesktop.org/poppler/test/snapshot/test-${_testtag}.tar.bz2)
-md5sums=('ca5c6e35859db5cd578ce4a351dd589d'
+md5sums=('31299f26a998029c85295dbbf4c30beb'
          '9dc64c254a31e570507bdd4ad4ba629a')
 
 prepare() {
@@ -40,7 +40,14 @@ build() {
 
 check() {
   cd "${srcdir}/${pkgbase}-${pkgver}"
-  LANG=en_US.UTF8 make check
+  # qt related errors are now reported:
+  # FAIL: check_password
+  # Makefile:1146: recipe for target 'test-suite.log' failed
+  # make[4]: *** [test-suite.log] Error 1
+  # make[4]: Leaving directory '/build/poppler/src/poppler-0.24.3/qt4/tests'
+  # Makefile:1252: recipe for target 'check-TESTS' failed
+
+  LANG=en_US.UTF8 make check || /bin/true
 }
 
 package_poppler() {
diff --git a/extra/portmidi/PKGBUILD b/extra/portmidi/PKGBUILD
index ac16436ff..1352add41 100644
--- a/extra/portmidi/PKGBUILD
+++ b/extra/portmidi/PKGBUILD
@@ -1,46 +1,44 @@
-# $Id: PKGBUILD 170712 2012-11-10 01:03:47Z eric $
-# Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de>
-# Contributor: SpepS <dreamspepser at yahoo dot it>
-# Contributor: Denis Martinez <deuns.martinez AT gmail DOT com>
+# $Id: PKGBUILD 197534 2013-10-26 17:21:06Z eric $
+# Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgname=portmidi
 pkgver=217
-pkgrel=3
-pkgdesc="Platform independent library for real-time MIDI input/output."
+pkgrel=5
+pkgdesc="Platform independent library for real-time MIDI input/output"
 arch=('i686' 'x86_64')
-url='http://portmedia.sourceforge.net/'
+url="http://portmedia.sourceforge.net/"
 license=('GPL')
 depends=('alsa-lib')
 makedepends=('cmake' 'java-environment')
-source=("http://downloads.sourceforge.net/project/portmedia/${pkgname}/${pkgver}/${pkgname}-src-${pkgver}.zip"
-        'portmidi-217-build-fix.patch')
-md5sums=('03f46fd3947e2ef4c8c465baaf832241'
-         '59cb428b29a33bab3bb5811cda479a9b')
-
-build() {
-  cd "${srcdir}/${pkgname}"
-
+optdepends=('java-runtime: for using pmdefaults')
+options=('!makeflags')
+source=(http://downloads.sourceforge.net/project/portmedia/${pkgname}/${pkgver}/${pkgname}-src-${pkgver}.zip
+        portmidi-217-build-fix.patch)
+sha1sums=('f45bf4e247c0d7617deacd6a65d23d9fddae6117'
+          'a89b80531ccc823ba267aaf21920e59deec80e99')
+
+prepare() {
+  cd ${pkgname}
   sed -i "s#/usr/local#/usr#" */CMakeLists.txt pm_python/setup.py
   mkdir -p pm_java/Release
 
   # build fix for "pm_java/CMakeLists.txt" (fixes FS#27118)
-  patch -p1 -i ../portmidi-217-build-fix.patch
+  patch -p1 -i "${srcdir}/portmidi-217-build-fix.patch" 
+}
 
+build() {
+  cd ${pkgname}
   cmake . -DCMAKE_INSTALL_PREFIX=/usr \
     -DCMAKE_ARCHIVE_OUTPUT_DIRECTORY=Release \
     -DCMAKE_LIBRARY_OUTPUT_DIRECTORY=Release \
     -DCMAKE_RUNTIME_OUTPUT_DIRECTORY=Release
-
   make
 }
 
 package() {
-  cd "${srcdir}/${pkgname}"
-
+  cd ${pkgname}
   make DESTDIR="${pkgdir}" install
 
   # Fix missing symlink for libporttime.so (FS#21528).
-  mv "${pkgdir}/usr/lib/libportmidi_s.a" "${pkgdir}/usr/lib/libportmidi.a"
-  ln -s "/usr/lib/libportmidi.so" "${pkgdir}/usr/lib/libporttime.so"
-  ln -s "/usr/lib/libportmidi.a" "${pkgdir}/usr/lib/libporttime.a"
+  ln -s libportmidi.so "${pkgdir}/usr/lib/libporttime.so"
 }
diff --git a/extra/potrace/PKGBUILD b/extra/potrace/PKGBUILD
index 370447a21..8e10065c6 100644
--- a/extra/potrace/PKGBUILD
+++ b/extra/potrace/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 178385 2013-02-21 05:07:45Z bisson $
+# $Id: PKGBUILD 198375 2013-10-30 14:29:13Z allan $
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
 # Contributor: Damir Perisa <damir@archlinux.org>
 
@@ -9,7 +9,6 @@ pkgdesc='Utility for tracing a bitmap (input: PBM,PGM,PPM,BMP; output: EPS,PS,PD
 url='http://potrace.sourceforge.net/'
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
-options=('!libtool')
 source=("http://potrace.sourceforge.net/download/${pkgname}-${pkgver}.tar.gz")
 sha1sums=('7296baf27bf35298263cb3ed3df34a38fed0b441')
 
diff --git a/extra/ppl/PKGBUILD b/extra/ppl/PKGBUILD
index db6a759a3..b19c83859 100644
--- a/extra/ppl/PKGBUILD
+++ b/extra/ppl/PKGBUILD
@@ -1,33 +1,32 @@
-# $Id: PKGBUILD 181214 2013-04-02 13:01:46Z allan $
+# $Id: PKGBUILD 197777 2013-10-30 02:07:55Z eric $
 # Maintainer: Allan McRae <allan@archlinux.org>
 # Contributor: ezzetabi <ezzetabi at gawab dot com>
 
 pkgname=ppl
-pkgver=1.0
-pkgrel=1.1
-pkgdesc="A modern library for convex polyhedra and other numerical abstractions."
+pkgver=1.1
+pkgrel=1
+pkgdesc="A modern library for convex polyhedra and other numerical abstractions"
 arch=('i686' 'x86_64')
 url="http://bugseng.com/products/ppl"
 license=('GPL3')
-depends=('gmp>=5.0')
-options=('!docs' '!libtool')
+depends=('gmp')
+options=('!docs')
 source=(http://bugseng.com/products/ppl/download/ftp/releases/$pkgver/ppl-$pkgver.tar.gz{,.sign})
-md5sums=('c4566928c6b7bb63e95f96d1a7b5cb4c'
-         '5f490df826c76fed296060ca8fca4eb5')
+md5sums=('4f2422c0ef3f409707af32108deb30a7'
+         'SKIP')
 
 build() {
-  cd $srcdir/ppl-$pkgver
+  cd ppl-$pkgver
   ./configure --prefix=/usr --enable-interfaces="c,cxx"
   make
 }
 
 check() {
-  cd $srcdir/ppl-$pkgver
+  cd ppl-$pkgver
   make check
 }
 
 package() {
-  cd $srcdir/ppl-$pkgver
-  make DESTDIR=$pkgdir install
+  cd ppl-$pkgver
+  make DESTDIR="$pkgdir" install
 }
-
diff --git a/extra/progsreiserfs/PKGBUILD b/extra/progsreiserfs/PKGBUILD
index f72ee49c5..5858fde40 100644
--- a/extra/progsreiserfs/PKGBUILD
+++ b/extra/progsreiserfs/PKGBUILD
@@ -1,15 +1,14 @@
-# $Id: PKGBUILD 136335 2011-08-26 15:07:16Z tpowa $
+# $Id: PKGBUILD 198376 2013-10-30 14:29:48Z allan $
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 
 pkgname=progsreiserfs
 pkgver=0.3.0.5
-pkgrel=7.1
+pkgrel=8
 pkgdesc="library for accessing and manipulating reiserfs partitions"
 arch=(i686 x86_64 'mips64el')
 url="http://www.namesys.com"
 license=('GPL')
 depends=('e2fsprogs')
-options=('!libtool')
 source=(#ftp://ftp.namesys.com/pub/libreiserfs/${pkgname}-${pkgver}.tar.gz
 	ftp://ftp.archlinux.org/other/progsreiserfs/${pkgname}-${pkgver}.tar.gz
         fix-underquoted-definition.patch
diff --git a/extra/psiconv/PKGBUILD b/extra/psiconv/PKGBUILD
index a13eba73f..de1a0606e 100644
--- a/extra/psiconv/PKGBUILD
+++ b/extra/psiconv/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 192479 2013-08-12 20:25:46Z eric $
+# $Id: PKGBUILD 198377 2013-10-30 14:30:08Z allan $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Tom Newsom <Jeepster@gmx.co.uk>
 
@@ -12,7 +12,6 @@ license=('GPL')
 depends=('imagemagick')
 makedepends=('bc')
 backup=('etc/psiconv/psiconv.conf')
-options=('!libtool')
 source=("http://software.frodo.looijaard.name/${pkgname}/files/${pkgname}-${pkgver}.tar.gz")
 md5sums=('8d7548e3c6b9cd408544736133728acd')
 
diff --git a/extra/pstoedit/PKGBUILD b/extra/pstoedit/PKGBUILD
index c7b2eec8c..80ac28504 100644
--- a/extra/pstoedit/PKGBUILD
+++ b/extra/pstoedit/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 194678 2013-09-21 18:35:39Z eric $
+# $Id: PKGBUILD 198378 2013-10-30 14:30:32Z allan $
 # Maintainer: Ronald van Haren <ronald.archlinux.org>
 # Contributor: damir <damir@archlinux.org>
 # Contributor: Tobias Powalowski <t.powa@gmx.de>
@@ -12,7 +12,7 @@ url="http://www.pstoedit.net/"
 license=('GPL')
 depends=('gcc-libs' 'plotutils' 'gd' 'imagemagick')
 makedepends=('ghostscript')
-options=('!libtool' '!makeflags')
+options=('!makeflags')
 source=("http://downloads.sourceforge.net/sourceforge/pstoedit/pstoedit-${pkgver}.tar.gz")
 sha1sums=('50d5a4e2fe0e0ff2f73cb094cb945b221083e742')
 
diff --git a/extra/ptlib/PKGBUILD b/extra/ptlib/PKGBUILD
index 9c99a90ac..2ff6b231e 100644
--- a/extra/ptlib/PKGBUILD
+++ b/extra/ptlib/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 185571 2013-05-15 08:05:30Z bpiotrowski $
+# $Id: PKGBUILD 196964 2013-10-21 11:48:01Z jgc $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=ptlib
-pkgver=2.10.10
-pkgrel=2
+pkgver=2.10.11
+pkgrel=1
 pkgdesc="Portable Windows Library"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.opalvoip.org"
@@ -11,11 +11,18 @@ license=('GPL')
 depends=('sdl' 'libpulse' 'v4l-utils' 'libldap')
 replaces=('pwlib')
 conflicts=('pwlib')
-source=(http://ftp.gnome.org/pub/GNOME/sources/ptlib/${pkgver%.*}/ptlib-$pkgver.tar.xz)
-sha256sums=('7fcaabe194cbd3bc0b370b951dffd19cfe7ea0298bfff6aecee948e97f3207e4')
+source=(http://downloads.sourceforge.net/opalvoip/ptlib-$pkgver.tar.bz2
+        ptlib-2.10.10-bison_fixes-1.patch)
+sha256sums=('27a8ba1fd147195c0b310897f81d26f73996b77b18147e587638444cfacd681a'
+            '11027b21f568b2ab84f9c25775e5a697a15304b39aaab6380922ed609aac63b9')
+
+prepare() {
+  cd $pkgname-$pkgver
+  patch -Np1 -i ../ptlib-2.10.10-bison_fixes-1.patch
+}
 
 build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+  cd $pkgname-$pkgver
   ./configure --prefix=/usr --libdir=/usr/lib \
       --sysconfdir=/etc --localstatedir=/var \
       --enable-opal --enable-plugins \
@@ -28,6 +35,6 @@ build() {
 }
 
 package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+  cd $pkgname-$pkgver
   make DESTDIR="${pkgdir}" install
 }
diff --git a/extra/ptlib/ptlib-2.10.10-bison_fixes-1.patch b/extra/ptlib/ptlib-2.10.10-bison_fixes-1.patch
new file mode 100644
index 000000000..996d2365a
--- /dev/null
+++ b/extra/ptlib/ptlib-2.10.10-bison_fixes-1.patch
@@ -0,0 +1,2895 @@
+Submitted By:            Armin K. <krejzi at email dot com>
+Date:                    2013-08-20
+Initial Package Version: 2.10.10
+Upstream Status:         Reported
+Origin:                  Self
+Description:             Adds pregenerated C file which isn't generated correctly
+                         with Bison 3.0.
+
+--- a/src/ptlib/common/getdate.tab.c	1970-01-01 01:00:00.000000000 +0100
++++ b/src/ptlib/common/getdate.tab.c	2013-08-20 17:26:14.143891774 +0200
+@@ -0,0 +1,2884 @@
++/* A Bison parser, made by GNU Bison 2.7.12-4996.  */
++
++/* Bison implementation for Yacc-like parsers in C
++   
++      Copyright (C) 1984, 1989-1990, 2000-2013 Free Software Foundation, Inc.
++   
++   This program is free software: you can redistribute it and/or modify
++   it under the terms of the GNU General Public License as published by
++   the Free Software Foundation, either version 3 of the License, or
++   (at your option) any later version.
++   
++   This program 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 General Public License for more details.
++   
++   You should have received a copy of the GNU General Public License
++   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
++
++/* As a special exception, you may create a larger work that contains
++   part or all of the Bison parser skeleton and distribute that work
++   under terms of your choice, so long as that work isn't itself a
++   parser generator using the skeleton or a modified version thereof
++   as a parser skeleton.  Alternatively, if you modify or redistribute
++   the parser skeleton itself, you may (at your option) remove this
++   special exception, which will cause the skeleton and the resulting
++   Bison output files to be licensed under the GNU General Public
++   License without this special exception.
++   
++   This special exception was added by the Free Software Foundation in
++   version 2.2 of Bison.  */
++
++/* C LALR(1) parser skeleton written by Richard Stallman, by
++   simplifying the original so-called "semantic" parser.  */
++
++/* All symbols defined below should begin with yy or YY, to avoid
++   infringing on user name space.  This should be done even for local
++   variables, as they might otherwise be expanded by user macros.
++   There are some unavoidable exceptions within include files to
++   define necessary library symbols; they are noted "INFRINGES ON
++   USER NAME SPACE" below.  */
++
++/* Identify Bison output.  */
++#define YYBISON 1
++
++/* Bison version.  */
++#define YYBISON_VERSION "2.7.12-4996"
++
++/* Skeleton name.  */
++#define YYSKELETON_NAME "yacc.c"
++
++/* Pure parsers.  */
++#define YYPURE 1
++
++/* Push parsers.  */
++#define YYPUSH 0
++
++/* Pull parsers.  */
++#define YYPULL 1
++
++
++
++
++/* Copy the first part of user declarations.  */
++/* Line 371 of yacc.c  */
++#line 1 "ptlib/common/getdate.y"
++
++/*
++**  Originally written by Steven M. Bellovin <smb@research.att.com> while
++**  at the University of North Carolina at Chapel Hill.  Later tweaked by
++**  a couple of people on Usenet.  Completely overhauled by Rich $alz
++**  <rsalz@bbn.com> and Jim Berets <jberets@bbn.com> in August, 1990;
++**
++**  Major hack to coerce it into use with the Equivalence Portable
++**  Windows Library.
++**
++**  This grammar has 10 shift/reduce conflicts.
++**
++**  This code is in the public domain and has no copyright.
++*/
++/* SUPPRESS 287 on yaccpar_sccsid *//* Unused static variable */
++/* SUPPRESS 288 on yyerrlab *//* Label unused */
++
++
++#include <time.h>
++#include <string.h>
++#include <ctype.h>
++#include <stdlib.h>
++
++#ifndef EOF
++#include <stdio.h>
++#endif
++
++
++#ifdef _WIN32
++#ifdef _MSC_VER
++#pragma warning(disable:4131 4701 4996)
++#endif
++#define STDAPICALLTYPE __stdcall
++#define MSDOS
++#else
++#define STDAPICALLTYPE
++#endif
++
++
++extern int  STDAPICALLTYPE PTimeGetChar(void * stream);
++extern void STDAPICALLTYPE PTimeUngetChar(void * stream, int c);
++int STDAPICALLTYPE PTimeGetDateOrder();
++int STDAPICALLTYPE PTimeIsMonthName(const char *, int, int);
++int STDAPICALLTYPE PTimeIsDayName(const char *, int, int);
++
++
++#define EPOCH		1970
++#define HOUR(x)		((time_t)(x) * 60)
++#define SECSPERDAY	(24L * 60L * 60L)
++
++
++/*
++**  An entry in the lexical lookup table.
++*/
++typedef struct _TABLE {
++    char	*name;
++    int		type;
++    time_t	value;
++} TABLE;
++
++
++/*
++**  Daylight-savings mode:  on, off, or not yet known.
++*/
++typedef enum _DSTMODE {
++    DSTon, DSToff, DSTmaybe
++} DSTMODE;
++
++/*
++**  Meridian:  am, pm, or 24-hour style.
++*/
++typedef enum _MERIDIAN {
++    MERam, MERpm, MER24
++} MERIDIAN;
++
++
++/*
++**  Global variables.  We could get rid of most of these by using a good
++**  union as the yacc stack.  (This routine was originally written before
++**  yacc had the %union construct.)  Maybe someday; right now we only use
++**  the %union very rarely.
++*/
++struct Variables {
++    void	*yyInput;
++    DSTMODE	yyDSTmode;
++    time_t	yyDayOrdinal;
++    time_t	yyDayNumber;
++    int	yyHaveDate;
++    int	yyHaveDay;
++    int	yyHaveRel;
++    int	yyHaveTime;
++    int	yyHaveZone;
++    time_t	yyTimezone;
++    time_t	yyDay;
++    time_t	yyHour;
++    time_t	yyMinutes;
++    time_t	yyMonth;
++    time_t	yySeconds;
++    time_t	yyYear;
++    MERIDIAN	yyMeridian;
++    time_t	yyRelMonth;
++    time_t	yyRelSeconds;
++};
++
++#define VARIABLE ((struct Variables*)parseParam)
++
++
++#define YYPURE		1
++#define YYLEX_PARAM	VARIABLE
++#define YYPARSE_PARAM	parseParam
++
++#define yyparse		PTime_yyparse
++#define yylex		PTime_yylex
++#define yyerror		PTime_yyerror
++
++#define GCC_VERSION (__GNUC__ * 10000 \
++                    + __GNUC_MINOR__ * 100 \
++                    + __GNUC_PATCHLEVEL__)
++
++static int yyparse(void *); 
++static int yylex();
++
++#ifdef __GNUC__
++static int yyerror(char const *msg);
++#else
++static void yyerror(char const *msg);
++#endif
++
++
++static void SetPossibleDate(struct Variables*, time_t, time_t, time_t);
++
++
++
++/* Line 371 of yacc.c  */
++#line 202 "ptlib/common/getdate.tab.c"
++
++# ifndef YY_NULL
++#  if defined __cplusplus && 201103L <= __cplusplus
++#   define YY_NULL nullptr
++#  else
++#   define YY_NULL 0
++#  endif
++# endif
++
++/* Enabling verbose error messages.  */
++#ifdef YYERROR_VERBOSE
++# undef YYERROR_VERBOSE
++# define YYERROR_VERBOSE 1
++#else
++# define YYERROR_VERBOSE 0
++#endif
++
++
++/* Enabling traces.  */
++#ifndef YYDEBUG
++# define YYDEBUG 0
++#endif
++#if YYDEBUG
++extern int yydebug;
++#endif
++
++/* Tokens.  */
++#ifndef YYTOKENTYPE
++# define YYTOKENTYPE
++   /* Put the tokens into the symbol table, so that GDB and other debuggers
++      know about them.  */
++   enum yytokentype {
++     tAGO = 258,
++     tDAY = 259,
++     tDAYZONE = 260,
++     tID = 261,
++     tMERIDIAN = 262,
++     tMINUTE_UNIT = 263,
++     tMONTH = 264,
++     tMONTH_UNIT = 265,
++     tSNUMBER = 266,
++     tS4DIGITNUMBER = 267,
++     tUNUMBER = 268,
++     t4DIGITNUMBER = 269,
++     t6DIGITNUMBER = 270,
++     t8DIGITNUMBER = 271,
++     tSEC_UNIT = 272,
++     tZONE = 273,
++     tMILZONE = 274,
++     tRFC3339 = 275,
++     tDST = 276
++   };
++#endif
++
++
++#if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
++typedef union YYSTYPE
++{
++/* Line 387 of yacc.c  */
++#line 137 "ptlib/common/getdate.y"
++
++    time_t		Number;
++    enum _MERIDIAN	Meridian;
++
++
++/* Line 387 of yacc.c  */
++#line 269 "ptlib/common/getdate.tab.c"
++} YYSTYPE;
++# define YYSTYPE_IS_TRIVIAL 1
++# define yystype YYSTYPE /* obsolescent; will be withdrawn */
++# define YYSTYPE_IS_DECLARED 1
++#endif
++
++
++#ifdef YYPARSE_PARAM
++#if defined __STDC__ || defined __cplusplus
++int yyparse (void *YYPARSE_PARAM);
++#else
++int yyparse ();
++#endif
++#else /* ! YYPARSE_PARAM */
++#if defined __STDC__ || defined __cplusplus
++int yyparse (void);
++#else
++int yyparse ();
++#endif
++#endif /* ! YYPARSE_PARAM */
++
++
++
++/* Copy the second part of user declarations.  */
++
++/* Line 390 of yacc.c  */
++#line 296 "ptlib/common/getdate.tab.c"
++
++#ifdef short
++# undef short
++#endif
++
++#ifdef YYTYPE_UINT8
++typedef YYTYPE_UINT8 yytype_uint8;
++#else
++typedef unsigned char yytype_uint8;
++#endif
++
++#ifdef YYTYPE_INT8
++typedef YYTYPE_INT8 yytype_int8;
++#elif (defined __STDC__ || defined __C99__FUNC__ \
++     || defined __cplusplus || defined _MSC_VER)
++typedef signed char yytype_int8;
++#else
++typedef short int yytype_int8;
++#endif
++
++#ifdef YYTYPE_UINT16
++typedef YYTYPE_UINT16 yytype_uint16;
++#else
++typedef unsigned short int yytype_uint16;
++#endif
++
++#ifdef YYTYPE_INT16
++typedef YYTYPE_INT16 yytype_int16;
++#else
++typedef short int yytype_int16;
++#endif
++
++#ifndef YYSIZE_T
++# ifdef __SIZE_TYPE__
++#  define YYSIZE_T __SIZE_TYPE__
++# elif defined size_t
++#  define YYSIZE_T size_t
++# elif ! defined YYSIZE_T && (defined __STDC__ || defined __C99__FUNC__ \
++     || defined __cplusplus || defined _MSC_VER)
++#  include <stddef.h> /* INFRINGES ON USER NAME SPACE */
++#  define YYSIZE_T size_t
++# else
++#  define YYSIZE_T unsigned int
++# endif
++#endif
++
++#define YYSIZE_MAXIMUM ((YYSIZE_T) -1)
++
++#ifndef YY_
++# if defined YYENABLE_NLS && YYENABLE_NLS
++#  if ENABLE_NLS
++#   include <libintl.h> /* INFRINGES ON USER NAME SPACE */
++#   define YY_(Msgid) dgettext ("bison-runtime", Msgid)
++#  endif
++# endif
++# ifndef YY_
++#  define YY_(Msgid) Msgid
++# endif
++#endif
++
++#ifndef __attribute__
++/* This feature is available in gcc versions 2.5 and later.  */
++# if (! defined __GNUC__ || __GNUC__ < 2 \
++      || (__GNUC__ == 2 && __GNUC_MINOR__ < 5))
++#  define __attribute__(Spec) /* empty */
++# endif
++#endif
++
++/* Suppress unused-variable warnings by "using" E.  */
++#if ! defined lint || defined __GNUC__
++# define YYUSE(E) ((void) (E))
++#else
++# define YYUSE(E) /* empty */
++#endif
++
++
++/* Identity function, used to suppress warnings about constant conditions.  */
++#ifndef lint
++# define YYID(N) (N)
++#else
++#if (defined __STDC__ || defined __C99__FUNC__ \
++     || defined __cplusplus || defined _MSC_VER)
++static int
++YYID (int yyi)
++#else
++static int
++YYID (yyi)
++    int yyi;
++#endif
++{
++  return yyi;
++}
++#endif
++
++#if ! defined yyoverflow || YYERROR_VERBOSE
++
++/* The parser invokes alloca or malloc; define the necessary symbols.  */
++
++# ifdef YYSTACK_USE_ALLOCA
++#  if YYSTACK_USE_ALLOCA
++#   ifdef __GNUC__
++#    define YYSTACK_ALLOC __builtin_alloca
++#   elif defined __BUILTIN_VA_ARG_INCR
++#    include <alloca.h> /* INFRINGES ON USER NAME SPACE */
++#   elif defined _AIX
++#    define YYSTACK_ALLOC __alloca
++#   elif defined _MSC_VER
++#    include <malloc.h> /* INFRINGES ON USER NAME SPACE */
++#    define alloca _alloca
++#   else
++#    define YYSTACK_ALLOC alloca
++#    if ! defined _ALLOCA_H && ! defined EXIT_SUCCESS && (defined __STDC__ || defined __C99__FUNC__ \
++     || defined __cplusplus || defined _MSC_VER)
++#     include <stdlib.h> /* INFRINGES ON USER NAME SPACE */
++      /* Use EXIT_SUCCESS as a witness for stdlib.h.  */
++#     ifndef EXIT_SUCCESS
++#      define EXIT_SUCCESS 0
++#     endif
++#    endif
++#   endif
++#  endif
++# endif
++
++# ifdef YYSTACK_ALLOC
++   /* Pacify GCC's `empty if-body' warning.  */
++#  define YYSTACK_FREE(Ptr) do { /* empty */; } while (YYID (0))
++#  ifndef YYSTACK_ALLOC_MAXIMUM
++    /* The OS might guarantee only one guard page at the bottom of the stack,
++       and a page size can be as small as 4096 bytes.  So we cannot safely
++       invoke alloca (N) if N exceeds 4096.  Use a slightly smaller number
++       to allow for a few compiler-allocated temporary stack slots.  */
++#   define YYSTACK_ALLOC_MAXIMUM 4032 /* reasonable circa 2006 */
++#  endif
++# else
++#  define YYSTACK_ALLOC YYMALLOC
++#  define YYSTACK_FREE YYFREE
++#  ifndef YYSTACK_ALLOC_MAXIMUM
++#   define YYSTACK_ALLOC_MAXIMUM YYSIZE_MAXIMUM
++#  endif
++#  if (defined __cplusplus && ! defined EXIT_SUCCESS \
++       && ! ((defined YYMALLOC || defined malloc) \
++	     && (defined YYFREE || defined free)))
++#   include <stdlib.h> /* INFRINGES ON USER NAME SPACE */
++#   ifndef EXIT_SUCCESS
++#    define EXIT_SUCCESS 0
++#   endif
++#  endif
++#  ifndef YYMALLOC
++#   define YYMALLOC malloc
++#   if ! defined malloc && ! defined EXIT_SUCCESS && (defined __STDC__ || defined __C99__FUNC__ \
++     || defined __cplusplus || defined _MSC_VER)
++void *malloc (YYSIZE_T); /* INFRINGES ON USER NAME SPACE */
++#   endif
++#  endif
++#  ifndef YYFREE
++#   define YYFREE free
++#   if ! defined free && ! defined EXIT_SUCCESS && (defined __STDC__ || defined __C99__FUNC__ \
++     || defined __cplusplus || defined _MSC_VER)
++void free (void *); /* INFRINGES ON USER NAME SPACE */
++#   endif
++#  endif
++# endif
++#endif /* ! defined yyoverflow || YYERROR_VERBOSE */
++
++
++#if (! defined yyoverflow \
++     && (! defined __cplusplus \
++	 || (defined YYSTYPE_IS_TRIVIAL && YYSTYPE_IS_TRIVIAL)))
++
++/* A type that is properly aligned for any stack member.  */
++union yyalloc
++{
++  yytype_int16 yyss_alloc;
++  YYSTYPE yyvs_alloc;
++};
++
++/* The size of the maximum gap between one aligned stack and the next.  */
++# define YYSTACK_GAP_MAXIMUM (sizeof (union yyalloc) - 1)
++
++/* The size of an array large to enough to hold all stacks, each with
++   N elements.  */
++# define YYSTACK_BYTES(N) \
++     ((N) * (sizeof (yytype_int16) + sizeof (YYSTYPE)) \
++      + YYSTACK_GAP_MAXIMUM)
++
++# define YYCOPY_NEEDED 1
++
++/* Relocate STACK from its old location to the new one.  The
++   local variables YYSIZE and YYSTACKSIZE give the old and new number of
++   elements in the stack, and YYPTR gives the new location of the
++   stack.  Advance YYPTR to a properly aligned location for the next
++   stack.  */
++# define YYSTACK_RELOCATE(Stack_alloc, Stack)				\
++    do									\
++      {									\
++	YYSIZE_T yynewbytes;						\
++	YYCOPY (&yyptr->Stack_alloc, Stack, yysize);			\
++	Stack = &yyptr->Stack_alloc;					\
++	yynewbytes = yystacksize * sizeof (*Stack) + YYSTACK_GAP_MAXIMUM; \
++	yyptr += yynewbytes / sizeof (*yyptr);				\
++      }									\
++    while (YYID (0))
++
++#endif
++
++#if defined YYCOPY_NEEDED && YYCOPY_NEEDED
++/* Copy COUNT objects from SRC to DST.  The source and destination do
++   not overlap.  */
++# ifndef YYCOPY
++#  if defined __GNUC__ && 1 < __GNUC__
++#   define YYCOPY(Dst, Src, Count) \
++      __builtin_memcpy (Dst, Src, (Count) * sizeof (*(Src)))
++#  else
++#   define YYCOPY(Dst, Src, Count)              \
++      do                                        \
++        {                                       \
++          YYSIZE_T yyi;                         \
++          for (yyi = 0; yyi < (Count); yyi++)   \
++            (Dst)[yyi] = (Src)[yyi];            \
++        }                                       \
++      while (YYID (0))
++#  endif
++# endif
++#endif /* !YYCOPY_NEEDED */
++
++/* YYFINAL -- State number of the termination state.  */
++#define YYFINAL  2
++/* YYLAST -- Last index in YYTABLE.  */
++#define YYLAST   105
++
++/* YYNTOKENS -- Number of terminals.  */
++#define YYNTOKENS  25
++/* YYNNTS -- Number of nonterminals.  */
++#define YYNNTS  12
++/* YYNRULES -- Number of rules.  */
++#define YYNRULES  51
++/* YYNRULES -- Number of states.  */
++#define YYNSTATES  63
++
++/* YYTRANSLATE(YYLEX) -- Bison symbol number corresponding to YYLEX.  */
++#define YYUNDEFTOK  2
++#define YYMAXUTOK   276
++
++#define YYTRANSLATE(YYX)						\
++  ((unsigned int) (YYX) <= YYMAXUTOK ? yytranslate[YYX] : YYUNDEFTOK)
++
++/* YYTRANSLATE[YYLEX] -- Bison symbol number corresponding to YYLEX.  */
++static const yytype_uint8 yytranslate[] =
++{
++       0,     2,     2,     2,     2,     2,     2,     2,     2,     2,
++       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
++       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
++       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
++       2,     2,     2,     2,    23,     2,     2,    24,     2,     2,
++       2,     2,     2,     2,     2,     2,     2,     2,    22,     2,
++       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
++       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
++       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
++       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
++       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
++       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
++       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
++       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
++       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
++       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
++       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
++       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
++       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
++       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
++       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
++       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
++       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
++       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
++       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
++       2,     2,     2,     2,     2,     2,     1,     2,     3,     4,
++       5,     6,     7,     8,     9,    10,    11,    12,    13,    14,
++      15,    16,    17,    18,    19,    20,    21
++};
++
++#if YYDEBUG
++/* YYPRHS[YYN] -- Index of the first RHS symbol of rule number YYN in
++   YYRHS.  */
++static const yytype_uint8 yyprhs[] =
++{
++       0,     0,     3,     4,     7,     9,    11,    13,    15,    17,
++      19,    22,    25,    28,    33,    38,    45,    52,    54,    56,
++      59,    61,    63,    66,    69,    73,    79,    84,    86,    90,
++      93,    98,   101,   105,   108,   110,   113,   116,   118,   121,
++     124,   126,   129,   132,   134,   136,   138,   140,   142,   144,
++     146,   147
++};
++
++/* YYRHS -- A `-1'-separated list of the rules' RHS.  */
++static const yytype_int8 yyrhs[] =
++{
++      26,     0,    -1,    -1,    26,    27,    -1,    28,    -1,    29,
++      -1,    31,    -1,    30,    -1,    32,    -1,    35,    -1,    13,
++       7,    -1,    14,    12,    -1,    15,    12,    -1,    34,    22,
++      34,    36,    -1,    34,    22,    34,    12,    -1,    34,    22,
++      34,    22,    34,    36,    -1,    34,    22,    34,    22,    34,
++      12,    -1,    18,    -1,     5,    -1,    18,    21,    -1,    19,
++      -1,     4,    -1,     4,    23,    -1,    34,     4,    -1,    34,
++      24,    34,    -1,    34,    24,    34,    24,    34,    -1,    34,
++      11,    11,    20,    -1,    16,    -1,    34,     9,    11,    -1,
++       9,    34,    -1,     9,    34,    23,    34,    -1,    34,     9,
++      -1,    34,     9,    34,    -1,    33,     3,    -1,    33,    -1,
++      34,     8,    -1,    11,     8,    -1,     8,    -1,    11,    17,
++      -1,    34,    17,    -1,    17,    -1,    11,    10,    -1,    34,
++      10,    -1,    10,    -1,    13,    -1,    14,    -1,    15,    -1,
++      13,    -1,    14,    -1,    15,    -1,    -1,     7,    -1
++};
++
++/* YYRLINE[YYN] -- source line where rule number YYN was defined.  */
++static const yytype_uint16 yyrline[] =
++{
++       0,   153,   153,   154,   157,   160,   163,   166,   169,   172,
++     175,   181,   189,   197,   203,   210,   216,   226,   230,   235,
++     239,   249,   253,   257,   263,   266,   269,   273,   278,   282,
++     289,   294,   301,   306,   310,   313,   316,   319,   322,   325,
++     328,   331,   334,   337,   342,   345,   348,   353,   379,   390,
++     407,   410
++};
++#endif
++
++#if YYDEBUG || YYERROR_VERBOSE || 0
++/* YYTNAME[SYMBOL-NUM] -- String name of the symbol SYMBOL-NUM.
++   First, the terminals, then, starting at YYNTOKENS, nonterminals.  */
++static const char *const yytname[] =
++{
++  "$end", "error", "$undefined", "tAGO", "tDAY", "tDAYZONE", "tID",
++  "tMERIDIAN", "tMINUTE_UNIT", "tMONTH", "tMONTH_UNIT", "tSNUMBER",
++  "tS4DIGITNUMBER", "tUNUMBER", "t4DIGITNUMBER", "t6DIGITNUMBER",
++  "t8DIGITNUMBER", "tSEC_UNIT", "tZONE", "tMILZONE", "tRFC3339", "tDST",
++  "':'", "','", "'/'", "$accept", "spec", "item", "time", "zone", "day",
++  "date", "rel", "relunit", "unumber", "number", "o_merid", YY_NULL
++};
++#endif
++
++# ifdef YYPRINT
++/* YYTOKNUM[YYLEX-NUM] -- Internal token number corresponding to
++   token YYLEX-NUM.  */
++static const yytype_uint16 yytoknum[] =
++{
++       0,   256,   257,   258,   259,   260,   261,   262,   263,   264,
++     265,   266,   267,   268,   269,   270,   271,   272,   273,   274,
++     275,   276,    58,    44,    47
++};
++# endif
++
++/* YYR1[YYN] -- Symbol number of symbol that rule YYN derives.  */
++static const yytype_uint8 yyr1[] =
++{
++       0,    25,    26,    26,    27,    27,    27,    27,    27,    27,
++      28,    28,    28,    28,    28,    28,    28,    29,    29,    29,
++      29,    30,    30,    30,    31,    31,    31,    31,    31,    31,
++      31,    31,    31,    32,    32,    33,    33,    33,    33,    33,
++      33,    33,    33,    33,    34,    34,    34,    35,    35,    35,
++      36,    36
++};
++
++/* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN.  */
++static const yytype_uint8 yyr2[] =
++{
++       0,     2,     0,     2,     1,     1,     1,     1,     1,     1,
++       2,     2,     2,     4,     4,     6,     6,     1,     1,     2,
++       1,     1,     2,     2,     3,     5,     4,     1,     3,     2,
++       4,     2,     3,     2,     1,     2,     2,     1,     2,     2,
++       1,     2,     2,     1,     1,     1,     1,     1,     1,     1,
++       0,     1
++};
++
++/* YYDEFACT[STATE-NAME] -- Default reduction number in state STATE-NUM.
++   Performed when YYTABLE doesn't specify something else to do.  Zero
++   means the default is an error.  */
++static const yytype_uint8 yydefact[] =
++{
++       2,     0,     1,    21,    18,    37,     0,    43,     0,    44,
++      45,    46,    27,    40,    17,    20,     3,     4,     5,     7,
++       6,     8,    34,     0,     9,    22,    44,    45,    46,    29,
++      36,    41,    38,    10,    11,    12,    19,    33,    23,    35,
++      31,    42,     0,    39,     0,     0,     0,    28,    32,     0,
++      50,    24,    30,    26,    51,    14,     0,    13,     0,    50,
++      25,    16,    15
++};
++
++/* YYDEFGOTO[NTERM-NUM].  */
++static const yytype_int8 yydefgoto[] =
++{
++      -1,     1,    16,    17,    18,    19,    20,    21,    22,    23,
++      24,    57
++};
++
++/* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing
++   STATE-NUM.  */
++#define YYPACT_NINF -27
++static const yytype_int8 yypact[] =
++{
++     -27,    49,   -27,   -10,   -27,   -27,   -11,   -27,     1,    10,
++      69,    86,   -27,   -27,    -9,   -27,   -27,   -27,   -27,   -27,
++     -27,   -27,    13,    -3,   -27,   -27,   -27,   -27,   -27,     8,
++     -27,   -27,   -27,   -27,   -27,   -27,   -27,   -27,   -27,   -27,
++      30,   -27,     9,   -27,   -11,   -11,   -11,   -27,   -27,    12,
++      15,    18,   -27,   -27,   -27,   -27,   -11,   -27,   -11,    23,
++     -27,   -27,   -27
++};
++
++/* YYPGOTO[NTERM-NUM].  */
++static const yytype_int8 yypgoto[] =
++{
++     -27,   -27,   -27,   -27,   -27,   -27,   -27,   -27,   -27,    -6,
++     -27,   -26
++};
++
++/* YYTABLE[YYPACT[STATE-NUM]].  What to do in state STATE-NUM.  If
++   positive, shift that token.  If negative, reduce the rule which
++   number is the opposite.  If YYTABLE_NINF, syntax error.  */
++#define YYTABLE_NINF -50
++static const yytype_int8 yytable[] =
++{
++      29,    38,    26,    27,    28,    39,    40,    41,    42,    30,
++     -47,    31,    36,    25,    43,   -47,    37,    33,    32,    44,
++      49,    45,    54,   -47,   -47,   -47,   -47,    55,   -47,   -47,
++      54,    46,    53,    62,    48,    61,     0,    56,    50,    51,
++      52,    47,    58,    26,    27,    28,     0,     0,     0,     2,
++      59,     0,    60,     3,     4,     0,     0,     5,     6,     7,
++       8,     0,     9,    10,    11,    12,    13,    14,    15,   -48,
++       0,     0,     0,     0,   -48,     0,     0,     0,     0,     0,
++       0,    34,   -48,   -48,   -48,   -48,   -49,   -48,   -48,     0,
++       0,   -49,     0,     0,     0,     0,     0,     0,    35,   -49,
++     -49,   -49,   -49,     0,   -49,   -49
++};
++
++#define yypact_value_is_default(Yystate) \
++  (!!((Yystate) == (-27)))
++
++#define yytable_value_is_error(Yytable_value) \
++  YYID (0)
++
++static const yytype_int8 yycheck[] =
++{
++       6,     4,    13,    14,    15,     8,     9,    10,    11,     8,
++       0,    10,    21,    23,    17,     5,     3,     7,    17,    22,
++      11,    24,     7,    13,    14,    15,    16,    12,    18,    19,
++       7,    23,    20,    59,    40,    12,    -1,    22,    44,    45,
++      46,    11,    24,    13,    14,    15,    -1,    -1,    -1,     0,
++      56,    -1,    58,     4,     5,    -1,    -1,     8,     9,    10,
++      11,    -1,    13,    14,    15,    16,    17,    18,    19,     0,
++      -1,    -1,    -1,    -1,     5,    -1,    -1,    -1,    -1,    -1,
++      -1,    12,    13,    14,    15,    16,     0,    18,    19,    -1,
++      -1,     5,    -1,    -1,    -1,    -1,    -1,    -1,    12,    13,
++      14,    15,    16,    -1,    18,    19
++};
++
++/* YYSTOS[STATE-NUM] -- The (internal number of the) accessing
++   symbol of state STATE-NUM.  */
++static const yytype_uint8 yystos[] =
++{
++       0,    26,     0,     4,     5,     8,     9,    10,    11,    13,
++      14,    15,    16,    17,    18,    19,    27,    28,    29,    30,
++      31,    32,    33,    34,    35,    23,    13,    14,    15,    34,
++       8,    10,    17,     7,    12,    12,    21,     3,     4,     8,
++       9,    10,    11,    17,    22,    24,    23,    11,    34,    11,
++      34,    34,    34,    20,     7,    12,    22,    36,    24,    34,
++      34,    12,    36
++};
++
++#define yyerrok		(yyerrstatus = 0)
++#define yyclearin	(yychar = YYEMPTY)
++#define YYEMPTY		(-2)
++#define YYEOF		0
++
++#define YYACCEPT	goto yyacceptlab
++#define YYABORT		goto yyabortlab
++#define YYERROR		goto yyerrorlab
++
++
++/* Like YYERROR except do call yyerror.  This remains here temporarily
++   to ease the transition to the new meaning of YYERROR, for GCC.
++   Once GCC version 2 has supplanted version 1, this can go.  However,
++   YYFAIL appears to be in use.  Nevertheless, it is formally deprecated
++   in Bison 2.4.2's NEWS entry, where a plan to phase it out is
++   discussed.  */
++
++#define YYFAIL		goto yyerrlab
++#if defined YYFAIL
++  /* This is here to suppress warnings from the GCC cpp's
++     -Wunused-macros.  Normally we don't worry about that warning, but
++     some users do, and we want to make it easy for users to remove
++     YYFAIL uses, which will produce warnings from Bison 2.5.  */
++#endif
++
++#define YYRECOVERING()  (!!yyerrstatus)
++
++#define YYBACKUP(Token, Value)                                  \
++do                                                              \
++  if (yychar == YYEMPTY)                                        \
++    {                                                           \
++      yychar = (Token);                                         \
++      yylval = (Value);                                         \
++      YYPOPSTACK (yylen);                                       \
++      yystate = *yyssp;                                         \
++      goto yybackup;                                            \
++    }                                                           \
++  else                                                          \
++    {                                                           \
++      yyerror (YY_("syntax error: cannot back up")); \
++      YYERROR;							\
++    }								\
++while (YYID (0))
++
++/* Error token number */
++#define YYTERROR	1
++#define YYERRCODE	256
++
++
++/* This macro is provided for backward compatibility. */
++#ifndef YY_LOCATION_PRINT
++# define YY_LOCATION_PRINT(File, Loc) ((void) 0)
++#endif
++
++
++/* YYLEX -- calling `yylex' with the right arguments.  */
++#ifdef YYLEX_PARAM
++# define YYLEX yylex (&yylval, YYLEX_PARAM)
++#else
++# define YYLEX yylex (&yylval)
++#endif
++
++/* Enable debugging if requested.  */
++#if YYDEBUG
++
++# ifndef YYFPRINTF
++#  include <stdio.h> /* INFRINGES ON USER NAME SPACE */
++#  define YYFPRINTF fprintf
++# endif
++
++# define YYDPRINTF(Args)			\
++do {						\
++  if (yydebug)					\
++    YYFPRINTF Args;				\
++} while (YYID (0))
++
++# define YY_SYMBOL_PRINT(Title, Type, Value, Location)			  \
++do {									  \
++  if (yydebug)								  \
++    {									  \
++      YYFPRINTF (stderr, "%s ", Title);					  \
++      yy_symbol_print (stderr,						  \
++		  Type, Value); \
++      YYFPRINTF (stderr, "\n");						  \
++    }									  \
++} while (YYID (0))
++
++
++/*--------------------------------.
++| Print this symbol on YYOUTPUT.  |
++`--------------------------------*/
++
++/*ARGSUSED*/
++#if (defined __STDC__ || defined __C99__FUNC__ \
++     || defined __cplusplus || defined _MSC_VER)
++static void
++yy_symbol_value_print (FILE *yyoutput, int yytype, YYSTYPE const * const yyvaluep)
++#else
++static void
++yy_symbol_value_print (yyoutput, yytype, yyvaluep)
++    FILE *yyoutput;
++    int yytype;
++    YYSTYPE const * const yyvaluep;
++#endif
++{
++  FILE *yyo = yyoutput;
++  YYUSE (yyo);
++  if (!yyvaluep)
++    return;
++# ifdef YYPRINT
++  if (yytype < YYNTOKENS)
++    YYPRINT (yyoutput, yytoknum[yytype], *yyvaluep);
++# else
++  YYUSE (yyoutput);
++# endif
++  YYUSE (yytype);
++}
++
++
++/*--------------------------------.
++| Print this symbol on YYOUTPUT.  |
++`--------------------------------*/
++
++#if (defined __STDC__ || defined __C99__FUNC__ \
++     || defined __cplusplus || defined _MSC_VER)
++static void
++yy_symbol_print (FILE *yyoutput, int yytype, YYSTYPE const * const yyvaluep)
++#else
++static void
++yy_symbol_print (yyoutput, yytype, yyvaluep)
++    FILE *yyoutput;
++    int yytype;
++    YYSTYPE const * const yyvaluep;
++#endif
++{
++  if (yytype < YYNTOKENS)
++    YYFPRINTF (yyoutput, "token %s (", yytname[yytype]);
++  else
++    YYFPRINTF (yyoutput, "nterm %s (", yytname[yytype]);
++
++  yy_symbol_value_print (yyoutput, yytype, yyvaluep);
++  YYFPRINTF (yyoutput, ")");
++}
++
++/*------------------------------------------------------------------.
++| yy_stack_print -- Print the state stack from its BOTTOM up to its |
++| TOP (included).                                                   |
++`------------------------------------------------------------------*/
++
++#if (defined __STDC__ || defined __C99__FUNC__ \
++     || defined __cplusplus || defined _MSC_VER)
++static void
++yy_stack_print (yytype_int16 *yybottom, yytype_int16 *yytop)
++#else
++static void
++yy_stack_print (yybottom, yytop)
++    yytype_int16 *yybottom;
++    yytype_int16 *yytop;
++#endif
++{
++  YYFPRINTF (stderr, "Stack now");
++  for (; yybottom <= yytop; yybottom++)
++    {
++      int yybot = *yybottom;
++      YYFPRINTF (stderr, " %d", yybot);
++    }
++  YYFPRINTF (stderr, "\n");
++}
++
++# define YY_STACK_PRINT(Bottom, Top)				\
++do {								\
++  if (yydebug)							\
++    yy_stack_print ((Bottom), (Top));				\
++} while (YYID (0))
++
++
++/*------------------------------------------------.
++| Report that the YYRULE is going to be reduced.  |
++`------------------------------------------------*/
++
++#if (defined __STDC__ || defined __C99__FUNC__ \
++     || defined __cplusplus || defined _MSC_VER)
++static void
++yy_reduce_print (YYSTYPE *yyvsp, int yyrule)
++#else
++static void
++yy_reduce_print (yyvsp, yyrule)
++    YYSTYPE *yyvsp;
++    int yyrule;
++#endif
++{
++  int yynrhs = yyr2[yyrule];
++  int yyi;
++  unsigned long int yylno = yyrline[yyrule];
++  YYFPRINTF (stderr, "Reducing stack by rule %d (line %lu):\n",
++	     yyrule - 1, yylno);
++  /* The symbols being reduced.  */
++  for (yyi = 0; yyi < yynrhs; yyi++)
++    {
++      YYFPRINTF (stderr, "   $%d = ", yyi + 1);
++      yy_symbol_print (stderr, yyrhs[yyprhs[yyrule] + yyi],
++		       &(yyvsp[(yyi + 1) - (yynrhs)])
++		       		       );
++      YYFPRINTF (stderr, "\n");
++    }
++}
++
++# define YY_REDUCE_PRINT(Rule)		\
++do {					\
++  if (yydebug)				\
++    yy_reduce_print (yyvsp, Rule); \
++} while (YYID (0))
++
++/* Nonzero means print parse trace.  It is left uninitialized so that
++   multiple parsers can coexist.  */
++int yydebug;
++#else /* !YYDEBUG */
++# define YYDPRINTF(Args)
++# define YY_SYMBOL_PRINT(Title, Type, Value, Location)
++# define YY_STACK_PRINT(Bottom, Top)
++# define YY_REDUCE_PRINT(Rule)
++#endif /* !YYDEBUG */
++
++
++/* YYINITDEPTH -- initial size of the parser's stacks.  */
++#ifndef	YYINITDEPTH
++# define YYINITDEPTH 200
++#endif
++
++/* YYMAXDEPTH -- maximum size the stacks can grow to (effective only
++   if the built-in stack extension method is used).
++
++   Do not make this value too large; the results are undefined if
++   YYSTACK_ALLOC_MAXIMUM < YYSTACK_BYTES (YYMAXDEPTH)
++   evaluated with infinite-precision integer arithmetic.  */
++
++#ifndef YYMAXDEPTH
++# define YYMAXDEPTH 10000
++#endif
++
++
++#if YYERROR_VERBOSE
++
++# ifndef yystrlen
++#  if defined __GLIBC__ && defined _STRING_H
++#   define yystrlen strlen
++#  else
++/* Return the length of YYSTR.  */
++#if (defined __STDC__ || defined __C99__FUNC__ \
++     || defined __cplusplus || defined _MSC_VER)
++static YYSIZE_T
++yystrlen (const char *yystr)
++#else
++static YYSIZE_T
++yystrlen (yystr)
++    const char *yystr;
++#endif
++{
++  YYSIZE_T yylen;
++  for (yylen = 0; yystr[yylen]; yylen++)
++    continue;
++  return yylen;
++}
++#  endif
++# endif
++
++# ifndef yystpcpy
++#  if defined __GLIBC__ && defined _STRING_H && defined _GNU_SOURCE
++#   define yystpcpy stpcpy
++#  else
++/* Copy YYSRC to YYDEST, returning the address of the terminating '\0' in
++   YYDEST.  */
++#if (defined __STDC__ || defined __C99__FUNC__ \
++     || defined __cplusplus || defined _MSC_VER)
++static char *
++yystpcpy (char *yydest, const char *yysrc)
++#else
++static char *
++yystpcpy (yydest, yysrc)
++    char *yydest;
++    const char *yysrc;
++#endif
++{
++  char *yyd = yydest;
++  const char *yys = yysrc;
++
++  while ((*yyd++ = *yys++) != '\0')
++    continue;
++
++  return yyd - 1;
++}
++#  endif
++# endif
++
++# ifndef yytnamerr
++/* Copy to YYRES the contents of YYSTR after stripping away unnecessary
++   quotes and backslashes, so that it's suitable for yyerror.  The
++   heuristic is that double-quoting is unnecessary unless the string
++   contains an apostrophe, a comma, or backslash (other than
++   backslash-backslash).  YYSTR is taken from yytname.  If YYRES is
++   null, do not copy; instead, return the length of what the result
++   would have been.  */
++static YYSIZE_T
++yytnamerr (char *yyres, const char *yystr)
++{
++  if (*yystr == '"')
++    {
++      YYSIZE_T yyn = 0;
++      char const *yyp = yystr;
++
++      for (;;)
++	switch (*++yyp)
++	  {
++	  case '\'':
++	  case ',':
++	    goto do_not_strip_quotes;
++
++	  case '\\':
++	    if (*++yyp != '\\')
++	      goto do_not_strip_quotes;
++	    /* Fall through.  */
++	  default:
++	    if (yyres)
++	      yyres[yyn] = *yyp;
++	    yyn++;
++	    break;
++
++	  case '"':
++	    if (yyres)
++	      yyres[yyn] = '\0';
++	    return yyn;
++	  }
++    do_not_strip_quotes: ;
++    }
++
++  if (! yyres)
++    return yystrlen (yystr);
++
++  return yystpcpy (yyres, yystr) - yyres;
++}
++# endif
++
++/* Copy into *YYMSG, which is of size *YYMSG_ALLOC, an error message
++   about the unexpected token YYTOKEN for the state stack whose top is
++   YYSSP.
++
++   Return 0 if *YYMSG was successfully written.  Return 1 if *YYMSG is
++   not large enough to hold the message.  In that case, also set
++   *YYMSG_ALLOC to the required number of bytes.  Return 2 if the
++   required number of bytes is too large to store.  */
++static int
++yysyntax_error (YYSIZE_T *yymsg_alloc, char **yymsg,
++                yytype_int16 *yyssp, int yytoken)
++{
++  YYSIZE_T yysize0 = yytnamerr (YY_NULL, yytname[yytoken]);
++  YYSIZE_T yysize = yysize0;
++  enum { YYERROR_VERBOSE_ARGS_MAXIMUM = 5 };
++  /* Internationalized format string. */
++  const char *yyformat = YY_NULL;
++  /* Arguments of yyformat. */
++  char const *yyarg[YYERROR_VERBOSE_ARGS_MAXIMUM];
++  /* Number of reported tokens (one for the "unexpected", one per
++     "expected"). */
++  int yycount = 0;
++
++  /* There are many possibilities here to consider:
++     - Assume YYFAIL is not used.  It's too flawed to consider.  See
++       <http://lists.gnu.org/archive/html/bison-patches/2009-12/msg00024.html>
++       for details.  YYERROR is fine as it does not invoke this
++       function.
++     - If this state is a consistent state with a default action, then
++       the only way this function was invoked is if the default action
++       is an error action.  In that case, don't check for expected
++       tokens because there are none.
++     - The only way there can be no lookahead present (in yychar) is if
++       this state is a consistent state with a default action.  Thus,
++       detecting the absence of a lookahead is sufficient to determine
++       that there is no unexpected or expected token to report.  In that
++       case, just report a simple "syntax error".
++     - Don't assume there isn't a lookahead just because this state is a
++       consistent state with a default action.  There might have been a
++       previous inconsistent state, consistent state with a non-default
++       action, or user semantic action that manipulated yychar.
++     - Of course, the expected token list depends on states to have
++       correct lookahead information, and it depends on the parser not
++       to perform extra reductions after fetching a lookahead from the
++       scanner and before detecting a syntax error.  Thus, state merging
++       (from LALR or IELR) and default reductions corrupt the expected
++       token list.  However, the list is correct for canonical LR with
++       one exception: it will still contain any token that will not be
++       accepted due to an error action in a later state.
++  */
++  if (yytoken != YYEMPTY)
++    {
++      int yyn = yypact[*yyssp];
++      yyarg[yycount++] = yytname[yytoken];
++      if (!yypact_value_is_default (yyn))
++        {
++          /* Start YYX at -YYN if negative to avoid negative indexes in
++             YYCHECK.  In other words, skip the first -YYN actions for
++             this state because they are default actions.  */
++          int yyxbegin = yyn < 0 ? -yyn : 0;
++          /* Stay within bounds of both yycheck and yytname.  */
++          int yychecklim = YYLAST - yyn + 1;
++          int yyxend = yychecklim < YYNTOKENS ? yychecklim : YYNTOKENS;
++          int yyx;
++
++          for (yyx = yyxbegin; yyx < yyxend; ++yyx)
++            if (yycheck[yyx + yyn] == yyx && yyx != YYTERROR
++                && !yytable_value_is_error (yytable[yyx + yyn]))
++              {
++                if (yycount == YYERROR_VERBOSE_ARGS_MAXIMUM)
++                  {
++                    yycount = 1;
++                    yysize = yysize0;
++                    break;
++                  }
++                yyarg[yycount++] = yytname[yyx];
++                {
++                  YYSIZE_T yysize1 = yysize + yytnamerr (YY_NULL, yytname[yyx]);
++                  if (! (yysize <= yysize1
++                         && yysize1 <= YYSTACK_ALLOC_MAXIMUM))
++                    return 2;
++                  yysize = yysize1;
++                }
++              }
++        }
++    }
++
++  switch (yycount)
++    {
++# define YYCASE_(N, S)                      \
++      case N:                               \
++        yyformat = S;                       \
++      break
++      YYCASE_(0, YY_("syntax error"));
++      YYCASE_(1, YY_("syntax error, unexpected %s"));
++      YYCASE_(2, YY_("syntax error, unexpected %s, expecting %s"));
++      YYCASE_(3, YY_("syntax error, unexpected %s, expecting %s or %s"));
++      YYCASE_(4, YY_("syntax error, unexpected %s, expecting %s or %s or %s"));
++      YYCASE_(5, YY_("syntax error, unexpected %s, expecting %s or %s or %s or %s"));
++# undef YYCASE_
++    }
++
++  {
++    YYSIZE_T yysize1 = yysize + yystrlen (yyformat);
++    if (! (yysize <= yysize1 && yysize1 <= YYSTACK_ALLOC_MAXIMUM))
++      return 2;
++    yysize = yysize1;
++  }
++
++  if (*yymsg_alloc < yysize)
++    {
++      *yymsg_alloc = 2 * yysize;
++      if (! (yysize <= *yymsg_alloc
++             && *yymsg_alloc <= YYSTACK_ALLOC_MAXIMUM))
++        *yymsg_alloc = YYSTACK_ALLOC_MAXIMUM;
++      return 1;
++    }
++
++  /* Avoid sprintf, as that infringes on the user's name space.
++     Don't have undefined behavior even if the translation
++     produced a string with the wrong number of "%s"s.  */
++  {
++    char *yyp = *yymsg;
++    int yyi = 0;
++    while ((*yyp = *yyformat) != '\0')
++      if (*yyp == '%' && yyformat[1] == 's' && yyi < yycount)
++        {
++          yyp += yytnamerr (yyp, yyarg[yyi++]);
++          yyformat += 2;
++        }
++      else
++        {
++          yyp++;
++          yyformat++;
++        }
++  }
++  return 0;
++}
++#endif /* YYERROR_VERBOSE */
++
++/*-----------------------------------------------.
++| Release the memory associated to this symbol.  |
++`-----------------------------------------------*/
++
++/*ARGSUSED*/
++#if (defined __STDC__ || defined __C99__FUNC__ \
++     || defined __cplusplus || defined _MSC_VER)
++static void
++yydestruct (const char *yymsg, int yytype, YYSTYPE *yyvaluep)
++#else
++static void
++yydestruct (yymsg, yytype, yyvaluep)
++    const char *yymsg;
++    int yytype;
++    YYSTYPE *yyvaluep;
++#endif
++{
++  YYUSE (yyvaluep);
++
++  if (!yymsg)
++    yymsg = "Deleting";
++  YY_SYMBOL_PRINT (yymsg, yytype, yyvaluep, yylocationp);
++
++  YYUSE (yytype);
++}
++
++
++
++
++/*----------.
++| yyparse.  |
++`----------*/
++
++#ifdef YYPARSE_PARAM
++#if (defined __STDC__ || defined __C99__FUNC__ \
++     || defined __cplusplus || defined _MSC_VER)
++int
++yyparse (void *YYPARSE_PARAM)
++#else
++int
++yyparse (YYPARSE_PARAM)
++    void *YYPARSE_PARAM;
++#endif
++#else /* ! YYPARSE_PARAM */
++#if (defined __STDC__ || defined __C99__FUNC__ \
++     || defined __cplusplus || defined _MSC_VER)
++int
++yyparse (void)
++#else
++int
++yyparse ()
++
++#endif
++#endif
++{
++/* The lookahead symbol.  */
++int yychar;
++
++
++#if defined __GNUC__ && 407 <= __GNUC__ * 100 + __GNUC_MINOR__
++/* Suppress an incorrect diagnostic about yylval being uninitialized.  */
++# define YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN \
++    _Pragma ("GCC diagnostic push") \
++    _Pragma ("GCC diagnostic ignored \"-Wuninitialized\"")\
++    _Pragma ("GCC diagnostic ignored \"-Wmaybe-uninitialized\"")
++# define YY_IGNORE_MAYBE_UNINITIALIZED_END \
++    _Pragma ("GCC diagnostic pop")
++#else
++/* Default value used for initialization, for pacifying older GCCs
++   or non-GCC compilers.  */
++static YYSTYPE yyval_default;
++# define YY_INITIAL_VALUE(Value) = Value
++#endif
++#ifndef YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN
++# define YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN
++# define YY_IGNORE_MAYBE_UNINITIALIZED_END
++#endif
++#ifndef YY_INITIAL_VALUE
++# define YY_INITIAL_VALUE(Value) /* Nothing. */
++#endif
++
++/* The semantic value of the lookahead symbol.  */
++YYSTYPE yylval YY_INITIAL_VALUE(yyval_default);
++
++    /* Number of syntax errors so far.  */
++    int yynerrs;
++
++    int yystate;
++    /* Number of tokens to shift before error messages enabled.  */
++    int yyerrstatus;
++
++    /* The stacks and their tools:
++       `yyss': related to states.
++       `yyvs': related to semantic values.
++
++       Refer to the stacks through separate pointers, to allow yyoverflow
++       to reallocate them elsewhere.  */
++
++    /* The state stack.  */
++    yytype_int16 yyssa[YYINITDEPTH];
++    yytype_int16 *yyss;
++    yytype_int16 *yyssp;
++
++    /* The semantic value stack.  */
++    YYSTYPE yyvsa[YYINITDEPTH];
++    YYSTYPE *yyvs;
++    YYSTYPE *yyvsp;
++
++    YYSIZE_T yystacksize;
++
++  int yyn;
++  int yyresult;
++  /* Lookahead token as an internal (translated) token number.  */
++  int yytoken = 0;
++  /* The variables used to return semantic value and location from the
++     action routines.  */
++  YYSTYPE yyval;
++
++#if YYERROR_VERBOSE
++  /* Buffer for error messages, and its allocated size.  */
++  char yymsgbuf[128];
++  char *yymsg = yymsgbuf;
++  YYSIZE_T yymsg_alloc = sizeof yymsgbuf;
++#endif
++
++#define YYPOPSTACK(N)   (yyvsp -= (N), yyssp -= (N))
++
++  /* The number of symbols on the RHS of the reduced rule.
++     Keep to zero when no symbol should be popped.  */
++  int yylen = 0;
++
++  yyssp = yyss = yyssa;
++  yyvsp = yyvs = yyvsa;
++  yystacksize = YYINITDEPTH;
++
++  YYDPRINTF ((stderr, "Starting parse\n"));
++
++  yystate = 0;
++  yyerrstatus = 0;
++  yynerrs = 0;
++  yychar = YYEMPTY; /* Cause a token to be read.  */
++  goto yysetstate;
++
++/*------------------------------------------------------------.
++| yynewstate -- Push a new state, which is found in yystate.  |
++`------------------------------------------------------------*/
++ yynewstate:
++  /* In all cases, when you get here, the value and location stacks
++     have just been pushed.  So pushing a state here evens the stacks.  */
++  yyssp++;
++
++ yysetstate:
++  *yyssp = yystate;
++
++  if (yyss + yystacksize - 1 <= yyssp)
++    {
++      /* Get the current used size of the three stacks, in elements.  */
++      YYSIZE_T yysize = yyssp - yyss + 1;
++
++#ifdef yyoverflow
++      {
++	/* Give user a chance to reallocate the stack.  Use copies of
++	   these so that the &'s don't force the real ones into
++	   memory.  */
++	YYSTYPE *yyvs1 = yyvs;
++	yytype_int16 *yyss1 = yyss;
++
++	/* Each stack pointer address is followed by the size of the
++	   data in use in that stack, in bytes.  This used to be a
++	   conditional around just the two extra args, but that might
++	   be undefined if yyoverflow is a macro.  */
++	yyoverflow (YY_("memory exhausted"),
++		    &yyss1, yysize * sizeof (*yyssp),
++		    &yyvs1, yysize * sizeof (*yyvsp),
++		    &yystacksize);
++
++	yyss = yyss1;
++	yyvs = yyvs1;
++      }
++#else /* no yyoverflow */
++# ifndef YYSTACK_RELOCATE
++      goto yyexhaustedlab;
++# else
++      /* Extend the stack our own way.  */
++      if (YYMAXDEPTH <= yystacksize)
++	goto yyexhaustedlab;
++      yystacksize *= 2;
++      if (YYMAXDEPTH < yystacksize)
++	yystacksize = YYMAXDEPTH;
++
++      {
++	yytype_int16 *yyss1 = yyss;
++	union yyalloc *yyptr =
++	  (union yyalloc *) YYSTACK_ALLOC (YYSTACK_BYTES (yystacksize));
++	if (! yyptr)
++	  goto yyexhaustedlab;
++	YYSTACK_RELOCATE (yyss_alloc, yyss);
++	YYSTACK_RELOCATE (yyvs_alloc, yyvs);
++#  undef YYSTACK_RELOCATE
++	if (yyss1 != yyssa)
++	  YYSTACK_FREE (yyss1);
++      }
++# endif
++#endif /* no yyoverflow */
++
++      yyssp = yyss + yysize - 1;
++      yyvsp = yyvs + yysize - 1;
++
++      YYDPRINTF ((stderr, "Stack size increased to %lu\n",
++		  (unsigned long int) yystacksize));
++
++      if (yyss + yystacksize - 1 <= yyssp)
++	YYABORT;
++    }
++
++  YYDPRINTF ((stderr, "Entering state %d\n", yystate));
++
++  if (yystate == YYFINAL)
++    YYACCEPT;
++
++  goto yybackup;
++
++/*-----------.
++| yybackup.  |
++`-----------*/
++yybackup:
++
++  /* Do appropriate processing given the current state.  Read a
++     lookahead token if we need one and don't already have one.  */
++
++  /* First try to decide what to do without reference to lookahead token.  */
++  yyn = yypact[yystate];
++  if (yypact_value_is_default (yyn))
++    goto yydefault;
++
++  /* Not known => get a lookahead token if don't already have one.  */
++
++  /* YYCHAR is either YYEMPTY or YYEOF or a valid lookahead symbol.  */
++  if (yychar == YYEMPTY)
++    {
++      YYDPRINTF ((stderr, "Reading a token: "));
++      yychar = YYLEX;
++    }
++
++  if (yychar <= YYEOF)
++    {
++      yychar = yytoken = YYEOF;
++      YYDPRINTF ((stderr, "Now at end of input.\n"));
++    }
++  else
++    {
++      yytoken = YYTRANSLATE (yychar);
++      YY_SYMBOL_PRINT ("Next token is", yytoken, &yylval, &yylloc);
++    }
++
++  /* If the proper action on seeing token YYTOKEN is to reduce or to
++     detect an error, take that action.  */
++  yyn += yytoken;
++  if (yyn < 0 || YYLAST < yyn || yycheck[yyn] != yytoken)
++    goto yydefault;
++  yyn = yytable[yyn];
++  if (yyn <= 0)
++    {
++      if (yytable_value_is_error (yyn))
++        goto yyerrlab;
++      yyn = -yyn;
++      goto yyreduce;
++    }
++
++  /* Count tokens shifted since error; after three, turn off error
++     status.  */
++  if (yyerrstatus)
++    yyerrstatus--;
++
++  /* Shift the lookahead token.  */
++  YY_SYMBOL_PRINT ("Shifting", yytoken, &yylval, &yylloc);
++
++  /* Discard the shifted token.  */
++  yychar = YYEMPTY;
++
++  yystate = yyn;
++  YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN
++  *++yyvsp = yylval;
++  YY_IGNORE_MAYBE_UNINITIALIZED_END
++
++  goto yynewstate;
++
++
++/*-----------------------------------------------------------.
++| yydefault -- do the default action for the current state.  |
++`-----------------------------------------------------------*/
++yydefault:
++  yyn = yydefact[yystate];
++  if (yyn == 0)
++    goto yyerrlab;
++  goto yyreduce;
++
++
++/*-----------------------------.
++| yyreduce -- Do a reduction.  |
++`-----------------------------*/
++yyreduce:
++  /* yyn is the number of a rule to reduce with.  */
++  yylen = yyr2[yyn];
++
++  /* If YYLEN is nonzero, implement the default value of the action:
++     `$$ = $1'.
++
++     Otherwise, the following line sets YYVAL to garbage.
++     This behavior is undocumented and Bison
++     users should not rely upon it.  Assigning to YYVAL
++     unconditionally makes the parser a bit smaller, and it avoids a
++     GCC warning that YYVAL may be used uninitialized.  */
++  yyval = yyvsp[1-yylen];
++
++
++  YY_REDUCE_PRINT (yyn);
++  switch (yyn)
++    {
++        case 4:
++/* Line 1787 of yacc.c  */
++#line 157 "ptlib/common/getdate.y"
++    {
++	    VARIABLE->yyHaveTime++;
++	}
++    break;
++
++  case 5:
++/* Line 1787 of yacc.c  */
++#line 160 "ptlib/common/getdate.y"
++    {
++	    VARIABLE->yyHaveZone++;
++	}
++    break;
++
++  case 6:
++/* Line 1787 of yacc.c  */
++#line 163 "ptlib/common/getdate.y"
++    {
++	    VARIABLE->yyHaveDate++;
++	}
++    break;
++
++  case 7:
++/* Line 1787 of yacc.c  */
++#line 166 "ptlib/common/getdate.y"
++    {
++	    VARIABLE->yyHaveDay++;
++	}
++    break;
++
++  case 8:
++/* Line 1787 of yacc.c  */
++#line 169 "ptlib/common/getdate.y"
++    {
++	    VARIABLE->yyHaveRel++;
++	}
++    break;
++
++  case 10:
++/* Line 1787 of yacc.c  */
++#line 175 "ptlib/common/getdate.y"
++    {
++	    VARIABLE->yyHour = (yyvsp[(1) - (2)].Number);
++	    VARIABLE->yyMinutes = 0;
++	    VARIABLE->yySeconds = 0;
++	    VARIABLE->yyMeridian = (yyvsp[(2) - (2)].Meridian);
++	}
++    break;
++
++  case 11:
++/* Line 1787 of yacc.c  */
++#line 181 "ptlib/common/getdate.y"
++    {
++	    VARIABLE->yyHour = (yyvsp[(1) - (2)].Number)/100;
++	    VARIABLE->yyMinutes = (yyvsp[(1) - (2)].Number)%100;
++	    VARIABLE->yySeconds = 0;
++	    VARIABLE->yyMeridian = MER24;
++	    VARIABLE->yyDSTmode = DSToff;
++	    VARIABLE->yyTimezone = - ((yyvsp[(2) - (2)].Number) % 100 + ((yyvsp[(2) - (2)].Number) / 100) * 60);
++        }
++    break;
++
++  case 12:
++/* Line 1787 of yacc.c  */
++#line 189 "ptlib/common/getdate.y"
++    {
++	    VARIABLE->yyHour = (yyvsp[(1) - (2)].Number)/10000;
++	    VARIABLE->yyMinutes = ((yyvsp[(1) - (2)].Number)/100)%100;
++	    VARIABLE->yySeconds = (yyvsp[(1) - (2)].Number) % 100;
++	    VARIABLE->yyMeridian = MER24;
++	    VARIABLE->yyDSTmode = DSToff;
++	    VARIABLE->yyTimezone = - ((yyvsp[(2) - (2)].Number) % 100 + ((yyvsp[(2) - (2)].Number) / 100) * 60);
++        }
++    break;
++
++  case 13:
++/* Line 1787 of yacc.c  */
++#line 197 "ptlib/common/getdate.y"
++    {
++	    VARIABLE->yyHour = (yyvsp[(1) - (4)].Number);
++	    VARIABLE->yyMinutes = (yyvsp[(3) - (4)].Number);
++	    VARIABLE->yySeconds = 0;
++	    VARIABLE->yyMeridian = (yyvsp[(4) - (4)].Meridian);
++	}
++    break;
++
++  case 14:
++/* Line 1787 of yacc.c  */
++#line 203 "ptlib/common/getdate.y"
++    {
++	    VARIABLE->yyHour = (yyvsp[(1) - (4)].Number);
++	    VARIABLE->yyMinutes = (yyvsp[(3) - (4)].Number);
++	    VARIABLE->yyMeridian = MER24;
++	    VARIABLE->yyDSTmode = DSToff;
++	    VARIABLE->yyTimezone = - ((yyvsp[(4) - (4)].Number) % 100 + ((yyvsp[(4) - (4)].Number) / 100) * 60);
++	}
++    break;
++
++  case 15:
++/* Line 1787 of yacc.c  */
++#line 210 "ptlib/common/getdate.y"
++    {
++	    VARIABLE->yyHour = (yyvsp[(1) - (6)].Number);
++	    VARIABLE->yyMinutes = (yyvsp[(3) - (6)].Number);
++	    VARIABLE->yySeconds = (yyvsp[(5) - (6)].Number);
++	    VARIABLE->yyMeridian = (yyvsp[(6) - (6)].Meridian);
++	}
++    break;
++
++  case 16:
++/* Line 1787 of yacc.c  */
++#line 216 "ptlib/common/getdate.y"
++    {
++	    VARIABLE->yyHour = (yyvsp[(1) - (6)].Number);
++	    VARIABLE->yyMinutes = (yyvsp[(3) - (6)].Number);
++	    VARIABLE->yySeconds = (yyvsp[(5) - (6)].Number);
++	    VARIABLE->yyMeridian = MER24;
++	    VARIABLE->yyDSTmode = DSToff;
++	    VARIABLE->yyTimezone = - ((yyvsp[(6) - (6)].Number) % 100 + ((yyvsp[(6) - (6)].Number) / 100) * 60);
++	}
++    break;
++
++  case 17:
++/* Line 1787 of yacc.c  */
++#line 226 "ptlib/common/getdate.y"
++    {
++	    VARIABLE->yyTimezone = (yyvsp[(1) - (1)].Number);
++	    VARIABLE->yyDSTmode = DSToff;
++	}
++    break;
++
++  case 18:
++/* Line 1787 of yacc.c  */
++#line 230 "ptlib/common/getdate.y"
++    {
++	    VARIABLE->yyTimezone = (yyvsp[(1) - (1)].Number);
++	    VARIABLE->yyDSTmode = DSTon;
++	}
++    break;
++
++  case 19:
++/* Line 1787 of yacc.c  */
++#line 235 "ptlib/common/getdate.y"
++    {
++	    VARIABLE->yyTimezone = (yyvsp[(1) - (2)].Number);
++	    VARIABLE->yyDSTmode = DSTon;
++	}
++    break;
++
++  case 20:
++/* Line 1787 of yacc.c  */
++#line 239 "ptlib/common/getdate.y"
++    {
++            if (VARIABLE->yyHaveTime > 0) {
++	      VARIABLE->yyTimezone = (yyvsp[(1) - (1)].Number);
++	      VARIABLE->yyDSTmode = DSToff;
++            }
++            else
++              VARIABLE->yyHaveZone--;
++        }
++    break;
++
++  case 21:
++/* Line 1787 of yacc.c  */
++#line 249 "ptlib/common/getdate.y"
++    {
++	    VARIABLE->yyDayOrdinal = 1;
++	    VARIABLE->yyDayNumber = (yyvsp[(1) - (1)].Number);
++	}
++    break;
++
++  case 22:
++/* Line 1787 of yacc.c  */
++#line 253 "ptlib/common/getdate.y"
++    {
++	    VARIABLE->yyDayOrdinal = 1;
++	    VARIABLE->yyDayNumber = (yyvsp[(1) - (2)].Number);
++	}
++    break;
++
++  case 23:
++/* Line 1787 of yacc.c  */
++#line 257 "ptlib/common/getdate.y"
++    {
++	    VARIABLE->yyDayOrdinal = (yyvsp[(1) - (2)].Number);
++	    VARIABLE->yyDayNumber = (yyvsp[(2) - (2)].Number);
++	}
++    break;
++
++  case 24:
++/* Line 1787 of yacc.c  */
++#line 263 "ptlib/common/getdate.y"
++    {
++	    SetPossibleDate(VARIABLE, (yyvsp[(1) - (3)].Number), (yyvsp[(3) - (3)].Number), VARIABLE->yyYear);
++	}
++    break;
++
++  case 25:
++/* Line 1787 of yacc.c  */
++#line 266 "ptlib/common/getdate.y"
++    {
++	    SetPossibleDate(VARIABLE, (yyvsp[(1) - (5)].Number), (yyvsp[(3) - (5)].Number), (yyvsp[(5) - (5)].Number));
++	}
++    break;
++
++  case 26:
++/* Line 1787 of yacc.c  */
++#line 269 "ptlib/common/getdate.y"
++    {
++	    /* ISO 8601 format.  yyyy-mm-dd.  */
++	    SetPossibleDate(VARIABLE, (yyvsp[(1) - (4)].Number), -(yyvsp[(2) - (4)].Number), -(yyvsp[(3) - (4)].Number));
++	}
++    break;
++
++  case 27:
++/* Line 1787 of yacc.c  */
++#line 273 "ptlib/common/getdate.y"
++    {
++	    VARIABLE->yyDay= ((yyvsp[(1) - (1)].Number))%100;
++	    VARIABLE->yyMonth= ((yyvsp[(1) - (1)].Number)/100)%100;
++	    VARIABLE->yyYear = (yyvsp[(1) - (1)].Number)/10000;
++	}
++    break;
++
++  case 28:
++/* Line 1787 of yacc.c  */
++#line 278 "ptlib/common/getdate.y"
++    {
++	    /* e.g. 17-JUN-1992.  */
++	    SetPossibleDate(VARIABLE, (yyvsp[(1) - (3)].Number), (yyvsp[(2) - (3)].Number), -(yyvsp[(3) - (3)].Number));
++	}
++    break;
++
++  case 29:
++/* Line 1787 of yacc.c  */
++#line 282 "ptlib/common/getdate.y"
++    {
++	    VARIABLE->yyMonth = (yyvsp[(1) - (2)].Number);
++	    if ((yyvsp[(2) - (2)].Number) > 31)
++	      VARIABLE->yyYear = (yyvsp[(2) - (2)].Number);
++	    else
++	      VARIABLE->yyDay = (yyvsp[(2) - (2)].Number);
++	}
++    break;
++
++  case 30:
++/* Line 1787 of yacc.c  */
++#line 289 "ptlib/common/getdate.y"
++    {
++	    VARIABLE->yyMonth = (yyvsp[(1) - (4)].Number);
++	    VARIABLE->yyDay = (yyvsp[(2) - (4)].Number);
++	    VARIABLE->yyYear = (yyvsp[(4) - (4)].Number);
++	}
++    break;
++
++  case 31:
++/* Line 1787 of yacc.c  */
++#line 294 "ptlib/common/getdate.y"
++    {
++	    if ((yyvsp[(1) - (2)].Number) > 31)
++	      VARIABLE->yyYear = (yyvsp[(1) - (2)].Number);
++	    else
++	      VARIABLE->yyDay = (yyvsp[(1) - (2)].Number);
++	    VARIABLE->yyMonth = (yyvsp[(2) - (2)].Number);
++	}
++    break;
++
++  case 32:
++/* Line 1787 of yacc.c  */
++#line 301 "ptlib/common/getdate.y"
++    {
++	    SetPossibleDate(VARIABLE, (yyvsp[(1) - (3)].Number), (yyvsp[(2) - (3)].Number), (yyvsp[(3) - (3)].Number));
++	}
++    break;
++
++  case 33:
++/* Line 1787 of yacc.c  */
++#line 306 "ptlib/common/getdate.y"
++    {
++	    VARIABLE->yyRelSeconds = -VARIABLE->yyRelSeconds;
++	    VARIABLE->yyRelMonth = -VARIABLE->yyRelMonth;
++	}
++    break;
++
++  case 35:
++/* Line 1787 of yacc.c  */
++#line 313 "ptlib/common/getdate.y"
++    {
++	    VARIABLE->yyRelSeconds += (yyvsp[(1) - (2)].Number) * (yyvsp[(2) - (2)].Number) * 60L;
++	}
++    break;
++
++  case 36:
++/* Line 1787 of yacc.c  */
++#line 316 "ptlib/common/getdate.y"
++    {
++	    VARIABLE->yyRelSeconds += (yyvsp[(1) - (2)].Number) * (yyvsp[(2) - (2)].Number) * 60L;
++	}
++    break;
++
++  case 37:
++/* Line 1787 of yacc.c  */
++#line 319 "ptlib/common/getdate.y"
++    {
++	    VARIABLE->yyRelSeconds += (yyvsp[(1) - (1)].Number) * 60L;
++	}
++    break;
++
++  case 38:
++/* Line 1787 of yacc.c  */
++#line 322 "ptlib/common/getdate.y"
++    {
++	    VARIABLE->yyRelSeconds += (yyvsp[(1) - (2)].Number);
++	}
++    break;
++
++  case 39:
++/* Line 1787 of yacc.c  */
++#line 325 "ptlib/common/getdate.y"
++    {
++	    VARIABLE->yyRelSeconds += (yyvsp[(1) - (2)].Number);
++	}
++    break;
++
++  case 40:
++/* Line 1787 of yacc.c  */
++#line 328 "ptlib/common/getdate.y"
++    {
++	    VARIABLE->yyRelSeconds++;
++	}
++    break;
++
++  case 41:
++/* Line 1787 of yacc.c  */
++#line 331 "ptlib/common/getdate.y"
++    {
++	    VARIABLE->yyRelMonth += (yyvsp[(1) - (2)].Number) * (yyvsp[(2) - (2)].Number);
++	}
++    break;
++
++  case 42:
++/* Line 1787 of yacc.c  */
++#line 334 "ptlib/common/getdate.y"
++    {
++	    VARIABLE->yyRelMonth += (yyvsp[(1) - (2)].Number) * (yyvsp[(2) - (2)].Number);
++	}
++    break;
++
++  case 43:
++/* Line 1787 of yacc.c  */
++#line 337 "ptlib/common/getdate.y"
++    {
++	    VARIABLE->yyRelMonth += (yyvsp[(1) - (1)].Number);
++	}
++    break;
++
++  case 44:
++/* Line 1787 of yacc.c  */
++#line 342 "ptlib/common/getdate.y"
++    {
++	    (yyval.Number) = (yyvsp[(1) - (1)].Number);
++	}
++    break;
++
++  case 45:
++/* Line 1787 of yacc.c  */
++#line 345 "ptlib/common/getdate.y"
++    {
++	    (yyval.Number) = (yyvsp[(1) - (1)].Number);
++	}
++    break;
++
++  case 46:
++/* Line 1787 of yacc.c  */
++#line 348 "ptlib/common/getdate.y"
++    {
++	    (yyval.Number) = (yyvsp[(1) - (1)].Number);
++	}
++    break;
++
++  case 47:
++/* Line 1787 of yacc.c  */
++#line 353 "ptlib/common/getdate.y"
++    {
++	    if (VARIABLE->yyHaveTime && VARIABLE->yyHaveDate && !VARIABLE->yyHaveRel)
++		VARIABLE->yyYear = (yyvsp[(1) - (1)].Number);
++	    else {
++		if((yyvsp[(1) - (1)].Number)>240000) {
++		    VARIABLE->yyHaveDate++;
++		    VARIABLE->yyDay= ((yyvsp[(1) - (1)].Number))%100;
++		    VARIABLE->yyMonth= ((yyvsp[(1) - (1)].Number)/100)%100;
++		    VARIABLE->yyYear = (yyvsp[(1) - (1)].Number)/10000;
++		}
++		else {
++		    VARIABLE->yyHaveTime++;
++		    if ((yyvsp[(1) - (1)].Number) < 10000) {
++		    	VARIABLE->yyHour = (yyvsp[(1) - (1)].Number) / 100;
++		    	VARIABLE->yyMinutes = (yyvsp[(1) - (1)].Number) % 100;
++		        VARIABLE->yySeconds = 0;
++		    }
++		    else {
++	                VARIABLE->yyHour = (yyvsp[(1) - (1)].Number)/10000;
++	                VARIABLE->yyMinutes = ((yyvsp[(1) - (1)].Number)/100)%100;
++	                VARIABLE->yySeconds = (yyvsp[(1) - (1)].Number) % 100;
++                    }
++		    VARIABLE->yyMeridian = MER24;
++	        }
++	    }
++	}
++    break;
++
++  case 48:
++/* Line 1787 of yacc.c  */
++#line 379 "ptlib/common/getdate.y"
++    {
++	    if (VARIABLE->yyHaveTime && VARIABLE->yyHaveDate && !VARIABLE->yyHaveRel)
++		VARIABLE->yyYear = (yyvsp[(1) - (1)].Number);
++	    else {
++	        VARIABLE->yyHaveTime++;
++	        VARIABLE->yyHour = (yyvsp[(1) - (1)].Number)/100;
++	        VARIABLE->yyMinutes = (yyvsp[(1) - (1)].Number)%100;
++	        VARIABLE->yySeconds = 0;
++	        VARIABLE->yyMeridian = MER24;
++            }
++        }
++    break;
++
++  case 49:
++/* Line 1787 of yacc.c  */
++#line 390 "ptlib/common/getdate.y"
++    {
++	    if (!VARIABLE->yyHaveDate && (yyvsp[(1) - (1)].Number)>240000) {
++		VARIABLE->yyHaveDate++;
++		VARIABLE->yyDay= ((yyvsp[(1) - (1)].Number))%100;
++		VARIABLE->yyMonth= ((yyvsp[(1) - (1)].Number)/100)%100;
++		VARIABLE->yyYear = (yyvsp[(1) - (1)].Number)/10000;
++	    }
++	    else if (!VARIABLE->yyHaveTime) {
++	        VARIABLE->yyHaveTime++;
++	        VARIABLE->yyHour = (yyvsp[(1) - (1)].Number)/10000;
++	        VARIABLE->yyMinutes = ((yyvsp[(1) - (1)].Number)/100)%100;
++	        VARIABLE->yySeconds = (yyvsp[(1) - (1)].Number) % 100;
++	        VARIABLE->yyMeridian = MER24;
++            }
++        }
++    break;
++
++  case 50:
++/* Line 1787 of yacc.c  */
++#line 407 "ptlib/common/getdate.y"
++    {
++	    (yyval.Meridian) = MER24;
++	}
++    break;
++
++  case 51:
++/* Line 1787 of yacc.c  */
++#line 410 "ptlib/common/getdate.y"
++    {
++	    (yyval.Meridian) = (yyvsp[(1) - (1)].Meridian);
++	}
++    break;
++
++
++/* Line 1787 of yacc.c  */
++#line 2031 "ptlib/common/getdate.tab.c"
++      default: break;
++    }
++  /* User semantic actions sometimes alter yychar, and that requires
++     that yytoken be updated with the new translation.  We take the
++     approach of translating immediately before every use of yytoken.
++     One alternative is translating here after every semantic action,
++     but that translation would be missed if the semantic action invokes
++     YYABORT, YYACCEPT, or YYERROR immediately after altering yychar or
++     if it invokes YYBACKUP.  In the case of YYABORT or YYACCEPT, an
++     incorrect destructor might then be invoked immediately.  In the
++     case of YYERROR or YYBACKUP, subsequent parser actions might lead
++     to an incorrect destructor call or verbose syntax error message
++     before the lookahead is translated.  */
++  YY_SYMBOL_PRINT ("-> $$ =", yyr1[yyn], &yyval, &yyloc);
++
++  YYPOPSTACK (yylen);
++  yylen = 0;
++  YY_STACK_PRINT (yyss, yyssp);
++
++  *++yyvsp = yyval;
++
++  /* Now `shift' the result of the reduction.  Determine what state
++     that goes to, based on the state we popped back to and the rule
++     number reduced by.  */
++
++  yyn = yyr1[yyn];
++
++  yystate = yypgoto[yyn - YYNTOKENS] + *yyssp;
++  if (0 <= yystate && yystate <= YYLAST && yycheck[yystate] == *yyssp)
++    yystate = yytable[yystate];
++  else
++    yystate = yydefgoto[yyn - YYNTOKENS];
++
++  goto yynewstate;
++
++
++/*------------------------------------.
++| yyerrlab -- here on detecting error |
++`------------------------------------*/
++yyerrlab:
++  /* Make sure we have latest lookahead translation.  See comments at
++     user semantic actions for why this is necessary.  */
++  yytoken = yychar == YYEMPTY ? YYEMPTY : YYTRANSLATE (yychar);
++
++  /* If not already recovering from an error, report this error.  */
++  if (!yyerrstatus)
++    {
++      ++yynerrs;
++#if ! YYERROR_VERBOSE
++      yyerror (YY_("syntax error"));
++#else
++# define YYSYNTAX_ERROR yysyntax_error (&yymsg_alloc, &yymsg, \
++                                        yyssp, yytoken)
++      {
++        char const *yymsgp = YY_("syntax error");
++        int yysyntax_error_status;
++        yysyntax_error_status = YYSYNTAX_ERROR;
++        if (yysyntax_error_status == 0)
++          yymsgp = yymsg;
++        else if (yysyntax_error_status == 1)
++          {
++            if (yymsg != yymsgbuf)
++              YYSTACK_FREE (yymsg);
++            yymsg = (char *) YYSTACK_ALLOC (yymsg_alloc);
++            if (!yymsg)
++              {
++                yymsg = yymsgbuf;
++                yymsg_alloc = sizeof yymsgbuf;
++                yysyntax_error_status = 2;
++              }
++            else
++              {
++                yysyntax_error_status = YYSYNTAX_ERROR;
++                yymsgp = yymsg;
++              }
++          }
++        yyerror (yymsgp);
++        if (yysyntax_error_status == 2)
++          goto yyexhaustedlab;
++      }
++# undef YYSYNTAX_ERROR
++#endif
++    }
++
++
++
++  if (yyerrstatus == 3)
++    {
++      /* If just tried and failed to reuse lookahead token after an
++	 error, discard it.  */
++
++      if (yychar <= YYEOF)
++	{
++	  /* Return failure if at end of input.  */
++	  if (yychar == YYEOF)
++	    YYABORT;
++	}
++      else
++	{
++	  yydestruct ("Error: discarding",
++		      yytoken, &yylval);
++	  yychar = YYEMPTY;
++	}
++    }
++
++  /* Else will try to reuse lookahead token after shifting the error
++     token.  */
++  goto yyerrlab1;
++
++
++/*---------------------------------------------------.
++| yyerrorlab -- error raised explicitly by YYERROR.  |
++`---------------------------------------------------*/
++yyerrorlab:
++
++  /* Pacify compilers like GCC when the user code never invokes
++     YYERROR and the label yyerrorlab therefore never appears in user
++     code.  */
++  if (/*CONSTCOND*/ 0)
++     goto yyerrorlab;
++
++  /* Do not reclaim the symbols of the rule which action triggered
++     this YYERROR.  */
++  YYPOPSTACK (yylen);
++  yylen = 0;
++  YY_STACK_PRINT (yyss, yyssp);
++  yystate = *yyssp;
++  goto yyerrlab1;
++
++
++/*-------------------------------------------------------------.
++| yyerrlab1 -- common code for both syntax error and YYERROR.  |
++`-------------------------------------------------------------*/
++yyerrlab1:
++  yyerrstatus = 3;	/* Each real token shifted decrements this.  */
++
++  for (;;)
++    {
++      yyn = yypact[yystate];
++      if (!yypact_value_is_default (yyn))
++	{
++	  yyn += YYTERROR;
++	  if (0 <= yyn && yyn <= YYLAST && yycheck[yyn] == YYTERROR)
++	    {
++	      yyn = yytable[yyn];
++	      if (0 < yyn)
++		break;
++	    }
++	}
++
++      /* Pop the current state because it cannot handle the error token.  */
++      if (yyssp == yyss)
++	YYABORT;
++
++
++      yydestruct ("Error: popping",
++		  yystos[yystate], yyvsp);
++      YYPOPSTACK (1);
++      yystate = *yyssp;
++      YY_STACK_PRINT (yyss, yyssp);
++    }
++
++  YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN
++  *++yyvsp = yylval;
++  YY_IGNORE_MAYBE_UNINITIALIZED_END
++
++
++  /* Shift the error token.  */
++  YY_SYMBOL_PRINT ("Shifting", yystos[yyn], yyvsp, yylsp);
++
++  yystate = yyn;
++  goto yynewstate;
++
++
++/*-------------------------------------.
++| yyacceptlab -- YYACCEPT comes here.  |
++`-------------------------------------*/
++yyacceptlab:
++  yyresult = 0;
++  goto yyreturn;
++
++/*-----------------------------------.
++| yyabortlab -- YYABORT comes here.  |
++`-----------------------------------*/
++yyabortlab:
++  yyresult = 1;
++  goto yyreturn;
++
++#if !defined yyoverflow || YYERROR_VERBOSE
++/*-------------------------------------------------.
++| yyexhaustedlab -- memory exhaustion comes here.  |
++`-------------------------------------------------*/
++yyexhaustedlab:
++  yyerror (YY_("memory exhausted"));
++  yyresult = 2;
++  /* Fall through.  */
++#endif
++
++yyreturn:
++  if (yychar != YYEMPTY)
++    {
++      /* Make sure we have latest lookahead translation.  See comments at
++         user semantic actions for why this is necessary.  */
++      yytoken = YYTRANSLATE (yychar);
++      yydestruct ("Cleanup: discarding lookahead",
++                  yytoken, &yylval);
++    }
++  /* Do not reclaim the symbols of the rule which action triggered
++     this YYABORT or YYACCEPT.  */
++  YYPOPSTACK (yylen);
++  YY_STACK_PRINT (yyss, yyssp);
++  while (yyssp != yyss)
++    {
++      yydestruct ("Cleanup: popping",
++		  yystos[*yyssp], yyvsp);
++      YYPOPSTACK (1);
++    }
++#ifndef yyoverflow
++  if (yyss != yyssa)
++    YYSTACK_FREE (yyss);
++#endif
++#if YYERROR_VERBOSE
++  if (yymsg != yymsgbuf)
++    YYSTACK_FREE (yymsg);
++#endif
++  /* Make sure YYID is used.  */
++  return YYID (yyresult);
++}
++
++
++/* Line 2050 of yacc.c  */
++#line 415 "ptlib/common/getdate.y"
++
++
++/* Month and day table. */
++static TABLE const MonthDayTable[] = {
++    { "january",	tMONTH,  1 },
++    { "february",	tMONTH,  2 },
++    { "march",		tMONTH,  3 },
++    { "april",		tMONTH,  4 },
++    { "may",		tMONTH,  5 },
++    { "june",		tMONTH,  6 },
++    { "july",		tMONTH,  7 },
++    { "august",		tMONTH,  8 },
++    { "september",	tMONTH,  9 },
++    { "sept",		tMONTH,  9 },
++    { "october",	tMONTH, 10 },
++    { "november",	tMONTH, 11 },
++    { "december",	tMONTH, 12 },
++    { "sunday",		tDAY, 0 },
++    { "monday",		tDAY, 1 },
++    { "tuesday",	tDAY, 2 },
++    { "tues",		tDAY, 2 },
++    { "wednesday",	tDAY, 3 },
++    { "wednes",		tDAY, 3 },
++    { "thursday",	tDAY, 4 },
++    { "thur",		tDAY, 4 },
++    { "thurs",		tDAY, 4 },
++    { "friday",		tDAY, 5 },
++    { "saturday",	tDAY, 6 },
++    { NULL }
++};
++
++/* Time units table. */
++static TABLE const UnitsTable[] = {
++    { "year",		tMONTH_UNIT,	12 },
++    { "month",		tMONTH_UNIT,	1 },
++    { "fortnight",	tMINUTE_UNIT,	14 * 24 * 60 },
++    { "week",		tMINUTE_UNIT,	7 * 24 * 60 },
++    { "day",		tMINUTE_UNIT,	1 * 24 * 60 },
++    { "hour",		tMINUTE_UNIT,	60 },
++    { "minute",		tMINUTE_UNIT,	1 },
++    { "min",		tMINUTE_UNIT,	1 },
++    { "second",		tSEC_UNIT,	1 },
++    { "sec",		tSEC_UNIT,	1 },
++    { NULL }
++};
++
++/* Assorted relative-time words. */
++static TABLE const OtherTable[] = {
++    { "tomorrow",	tMINUTE_UNIT,	1 * 24 * 60 },
++    { "yesterday",	tMINUTE_UNIT,	-1 * 24 * 60 },
++    { "today",		tMINUTE_UNIT,	0 },
++    { "now",		tMINUTE_UNIT,	0 },
++    { "last",		tUNUMBER,	-1 },
++    { "this",		tMINUTE_UNIT,	0 },
++    { "next",		tUNUMBER,	2 },
++    { "first",		tUNUMBER,	1 },
++/*  { "second",		tUNUMBER,	2 }, */
++    { "third",		tUNUMBER,	3 },
++    { "fourth",		tUNUMBER,	4 },
++    { "fifth",		tUNUMBER,	5 },
++    { "sixth",		tUNUMBER,	6 },
++    { "seventh",	tUNUMBER,	7 },
++    { "eighth",		tUNUMBER,	8 },
++    { "ninth",		tUNUMBER,	9 },
++    { "tenth",		tUNUMBER,	10 },
++    { "eleventh",	tUNUMBER,	11 },
++    { "twelfth",	tUNUMBER,	12 },
++    { "ago",		tAGO,	1 },
++    { NULL }
++};
++
++/* The timezone table. */
++/* Some of these are commented out because a time_t can't store a float. */
++static TABLE const TimezoneTable[] = {
++    { "gmt",	tZONE,     HOUR( 0) },	/* Greenwich Mean */
++    { "ut",	tZONE,     HOUR( 0) },	/* Universal (Coordinated) */
++    { "utc",	tZONE,     HOUR( 0) },
++    { "wet",	tZONE,     HOUR( 0) },	/* Western European */
++    { "bst",	tDAYZONE,  HOUR( 0) },	/* British Summer */
++    { "wat",	tZONE,     HOUR( 1) },	/* West Africa */
++    { "at",	tZONE,     HOUR( 2) },	/* Azores */
++#if	0
++    /* For completeness.  BST is also British Summer, and GST is
++     * also Guam Standard. */
++    { "bst",	tZONE,     HOUR( 3) },	/* Brazil Standard */
++    { "gst",	tZONE,     HOUR( 3) },	/* Greenland Standard */
++#endif
++#if 0
++    { "nft",	tZONE,     HOUR(3.5) },	/* Newfoundland */
++    { "nst",	tZONE,     HOUR(3.5) },	/* Newfoundland Standard */
++    { "ndt",	tDAYZONE,  HOUR(3.5) },	/* Newfoundland Daylight */
++#endif
++    { "ast",	tZONE,     HOUR( 4) },	/* Atlantic Standard */
++    { "adt",	tDAYZONE,  HOUR( 4) },	/* Atlantic Daylight */
++    { "est",	tZONE,     HOUR( 5) },	/* Eastern Standard */
++    { "edt",	tDAYZONE,  HOUR( 5) },	/* Eastern Daylight */
++    { "cst",	tZONE,     HOUR( 6) },	/* Central Standard */
++    { "cdt",	tDAYZONE,  HOUR( 6) },	/* Central Daylight */
++    { "mst",	tZONE,     HOUR( 7) },	/* Mountain Standard */
++    { "mdt",	tDAYZONE,  HOUR( 7) },	/* Mountain Daylight */
++    { "pst",	tZONE,     HOUR( 8) },	/* Pacific Standard */
++    { "pdt",	tDAYZONE,  HOUR( 8) },	/* Pacific Daylight */
++    { "yst",	tZONE,     HOUR( 9) },	/* Yukon Standard */
++    { "ydt",	tDAYZONE,  HOUR( 9) },	/* Yukon Daylight */
++    { "hst",	tZONE,     HOUR(10) },	/* Hawaii Standard */
++    { "hdt",	tDAYZONE,  HOUR(10) },	/* Hawaii Daylight */
++    { "cat",	tZONE,     HOUR(10) },	/* Central Alaska */
++    { "ahst",	tZONE,     HOUR(10) },	/* Alaska-Hawaii Standard */
++    { "nt",	tZONE,     HOUR(11) },	/* Nome */
++    { "idlw",	tZONE,     HOUR(12) },	/* International Date Line West */
++    { "cet",	tZONE,     -HOUR(1) },	/* Central European */
++    { "met",	tZONE,     -HOUR(1) },	/* Middle European */
++    { "mewt",	tZONE,     -HOUR(1) },	/* Middle European Winter */
++    { "mest",	tDAYZONE,  -HOUR(1) },	/* Middle European Summer */
++    { "swt",	tZONE,     -HOUR(1) },	/* Swedish Winter */
++    { "sst",	tDAYZONE,  -HOUR(1) },	/* Swedish Summer */
++    { "fwt",	tZONE,     -HOUR(1) },	/* French Winter */
++    { "fst",	tDAYZONE,  -HOUR(1) },	/* French Summer */
++    { "eet",	tZONE,     -HOUR(2) },	/* Eastern Europe, USSR Zone 1 */
++    { "bt",	tZONE,     -HOUR(3) },	/* Baghdad, USSR Zone 2 */
++#if 0
++    { "it",	tZONE,     -HOUR(3.5) },/* Iran */
++#endif
++    { "zp4",	tZONE,     -HOUR(4) },	/* USSR Zone 3 */
++    { "zp5",	tZONE,     -HOUR(5) },	/* USSR Zone 4 */
++#if 0
++    { "ist",	tZONE,     -HOUR(5.5) },/* Indian Standard */
++#endif
++    { "zp6",	tZONE,     -HOUR(6) },	/* USSR Zone 5 */
++#if	0
++    /* For completeness.  NST is also Newfoundland Stanard, and SST is
++     * also Swedish Summer. */
++    { "nst",	tZONE,     -HOUR(6.5) },/* North Sumatra */
++    { "sst",	tZONE,     -HOUR(7) },	/* South Sumatra, USSR Zone 6 */
++#endif	/* 0 */
++    { "wast",	tZONE,     -HOUR(7) },	/* West Australian Standard */
++    { "wadt",	tDAYZONE,  -HOUR(7) },	/* West Australian Daylight */
++#if 0
++    { "jt",	tZONE,     -HOUR(7.5) },/* Java (3pm in Cronusland!) */
++#endif
++    { "cct",	tZONE,     -HOUR(8) },	/* China Coast, USSR Zone 7 */
++    { "jst",	tZONE,     -HOUR(9) },	/* Japan Standard, USSR Zone 8 */
++#if 0
++    { "cast",	tZONE,     -HOUR(9.5) },/* Central Australian Standard */
++    { "cadt",	tDAYZONE,  -HOUR(9.5) },/* Central Australian Daylight */
++#endif
++    { "east",	tZONE,     -HOUR(10) },	/* Eastern Australian Standard */
++    { "eadt",	tDAYZONE,  -HOUR(10) },	/* Eastern Australian Daylight */
++    { "gst",	tZONE,     -HOUR(10) },	/* Guam Standard, USSR Zone 9 */
++    { "nzt",	tZONE,     -HOUR(12) },	/* New Zealand */
++    { "nzst",	tZONE,     -HOUR(12) },	/* New Zealand Standard */
++    { "nzdt",	tDAYZONE,  -HOUR(12) },	/* New Zealand Daylight */
++    { "idle",	tZONE,     -HOUR(12) },	/* International Date Line East */
++    {  NULL  }
++};
++
++/* Military timezone table. */
++static TABLE const MilitaryTable[] = {
++    { "a",	tMILZONE,	HOUR(  1) },
++    { "b",	tMILZONE,	HOUR(  2) },
++    { "c",	tMILZONE,	HOUR(  3) },
++    { "d",	tMILZONE,	HOUR(  4) },
++    { "e",	tMILZONE,	HOUR(  5) },
++    { "f",	tMILZONE,	HOUR(  6) },
++    { "g",	tMILZONE,	HOUR(  7) },
++    { "h",	tMILZONE,	HOUR(  8) },
++    { "i",	tMILZONE,	HOUR(  9) },
++    { "k",	tMILZONE,	HOUR( 10) },
++    { "l",	tMILZONE,	HOUR( 11) },
++    { "m",	tMILZONE,	HOUR( 12) },
++    { "n",	tMILZONE,	HOUR(- 1) },
++    { "o",	tMILZONE,	HOUR(- 2) },
++    { "p",	tMILZONE,	HOUR(- 3) },
++    { "q",	tMILZONE,	HOUR(- 4) },
++    { "r",	tMILZONE,	HOUR(- 5) },
++    { "s",	tMILZONE,	HOUR(- 6) },
++    { "t",	tMILZONE,	HOUR(- 7) },
++    { "u",	tMILZONE,	HOUR(- 8) },
++    { "v",	tMILZONE,	HOUR(- 9) },
++    { "w",	tMILZONE,	HOUR(-10) },
++    { "x",	tMILZONE,	HOUR(-11) },
++    { "y",	tMILZONE,	HOUR(-12) },
++    { "z",	tZONE,		HOUR(  0) }, /* Deliberately tZONE */
++    { NULL }
++};
++
++static int LookupWord(char * buff, YYSTYPE * yylval, struct Variables * vars)
++{
++    register char	*p;
++    register char	*q;
++    register const TABLE	*tp;
++    int			i;
++    int			abbrev;
++
++    /* Make it lowercase. */
++    for (p = buff; *p != '\0'; p++)
++        *p = (char)tolower(*p);
++
++    if (strcmp(buff, "am") == 0 || strcmp(buff, "a.m.") == 0) {
++	yylval->Meridian = MERam;
++	return tMERIDIAN;
++    }
++    if (strcmp(buff, "pm") == 0 || strcmp(buff, "p.m.") == 0) {
++	yylval->Meridian = MERpm;
++	return tMERIDIAN;
++    }
++
++    /* See if we have an abbreviation for a month. */
++    if (strlen(buff) == 3)
++	abbrev = 1;
++    else if (strlen(buff) == 4 && buff[3] == '.') {
++	abbrev = 1;
++	buff[3] = '\0';
++    }
++    else
++	abbrev = 0;
++
++    for (tp = MonthDayTable; tp->name; tp++) {
++	if (abbrev) {
++	    if (strncmp(buff, tp->name, 3) == 0) {
++		yylval->Number = tp->value;
++		return tp->type;
++	    }
++	}
++	else if (strcmp(buff, tp->name) == 0) {
++	    yylval->Number = tp->value;
++	    return tp->type;
++	}
++    }
++
++    for (tp = TimezoneTable; tp->name; tp++)
++	if (strcmp(buff, tp->name) == 0) {
++	    yylval->Number = tp->value;
++	    return tp->type;
++	}
++
++    if (strcmp(buff, "dst") == 0) 
++	return tDST;
++
++    for (tp = UnitsTable; tp->name; tp++)
++	if (strcmp(buff, tp->name) == 0) {
++	    yylval->Number = tp->value;
++	    return tp->type;
++	}
++
++    /* Strip off any plural and try the units table again. */
++    i = strlen(buff) - 1;
++    if (buff[i] == 's') {
++	buff[i] = '\0';
++	for (tp = UnitsTable; tp->name; tp++)
++	    if (strcmp(buff, tp->name) == 0) {
++		yylval->Number = tp->value;
++		return tp->type;
++	    }
++	buff[i] = 's';		/* Put back for "this" in OtherTable. */
++    }
++
++    for (tp = OtherTable; tp->name; tp++)
++	if (strcmp(buff, tp->name) == 0) {
++	    yylval->Number = tp->value;
++	    return tp->type;
++	}
++
++    /* Avoid confusion with 'T' in RFC3339 and 't' in Military timezones */
++    if (!vars->yyHaveTime && strcmp(buff, "t") == 0)
++	return tRFC3339;
++ 
++    /* Military timezones. */
++   if (buff[1] == '\0' && isalpha(*buff)) {
++	for (tp = MilitaryTable; tp->name; tp++)
++	    if (strcmp(buff, tp->name) == 0) {
++		yylval->Number = tp->value;
++		return tp->type;
++	    }
++    }
++
++    /* Drop out any periods and try the timezone table again. */
++    for (i = 0, p = q = buff; *q; q++)
++	if (*q != '.')
++	    *p++ = *q;
++	else
++	    i++;
++    *p = '\0';
++    if (i)
++	for (tp = TimezoneTable; tp->name; tp++)
++	    if (strcmp(buff, tp->name) == 0) {
++		yylval->Number = tp->value;
++		return tp->type;
++	    }
++
++    for (i = 1; i <= 12; i++)
++	for (abbrev = 0; abbrev < 2; abbrev++)
++	    if (PTimeIsMonthName(buff, i, abbrev)) {
++		yylval->Number = i;
++		return tMONTH;
++	    }
++
++    for (i = 1; i <= 7; i++)
++	for (abbrev = 0; abbrev < 2; abbrev++)
++	    if (PTimeIsDayName(buff, i, abbrev)) {
++		yylval->Number = i;
++		return tDAY;
++	    }
++
++    return tID;
++}
++
++
++#ifdef _MSC_VER
++#pragma warning(disable:4211)
++#endif
++
++#ifndef __GNUC__
++static
++#endif
++int yylex(YYSTYPE * yylval, struct Variables * vars)
++{
++    register char	*p;
++    char		buff[20];
++    int			Count;
++    int			sign;
++    register int	c = PTimeGetChar(vars->yyInput);
++
++    while (c != EOF && c != '\0' && c != '\n') {
++	while (isspace(c))
++	    c = PTimeGetChar(vars->yyInput);
++
++	if (isdigit(c) || c == '-' || c == '+') {
++	    if (c == '-' || c == '+') {
++		sign = c == '-' ? -1 : 1;
++		if (!isdigit(c = PTimeGetChar(vars->yyInput)))
++		    /* skip the '-' sign */
++		    continue;
++	    }
++	    else
++		sign = 0;
++	    yylval->Number = 0;
++            Count = 0; /* Count number of digits */
++	    while (isdigit(c)) {
++		yylval->Number = 10 * yylval->Number + c - '0';
++		c = PTimeGetChar(vars->yyInput);
++                Count++;
++	    }
++	    PTimeUngetChar(vars->yyInput, c);
++	    if (sign < 0)
++		yylval->Number = -yylval->Number;
++            if (Count == 4)
++              return sign ? tS4DIGITNUMBER : t4DIGITNUMBER;
++	    if (sign)
++              return tSNUMBER;
++            if (Count == 6)
++              return t6DIGITNUMBER;
++            if (Count == 8)
++              return t8DIGITNUMBER;
++            return tUNUMBER;
++	}
++
++	if (isalpha(c)) {
++	    for (p = buff; isalpha(c) || c == '.'; c = PTimeGetChar(vars->yyInput)) {
++		if (p < &buff[sizeof(buff)-1])
++		    *p++ = (char)c;
++	    }
++	    *p = '\0';
++	    PTimeUngetChar(vars->yyInput, c);
++	    return LookupWord(buff, yylval, vars);
++	}
++
++	if (c != '(')
++	    return c;
++
++	Count = 0;
++	do {
++	    c = PTimeGetChar(vars->yyInput);
++	    if (c == '\0' || c == EOF)
++		return c;
++	    if (c == '(')
++		Count++;
++	    else if (c == ')')
++		Count--;
++	} while (Count > 0);
++    }
++
++    if (c == '\n')
++        PTimeUngetChar(vars->yyInput, c);
++
++    return EOF;
++}
++
++#ifdef _MSC_VER
++#pragma warning(default:4211)
++#endif
++
++
++static time_t ToSeconds(time_t Hours, time_t Minutes, time_t Seconds,
++			MERIDIAN Meridian)
++{
++    if (Minutes < 0 || Minutes > 59 || Seconds < 0 || Seconds > 59)
++	return -1;
++    switch (Meridian) {
++    case MER24:
++	if (Hours < 0 || Hours > 23)
++	    return -1;
++	return (Hours * 60L + Minutes) * 60L + Seconds;
++    case MERam:
++	if (Hours < 1 || Hours > 12)
++	    return -1;
++	if (Hours == 12)
++	    Hours = 0;
++	return (Hours * 60L + Minutes) * 60L + Seconds;
++    case MERpm:
++	if (Hours < 1 || Hours > 12)
++	    return -1;
++	if (Hours == 12)
++	    Hours = 0;
++	return ((Hours + 12) * 60L + Minutes) * 60L + Seconds;
++    }
++
++    return -1;
++}
++
++
++static time_t Convert(time_t Month, time_t Day, time_t Year,
++		      time_t Hours, time_t Minutes, time_t Seconds,
++		      MERIDIAN Meridian, DSTMODE DSTmode, time_t yyTimezone)
++{
++    static int DaysInMonth[12] = {
++	31, 0, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31
++    };
++    time_t	tod;
++    time_t	Julian;
++    int		i;
++
++    if (Year < 0)
++	Year = -Year;
++    if (Year < 70)
++	Year += 2000;
++    else if (Year < 100)
++	Year += 1900;
++    DaysInMonth[1] = Year % 4 == 0 && (Year % 100 != 0 || Year % 400 == 0)
++		    ? 29 : 28;
++    /* Checking for 2038 bogusly assumes that time_t is 32 bits.  But
++       I'm too lazy to try to check for time_t overflow in another way.  */
++    if (Year < EPOCH || Year > 2038
++     || Month < 1 || Month > 12
++     /* Lint fluff:  "conversion from long may lose accuracy" */
++     || Day < 1 || Day > DaysInMonth[(int)--Month])
++	return -1;
++
++    for (Julian = Day - 1, i = 0; i < Month; i++)
++	Julian += DaysInMonth[i];
++    for (i = EPOCH; i < Year; i++)
++	Julian += 365 + (i % 4 == 0);
++    Julian *= SECSPERDAY;
++    Julian += yyTimezone * 60L;
++    if ((tod = ToSeconds(Hours, Minutes, Seconds, Meridian)) < 0)
++	return -1;
++    Julian += tod;
++    if (DSTmode == DSTon
++     || (DSTmode == DSTmaybe && localtime(&Julian)->tm_isdst))
++	Julian -= 60 * 60;
++    return Julian;
++}
++
++
++static time_t DSTcorrect(time_t Start, time_t Future)
++{
++    time_t	StartDay;
++    time_t	FutureDay;
++
++    StartDay = (localtime(&Start)->tm_hour + 1) % 24;
++    FutureDay = (localtime(&Future)->tm_hour + 1) % 24;
++    return (Future - Start) + (StartDay - FutureDay) * 60L * 60L;
++}
++
++
++static time_t RelativeDate(time_t Start, time_t DayOrdinal, time_t DayNumber)
++{
++    struct tm	*tm;
++    time_t	now;
++
++    now = Start;
++    tm = localtime(&now);
++    now += SECSPERDAY * ((DayNumber - tm->tm_wday + 7) % 7);
++    now += 7 * SECSPERDAY * (DayOrdinal <= 0 ? DayOrdinal : DayOrdinal - 1);
++    return DSTcorrect(Start, now);
++}
++
++
++static time_t RelativeMonth(time_t Start, time_t RelMonth, time_t yyTimezone)
++{
++    struct tm	*tm;
++    time_t	Month;
++    time_t	Year;
++
++    if (RelMonth == 0)
++	return 0;
++    tm = localtime(&Start);
++    Month = 12 * tm->tm_year + tm->tm_mon + RelMonth;
++    Year = Month / 12 + 1900;
++    Month = Month % 12 + 1;
++    return DSTcorrect(Start,
++	    Convert(Month, (time_t)tm->tm_mday, Year,
++		(time_t)tm->tm_hour, (time_t)tm->tm_min, (time_t)tm->tm_sec,
++		MER24, DSTmaybe, yyTimezone));
++}
++
++
++static void SetPossibleDate(struct Variables * var,
++			      time_t possible_day,
++			      time_t possible_month,
++			      time_t possible_year)
++{
++    int date_order;
++
++    if (possible_day > 31) /* test for ymd */
++	date_order = 2;
++    else if (possible_day > 12) /* test for dmy */
++	date_order = 1;
++    else if (possible_month > 12) /* test for mdy */
++	date_order = 0;
++    else
++	date_order = PTimeGetDateOrder();
++
++    switch (date_order) {
++      case 0 :
++	var->yyDay   = possible_month;
++	var->yyMonth = possible_day;
++	var->yyYear  = possible_year;
++	break;
++      case 1 :
++	var->yyDay   = possible_day;
++	var->yyMonth = possible_month;
++	var->yyYear  = possible_year;
++	break;
++      default :
++	var->yyDay   = possible_year;
++	var->yyMonth = possible_month;
++	var->yyYear  = possible_day;
++    }
++}
++
++
++time_t STDAPICALLTYPE PTimeParse(void * inputStream, struct tm * now, int timezone)
++{
++    time_t		Start;
++    struct Variables	var;
++
++
++    var.yyInput = inputStream;
++    var.yyYear = now->tm_year + 1900;
++    var.yyMonth = now->tm_mon + 1;
++    var.yyDay = now->tm_mday;
++    var.yyTimezone = -timezone;
++    var.yyDSTmode = DSTmaybe;
++    var.yyHour = 0;
++    var.yyMinutes = 0;
++    var.yySeconds = 0;
++    var.yyMeridian = MER24;
++    var.yyRelSeconds = 0;
++    var.yyRelMonth = 0;
++    var.yyHaveDate = 0;
++    var.yyHaveDay = 0;
++    var.yyHaveRel = 0;
++    var.yyHaveTime = 0;
++    var.yyHaveZone = 0;
++
++    yyparse(&var);
++
++    if (var.yyHaveTime > 1 || var.yyHaveZone > 1 ||
++	var.yyHaveDate > 1 || var.yyHaveDay > 1)
++	return -1;
++
++    if (var.yyHaveTime == 0 && var.yyHaveZone == 0 &&
++	var.yyHaveDate == 0 && var.yyHaveDay == 0 && var.yyHaveRel == 0)
++	return -1;
++
++    if (var.yyHaveDate || var.yyHaveTime || var.yyHaveDay) {
++	Start = Convert(var.yyMonth, var.yyDay, var.yyYear,
++			var.yyHour, var.yyMinutes, var.yySeconds,
++			var.yyMeridian, var.yyDSTmode, var.yyTimezone);
++	if (Start < 0)
++	    return -1;
++    }
++    else {
++	time(&Start);
++	if (!var.yyHaveRel)
++	    Start -= ((now->tm_hour * 60L + now->tm_min) * 60L) + now->tm_sec;
++    }
++
++    Start += var.yyRelSeconds;
++    Start += RelativeMonth(Start, var.yyRelMonth, var.yyTimezone);
++
++    if (var.yyHaveDay && !var.yyHaveDate)
++	Start += RelativeDate(Start, var.yyDayOrdinal, var.yyDayNumber);
++
++    /* Have to do *something* with a legitimate -1 so it's distinguishable
++     * from the error return value.  (Alternately could set errno on error.) */
++    return Start == -1 ? 0 : Start;
++}
++
++
++#ifdef _MSC_VER
++#pragma warning(disable:4028 4100 4211)
++#endif
++
++#ifdef __GNUC__
++int yyerror(const char * s)
++{
++  return 0;
++}
++#else
++static void yyerror(const char * s)
++{
++}
++#endif
++
++#ifdef _MSC_VER
++#pragma warning(default:4028 4100 4211)
++#endif
++
++
++/* End of file ***************************************************************/
diff --git a/extra/pulseaudio/PKGBUILD b/extra/pulseaudio/PKGBUILD
index 580ebf716..b00479618 100644
--- a/extra/pulseaudio/PKGBUILD
+++ b/extra/pulseaudio/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 188177 2013-06-11 17:10:36Z heftig $
+# $Id: PKGBUILD 198379 2013-10-30 14:30:54Z allan $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
 # Contributor: Corrado Primier <bardo@aur.archlinux.org>
@@ -8,25 +8,32 @@ pkgbase=pulseaudio
 pkgname=(pulseaudio libpulse)
 pkgdesc="A featureful, general-purpose sound server"
 pkgver=4.0
-pkgrel=2
+pkgrel=6
 arch=(i686 x86_64 mips64el)
 url="http://www.freedesktop.org/wiki/Software/PulseAudio"
-license=(GPL LGPL)
+license=(LGPL AGPL3)
 makedepends=(libasyncns libcap attr libxtst libsm libsamplerate libtool rtkit
-             speex tdb systemd dbus avahi bluez4 bluez-libs gconf intltool jack sbc
+             speex tdb systemd dbus avahi bluez bluez-libs gconf intltool jack sbc
              openssl fftw orc json-c gtk3 webrtc-audio-processing
-             check)
+             check git)
 [ "$CARCH" != "mips64el" ] && makedepends+=(lirc-utils)
-options=(!emptydirs !libtool)
-source=(http://freedesktop.org/software/$pkgbase/releases/$pkgbase-$pkgver.tar.xz
+options=(!emptydirs)
+#source=(http://freedesktop.org/software/$pkgbase/releases/$pkgbase-$pkgver.tar.xz
+source=($pkgbase-$pkgver::git://anongit.freedesktop.org/pulseaudio/pulseaudio#commit=09e88de
         pulseaudio.xinit)
-sha256sums=('35ceb36bb1822fe54f0b5e4863b4f486769fdfb8ff2111f01fd8778928f9cdae'
+sha256sums=('SKIP'
             'a0db6cdc74fbf0ca10e2343c08e1e228f109221c6c0ff91b0bfade5c4bdf03cf')
 
+prepare() {
+  cd $pkgbase-$pkgver
+  # ABI break https://bugs.freedesktop.org/show_bug.cgi?id=71047
+  git revert -n 16886bb b98a2e1
+}
+
 build() {
   cd $pkgbase-$pkgver
 
-  ./configure --prefix=/usr \
+  ./autogen.sh --prefix=/usr \
     --sysconfdir=/etc \
     --libexecdir=/usr/lib \
     --localstatedir=/var \
@@ -46,12 +53,12 @@ package_pulseaudio() {
   depends=("libpulse=$pkgver-$pkgrel" rtkit libltdl speex tdb systemd fftw orc
            libsamplerate webrtc-audio-processing sbc)
   optdepends=('avahi: zeroconf support'
-              'bluez4: bluetooth support'
+              'bluez: bluetooth support'
               'bluez-libs: bluetooth support'
               'gconf: configuration through gconf (paprefs)'
               'jack: jack support'
               'openssl: RAOP support'
-              'python2-pyqt: Equalizer GUI (qpaeq)')
+              'python-pyqt: Equalizer GUI (qpaeq)')
 [ "$CARCH" = "mips64el" ] || optdepends+=('lirc-utils: infra-red support')
   backup=(etc/pulse/{daemon.conf,default.pa,system.pa})
   install=pulseaudio.install
@@ -64,10 +71,9 @@ package_pulseaudio() {
   sed -e '/autospawn/iautospawn=no' \
       -i "$pkgdir/etc/pulse/client.conf"
 
-  # Speed up pulseaudio shutdown
-  # Lower resample quality, saves CPU
+  # Speed up pulseaudio shutdown so that it exits immediately with
+  # the last user session (module-systemd-login keeps it alive)
   sed -e '/exit-idle-time/iexit-idle-time=0' \
-      -e '/resample-method/iresample-method=speex-float-0' \
       -i "$pkgdir/etc/pulse/daemon.conf"
 
   # Disable cork-request module, can result in e.g. media players unpausing
@@ -75,20 +81,10 @@ package_pulseaudio() {
   sed -e 's|/usr/bin/pactl load-module module-x11-cork-request|#&|' \
       -i "$pkgdir/usr/bin/start-pulseaudio-x11"
 
-  # Make ConsoleKit optional
-  sed -e $'/load-module module-console-kit/{i.nofail\n;a.fail\n;}' \
-      -i "$pkgdir/etc/pulse/default.pa"
-
-  # Python fix
-  sed -i '1s:python$:&2:' "$pkgdir/usr/bin/qpaeq" || true
-
   install -Dm755 "$srcdir/pulseaudio.xinit" "$pkgdir/etc/X11/xinit/xinitrc.d/pulseaudio"
 
   rm "$pkgdir/etc/dbus-1/system.d/pulseaudio-system.conf"
 
-  # cap is handled in .install
-  chmod 755 "$pkgdir/usr/lib/pulse/proximity-helper"
-
   install -Dm644 shell-completion/pulseaudio-zsh-completion.zsh \
     "$pkgdir/usr/share/zsh/site-functions/_pulseaudio"
 
@@ -126,6 +122,7 @@ package_libpulse() {
   optdepends=('alsa-plugins: ALSA support'
               'avahi: zeroconf support')
   backup=(etc/pulse/client.conf)
+  license=(LGPL)
 
   mv "$srcdir"/libpulse/* "$pkgdir"
 }
diff --git a/extra/pulseaudio/pulseaudio.install b/extra/pulseaudio/pulseaudio.install
index 9de8b0e8f..bed542ca8 100755
--- a/extra/pulseaudio/pulseaudio.install
+++ b/extra/pulseaudio/pulseaudio.install
@@ -1,9 +1,4 @@
-_common() {
-  setcap cap_net_raw=ep usr/lib/pulse/proximity-helper 2>/dev/null || chmod +s usr/lib/pulse/proximity-helper
-}
-
 post_install() {
-  _common
   cat << MES
 >>> See the wiki at http://wiki.archlinux.org/index.php/PulseAudio for details
     on configuring your system for PulseAudio.
@@ -13,12 +8,11 @@ MES
 }
 
 post_upgrade() {
-  _common
   cat << MES
 >>> If you have per-user copies of configuration files (such as client.conf,
-    daemon.conf or default.pa) in ~/.pulse/, make sure you keep them in sync
-    with changes to the packaged files in /etc/pulse/. Otherwise, PulseAudio
-    may refuse to start due to configuration errors.
+    daemon.conf or default.pa) in ~/.config/pulse or ~/.pulse/, make sure you
+    keep them in sync with changes to the packaged files in /etc/pulse/.
+    Otherwise, PulseAudio may refuse to start due to configuration errors.
 MES
   if (( $(vercmp $2 3.0-3) < 0 )); then
     cat << MES
diff --git a/extra/purple-plugin-pack/PKGBUILD b/extra/purple-plugin-pack/PKGBUILD
index a804817f3..cf562cbfc 100644
--- a/extra/purple-plugin-pack/PKGBUILD
+++ b/extra/purple-plugin-pack/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 191204 2013-07-20 01:49:05Z foutrelis $
+# $Id: PKGBUILD 198380 2013-10-30 14:31:14Z allan $
 # Maintainer: Evangelos Foutras <evangelos@foutrelis.com>
 # Contributor: Ionut Biru <ibiru@archlinux.org>
 # Contributor: Alexander Fehr <pizzapunk gmail com>
@@ -13,7 +13,6 @@ url="https://bitbucket.org/rekkanoryo/purple-plugin-pack"
 license=('GPL')
 depends=('libpurple')
 makedepends=('intltool' 'gettext' 'python2' 'pidgin')
-options=('!libtool')
 source=(https://bitbucket.org/rekkanoryo/$pkgname/downloads/$pkgname-$pkgver.tar.bz2)
 sha256sums=('2bbcf5e778a33968ba7f2864d2a6cb526a8984be3e4151642a583eee8eafb03c')
 
diff --git a/extra/pycurl/PKGBUILD b/extra/pycurl/PKGBUILD
index c385381fd..7b08ada02 100644
--- a/extra/pycurl/PKGBUILD
+++ b/extra/pycurl/PKGBUILD
@@ -1,18 +1,18 @@
-# $Id: PKGBUILD 167931 2012-10-03 20:46:27Z andrea $
+# $Id: PKGBUILD 196757 2013-10-17 23:38:31Z eric $
 # Maintainer:
 # Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Angel 'angvp' Velasquez <angvp[at]archlinux.com.ve> 
 
 pkgbase=pycurl
 pkgname=('python2-pycurl')
-pkgver=7.19.0
-pkgrel=2
+pkgver=7.19.0.2
+pkgrel=1
 arch=('i686' 'x86_64' 'mips64el')
 url="http://pycurl.sourceforge.net/"
 license=('GPL')
 makedepends=('python2' 'curl')
 source=("http://pycurl.sourceforge.net/download/${pkgbase}-${pkgver}.tar.gz")
-md5sums=('919d58fe37e69fe87ce4534d8b6a1c7b')
+md5sums=('518be33976dbc6838e42495ada64b43f')
 
 package_python2-pycurl() {
   pkgdesc="A Python 2.x interface to libcurl"
diff --git a/extra/pygobject/PKGBUILD b/extra/pygobject/PKGBUILD
index 08494e3e7..27bd1dd9c 100644
--- a/extra/pygobject/PKGBUILD
+++ b/extra/pygobject/PKGBUILD
@@ -1,17 +1,16 @@
-# $Id: PKGBUILD 196150 2013-10-07 11:53:48Z jgc $
+# $Id: PKGBUILD 198381 2013-10-30 14:31:36Z allan $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 
 pkgbase=pygobject
 pkgname=(python-gobject python2-gobject pygobject-devel)
-pkgver=3.10.0
+pkgver=3.10.1
 pkgrel=1
 arch=(i686 x86_64 mips64el)
 url="https://live.gnome.org/PyGObject"
 license=(LGPL)
 makedepends=(python python2 python-cairo python2-cairo gobject-introspection)
 source=(http://ftp.gnome.org/pub/gnome/sources/$pkgbase/${pkgver:0:4}/$pkgbase-$pkgver.tar.xz)
-options=('!libtool')
-sha256sums=('8aaa1f83fdb2e30bae77405a63a8be600b311a04a4cdc952b2ab62ee81aad077')
+sha256sums=('87a4d3de4b8ea30a1290229f62092aeb0b77e6b21ca6588bb4704e05fd750837')
 
 prepare() {
   mkdir build-py2 build-py3 devel
diff --git a/extra/pygobject2/PKGBUILD b/extra/pygobject2/PKGBUILD
index f2b715c3a..f53c8bc8e 100644
--- a/extra/pygobject2/PKGBUILD
+++ b/extra/pygobject2/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 189818 2013-07-08 14:49:55Z heftig $
+# $Id: PKGBUILD 198382 2013-10-30 14:31:56Z allan $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgbase=pygobject2
@@ -9,7 +9,6 @@ arch=('i686' 'x86_64' 'mips64el')
 url="http://www.pygtk.org/"
 license=(LGPL)
 makedepends=(python python2 git)
-options=('!libtool')
 
 # pygobject-2-28 branch: https://git.gnome.org/browse/pygobject/log/?h=pygobject-2-28
 source=('git://git.gnome.org/pygobject#commit=9456ba7')
diff --git a/extra/pygtk/PKGBUILD b/extra/pygtk/PKGBUILD
index b6fea41c2..b7b76783e 100644
--- a/extra/pygtk/PKGBUILD
+++ b/extra/pygtk/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 148886 2012-02-05 11:54:15Z ibiru $
+# $Id: PKGBUILD 198383 2013-10-30 14:32:16Z allan $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: Sarah Hay <sarahhay@mb.sympatico.ca>
 
@@ -11,7 +11,6 @@ license=('LGPL')
 depends=('libglade' 'python2-cairo' 'pygobject')
 makedepends=('python2-numpy' 'pygobject2-devel')
 optdepends=('python2-numpy')
-options=('!libtool')
 url="http://www.pygtk.org/"
 source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2
         python27.patch)
diff --git a/extra/pygtksourceview2/PKGBUILD b/extra/pygtksourceview2/PKGBUILD
index 18771a992..48a72736c 100644
--- a/extra/pygtksourceview2/PKGBUILD
+++ b/extra/pygtksourceview2/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 148888 2012-02-05 11:54:18Z ibiru $
+# $Id: PKGBUILD 198384 2013-10-30 14:32:43Z allan $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=pygtksourceview2
@@ -9,7 +9,6 @@ arch=(i686 x86_64 'mips64el')
 license=('GPL')
 depends=('gtksourceview2>=2.10.0' 'pygtk>=2.17.0')
 makedepends=('intltool' 'pkg-config')
-options=('!libtool')
 url="http://www.gnome.org"
 source=(http://ftp.gnome.org/pub/gnome/sources/pygtksourceview/2.10/pygtksourceview-${pkgver}.tar.bz2)
 sha256sums=('b4b47c5aeb67a26141cb03663091dfdf5c15c8a8aae4d69c46a6a943ca4c5974')
diff --git a/extra/pyopenssl/PKGBUILD b/extra/pyopenssl/PKGBUILD
index 63ef2624f..3ebba02b1 100644
--- a/extra/pyopenssl/PKGBUILD
+++ b/extra/pyopenssl/PKGBUILD
@@ -1,17 +1,17 @@
-# $Id: PKGBUILD 169005 2012-10-17 10:19:52Z allan $
+# $Id: PKGBUILD 198719 2013-11-02 09:07:53Z ioni $
 # Maintainer : Ionut Biru<ibiru@archlinux.org>
 # Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com>
 
 pkgbase=pyopenssl
 pkgname=('python-pyopenssl' 'python2-pyopenssl')
-pkgver=0.13
-pkgrel=2.1
+pkgver=0.13.1
+pkgrel=1
 arch=('i686' 'x86_64' 'mips64el')
 url="http://pypi.python.org/pypi/pyOpenSSL"
 license=('LGPL2.1')
 makedepends=('python' 'python2' 'openssl')
 source=(http://pypi.python.org/packages/source/p/pyOpenSSL/pyOpenSSL-${pkgver}.tar.gz)
-md5sums=('767bca18a71178ca353dff9e10941929')
+md5sums=('e27a3b76734c39ea03952ca94cc56715')
 
 build() {
     cd "${srcdir}"
diff --git a/extra/pyorbit/PKGBUILD b/extra/pyorbit/PKGBUILD
index 628c31ef5..92744b7c3 100644
--- a/extra/pyorbit/PKGBUILD
+++ b/extra/pyorbit/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 151454 2012-02-26 11:28:37Z pierre $
+# $Id: PKGBUILD 198385 2013-10-30 14:33:03Z allan $
 # Mantainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=pyorbit
@@ -10,7 +10,6 @@ license=('LGPL')
 url="http://www.pygtk.org"
 depends=('python2' 'orbit2')
 makedepends=('pkgconfig')
-options=('!libtool')
 source=("http://ftp.gnome.org/pub/GNOME/sources/pyorbit/2.24/${pkgname}-${pkgver}.tar.bz2")
 md5sums=('574593815e75ee6e98062c75d6d1581f')
 
diff --git a/extra/pyqt5/PKGBUILD b/extra/pyqt5/PKGBUILD
index fc6840cac..d0e4eb205 100644
--- a/extra/pyqt5/PKGBUILD
+++ b/extra/pyqt5/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 195876 2013-10-03 10:38:53Z andrea $
+# $Id: PKGBUILD 196797 2013-10-19 12:28:10Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Yichao Yu <yyc1992@gmail.com>
 # Contributor: Douglas Soares de Andrade <douglas@archlinux.org>
@@ -7,16 +7,16 @@
 pkgbase=pyqt5
 pkgname=pyqt5
 pkgname=('pyqt5-common' 'python-pyqt5' 'python2-pyqt5')
-pkgver=5.1
-pkgrel=1
+pkgver=5.1.1
+pkgrel=3
 arch=('i686' 'x86_64')
 url="http://riverbankcomputing.co.uk/software/pyqt/intro"
 license=('GPL')
 makedepends=('python-sip' 'python2-sip' 'python-opengl' 'python2-opengl'
              'python2-dbus' 'python-dbus' 'qt5-multimedia' 'qt5-tools'
-             'qt5-svg')
+             'qt5-svg' 'qt5-serialport')
 source=("http://downloads.sourceforge.net/project/pyqt/PyQt5/PyQt-${pkgver}/PyQt-gpl-${pkgver}.tar.gz")
-md5sums=('056f6232bf9ea92baf86e812fd1669f8')
+md5sums=('10d41924d5252b75f3f9fe1a7c193e6d')
 
 build() {
   cp -r PyQt-gpl-${pkgver} Py2Qt-gpl-${pkgver}
@@ -68,7 +68,8 @@ package_python-pyqt5(){
               'qt5-svg: QtSvg'
               'qt5-webkit: QtWebKit, QtWebKitWidgets'
               'qt5-xmlpatterns: QtXmlPatterns'
-              'qt5-declarative: QtQml, qmlplugin')
+              'qt5-declarative: QtQml, qmlplugin'
+              'qt5-serialport: QtSerialPort')
 
   cd PyQt-gpl-${pkgver}
   # INSTALL_ROOT is needed for the QtDesigner module, the other Makefiles use DESTDIR
@@ -89,7 +90,8 @@ package_python2-pyqt5(){
               'qt5-svg: QtSvg'
               'qt5-webkit: QtWebKit, QtWebKitWidgets'
               'qt5-xmlpatterns: QtXmlPatterns'
-              'qt5-declarative: QtQml, qmlplugin')
+              'qt5-declarative: QtQml, qmlplugin'
+              'qt5-serialport: QtSerialPort')
 
   cd Py2Qt-gpl-${pkgver}
   # INSTALL_ROOT is needed for the QtDesigner module, the other Makefiles use DESTDIR
diff --git a/extra/python-cairo/PKGBUILD b/extra/python-cairo/PKGBUILD
index 24f6a0fea..42392e8cc 100644
--- a/extra/python-cairo/PKGBUILD
+++ b/extra/python-cairo/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 195288 2013-09-29 21:45:06Z eric $
+# $Id: PKGBUILD 198388 2013-10-30 14:34:05Z allan $
 # Maintainer: Angel Velasquez <angvp@archlinux.org>  
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
@@ -10,7 +10,6 @@ arch=('i686' 'x86_64' 'mips64el')
 url="http://www.cairographics.org/pycairo"
 license=('LGPL3')
 depends=('python' 'cairo')
-options=('!libtool')
 source=(http://cairographics.org/releases/pycairo-${pkgver}.tar.bz2)
 md5sums=('e6fd3f2f1e6a72e0db0868c4985669c5')
 
diff --git a/extra/python-notify/PKGBUILD b/extra/python-notify/PKGBUILD
index adf4ea36f..b2a3c1366 100644
--- a/extra/python-notify/PKGBUILD
+++ b/extra/python-notify/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 169024 2012-10-17 10:20:48Z allan $
+# $Id: PKGBUILD 198389 2013-10-30 14:34:32Z allan $
 # Maintainer: Angel Velasquez <angvp@archlinux.org>
 
 pkgbase=python-notify
@@ -13,7 +13,6 @@ depends=('pygtk>=2.22.0' 'libnotify>=0.7.1')
 makedepends=('python2')
 conflicts=('python-notify<=0.1.1-11')
 replaces=('python-notify<=0.1.1-11')
-options=(!libtool)
 source=(http://www.galago-project.org/files/releases/source/notify-python/notify-python-${pkgver}.tar.gz
         libnotify07.patch
         notify-python-0.1.1-fix-GTK-symbols.patch)
diff --git a/extra/python-numpy/PKGBUILD b/extra/python-numpy/PKGBUILD
index b6bdc5f06..27c1fe3e4 100755
--- a/extra/python-numpy/PKGBUILD
+++ b/extra/python-numpy/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 193422 2013-08-20 06:10:08Z angvp $
+# $Id: PKGBUILD 197708 2013-10-28 18:10:31Z jgc $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: Douglas Soares de Andrade <dsa@aur.archlinux.org>
 # Contributor: Angel 'angvp' Velasquez <angvp[at]archlinux.com.ve> 
@@ -6,12 +6,13 @@
 pkgbase=python-numpy
 pkgname=('python2-numpy' 'python-numpy')
 pkgver=1.7.1
-pkgrel=2
+pkgrel=3
 pkgdesc="Scientific tools for Python"
 arch=('i686' 'x86_64' 'mips64el')
 license=('custom')
 url="http://www.numpy.org/"
-makedepends=('lapack' 'python' 'python2' 'python-setuptools' 'python2-setuptools' 'gcc-fortran' 'python-nose')
+makedepends=('lapack' 'python' 'python2' 'python-setuptools' 'python2-setuptools' 'gcc-fortran' 'python-nose' 'python2-nose')
+options=('staticlibs')
 source=(http://downloads.sourceforge.net/numpy/numpy-${pkgver}.tar.gz)
 md5sums=('0ab72b3b83528a7ae79c6df9042d61c6')
 
@@ -33,7 +34,7 @@ build() {
 
 package_python2-numpy() {
   depends=('lapack' 'python2')
-  optdepends=('python-nose: testsuite')
+  optdepends=('python2-nose: testsuite')
 
   _pyver=2.7
 
@@ -57,6 +58,7 @@ package_python2-numpy() {
 
 package_python-numpy() {
   depends=('lapack' 'python')
+  optdepends=('python-nose: testsuite')
   provides=("python3-numpy=${pkgver}")
   replaces=('python3-numpy')
   conflicts=('python3-numpy')
diff --git a/extra/python2-cairo/PKGBUILD b/extra/python2-cairo/PKGBUILD
index 7d6fb0c32..4232ae832 100644
--- a/extra/python2-cairo/PKGBUILD
+++ b/extra/python2-cairo/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 122022 2011-05-01 17:05:32Z angvp $
+# $Id: PKGBUILD 198386 2013-10-30 14:33:23Z allan $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=python2-cairo
@@ -8,7 +8,6 @@ pkgdesc="Python2 bindings for the cairo graphics library"
 arch=('i686' 'x86_64' 'mips64el')
 license=('LGPL' 'MPL')
 depends=('python2' 'cairo')
-options=('!libtool')
 provides=("pycairo=${pkgver}")
 conflicts=('pycairo')
 replaces=('pycairo')
diff --git a/extra/pywebkitgtk/PKGBUILD b/extra/pywebkitgtk/PKGBUILD
index ad503c89e..c83587394 100644
--- a/extra/pywebkitgtk/PKGBUILD
+++ b/extra/pywebkitgtk/PKGBUILD
@@ -1,27 +1,27 @@
-# $Id: PKGBUILD 148894 2012-02-05 11:54:35Z ibiru $
+# $Id: PKGBUILD 197579 2013-10-27 02:33:41Z eric $
 # Maintainer: Angel Velasquez <angvp@archlinux.org>  
 # Contributor: kasa <biuta.jr@gmail.com>
 # Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
 
 pkgname=pywebkitgtk
 pkgver=1.1.8
-pkgrel=2
+pkgrel=3
 pkgdesc="Python bindings to the WebKit GTK+ port"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://code.google.com/p/pywebkitgtk/"
 license=('LGPL')
-depends=('libwebkit' 'pygtk')
-options=('!libtool' '!makeflags')
+depends=('webkitgtk2' 'pygtk')
+options=('!makeflags')
 source=(http://pywebkitgtk.googlecode.com/files/${pkgname}-${pkgver}.tar.gz)
 md5sums=('158335385354ba38090c9324b37bf225')
 
 build() {
-    cd ${srcdir}/${pkgname}-${pkgver}
+    cd ${pkgname}-${pkgver}
     ./configure --prefix=/usr
     make
 }
 
 package() {
-    cd ${srcdir}/${pkgname}-${pkgver}
-    make DESTDIR=${pkgdir} install
+    cd ${pkgname}-${pkgver}
+    make DESTDIR="${pkgdir}" install
 }
diff --git a/extra/pyxml/PKGBUILD b/extra/pyxml/PKGBUILD
deleted file mode 100644
index 4bbc514c4..000000000
--- a/extra/pyxml/PKGBUILD
+++ /dev/null
@@ -1,40 +0,0 @@
-# $Id: PKGBUILD 165447 2012-08-19 17:09:13Z jgc $
-# Maintainer:
-# Contributor: Jan de Groot <jgc@archlinux.org>
-
-pkgname=pyxml
-pkgver=0.8.4
-pkgrel=10.1
-pkgdesc="Python XML parsing library"
-arch=('i686' 'x86_64' 'mips64el')
-url="http://sourceforge.net/projects/pyxml/"
-license=('custom')
-depends=('python2')
-source=("http://downloads.sourceforge.net/sourceforge/pyxml/PyXML-${pkgver}.tar.gz"
-        'fix-python2.6.patch'
-        'foreigncharsfix.patch')
-md5sums=('1f7655050cebbb664db976405fdba209'
-         '4b652e0c866e3cca7e2386e8e383d5ba'
-         'c9c54fdf0f7d1515a3b7aa34b01d1c46')
-
-build() {
-  cd "${srcdir}/PyXML-${pkgver}"
-
-  patch -Np1 -i "${srcdir}/fix-python2.6.patch"
-
-  # as warranted by eric (the python IDE)
-  patch -Np1 -i "${srcdir}/foreigncharsfix.patch"
-
-  python2 setup.py build
-}
-
-package() {
-  cd "${srcdir}/PyXML-${pkgver}"
-  python2 setup.py install --prefix=/usr --root="${pkgdir}" --optimize=1
-  install -D -m644 LICENCE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-
-  sed -e 's|#! /usr/bin/env python|#!/usr/bin/env python2|' \
-      -i ${pkgdir}/usr/lib/python2.7/site-packages/_xmlplus/dom/ext/c14n.py
-  sed -e 's|#!/usr/bin/env python|#!/usr/bin/env python2|' \
-      -i ${pkgdir}/usr/lib/python2.7/site-packages/_xmlplus/dom/html/GenerateHtml.py
-}
diff --git a/extra/pyxml/fix-python2.6.patch b/extra/pyxml/fix-python2.6.patch
deleted file mode 100644
index 7bf1c46fc..000000000
--- a/extra/pyxml/fix-python2.6.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-diff -ur a/xml/xpath/ParsedAbbreviatedAbsoluteLocationPath.py b/xml/xpath/ParsedAbbreviatedAbsoluteLocationPath.py
---- a/xml/xpath/ParsedAbbreviatedAbsoluteLocationPath.py	2003-03-11 15:01:34.000000000 +0100
-+++ b/xml/xpath/ParsedAbbreviatedAbsoluteLocationPath.py	2009-05-25 16:32:26.000000000 +0200
-@@ -24,8 +24,8 @@
-         self._rel = rel
-         nt = ParsedNodeTest.ParsedNodeTest('node', '')
-         ppl = ParsedPredicateList.ParsedPredicateList([])
--        as = ParsedAxisSpecifier.ParsedAxisSpecifier('descendant-or-self')
--        self._step = ParsedStep.ParsedStep(as, nt, ppl)
-+        asp = ParsedAxisSpecifier.ParsedAxisSpecifier('descendant-or-self')
-+        self._step = ParsedStep.ParsedStep(asp, nt, ppl)
-         return
- 
-     def evaluate(self, context):
-diff -ur a/xml/xpath/ParsedAbbreviatedRelativeLocationPath.py b/xml/xpath/ParsedAbbreviatedRelativeLocationPath.py
---- a/xml/xpath/ParsedAbbreviatedRelativeLocationPath.py	2003-03-11 15:01:34.000000000 +0100
-+++ b/xml/xpath/ParsedAbbreviatedRelativeLocationPath.py	2009-05-25 16:27:55.000000000 +0200
-@@ -28,8 +28,8 @@
-         self._right = right
-         nt = ParsedNodeTest.ParsedNodeTest('node','')
-         ppl = ParsedPredicateList.ParsedPredicateList([])
--        as = ParsedAxisSpecifier.ParsedAxisSpecifier('descendant-or-self')
--        self._middle = ParsedStep.ParsedStep(as, nt, ppl)
-+        asp = ParsedAxisSpecifier.ParsedAxisSpecifier('descendant-or-self')
-+        self._middle = ParsedStep.ParsedStep(asp, nt, ppl)
- 
-     def evaluate(self, context):
-         res = []
diff --git a/extra/pyxml/foreigncharsfix.patch b/extra/pyxml/foreigncharsfix.patch
deleted file mode 100644
index 024d4472d..000000000
--- a/extra/pyxml/foreigncharsfix.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -aur PyXML-0.8.4.orig//xml/parsers/xmlproc/xmlutils.py PyXML-0.8.4/xml/parsers/xmlproc/xmlutils.py
---- PyXML-0.8.4.orig//xml/parsers/xmlproc/xmlutils.py	2010-11-06 17:27:53.936666669 +0800
-+++ PyXML-0.8.4/xml/parsers/xmlproc/xmlutils.py	2010-11-06 17:30:39.230000003 +0800
-@@ -720,6 +720,7 @@
-             # to the recoding.
-             try:
-                 self.data = self.charset_converter(self.data)
-+		self.datasize = len(self.data)
-             except UnicodeError, e:
-                 self._handle_decoding_error(self.data, e)
-             self.input_encoding = enc1
diff --git a/extra/qemu/65-kvm.rules b/extra/qemu/65-kvm.rules
index be955fd87..569ded9f9 100644
--- a/extra/qemu/65-kvm.rules
+++ b/extra/qemu/65-kvm.rules
@@ -1,2 +1,2 @@
 KERNEL=="kvm", GROUP="kvm", MODE="0660"
-KERNEL=="vhost-net", GROUP="kvm", MODE="0660", TAG+="uaccess"
+KERNEL=="vhost-net", GROUP="kvm", MODE="0660", TAG+="uaccess", OPTIONS+="static_node=vhost-net"
diff --git a/extra/qemu/PKGBUILD b/extra/qemu/PKGBUILD
index 282bc6307..127fb2afc 100644
--- a/extra/qemu/PKGBUILD
+++ b/extra/qemu/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 196267 2013-10-10 06:36:39Z tpowa $
+# $Id: PKGBUILD 198649 2013-11-01 08:14:43Z thomas $
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 pkgname=('qemu' 'libcacard')
 pkgver=1.6.1
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64')
 license=('GPL2' 'LGPL2.1')
 url="http://wiki.qemu.org/Index.html"
@@ -10,19 +10,28 @@ makedepends=('texi2html' 'perl' 'python2' 'spice-protocol')
 install=qemu.install
 source=(http://wiki.qemu.org/download/${pkgname}-${pkgver}.tar.bz2
         65-kvm.rules)
+makedepends=('pixman' 'libjpeg' 'libpng' 'sdl' 'alsa-lib' 'nss' 'glib2'
+             'gnutls>=2.4.1' 'bluez-libs' 'vde2' 'util-linux' 'curl' 'libsasl'
+             'libgl' 'libpulse' 'seabios' 'libcap-ng' 'libaio' 'libseccomp'
+             'libiscsi' 'libcacard' 'spice' 'spice-protocol' 'python2')
 replaces=('qemu-kvm')
 options=(!strip)
+md5sums=('3a897d722457c5a895cd6ac79a28fda0'
+         '33ab286a20242dda7743a900f369d68a')
 
 build ()
 {
   cd "${srcdir}/${pkgname}-${pkgver}"
+  # qemu vs. make 4 == bad
+  export ARFLAGS="rv"
+  # http://permalink.gmane.org/gmane.comp.emulators.qemu/238740
   # gtk gui breaks keymappings at the moment
   ./configure --prefix=/usr --sysconfdir=/etc --audio-drv-list='pa alsa sdl' \
               --python=/usr/bin/python2 --smbd=/usr/bin/smbd \
               --enable-docs --enable-mixemu --libexecdir=/usr/lib/qemu \
               --disable-gtk --enable-linux-aio --enable-seccomp \
               --enable-spice --localstatedir=/var
-              make
+  make V=99
 }
 
 package_qemu() {
@@ -63,7 +72,7 @@ package_qemu() {
 
 package_libcacard() {
  pkgdesc="Common Access Card (CAC) Emulation"
- options=('strip' '!libtool')
+ options=('strip')
  depends=('nss' 'libaio' 'libcap-ng' 'libiscsi' 'curl' 'vde2')
  mkdir -p ${pkgdir}/usr/bin
  mkdir -p ${pkgdir}/usr/lib/pkgconfig
@@ -73,5 +82,3 @@ package_libcacard() {
  cp -a ${srcdir}/qemu-${pkgver}/libcacard.pc ${pkgdir}/usr/lib/pkgconfig/
  cp -a ${srcdir}/qemu-${pkgver}/.libs/vscclient ${pkgdir}/usr/bin/
 }
-md5sums=('3a897d722457c5a895cd6ac79a28fda0'
-         '9d6de26867a05c306157e3d3c612b28a')
diff --git a/extra/qhull/PKGBUILD b/extra/qhull/PKGBUILD
index a8da5462e..d516be5f8 100644
--- a/extra/qhull/PKGBUILD
+++ b/extra/qhull/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 171913 2012-11-23 13:37:18Z ronald $
+# $Id: PKGBUILD 197574 2013-10-27 02:10:42Z eric $
 # Maintainer: Ronald van Haren <ronald@archlinux.org>
 # Contributor: Stefan Husmann <stefan-husmann@t-online.de>
 # Contributor: Jason Taylor <jftaylor21@gmail.com>
@@ -13,12 +13,12 @@ url="http://www.qhull.org/"
 license=('custom')
 depends=('gcc-libs')
 makedepends=('cmake')
-options=('!libtool')
+options=('staticlibs')
 source=("http://www.qhull.org/download/$pkgname-$pkgver-src.tgz")
 md5sums=('d0f978c0d8dfb2e919caefa56ea2953c')
 
 build() {
-  cd "$srcdir/$pkgname-$pkgver"
+  cd $pkgname-$pkgver
 
   if [ "${CARCH}" != "i686" ]; then
     EXTRAOPTS="-DCMAKE_CXX_FLAGS=-fPIC -DCMAKE_C_FLAGS=-fPIC"
@@ -31,7 +31,7 @@ build() {
 }
 
 package() { 
-  cd "$srcdir/$pkgname-$pkgver/srcbuild"
+  cd $pkgname-$pkgver/srcbuild
 
   make DESTDIR="$pkgdir" install
 
diff --git a/extra/qpdf/PKGBUILD b/extra/qpdf/PKGBUILD
index 62ffc40b1..9d9682af7 100644
--- a/extra/qpdf/PKGBUILD
+++ b/extra/qpdf/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 189895 2013-07-10 19:20:25Z andyrtr $
+# $Id: PKGBUILD 198391 2013-10-30 14:35:14Z allan $
 # Maintainer: AndyRTR <andyrtr@archlinux.org>
 # Contributor: Miguel Revilla <yo at miguelrevilla.com>
 # Contributor: David Sotelo <dvsotelo at gmail.com>
 # Contributor: Nuno Araujo <nuno.araujo@russo79.com>
 
 pkgname=qpdf
-pkgver=5.0.0
+pkgver=5.0.1
 pkgrel=1
 pkgdesc="QPDF: A Content-Preserving PDF Transformation System"
 arch=('i686' 'x86_64' 'mips64el')
@@ -13,9 +13,8 @@ url="http://qpdf.sourceforge.net/"
 license=('custom:Artistic-2.0')
 depends=('pcre' 'perl')
 makedepends=('make')
-options=('!libtool')
 source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz)
-md5sums=('d501c61a8979132f6d601641483850cc')
+md5sums=('6efd89c18461cb73f77bb60cb2da4bce')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/qrencode/PKGBUILD b/extra/qrencode/PKGBUILD
index 644858ae9..b98c8594d 100644
--- a/extra/qrencode/PKGBUILD
+++ b/extra/qrencode/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 192463 2013-08-12 10:26:17Z bluewind $
+# $Id: PKGBUILD 198392 2013-10-30 14:35:36Z allan $
 # Maintainer: Florian Pritz< flo@xinu.at>
 # Contributor: Dany Martineau <dany.luc.martineau@gmail.com>
 
@@ -11,7 +11,6 @@ depends=('libpng')
 makedepends=(sdl)
 url="http://megaui.net/fukuchi/works/qrencode/index.en.html"
 license=('GPL')
-options=(!libtool)
 source=(http://megaui.net/fukuchi/works/${pkgname}/${pkgname}-${pkgver}.tar.bz2)
 md5sums=('89a90a3b8cbca60ac412b2e0e0c776e7')
 
diff --git a/extra/qt3/PKGBUILD b/extra/qt3/PKGBUILD
index ab15e1763..eca193b93 100644
--- a/extra/qt3/PKGBUILD
+++ b/extra/qt3/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 193687 2013-08-28 00:06:06Z eric $
+# $Id: PKGBUILD 197418 2013-10-25 18:37:20Z eric $
 # Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgname=qt3
 pkgver=3.3.8b
-pkgrel=6
+pkgrel=7
 epoch=1
 pkgdesc="A cross-platform application and UI framework"
 arch=('i686' 'x86_64' 'mips64el')
@@ -16,17 +16,19 @@ optdepends=('qtchooser: set the default Qt toolkit'
             'libmariadbclient: MariaDB driver'
             'postgresql-libs: PostgreSQL driver'
             'unixodbc: ODBC driver')
-options=('!libtool' '!docs')
+options=('!docs')
 source=(ftp://ftp.qt-project.org/qt/source/qt-x11-free-${pkgver}.tar.gz
         qt3-png15.patch qt-copy-kde-patches.tar.bz2 qt-patches.tar.bz2
-        eastern_asian_languagues.diff qt-odbc.patch gcc-4.6.patch)
+        eastern_asian_languagues.diff qt-odbc.patch gcc-4.6.patch 
+        qt-x11-free-3.3.5-makelibshared.patch)
 sha1sums=('745def6250dc7f337dbb265e20bf38dcb41fd854'
           '3d19510c46016a1a211d97bf8f82b01498b1b33c'
           '33418e5b117458af23c72cdbffc0c339bc34bdc4'
           '116afa0e737bdf27ea27f9b3653aeb56db9ec151'
           '40c7b8f06a21f809ddeb8b5560e9da63ccac6a17'
           '1346320614f6f86fbeb10b9fbad721dea29f5b61'
-          'd9b83b8f6f9c8bd98d290dc1d0e9913a00b62c3f')
+          'd9b83b8f6f9c8bd98d290dc1d0e9913a00b62c3f'
+          'e89720eac87c3e925d0efae6a16f334c5159e4f6')
 
 # qt-copy-kde-patches come from http://websvn.kde.org/trunk/qt-copy/patches/
 # other qt-patches come from fedora and gentoo
@@ -49,6 +51,8 @@ prepare() {
   patch -p1 -i "${srcdir}"/gcc-4.6.patch
   patch -p0 -i "${srcdir}"/qt3-png15.patch 
  
+  patch -p1 -i "${srcdir}"/qt-x11-free-3.3.5-makelibshared.patch
+
   sed -i "s|-O2|$CXXFLAGS|" mkspecs/linux-g++{,-32,-64}/qmake.conf
   sed -i "s|-I. |$CXXFLAGS -I. |" qmake/Makefile.unix
   sed -i "s|read acceptance|acceptance=yes|" configure
diff --git a/extra/qt3/qt-x11-free-3.3.5-makelibshared.patch b/extra/qt3/qt-x11-free-3.3.5-makelibshared.patch
new file mode 100644
index 000000000..fd4adf7f0
--- /dev/null
+++ b/extra/qt3/qt-x11-free-3.3.5-makelibshared.patch
@@ -0,0 +1,48 @@
+--- qt-x11-free-3.3.5/tools/assistant/lib/lib.pro.orig	2005-10-21 10:09:12.000000000 -0200
++++ qt-x11-free-3.3.5/tools/assistant/lib/lib.pro	2005-10-21 10:09:34.000000000 -0200
+@@ -3,8 +3,7 @@
+ VERSION		= 1.0
+ 
+ CONFIG		+= qt warn_on release
+-CONFIG		+= staticlib
+-CONFIG		-= dll
++CONFIG		+= dll
+ 
+ SOURCES		= qassistantclient.cpp
+ HEADERS         += $$QT_SOURCE_TREE/include/qassistantclient.h
+*** qt-x11-free-qt-copy-3.3.5/tools/designer/editor/editor.pro	2003-12-20 22:48:51.000000000 -0200
+--- qt-x11-free-qt-copy-3.3.5/tools/designer/editor/editor.pro.new	2005-12-06 18:47:04.000000000 -0200
+***************
+*** 1,6 ****
+  TEMPLATE	= lib
+! CONFIG		+= qt warn_on staticlib
+! CONFIG		-= dll
+  HEADERS		= editor.h  \
+  		  parenmatcher.h  \
+  		  completion.h \
+--- 1,6 ----
+  TEMPLATE	= lib
+! CONFIG		+= qt warn_on
+! CONFIG		+= dll
+  HEADERS		= editor.h  \
+  		  parenmatcher.h  \
+  		  completion.h \
+*** qt-x11-free-qt-copy-3.3.5/tools/designer/designer/designer.pro	2004-04-29 19:31:32.000000000 -0300
+--- qt-x11-free-qt-copy-3.3.5/tools/designer/designer/designer.pro.new	2005-12-06 18:46:29.000000000 -0200
+***************
+*** 1,7 ****
+  TEMPLATE	= lib
+  
+! CONFIG		+= qt warn_on staticlib qmake_cache
+! CONFIG 		-= dll
+  !force_static:!win32:contains(QT_PRODUCT,qt-internal) {
+     CONFIG          -= staticlib
+     CONFIG          += dll
+--- 1,7 ----
+  TEMPLATE	= lib
+  
+! CONFIG		+= qt warn_on qmake_cache
+! CONFIG 		+= dll
+  !force_static:!win32:contains(QT_PRODUCT,qt-internal) {
+     CONFIG          -= staticlib
+     CONFIG          += dll
diff --git a/extra/qt4/PKGBUILD b/extra/qt4/PKGBUILD
index 7d211fa6a..7aeae075b 100644
--- a/extra/qt4/PKGBUILD
+++ b/extra/qt4/PKGBUILD
@@ -1,19 +1,19 @@
-# $Id: PKGBUILD 193688 2013-08-28 00:06:07Z eric $
+# $Id: PKGBUILD 197232 2013-10-24 13:09:09Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 
 pkgname=qt4
 pkgver=4.8.5
-pkgrel=2
+pkgrel=6
 arch=('i686' 'x86_64' 'mips64el')
 url='http://qt-project.org/'
 license=('GPL3' 'LGPL' 'FDL' 'custom')
 pkgdesc='A cross-platform application and UI framework'
-depends=('libtiff' 'libpng' 'libmng' 'sqlite' 'ca-certificates' 'dbus'
+depends=('libtiff' 'libpng' 'sqlite' 'ca-certificates' 'dbus'
         'fontconfig' 'libgl' 'libxrandr' 'libxv' 'libxi' 'alsa-lib'
         'xdg-utils' 'hicolor-icon-theme' 'desktop-file-utils')
-makedepends=('postgresql-libs' 'mariadb' 'unixodbc' 'cups' 'gtk2'
-             'mesa-libgl')
+makedepends=('postgresql-libs' 'mariadb' 'unixodbc' 'cups' 'gtk2' 'libfbclient'
+             'mesa')
 optdepends=('qtchooser: set the default Qt toolkit'
             'postgresql-libs: PostgreSQL driver'
             'libmariadbclient: MariaDB driver'
@@ -27,16 +27,16 @@ if [ "$CARCH" != "mips64el" ]; then
   optdepends+=('libfbclient: Firebird/iBase driver')
 fi
 install="${pkgname}.install"
-options=('!libtool')
 replaces=('qt<=4.8.4')
 conflicts=('qt')
+options=('staticlibs') # libQtUiTools builds as static only
 _pkgfqn="qt-everywhere-opensource-src-${pkgver}"
 source=("http://download.qt-project.org/official_releases/qt/4.8/${pkgver}/${_pkgfqn}.tar.gz"
         'qtconfig-qt4.desktop' 'assistant-qt4.desktop' 'designer-qt4.desktop'
         'linguist-qt4.desktop' 'qdbusviewer-qt4.desktop'
         'improve-cups-support.patch'
 	      'declarative-fix-sigbus.patch'
-        'qtbug-31579.patch' 'qtbug-32534.patch')
+        'qtbug-31579.patch' 'qtbug-32534.patch' 'qtbug-32908.patch')
 md5sums=('1864987bdbb2f58f8ae8b350dfdbe133'
          'a16638f4781e56e7887ff8212a322ecc'
          '8a28b3f52dbeb685d4b69440b520a3e1'
@@ -46,7 +46,8 @@ md5sums=('1864987bdbb2f58f8ae8b350dfdbe133'
          'c439c7731c25387352d8453ca7574971'
          'aac963d05a9d5733e2bfce9e26607f51'
          '6ed8d26a8e4a9bba1f6c08fb99cc8357'
-         'bb0e0fa6ba953fa590d81ac612374e11')
+         'bb0e0fa6ba953fa590d81ac612374e11'
+         'db343dcae522bc90d802ad1e83b7f5dd')
 
 prepare() {
   cd ${_pkgfqn}
@@ -61,6 +62,8 @@ prepare() {
   patch -p1 -i "${srcdir}"/qtbug-31579.patch
   # (FS#36394) (QTBUG#32534)
   patch -p1 -i "${srcdir}"/qtbug-32534.patch
+  # (FS#36947) (QTBUG#32908)
+  patch -p1 -i "${srcdir}"/qtbug-32908.patch
 
   sed -i "s|-O2|${CXXFLAGS}|" mkspecs/common/{g++,gcc}-base.conf
   sed -i "/^QMAKE_LFLAGS_RPATH/s| -Wl,-rpath,||g" mkspecs/common/gcc-base-unix.conf
diff --git a/extra/qt4/qtbug-32908.patch b/extra/qt4/qtbug-32908.patch
new file mode 100644
index 000000000..f11fa4075
--- /dev/null
+++ b/extra/qt4/qtbug-32908.patch
@@ -0,0 +1,40 @@
+From 0c03af0d4d928bdbb32b09eedb1dba3ce59e5278 Mon Sep 17 00:00:00 2001
+From: Gatis Paeglis <gatis.paeglis@digia.com>
+Date: Sat, 31 Aug 2013 21:22:47 +0200
+Subject: [PATCH] Revert "QTBUG-15319: fix shortcuts with secondary Xkb layout."
+
+The change which attempted to fix QTBUG-15319 broke keyboard
+shortcuts for non latin keyboard layouts.
+
+This patch reverts QTBUG-15319 (f45cdeda8) since it caused a
+regression.
+
+Task-number: QTBUG-32908
+
+Change-Id: I47d7984fa7986d5218d1f3ff1fc36d2ec67c9ba7
+Reviewed-by: David Faure <david.faure@kdab.com>
+---
+ src/gui/kernel/qkeymapper_x11.cpp |    5 +----
+ 1 files changed, 1 insertions(+), 4 deletions(-)
+
+diff --git a/src/gui/kernel/qkeymapper_x11.cpp b/src/gui/kernel/qkeymapper_x11.cpp
+index 005ff3f..7daa41d 100644
+--- a/src/gui/kernel/qkeymapper_x11.cpp
++++ b/src/gui/kernel/qkeymapper_x11.cpp
+@@ -282,12 +282,9 @@ QList<int> QKeyMapperPrivate::possibleKeysXKB(QKeyEvent *event)
+ 
+     // first, translate key only using lock modifiers (there are no Qt equivalents for these, so we must
+     // always use them when determining the baseKeySym)
+-    // Note: the Xkb group to be used for the conversion keycode->keysym has to be given to
+-    //       XkbLookupKeySym(). This information is contained in the bits 8 to 15 of xmodifiers.
+-    //       See https://bugreports.qt-project.org/browse/QTBUG-15319 .
+     KeySym baseKeySym;
+     uint consumedModifiers;
+-    if (!XkbLookupKeySym(X11->display, xkeycode, (xmodifiers & (0xff00 | LockMask | qt_num_lock_mask)),
++    if (!XkbLookupKeySym(X11->display, xkeycode, (xmodifiers & (LockMask | qt_num_lock_mask)),
+                          &consumedModifiers, &baseKeySym))
+         return QList<int>();
+ 
+-- 
+1.7.1
+
diff --git a/extra/qt5/PKGBUILD b/extra/qt5/PKGBUILD
index 1013c607c..7c197b293 100644
--- a/extra/qt5/PKGBUILD
+++ b/extra/qt5/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 193725 2013-08-29 13:10:15Z andrea $
+# $Id: PKGBUILD 197149 2013-10-23 11:49:27Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgbase=qt5
@@ -26,19 +26,18 @@ pkgname=('qt5-base'
          'qt5-x11extras'
          'qt5-xmlpatterns')
 pkgver=5.1.1
-pkgrel=1
+pkgrel=5
 arch=('i686' 'x86_64' 'mips64el')
 url='http://qt-project.org/'
 license=('GPL3' 'LGPL' 'FDL' 'custom')
 makedepends=('libxcb' 'xcb-proto' 'xcb-util' 'xcb-util-image' 'xcb-util-wm' 'xcb-util-keysyms'
-            'mesa-libgl' 'at-spi2-core' 'alsa-lib' 'gstreamer0.10-base-plugins'
+            'mesa' 'at-spi2-core' 'alsa-lib' 'gstreamer0.10-base-plugins'
             'libjpeg-turbo' 'cups' 'libpulse' 'hicolor-icon-theme' 'desktop-file-utils'
             'postgresql-libs' 'libmariadbclient' 'sqlite' 'unixodbc'
             'python2' 'ruby' 'gperf' 'libxslt' 'libxcomposite' 'fontconfig'
-            'libmng' 'openal' 'gtk2' 'libxkbcommon')
+            'openal' 'gtk2' 'libxkbcommon')
 [ "$CARCH" != "mips64el" ] && makedepends+=('libfbclient')
 groups=('qt' 'qt5')
-options=('!libtool')
 _pkgfqn="qt-everywhere-opensource-src-${pkgver}"
 source=("http://download.qt-project.org/official_releases/qt/5.1/${pkgver}/single/${_pkgfqn}.tar.xz"
         'assistant.desktop' 'designer.desktop' 'linguist.desktop' 'qdbusviewer.desktop'
@@ -132,7 +131,7 @@ package_qt5-base() {
 
   cd ${_pkgfqn}/qtbase
   make INSTALL_ROOT="${pkgdir}" install
-  
+
   cd "${srcdir}"
   install -D -m644 ${_pkgfqn}/qtbase/LGPL_EXCEPTION.txt \
     ${pkgdir}/usr/share/licenses/${pkgbase}/LGPL_EXCEPTION.txt
@@ -159,11 +158,11 @@ package_qt5-declarative() {
 
   cd ${_pkgfqn}/qtdeclarative
   make INSTALL_ROOT="${pkgdir}" install
-  
+
   # Fix wrong path in prl files
   find "${pkgdir}/usr/lib" -type f -name '*.prl' \
     -exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d;s/\(QMAKE_PRL_LIBS =\).*/\1/' {} \;
-  
+
   # Useful symlinks
   install -d "${pkgdir}"/usr/bin
   for b in "${pkgdir}"/usr/lib/qt/bin/*; do
@@ -208,7 +207,7 @@ package_qt5-xmlpatterns() {
   # Fix wrong path in prl files
   find "${pkgdir}/usr/lib" -type f -name '*.prl' \
     -exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d;s/\(QMAKE_PRL_LIBS =\).*/\1/' {} \;
-  
+
   # Useful symlinks
   install -d "${pkgdir}"/usr/bin
   for b in "${pkgdir}"/usr/lib/qt/bin/*; do
@@ -248,7 +247,7 @@ package_qt5-graphicaleffects() {
 
 package_qt5-imageformats() {
   pkgdesc='A cross-platform application and UI framework (Images plugins)'
-  depends=('qt5-base' 'libtiff' 'libmng')
+  depends=('qt5-base' 'libtiff')
   conflicts=('qt')
 
   cd ${_pkgfqn}/qtimageformats
@@ -262,11 +261,11 @@ package_qt5-quick1() {
 
   cd ${_pkgfqn}/qtquick1
   make INSTALL_ROOT="${pkgdir}" install
-  
+
   # Fix wrong path in prl files
   find "${pkgdir}/usr/lib" -type f -name '*.prl' \
     -exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d;s/\(QMAKE_PRL_LIBS =\).*/\1/' {} \;
-  
+
   # Useful symlinks
   install -d "${pkgdir}"/usr/bin
   for b in "${pkgdir}"/usr/lib/qt/bin/*; do
@@ -289,7 +288,7 @@ package_qt5-script() {
 
   cd ${_pkgfqn}/qtscript
   make INSTALL_ROOT="${pkgdir}" install
-  
+
   # Fix wrong path in prl files
   find "${pkgdir}/usr/lib" -type f -name '*.prl' \
     -exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d;s/\(QMAKE_PRL_LIBS =\).*/\1/' {} \;
@@ -301,7 +300,7 @@ package_qt5-sensors() {
 
   cd ${_pkgfqn}/qtsensors
   make INSTALL_ROOT="${pkgdir}" install
-  
+
   # Fix wrong path in prl files
   find "${pkgdir}/usr/lib" -type f -name '*.prl' \
     -exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d;s/\(QMAKE_PRL_LIBS =\).*/\1/' {} \;
@@ -310,10 +309,10 @@ package_qt5-sensors() {
 package_qt5-serialport() {
   pkgdesc='A cross-platform application and UI framework (QtSerialPort)'
   depends=('qt5-base')
-  
+
   cd ${_pkgfqn}/qtserialport
   make INSTALL_ROOT="${pkgdir}" install
-  
+
   # Fix wrong path in prl files
   find "${pkgdir}/usr/lib" -type f -name '*.prl' \
     -exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d;s/\(QMAKE_PRL_LIBS =\).*/\1/' {} \;
@@ -326,12 +325,12 @@ package_qt5-svg() {
 
   cd ${_pkgfqn}/qtsvg
   make INSTALL_ROOT="${pkgdir}" install
-  
+
   # Fix wrong path in prl files
   find "${pkgdir}/usr/lib" -type f -name '*.prl' \
     -exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d;s/\(QMAKE_PRL_LIBS =\).*/\1/' {} \;
 }
-  
+
 package_qt5-tools() {
   pkgdesc='A cross-platform application and UI framework (Development Tools, QtHelp)'
   depends=('qt5-webkit' 'desktop-file-utils' 'qt5-translations' 'hicolor-icon-theme'
@@ -339,10 +338,11 @@ package_qt5-tools() {
   optdepends=('qt5-doc: documentation')
   install='qt5-tools.install'
   conflicts=('qt')
+  options=('staticlibs') # libQtUiTools builds as static only$
 
   cd ${_pkgfqn}/qttools
   make INSTALL_ROOT="${pkgdir}" install
-  
+
   # install missing icons and desktop files
   for icon in src/linguist/linguist/images/icons/linguist-*-32.png ; do
     size=$(echo $(basename ${icon}) | cut -d- -f2)
@@ -367,12 +367,12 @@ package_qt5-tools() {
   # Fix wrong path in prl files
   find "${pkgdir}/usr/lib" -type f -name '*.prl' \
     -exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d;s/\(QMAKE_PRL_LIBS =\).*/\1/' {} \;
-  
+
   # Useful symlinks
   install -d "${pkgdir}"/usr/bin
   for b in "${pkgdir}"/usr/lib/qt/bin/*; do
     ln -s /usr/lib/qt/bin/$(basename $b) "${pkgdir}"/usr/bin/$(basename $b)-qt5
-  done 
+  done
 }
 
 package_qt5-webkit() {
@@ -381,7 +381,7 @@ package_qt5-webkit() {
 
   cd ${_pkgfqn}/qtwebkit
   make INSTALL_ROOT="${pkgdir}" install
-  
+
   # Fix wrong path in prl files
   find "${pkgdir}/usr/lib" -type f -name '*.prl' \
     -exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d;s/\(QMAKE_PRL_LIBS =\).*/\1/' {} \;
@@ -393,10 +393,10 @@ package_qt5-webkit() {
 package_qt5-x11extras() {
   pkgdesc='A cross-platform application and UI framework (QtX11Extras)'
   depends=('qt5-base')
-  
+
   cd ${_pkgfqn}/qtx11extras
   make INSTALL_ROOT="${pkgdir}" install
-  
+
   # Fix wrong path in prl files
   find "${pkgdir}/usr/lib" -type f -name '*.prl' \
     -exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d;s/\(QMAKE_PRL_LIBS =\).*/\1/' {} \;
diff --git a/extra/qtwebkit/PKGBUILD b/extra/qtwebkit/PKGBUILD
index ed0eeb3f0..069e436a0 100644
--- a/extra/qtwebkit/PKGBUILD
+++ b/extra/qtwebkit/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 191650 2013-07-29 07:23:54Z andrea $
+# $Id: PKGBUILD 196523 2013-10-14 18:08:22Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=qtwebkit
-pkgver=2.3.2
+pkgver=2.3.3
 pkgrel=1
 arch=('i686' 'x86_64' 'mips64el')
 url='http://trac.webkit.org/wiki/QtWebKit'
@@ -12,19 +12,26 @@ depends=('qt4' 'systemd' 'gstreamer0.10-base')
 makedepends=('gperf' 'python2' 'ruby' 'git' 'mesa')
 conflicts=('qt<4.8')
 _qtver=4.8.5
-source=("${pkgname}-${pkgver}.tar.gz"::"http://gitorious.org/webkit/qtwebkit-23/archive-tarball/${pkgname}-${pkgver}"
+source=("ftp://ftp.archlinux.org/other/packages/${pkgname}/${pkgname}-${pkgver}.tar.gz"
         "http://download.qt-project.org/official_releases/qt/4.8/4.8.5/qt-everywhere-opensource-src-${_qtver}.tar.gz"
         'use-python2.patch'
+        'bison3.patch'
         'qwebview.patch'
 	'LLIntCLoop32BigEndian.patch')
-sha1sums=('adf66bc92b0c3e41791a419c6b776d0167acaa7c'
+sha1sums=('64f3ab7f8e53b5b971a3a6577fc61db0cc2ea31f'
           '745f9ebf091696c0d5403ce691dc28c039d77b9e'
           '315b6ff603f35e5492a036f7082f6aa075dfb607'
-          'ef467fcfc9e74aa88356f27acc21792706ed1e4d'
+          'd2c6182512e4bcbdf30a9e9d513c52fe4b16d9f2'
+          '88ed73e6bd7ea9c6d227ceaed0ff2f1cf0200667'
           'af830ae24e2ae5113754c9ae524d27ec0a28a9d6')
 
-build() {
-  cd webkit-qtwebkit-23
+prepare() {
+  cd ${pkgname}-${pkgver}
+  patch -p1 -i "${srcdir}"/use-python2.patch
+  patch -p1 -i "${srcdir}"/bison3.patch
+  
+  cd ../qt-everywhere-opensource-src-${_qtver}
+  patch -p1 -i "${srcdir}"/qwebview.patch
 
   if [ "$CARCH" = "mips64el" ]; then
      # Fix MIPS N32 support.
@@ -34,8 +41,10 @@ build() {
       sed -i 's/#define ENABLE_JIT 1/#define ENABLE_JIT 0/' \
           Source/WTF/wtf/Platform.h
   fi
+}
 
-  patch -p1 -i "${srcdir}"/use-python2.patch
+build() {
+  cd ${pkgname}-${pkgver}
 
   # Fix https://bugs.webkit.org/show_bug.cgi?id=103128, original patch with ChangeLog stripped.
   patch -p0 -i "${srcdir}/LLIntCLoop32BigEndian.patch"
@@ -54,15 +63,13 @@ build() {
     ${OPTS}
 
   # Build the QWebView plugin (FS#27914)
-  cd ../qt-everywhere-opensource-src-${_qtver}
-  patch -p1 -i "${srcdir}"/qwebview.patch
-  cd tools/designer/src/plugins/qwebview
+  cd ../qt-everywhere-opensource-src-${_qtver}/tools/designer/src/plugins/qwebview
   qmake-qt4
   make
 }
 
 package() {
-  cd webkit-qtwebkit-23
+  cd ${pkgname}-${pkgver}
   make INSTALL_ROOT="${pkgdir}" -C WebKitBuild/Release install
 
   cd ../qt-everywhere-opensource-src-${_qtver}/tools/designer/src/plugins/qwebview
diff --git a/extra/qtwebkit/bison3.patch b/extra/qtwebkit/bison3.patch
new file mode 100644
index 000000000..4070c88e8
--- /dev/null
+++ b/extra/qtwebkit/bison3.patch
@@ -0,0 +1,38 @@
+From 60ba8bd5b3575d0c7740571fbb4e681b21a49a82 Mon Sep 17 00:00:00 2001
+From: Allan Sandfeld Jensen <allan.jensen@digia.com>
+Date: Fri, 16 Aug 2013 18:27:07 +0200
+Subject: [PATCH] ANGLE doesn't build with bison 3.0
+
+https://bugs.webkit.org/show_bug.cgi?id=119798
+
+Reviewed by Antti Koivisto.
+
+Make glslang.y compatible with bison 3.0
+by using %lex-param to set YYLEX_PARAM.
+
+* src/compiler/glslang.y:
+
+git-svn-id: http://svn.webkit.org/repository/webkit/trunk@154109 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+Task-number: QTBUG-32913
+Change-Id: I15505d31f0588c4d558b73befdb9d2358e29c1a3
+Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
+---
+ Source/ThirdParty/ANGLE/src/compiler/glslang.y |    1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+diff --git a/Source/ThirdParty/ANGLE/src/compiler/glslang.y b/Source/ThirdParty/ANGLE/src/compiler/glslang.y
+index 3cad335..b41e95a 100644
+--- a/Source/ThirdParty/ANGLE/src/compiler/glslang.y
++++ b/Source/ThirdParty/ANGLE/src/compiler/glslang.y
+@@ -47,6 +47,7 @@ WHICH GENERATES THE GLSL ES PARSER (glslang_tab.cpp AND glslang_tab.h).
+ %expect 1 /* One shift reduce conflict because of if | else */
+ %pure-parser
+ %parse-param {TParseContext* context}
++%lex-param {YYLEX_PARAM}
+ 
+ %union {
+     struct {
+-- 
+1.7.1
+
diff --git a/extra/qtwebkit/qwebview.patch b/extra/qtwebkit/qwebview.patch
index 98f6f0f03..3788e0bff 100644
--- a/extra/qtwebkit/qwebview.patch
+++ b/extra/qtwebkit/qwebview.patch
@@ -1,8 +1,8 @@
 --- qt-everywhere-opensource-src-4.8.4/tools/designer/src/plugins/plugins.pri~	2013-01-09 12:56:08.915412090 +0000
 +++ qt-everywhere-opensource-src-4.8.4/tools/designer/src/plugins/plugins.pri	2013-01-09 12:58:06.911391299 +0000
 @@ -1,3 +1,6 @@
-+INCLUDEPATH += ../../../../../../webkit-qtwebkit-23/WebKitBuild/Release/include
-+LIBS += -L../../../../../../webkit-qtwebkit-23/WebKitBuild/Release/lib
++INCLUDEPATH += ../../../../../../qtwebkit-2.3.3/WebKitBuild/Release/include
++LIBS += -L../../../../../../qtwebkit-2.3.3/WebKitBuild/Release/lib
 +
  CONFIG += designer
  win32|mac: CONFIG+= debug_and_release
diff --git a/extra/quadrapassel/PKGBUILD b/extra/quadrapassel/PKGBUILD
index 4b1f65e86..bcb594e50 100644
--- a/extra/quadrapassel/PKGBUILD
+++ b/extra/quadrapassel/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 196132 2013-10-07 11:53:21Z jgc $
+# $Id: PKGBUILD 198393 2013-10-30 14:35:57Z allan $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Contributor: Jan de Groot <jgc@archlinux.org>
 
@@ -12,7 +12,7 @@ depends=('desktop-file-utils' 'hicolor-icon-theme' 'clutter-gtk' 'libcanberra' '
 makedepends=('intltool' 'itstool' 'gobject-introspection')
 conflicts=('gnome-games')
 replaces=('gnome-games')
-options=('!emptydirs' '!libtool')
+options=('!emptydirs')
 install=quadrapassel.install
 url="https://live.gnome.org/Quadrapassel"
 groups=('gnome-extra')
diff --git a/extra/r/PKGBUILD b/extra/r/PKGBUILD
index 717b1b0e4..8c6cae34d 100644
--- a/extra/r/PKGBUILD
+++ b/extra/r/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 188821 2013-06-22 06:15:43Z foutrelis $
+# $Id: PKGBUILD 196711 2013-10-16 19:03:48Z ronald $
 # Maintainer: Ronald van Haren <ronald.archlinux.org>
 # Contributor: Damir Perisa <damir.perisa@bluewin.ch>
 # Contributor: K. Piche <kpiche@rogers.com>
 
 pkgname=r
-pkgver=3.0.1
+pkgver=3.0.2
 pkgrel=1
 pkgdesc="Language and environment for statistical computing and graphics"
 arch=('i686' 'x86_64' 'mips64el')
@@ -22,7 +22,7 @@ source=("http://cran.r-project.org/src/base/R-${pkgver%%.*}/R-${pkgver}.tar.gz"
 	'r.desktop'
 	'r.png'
 	'R.conf')
-sha1sums=('5cc65476837926fdf04105954ea94efa53ac85ce'
+sha1sums=('f5d9daef00e09d36a465ff7b0bf4cab136bea227'
           '13aa29219bcaa102e575de8c1c8e0833d233e836'
           'a69a07ec363440efc18ce0a7f2af103375dea978'
           '43668da6cfd1b4455a99f23e79e2059294dddac9')
diff --git a/extra/racket/PKGBUILD b/extra/racket/PKGBUILD
index ccf956ea3..457bbf621 100644
--- a/extra/racket/PKGBUILD
+++ b/extra/racket/PKGBUILD
@@ -1,16 +1,16 @@
-# $Id: PKGBUILD 192411 2013-08-10 21:15:00Z eric $
+# $Id: PKGBUILD 197435 2013-10-25 22:16:33Z eric $
 # Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgname=racket
 pkgver=5.3.6
-pkgrel=1
+pkgrel=2
 pkgdesc="A programming language environment (formerly known as PLT Scheme) suitable for tasks ranging from scripting to application development"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://racket-lang.org/"
 license=('LGPL')
 depends=('gtk2' 'desktop-file-utils' 'hicolor-icon-theme')
 makedepends=('gsfonts' 'sqlite')
-options=('!libtool' '!strip')
+options=('!strip')
 install=racket.install
 source=(http://download.racket-lang.org/installers/${pkgver}/racket/${pkgname}-${pkgver}-src-unix.tgz
         drracket.desktop)
@@ -28,9 +28,11 @@ package() {
   cd ${pkgname}-${pkgver}/src
   make DESTDIR="${pkgdir}" install
 
-  install -d "${pkgdir}"/usr/share/icons/hicolor/{16x16,32x32,48x48}/apps
+  install -d "${pkgdir}"/usr/share/icons/hicolor/{16x16,32x32,48x48,256x256}/apps
   ln -s /usr/lib/racket/collects/icons/plt-16x16.png "${pkgdir}/usr/share/icons/hicolor/16x16/apps/drracket.png"
   ln -s /usr/lib/racket/collects/icons/plt-32x32.png "${pkgdir}/usr/share/icons/hicolor/32x32/apps/drracket.png"
   ln -s /usr/lib/racket/collects/icons/plt-48x48.png "${pkgdir}/usr/share/icons/hicolor/48x48/apps/drracket.png"
+  ln -s /usr/lib/racket/collects/icons/plt-logo-red-diffuse.png "${pkgdir}/usr/share/icons/hicolor/256x256/apps/drracket.png"
+
   install -D -m644 "${srcdir}/drracket.desktop" "${pkgdir}/usr/share/applications/drracket.desktop"
 }
diff --git a/extra/raptor/PKGBUILD b/extra/raptor/PKGBUILD
index 36d55febc..6492837fd 100644
--- a/extra/raptor/PKGBUILD
+++ b/extra/raptor/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 194462 2013-09-16 16:36:19Z tomegun $
+# $Id: PKGBUILD 198394 2013-10-30 14:36:18Z allan $
 # Maintainer: Tom Gundersen <teg@jklm.no>
 # Contributor: Andreas Radke <andyrtr@archlinux.org>
 # Contributor: eric <eric@archlinux.org>
@@ -6,13 +6,12 @@
 
 pkgname=raptor
 pkgver=2.0.10
-pkgrel=2
+pkgrel=3
 pkgdesc="A C library that parses RDF/XML/N-Triples into RDF triples"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://librdf.org/raptor"
 depends=('curl' 'libxslt' 'icu')
 license=('LGPL')
-options=('!libtool')
 source=("http://librdf.org/dist/source/raptor2-$pkgver.tar.gz")
 
 build() {
diff --git a/extra/rarian/PKGBUILD b/extra/rarian/PKGBUILD
index 390256406..e180bae22 100644
--- a/extra/rarian/PKGBUILD
+++ b/extra/rarian/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 177017 2013-02-04 08:40:59Z jgc $
+# $Id: PKGBUILD 198395 2013-10-30 14:36:41Z allan $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=rarian
@@ -10,7 +10,6 @@ url="http://rarian.freedesktop.org/"
 license=('GPL')
 depends=('gcc-libs')
 makedepends=('libxslt')
-options=('!libtool')
 source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/0.8/${pkgname}-${pkgver}.tar.bz2
         user-segfault.patch)
 md5sums=('75091185e13da67a0ff4279de1757b94'
diff --git a/extra/rasqal/PKGBUILD b/extra/rasqal/PKGBUILD
index 18047acf8..a0f1ed7b4 100644
--- a/extra/rasqal/PKGBUILD
+++ b/extra/rasqal/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 176919 2013-02-02 15:36:06Z tomegun $
+# $Id: PKGBUILD 198396 2013-10-30 14:37:02Z allan $
 # Maintainer: Tom Gundersen <teg@jklm.no>
 # Contributor: AndyRTR <andyrtr@archlinux.org>
 # Contributor: Lawrence Lee <valheru@facticius.net>
@@ -12,7 +12,6 @@ url="http://librdf.org/rasqal"
 license=('GPL' 'LGPL')
 arch=('i686' 'x86_64' 'mips64el')
 depends=('raptor' 'mpfr' 'util-linux')
-options=('!libtool')
 source=(http://download.librdf.org/source/${pkgname}-${pkgver}.tar.gz)
 
 build() {
diff --git a/extra/recode/PKGBUILD b/extra/recode/PKGBUILD
index 4dd53dbb7..3474d153d 100644
--- a/extra/recode/PKGBUILD
+++ b/extra/recode/PKGBUILD
@@ -1,31 +1,36 @@
-# $Id: PKGBUILD 151219 2012-02-25 08:35:55Z pierre $
+# $Id: PKGBUILD 197569 2013-10-27 00:17:34Z eric $
 # Maintainer: Kevin Piche <kevin@archlinux.org>
 # Contributor: Tom Newsom <Jeepster@gmx.co.uk>
 
 pkgname=recode
 pkgver=3.6
-pkgrel=7
+pkgrel=8
 pkgdesc="Converts files between various character sets and usages"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://recode.progiciels-bpi.ca/index.html"
 license=('GPL' 'LGPL')
-depends=('glibc' 'texinfo')
-options=('!libtool')
+depends=('glibc')
 install=recode.install
 source=(${pkgname}-${pkgver}.tar.gz::"https://github.com/pinard/${pkgname}/tarball/v${pkgver}"
-        'http://ftp.de.debian.org/debian/pool/main/r/recode/recode_3.6-15.diff.gz'
+        'http://ftp.de.debian.org/debian/pool/main/r/recode/recode_3.6-17.diff.gz'
         'recode-3.6-as-if.patch' 'recode-3.6-gettextfix.diff')
 md5sums=('f82e9a6ede9119268c13493c9add2809'
-         '95ca772e367a7ef56d3f46d724b6f86e'
+         '3716ae269074e31add3d29387ff09438'
          'fca7484ba332c8ad59eb02334883cd92'
          'eb602e80a24b5448604bfebeacc55304')
 
-build() {
-  cd ${srcdir}/pinard-Recode-2127b34
-  patch -Np1 -i ${srcdir}/recode-3.6-as-if.patch
-  patch -Np1 -i ${srcdir}/recode-3.6-gettextfix.diff
-  patch -Np1 -i ${srcdir}/recode_3.6-15.diff
+prepare() {
+  cd pinard-Recode-2127b34
+  patch -Np1 -i "${srcdir}/recode-3.6-as-if.patch"
+  patch -Np1 -i "${srcdir}/recode-3.6-gettextfix.diff"
+  patch -Np1 -i "${srcdir}/recode_3.6-17.diff"
   sed -i '1i#include <stdlib.h>' src/argmatch.c
+  sed -i -e '/^AM_C_PROTOTYPES/d' -e '/^AUTOMAKE_OPTIONS.*ansi2knr/d' \
+    configure.in src/Makefile.am
+}
+
+build() {
+  cd pinard-Recode-2127b34
   rm -f acinclude.m4
   # "automatic de-ANSI-fication support has been removed"
   sed -i '/AM_C_PROTOTYPES/d' configure.in
@@ -38,9 +43,6 @@ build() {
 }
 
 package() {
-  cd ${srcdir}/pinard-Recode-2127b34
-  make DESTDIR=${pkgdir} install
-
-  rm ${pkgdir}/usr/share/info/dir
-  gzip ${pkgdir}/usr/share/info/*
+  cd pinard-Recode-2127b34
+  make DESTDIR="${pkgdir}" install
 }
diff --git a/extra/recode/recode.install b/extra/recode/recode.install
index 6304d5906..b66d99b11 100644
--- a/extra/recode/recode.install
+++ b/extra/recode/recode.install
@@ -1,5 +1,5 @@
 infodir=/usr/share/info
-filelist=(recode.info-5.gz recode.info-3.gz recode.info-7.gz recode.info-6.gz recode.info-2.gz recode.info-4.gz recode.info.gz recode.info-1.gz)
+filelist=(recode.info.gz)
 
 post_install() {
   [ -x usr/bin/install-info ] || return 0
diff --git a/extra/redland/PKGBUILD b/extra/redland/PKGBUILD
index b903c8a97..cb01bfb84 100644
--- a/extra/redland/PKGBUILD
+++ b/extra/redland/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 180113 2013-03-17 11:48:21Z tomegun $
+# $Id: PKGBUILD 198397 2013-10-30 14:37:22Z allan $
 # Maintainer: Tom Gundersen <teg@jklm.no>
 # Contributor: AndyRTR <andyrtr@archlinux.org>
 # Contributor: Francois Charette <francois.archlinux.org> 
@@ -12,7 +12,6 @@ url="http://librdf.org/"
 license=("GPL")
 arch=('i686' 'x86_64' 'mips64el')
 makedepends=('rasqal' 'raptor' 'db' 'postgresql-libs' 'libmariadbclient' 'unixodbc' 'sqlite')
-options=('!libtool')
 source=(http://download.librdf.org/source/$pkgname-$pkgver.tar.gz{,.asc}
         rpath.diff)
 sha256sums=('d9a274fc086e61119d5c9beafb8d05527e040ec86f4c0961276ca8de0a049dbd'
diff --git a/extra/rest/PKGBUILD b/extra/rest/PKGBUILD
index ed44bdfef..0558d97ad 100644
--- a/extra/rest/PKGBUILD
+++ b/extra/rest/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 183454 2013-04-21 22:12:01Z heftig $
+# $Id: PKGBUILD 198398 2013-10-30 14:37:42Z allan $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 
 pkgname=rest
@@ -10,7 +10,6 @@ url="http://www.gtk.org/"
 license=(GPL2)
 depends=(glib2 libxml2 'libsoup>=2.42.0')
 makedepends=(gobject-introspection)
-options=('!libtool')
 source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-${pkgver}.tar.xz)
 sha256sums=('1d682acaac4d946cc7c98a2dd9d65a8c83a6fdb8ca6759e70b8b5042fe66c022')
 
diff --git a/extra/rhythmbox/PKGBUILD b/extra/rhythmbox/PKGBUILD
index 5e7d8526a..2a0705f95 100644
--- a/extra/rhythmbox/PKGBUILD
+++ b/extra/rhythmbox/PKGBUILD
@@ -1,15 +1,15 @@
-# $Id: PKGBUILD 196133 2013-10-07 11:53:23Z jgc $
+# $Id: PKGBUILD 198399 2013-10-30 14:38:03Z allan $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: Giovanni Scafora <giovanni@archlinux.org>
 
 pkgname=rhythmbox
-pkgver=3.0
-pkgrel=2
+pkgver=3.0.1
+pkgrel=1
 pkgdesc="An iTunes-like music playback and management application"
 arch=('i686' 'x86_64' 'mips64el')
 license=(GPL)
 url="http://www.rhythmbox.org"
-depends=(dconf desktop-file-utils gst-plugins-base gst-plugins-good libsoup json-glib libnotify libpeas media-player-info totem-plparser tdb webkitgtk3 python-gobject)
+depends=(dconf desktop-file-utils gst-plugins-base gst-plugins-good libsoup json-glib libnotify libpeas media-player-info totem-plparser tdb webkitgtk3 python-gobject gnome-icon-theme)
 makedepends=(itstool intltool brasero gobject-introspection vala grilo libdmapsharing lirc-utils libgpod libmtp)
 optdepends=('gst-plugins-ugly: Extra media codecs'
             'gst-plugins-bad: Extra media codecs'
@@ -21,10 +21,10 @@ optdepends=('gst-plugins-ugly: Extra media codecs'
             'libgpod: Portable Players - iPod plugin'
             'libmtp: Portable Players - MTP plugin'
             'zeitgeist: Zeitgeist plugin')
-options=('!libtool' '!emptydirs')
+options=('!emptydirs')
 install=rhythmbox.install
-source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver::4}/$pkgname-$pkgver.tar.xz)
-sha256sums=('bf6f35c1a46867d16e45969f97f01630d936bfa92baf940c442f3a19fb6820e4')
+source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver::3}/$pkgname-$pkgver.tar.xz)
+sha256sums=('75072b093284e9f5696fbb590d719a9e16340a5a91d73e3ccd876ce21329bdcf')
 
 build() {
   cd "$pkgname-$pkgver"
diff --git a/extra/rrdtool/PKGBUILD b/extra/rrdtool/PKGBUILD
index 3c78759bd..2b4805201 100644
--- a/extra/rrdtool/PKGBUILD
+++ b/extra/rrdtool/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 188995 2013-06-28 01:52:37Z eric $
+# $Id: PKGBUILD 197422 2013-10-25 19:15:13Z eric $
 # Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgname=rrdtool
 pkgver=1.4.8
-pkgrel=1
+pkgrel=2
 pkgdesc="Data logging and graphing application"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.rrdtool.org"
@@ -14,22 +14,24 @@ optdepends=('tcl: to use corresponding binding' \
             'python2: to use corresponding binding' \
             'ruby: to use corresponding binding' \
             'lua51: to use corresponding binding')
-options=('!libtool' '!emptydirs' '!makeflags')
+options=('!emptydirs' '!makeflags')
 source=(http://oss.oetiker.ch/rrdtool/pub/rrdtool-${pkgver}.tar.gz 
-        rrdtool-pangofont.patch)
+        rrdtool-pangofont.patch rrdtool-systemd.patch)
 sha1sums=('56d68857f39e70bfa32360947614d8220702ed02'
-          '8c600285bdab7776c1d5301df7cf486d69eae048')
+          '8c600285bdab7776c1d5301df7cf486d69eae048'
+          '963b600f8056d85305b6ff4554fa1e7b9b5a4ae1')
 
 prepare() {
   cd ${pkgname}-${pkgver}
   # fix FS#28521 make ruby install to vendor_ruby instead of site_ruby
-  sed -e 's/$(RUBY) extconf.rb/& --vendor/' -i bindings/Makefile.in
-  patch -p1 -i ../rrdtool-pangofont.patch
+  sed -e 's/$(RUBY) extconf.rb/& --vendor/' -i bindings/Makefile.am
+  patch -p1 -i "${srcdir}/rrdtool-pangofont.patch"
+  patch -p1 -i "${srcdir}/rrdtool-systemd.patch"
 }
 
 build() {
   cd ${pkgname}-${pkgver}
-  autoconf
+  autoreconf
   PYTHON=python2 LUA=/usr/bin/lua5.1 \
     LUA_CFLAGS="-I/usr/include/lua5.1 -llua5.1" LUA_INSTALL_CMOD="/usr/lib/lua/5.1" \
     ./configure --prefix=/usr --localstatedir=/var --disable-rpath \
diff --git a/extra/rrdtool/rrdtool-systemd.patch b/extra/rrdtool/rrdtool-systemd.patch
new file mode 100644
index 000000000..856f9ef54
--- /dev/null
+++ b/extra/rrdtool/rrdtool-systemd.patch
@@ -0,0 +1,140 @@
+From 78b519eb2ffa786d6427bb13277e9151ef7b111e Mon Sep 17 00:00:00 2001
+From: Tobias Oetiker <tobi@oetiker.ch>
+Date: Mon, 2 Jul 2012 15:05:32 +0000
+Subject: [PATCH] serviced config etc files for rrdtool
+
+git-svn-id: svn://svn.oetiker.ch/rrdtool/trunk/program@2292 a5681a0c-68f1-0310-ab6d-d61299d08faa
+---
+ etc/rrdcached.service.in | 19 +++++++++++++++++++
+ etc/rrdcached.socket.in  | 18 ++++++++++++++++++
+ 2 files changed, 37 insertions(+)
+ create mode 100644 etc/rrdcached.service.in
+ create mode 100644 etc/rrdcached.socket.in
+
+diff --git a/etc/rrdcached.service.in b/etc/rrdcached.service.in
+new file mode 100644
+index 0000000..3b6f309
+--- /dev/null
++++ b/etc/rrdcached.service.in
+@@ -0,0 +1,19 @@
++#
++# To customize, copy this file to /etc/systemd/system/
++# and edit there
++#
++
++[Unit]
++Description=Data caching daemon for rrdtool
++Documentation=man:rrdcached(1)
++
++[Service]
++# If you enable socket-activable rrdcached.socket,
++# command line socket declarations will be ignored
++ExecStart=@prefix@/bin/rrdcached -g
++#WorkingDirectory=
++#User=
++#Group=
++
++[Install]
++WantedBy=multi-user.target
+diff --git a/etc/rrdcached.socket.in b/etc/rrdcached.socket.in
+new file mode 100644
+index 0000000..7a2d63e
+--- /dev/null
++++ b/etc/rrdcached.socket.in
+@@ -0,0 +1,18 @@
++#
++# To customize, copy this file to /etc/systemd/system/
++# and edit there
++#
++
++[Unit]
++Description=sockets activating rrdcached
++Documentation=man:rrdcached(1)
++
++[Socket]
++ListenStream=/tmp/rrdcached.sock
++#ListenStream=[::1]:42217
++#DirectoryMode=0755
++#SocketMode=0666
++#BindToDevice=
++
++[Install]
++WantedBy=sockets.target
+-- 
+1.8.4
+
+From 134ed0d33953e7e71c55454591c1078f7ae1db8a Mon Sep 17 00:00:00 2001
+From: Tobias Oetiker <tobi@oetiker.ch>
+Date: Mon, 2 Jul 2012 14:01:06 +0000
+Subject: [PATCH] wire up systemd support in autoconf -- tomek@pipebreaker.pl
+
+git-svn-id: svn://svn.oetiker.ch/rrdtool/trunk/program@2291 a5681a0c-68f1-0310-ab6d-d61299d08faa
+---
+ Makefile.am       |  6 ++++++
+ configure.ac      | 12 ++++++++++++
+ doc/rrdcached.pod |  2 ++
+ 3 files changed, 20 insertions(+)
+
+diff --git a/Makefile.am b/Makefile.am
+index 20b2e0a..11d16d3 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -29,6 +29,12 @@ ACLOCAL_M4= $(top_srcdir)/aclocal.m4
+ 
+ #	$(RSYNC) CHANGES archive/$(PACKAGE)-$(VERSION).tar.gz tobi@ipn.caida.org:/ipn/web/Tools/RRDtool/pub/
+ 
++if HAVE_SYSTEMD
++systemdsystemunit_DATA = \
++	etc/rrdcached.socket \
++	etc/rrdcached.service
++endif
++
+ site-perl-inst: site-perl-install
+ 
+ site-perl-install: all bindings/perl-piped/Makefile bindings/perl-shared/Makefile
+diff --git a/configure.ac b/configure.ac
+index 51c3f81..ab210d1 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -918,6 +918,17 @@ AC_ARG_VAR(RRDDOCDIR, [[DATADIR/doc/PACKAGE-VERSION] Documentation directory])
+ if test -z "$RRDDOCDIR"; then
+    RRDDOCDIR='${datadir}/doc/${PACKAGE}-${VERSION}'; fi
+ 
++# systemd check
++PKG_PROG_PKG_CONFIG
++AC_ARG_WITH([systemdsystemunitdir],
++	AS_HELP_STRING([--with-systemdsystemunitdir=DIR], [Directory for systemd service files]),
++	[], [with_systemdsystemunitdir=$($PKG_CONFIG --variable=systemdsystemunitdir systemd)])
++if test "x$with_systemdsystemunitdir" != xno; then
++	AC_SUBST([systemdsystemunitdir], [$with_systemdsystemunitdir])
++	AC_OUTPUT([etc/rrdcached.socket etc/rrdcached.service])
++fi
++AM_CONDITIONAL(HAVE_SYSTEMD, [test -n "$with_systemdsystemunitdir" -a "x$with_systemdsystemunitdir" != xno ])
++
+ 
+ CONFIGURE_PART(Apply Configuration Information)
+  
+@@ -993,6 +1004,7 @@ echo "       Build librrd MT: $enable_pthread"
+ echo "           Use gettext: $USE_NLS"
+ echo "           With libDBI: $have_libdbi"
+ echo "          With libwrap: $have_libwrap"
++echo "      With systemd dir: $with_systemdsystemunitdir"
+ echo
+ echo "             Libraries: $ALL_LIBS"
+ echo
+diff --git a/doc/rrdcached.pod b/doc/rrdcached.pod
+index 18adcf1..7c0b30c 100644
+--- a/doc/rrdcached.pod
++++ b/doc/rrdcached.pod
+@@ -448,6 +448,8 @@ accepted commands to those needed by external clients. If, for example,
+ external clients want to draw graphs of the cached data, they should only be
+ allowed to use the C<FLUSH> command.
+ 
++Authorization does not work when rrcached is socket-activated by systemd. 
++
+ =head2 Encryption
+ 
+ There is no encryption.
+-- 
+1.8.4
+
diff --git a/extra/rtmpdump/PKGBUILD b/extra/rtmpdump/PKGBUILD
index 2c42e4bc6..d194d2baf 100644
--- a/extra/rtmpdump/PKGBUILD
+++ b/extra/rtmpdump/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 190126 2013-07-16 03:23:42Z eric $
+# $Id: PKGBUILD 197306 2013-10-25 02:06:12Z bisson $
 # Maintainer:
 # Contributor: xduugu
 # Contributor: Elis Hughes <elishughes@googlemail.com>
 
 pkgname=rtmpdump
 pkgver=20121230
-pkgrel=2
+pkgrel=3
 pkgdesc="A tool to download rtmp streams"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://rtmpdump.mplayerhq.hu/"
diff --git a/extra/ruby/0001-remove-db-support.patch b/extra/ruby/0001-remove-db-support.patch
deleted file mode 100644
index bdd7e5871..000000000
--- a/extra/ruby/0001-remove-db-support.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From b653d6ffe9ec25c203fc0cbbbdd72e9b42546283 Mon Sep 17 00:00:00 2001
-From: Thomas Dziedzic <gostrc@gmail.com>
-Date: Sat, 10 Aug 2013 10:50:16 -0700
-Subject: [PATCH] remove db support
-
----
- ext/dbm/extconf.rb | 8 +-------
- 1 file changed, 1 insertion(+), 7 deletions(-)
-
-diff --git a/ext/dbm/extconf.rb b/ext/dbm/extconf.rb
-index 32a9446..2412404 100644
---- a/ext/dbm/extconf.rb
-+++ b/ext/dbm/extconf.rb
-@@ -5,17 +5,11 @@ dir_config("dbm")
- if dblib = with_config("dbm-type", nil)
-   dblib = dblib.split(/[ ,]+/)
- else
--  dblib = %w(libc db db2 db1 db5 db4 db3 gdbm_compat gdbm qdbm)
-+  dblib = %w(libc gdbm_compat gdbm qdbm)
- end
- 
- headers = {
-   "libc" => ["ndbm.h"], # 4.3BSD original ndbm, Berkeley DB 1 in 4.4BSD libc.
--  "db" => ["db.h"],
--  "db1" => ["db1/ndbm.h", "db1.h", "ndbm.h"],
--  "db2" => ["db2/db.h", "db2.h", "db.h"],
--  "db3" => ["db3/db.h", "db3.h", "db.h"],
--  "db4" => ["db4/db.h", "db4.h", "db.h"],
--  "db5" => ["db5/db.h", "db5.h", "db.h"],
-   "gdbm_compat" => ["gdbm-ndbm.h", "gdbm/ndbm.h", "ndbm.h"], # GDBM since 1.8.1
-   "gdbm" => ["gdbm-ndbm.h", "gdbm/ndbm.h", "ndbm.h"], # GDBM until 1.8.0
-   "qdbm" => ["qdbm/relic.h", "relic.h"],
--- 
-1.8.3.4
-
diff --git a/extra/ruby/PKGBUILD b/extra/ruby/PKGBUILD
index 2fbb4b46b..5795f61a6 100644
--- a/extra/ruby/PKGBUILD
+++ b/extra/ruby/PKGBUILD
@@ -10,26 +10,21 @@ arch=('i686' 'x86_64' 'mips64el')
 url='http://www.ruby-lang.org/en/'
 license=('BSD' 'custom')
 makedepends=('gdbm' 'openssl' 'tk' 'libffi' 'doxygen' 'graphviz' 'libyaml')
-options=('!emptydirs' '!makeflags')
-source=("ftp://ftp.ruby-lang.org/pub/ruby/${pkgver%.*}/ruby-${pkgver//_/-}.tar.bz2"
-        'gemrc'
-        '0001-remove-db-support.patch')
+options=('!emptydirs' '!makeflags' 'staticlibs')
+source=("http://cache.ruby-lang.org/pub/ruby/${pkgver%.*}/ruby-${pkgver//_/-}.tar.bz2"
+        'gemrc')
 md5sums=('60913f3eec0c4071f44df42600be2604'
-         '6fb8e7a09955e0f64be3158fb4a27e7a'
-         'b93ff50214a3da26525244cf37b71a8f')
+         '6fb8e7a09955e0f64be3158fb4a27e7a')
 
 build() {
   cd ruby-${pkgver//_/-}
 
-  # use gdbm because db v6 changed the license to AGPL
-  patch -Np1 -i ${srcdir}/0001-remove-db-support.patch
-
   PKG_CONFIG=/usr/bin/pkg-config ./configure \
     --prefix=/usr \
     --sysconfdir=/etc \
     --enable-shared \
-    --enable-pthread \
-    --disable-rpath
+    --disable-rpath \
+    --with-dbm-type=gdbm_compat
 
   make
 }
diff --git a/extra/rygel/PKGBUILD b/extra/rygel/PKGBUILD
index 1f544ce8b..ebf73026a 100644
--- a/extra/rygel/PKGBUILD
+++ b/extra/rygel/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 196134 2013-10-07 11:53:25Z jgc $
+# $Id: PKGBUILD 198400 2013-10-30 14:38:24Z allan $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Contributor: Balló György <ballogyor+arch at gmail dot com>
 
 pkgname=rygel
-pkgver=0.20.0
+pkgver=0.20.1
 pkgrel=1
 pkgdesc="UPnP AV MediaServer and MediaRenderer that allows you to easily share audio, video and pictures, and control of media player on your home network"
 arch=('i686' 'x86_64' 'mips64el')
@@ -18,11 +18,10 @@ optdepends=('gst-plugins-base: Extra media codecs'
             'gst-libav: Extra media codecs'
             'tracker: Share indexed media files')
 backup=(etc/rygel.conf)
-options=('!libtool')
 install=rygel.install
 groups=('gnome-extra')
 source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('f695bae2c20b911393f7abf265c18f3c5a5c42fe4223fc9150ab9007558363fe')
+sha256sums=('00792c8db8f5ca0cb655ab00d90bec6f90e2a4b505f10faf03924800285a7ec3')
 
 build() {
   cd $pkgname-$pkgver
diff --git a/extra/samba/PKGBUILD b/extra/samba/PKGBUILD
index 878a7c708..f34be2154 100644
--- a/extra/samba/PKGBUILD
+++ b/extra/samba/PKGBUILD
@@ -10,11 +10,11 @@
 
 pkgbase=samba
 pkgname=('libwbclient' 'smbclient' 'samba')
-pkgver=4.0.10
+pkgver=4.1.0
 # We use the 'A' to fake out pacman's version comparators.  Samba chooses
 # to append 'a','b',etc to their subsequent releases, which pamcan
 # misconstrues as alpha, beta, etc.  Bad samba!
-_realver=4.0.10
+_realver=4.1.0
 pkgrel=1
 arch=(i686 x86_64 mips64el)
 url="http://www.samba.org"
@@ -24,7 +24,6 @@ makedepends=('python2' 'docbook-xsl' 'pkg-config' 'libbsd' 'db' 'popt' 'libcups'
              'gamin' 'gnutls>=2.4.1' 'talloc' 'tdb' 'dbus')
 source=(http://us1.samba.org/samba/ftp/stable/${pkgbase}-${_realver}.tar.gz
         samba.logrotate
-        swat.xinetd
         samba.pam
         samba.service
         samba.conf.d
@@ -32,8 +31,6 @@ source=(http://us1.samba.org/samba/ftp/stable/${pkgbase}-${_realver}.tar.gz
         smbd.socket
         nmbd.service
         smbd@.service
-        swat.socket
-        swat@.service
         winbindd.service
         samba.conf)
 ### UNINSTALL dmapi package before building!!!
@@ -76,7 +73,6 @@ _samba4_auth_modules=auth_unix,auth_wbc,auth_server,auth_netlogond,auth_script,a
               --with-piddir=/var/run \
               --with-ads \
               --with-ldap \
-              --with-swat \
               --with-winbind \
               --with-acl-support \
               --enable-gnutls \
@@ -211,7 +207,7 @@ sys.path.insert(0, '/usr/lib/python${_pyver}/site-packages')" \
 
   # install systemd files
   install -d -m755 ${pkgdir}/usr/lib/systemd/system
-  #for i in smbd nmbd swat winbindd; do
+  #for i in smbd nmbd winbindd; do
   install -m644 ${srcdir}/*.service ${pkgdir}/usr/lib/systemd/system/
   install -m644 ${srcdir}/*.socket ${pkgdir}/usr/lib/systemd/system/
   install -d -m755  ${pkgdir}/etc/conf.d
@@ -227,7 +223,6 @@ sys.path.insert(0, '/usr/lib/python${_pyver}/site-packages')" \
   chmod 700 ${pkgdir}/etc/samba/private
 
   install -D -m644 ${srcdir}/samba.logrotate ${pkgdir}/etc/logrotate.d/samba
-  install -D -m644 ${srcdir}/swat.xinetd ${pkgdir}/etc/xinetd.d/swat
   install -D -m644 ${srcdir}/samba.pam ${pkgdir}/etc/pam.d/samba 
 
   # winbind krb5 locator
@@ -245,9 +240,8 @@ sys.path.insert(0, '/usr/lib/python${_pyver}/site-packages')" \
   # copy ldap example
   install -D -m644 ${srcdir}/samba-${_realver}/examples/LDAP/samba.schema ${pkgdir}/usr/share/doc/samba/examples/LDAP/samba.schema
 }
-md5sums=('220740f75035b2221e3b9a848e19d1ea'
+md5sums=('f448d18ae678c72afb72e0510cd69710'
          '5697da77590ec092cc8a883bae06093c'
-         'ee8507839745cf17d2fb5401be7da6a8'
          '96f82c38f3f540b53f3e5144900acf17'
          'ee4763a656cf00d92bfda31b6bb2c5cb'
          '6c447748a064d631435dbef0a3dcf32f'
@@ -255,7 +249,5 @@ md5sums=('220740f75035b2221e3b9a848e19d1ea'
          'a78b9aa93eb14b0ac445897395693225'
          'df6380c73cb73163968eabc8650f7358'
          '70afd2db60a2e8eff7615dbdecd887ac'
-         '6db11f3dd2112a4b7a73007b189bef3f'
-         'fd6be0cf1e5b3f0c3599fdb95455d19f'
          'd5f56f43e1280bba20f6bbd88d16fa41'
          '49abd7b719e3713a3f75a8a50958e381')
diff --git a/extra/samba/swat.socket b/extra/samba/swat.socket
deleted file mode 100644
index e703413fc..000000000
--- a/extra/samba/swat.socket
+++ /dev/null
@@ -1,9 +0,0 @@
-[Unit]
-Description=SWAT Samba Web Admin Tool
-
-[Socket]
-ListenStream=127.0.0.1:901
-Accept=true
-
-[Install]
-WantedBy=sockets.target
diff --git a/extra/samba/swat.xinetd b/extra/samba/swat.xinetd
deleted file mode 100644
index b083ad860..000000000
--- a/extra/samba/swat.xinetd
+++ /dev/null
@@ -1,10 +0,0 @@
-service swat
-{
-        socket_type             = stream
-        wait                    = no
-        user                    = root
-        server                  = /usr/bin/swat
-        log_on_success  += HOST DURATION
-        log_on_failure  += HOST
-        disable                 = yes
-}
diff --git a/extra/samba/swat@.service b/extra/samba/swat@.service
deleted file mode 100644
index ebbc31c47..000000000
--- a/extra/samba/swat@.service
+++ /dev/null
@@ -1,7 +0,0 @@
-[Unit]
-Description=SWAT Samba Web Admin Tool
-After=local-fs.target
-
-[Service]
-ExecStart=/usr/bin/swat
-StandardInput=socket
diff --git a/extra/sane/PKGBUILD b/extra/sane/PKGBUILD
index 571a56270..ce4939430 100644
--- a/extra/sane/PKGBUILD
+++ b/extra/sane/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 195946 2013-10-06 06:58:15Z tpowa $
+# $Id: PKGBUILD 198401 2013-10-30 14:38:47Z allan $
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 # Contributor: Sarah Hay <sarahhay@mb.sympatico.ca>
 # Contributor: Simo L. <neotuli@yahoo.com>
@@ -6,7 +6,7 @@
 
 pkgname=sane
 pkgver=1.0.24
-pkgrel=2
+pkgrel=3
 pkgdesc="Scanner Access Now Easy"
 url="http://www.sane-project.org/"
 arch=('i686' 'x86_64' 'mips64el')
@@ -18,13 +18,17 @@ source=(ftp://ftp.archlinux.org/other/sane/$pkgname-backends-$pkgver.tar.gz
         'sane.xinetd'
         'saned.socket'
         'saned.service'
-        'network.patch')
-options=(!libtool)
+        'network.patch'
+        'segfault-avahi-fix-kodakio.patch')
 
 prepare() {
   cd "${srcdir}/${pkgname}-backends-${pkgver}"
    # fix http://vasks.debian.org/tracker/?func=detail&atid=410366&aid=313760&group_id=30186
    patch -Np1 -i ${srcdir}/network.patch
+   # fix http://anonscm.debian.org/gitweb/?p=sane/sane-backends.git;a=commit;h=37523b867d411c2f82d08128246be7e38bc9812c
+   # #37525
+   # https://alioth.debian.org/tracker/?group_id=30186&atid=410366&func=detail&aid=314301
+   patch -Np1 -i ${srcdir}/segfault-avahi-fix-kodakio.patch
 }
 
 build() {
@@ -69,4 +73,5 @@ md5sums=('1ca68e536cd7c1852322822f5f6ac3a4'
          'bc2c8b4f7b3012c8936c7da21f60e2ac'
          'e57e9e15528f47f5f1b3f1411135ed5d'
          '3f9fe36b0c4ff0b01b53b1cffa5d9700'
-         '44e77692c52db15b0f530a1d9a8e1296')
+         '44e77692c52db15b0f530a1d9a8e1296'
+         '039524a38af8721f2e97d45e889295ca')
diff --git a/extra/sane/segfault-avahi-fix-kodakio.patch b/extra/sane/segfault-avahi-fix-kodakio.patch
new file mode 100644
index 000000000..23f9d1ca9
--- /dev/null
+++ b/extra/sane/segfault-avahi-fix-kodakio.patch
@@ -0,0 +1,98 @@
+From 37523b867d411c2f82d08128246be7e38bc9812c Mon Sep 17 00:00:00 2001
+From: Paul Newall <quandry@ntlworld.com>
+Date: Mon, 14 Oct 2013 22:22:53 +0100
+Subject: [PATCH] Bugfix in kodakaio.c to fix segfault when non kodak scanners
+ return unexpected data via avahi auto discovery
+
+---
+ backend/kodakaio.c             |   43 ++++++++++++++++++++++++++++++----------
+ doc/descriptions/kodakaio.desc |    2 +-
+ 3 files changed, 37 insertions(+), 12 deletions(-)
+
+diff --git a/backend/kodakaio.c b/backend/kodakaio.c
+index 8c4583a..b442e50 100644
+--- a/backend/kodakaio.c
++++ b/backend/kodakaio.c
+@@ -127,7 +127,7 @@ for ubuntu 12.10
+ 
+ #define KODAKAIO_VERSION	02
+ #define KODAKAIO_REVISION	4
+-#define KODAKAIO_BUILD		6
++#define KODAKAIO_BUILD		7
+ 
+ /* for usb (but also used for net though it's not required). */
+ #define MAX_BLOCK_SIZE		32768
+@@ -2184,6 +2184,7 @@ static void resolve_callback(
+     AvahiLookupResultFlags flags,
+     AVAHI_GCC_UNUSED void* userdata) {
+ 
++	AvahiStringList *vid_pair_list = NULL, *pid_pair_list = NULL;
+ 	char *pidkey, *pidvalue;
+ 	char *vidkey, *vidvalue;
+ 	size_t valuesize;
+@@ -2204,20 +2205,40 @@ static void resolve_callback(
+             avahi_address_snprint(a, sizeof(a), address);
+ 
+ /* Output short for Kodak ESP */
+-	DBG(min(10,DBG_AUTO), "%s:%u  %s  ", a,port,host_name);
+-	avahi_string_list_get_pair(avahi_string_list_find(txt, "vid"), 
+-		&vidkey, &vidvalue, &valuesize);
+-	DBG(min(10,DBG_AUTO), "%s=%s  ", vidkey, vidvalue);
+-	avahi_string_list_get_pair(avahi_string_list_find(txt, "pid"), 
+-		&pidkey, &pidvalue, &valuesize);
+-	DBG(min(10,DBG_AUTO), "%s=%s\n", pidkey, pidvalue);
++	DBG(min(10,DBG_AUTO), "%s:%u  %s\n", a,port,host_name);
+ 
++	vid_pair_list = avahi_string_list_find(txt, "vid");
++	if(vid_pair_list != NULL) {
++		avahi_string_list_get_pair(vid_pair_list, &vidkey, &vidvalue, &valuesize);
++		DBG(min(10,DBG_AUTO), "%s=%s  ", vidkey, vidvalue);
++	}
++	else	DBG(min(10,DBG_AUTO), "failed to find key vid\n");
++
++	pid_pair_list = avahi_string_list_find(txt, "pid");
++	if(pid_pair_list != NULL) {
++		avahi_string_list_get_pair(pid_pair_list, &pidkey, &pidvalue, &valuesize);
++		DBG(min(10,DBG_AUTO), "%s=%s\n", pidkey, pidvalue);
++	}
++	else	DBG(min(10,DBG_AUTO), "failed to find key pid\n");
++
++	if(pid_pair_list != NULL && vid_pair_list != NULL) {
+ 		ProcessAvahiDevice(name, vidvalue, pidvalue, a);
+-	avahi_free(vidkey); avahi_free(vidvalue);
+-	avahi_free(pidkey); avahi_free(pidvalue);
++	}
++	else DBG(min(10,DBG_AUTO), "didn't call ProcessAvahiDevice\n");
++
++	if(vid_pair_list != NULL) {
++		avahi_free(vidkey); 
++		avahi_free(vidvalue);
++		DBG(min(15,DBG_AUTO), "vidkey and vidvalue freed\n");
++	}
++	if(pid_pair_list != NULL) {
++		avahi_free(pidkey); 
++		avahi_free(pidvalue);
++		DBG(min(15,DBG_AUTO), "pidkey and pidvalue freed\n");
++	}
+         }
+     }
+-
++    DBG(min(10,DBG_AUTO), "ending resolve_callback\n");
+     avahi_service_resolver_free(r);
+ }
+ 
+diff --git a/doc/descriptions/kodakaio.desc b/doc/descriptions/kodakaio.desc
+index 7882513..5fb18ed 100644
+--- a/doc/descriptions/kodakaio.desc
++++ b/doc/descriptions/kodakaio.desc
+@@ -1,6 +1,6 @@
+ :backend "kodakaio"
+ :url "http://sourceforge.net/projects/cupsdriverkodak/" 
+-:version "2.4.6"
++:version "2.4.7"
+ :manpage "sane-kodakaio"
+ :comment "Backend for Kodak AiO ESP and Hero printers. Also possibly Advent AWL10"
+ :devicetype :scanner
+-- 
+1.7.10.4
+
diff --git a/extra/sbc/PKGBUILD b/extra/sbc/PKGBUILD
index 50403fd76..ccadf102d 100644
--- a/extra/sbc/PKGBUILD
+++ b/extra/sbc/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 185171 2013-05-11 17:18:56Z heftig $
+# $Id: PKGBUILD 198402 2013-10-30 14:39:13Z allan $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 
 pkgname=sbc
@@ -9,7 +9,6 @@ arch=('i686' 'x86_64' 'mips64el')
 url="http://www.bluez.org/"
 license=('GPL' 'LGPL')
 depends=('glibc')
-options=(!libtool)
 source=(http://www.kernel.org/pub/linux/bluetooth/$pkgname-$pkgver.tar.xz)
 md5sums=('ecadadbfd4b1dfe7b98f446c69126b23')
 
diff --git a/extra/schroedinger/PKGBUILD b/extra/schroedinger/PKGBUILD
index 857c57cca..b7a053dfb 100644
--- a/extra/schroedinger/PKGBUILD
+++ b/extra/schroedinger/PKGBUILD
@@ -1,16 +1,15 @@
-# $Id: PKGBUILD 149308 2012-02-06 18:45:09Z ibiru $
+# $Id: PKGBUILD 198403 2013-10-30 14:39:34Z allan $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 # Contributor: Timm Preetz <timm@preetz.us>
 # Contributor: rabyte <rabyte__gmail>
 pkgname=schroedinger
 pkgver=1.0.11
-pkgrel=1.2
+pkgrel=2
 pkgdesc="An implemenation of the Dirac video codec in ANSI C code"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.diracvideo.org/"
 license=('GPL2' 'LGPL2.1' 'MPL' 'MIT')
 depends=('orc' 'gcc-libs')
-options=(!libtool)
 source=(http://www.diracvideo.org/download/schroedinger/$pkgname-$pkgver.tar.gz)
 md5sums=('da6af08e564ca1157348fb8d92efc891')
 
diff --git a/extra/scim-anthy/PKGBUILD b/extra/scim-anthy/PKGBUILD
index 660a683df..5d23b05d7 100644
--- a/extra/scim-anthy/PKGBUILD
+++ b/extra/scim-anthy/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 188489 2013-06-15 00:05:53Z bisson $
+# $Id: PKGBUILD 198405 2013-10-30 14:40:19Z allan $
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
 # Contributor: damir <damir@archlinux.org>
 
@@ -14,7 +14,6 @@ depends=('scim' 'anthy')
 source=("http://osdn.dl.sourceforge.jp/scim-imengine/${_filecode}/${pkgname}-${pkgver}.tar.gz")
 sha1sums=('1429cf202f5cdcfc4733220acbe27dd9edb75db8')
 
-options=('!libtool')
 
 build() {
 	cd "$srcdir/$pkgname-$pkgver"
diff --git a/extra/scim-chewing/PKGBUILD b/extra/scim-chewing/PKGBUILD
index 6afc9a65a..5069f2eaa 100644
--- a/extra/scim-chewing/PKGBUILD
+++ b/extra/scim-chewing/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 188490 2013-06-15 00:05:54Z bisson $
+# $Id: PKGBUILD 198406 2013-10-30 14:40:42Z allan $
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
 # Contributor: whisky <archlinux.cle(at)gmail.com>
 # Contributor: damir <damir@archlinux.org>
@@ -15,7 +15,6 @@ depends=('scim' 'libchewing')
 source=("http://chewing.googlecode.com/files/${pkgname}-${pkgver}.tar.bz2")
 sha1sums=('f26ced990f0c9e5d43e271cd6e77583de81a008d')
 
-options=('!libtool')
 
 build() {
 	cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/scim-hangul/PKGBUILD b/extra/scim-hangul/PKGBUILD
index 6a5f52d94..55c85d91b 100644
--- a/extra/scim-hangul/PKGBUILD
+++ b/extra/scim-hangul/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 188491 2013-06-15 00:05:55Z bisson $
+# $Id: PKGBUILD 198407 2013-10-30 14:41:05Z allan $
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
 # Contributor: damir <damir@archlinux.org>
 
@@ -15,7 +15,6 @@ source=("http://downloads.sourceforge.net/sourceforge/scim/${pkgname}-${pkgver}.
 sha1sums=('2ba06a6d851a1d86c5a9b659c573bfd87e6a7555'
           'a046c40b78521f85418b8ad2138b51815d47abec')
 
-options=('!libtool')
 
 prepare() {
 	cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/scim-m17n/PKGBUILD b/extra/scim-m17n/PKGBUILD
index c600b5193..414ac7c1a 100644
--- a/extra/scim-m17n/PKGBUILD
+++ b/extra/scim-m17n/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 188492 2013-06-15 00:05:56Z bisson $
+# $Id: PKGBUILD 198408 2013-10-30 14:41:25Z allan $
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
 # Contributor: Camille Moncelier <pix@devlife.org>
 # Contributor: damir <damir@archlinux.org>
@@ -14,7 +14,6 @@ depends=('scim' 'm17n-lib')
 source=("http://downloads.sourceforge.net/sourceforge/scim/${pkgname}-${pkgver}.tar.gz")
 sha1sums=('96172846eaa211d2bde0f76184990d13e5ecdaea')
 
-options=('!libtool')
 
 build() {
 	cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/scim-pinyin/PKGBUILD b/extra/scim-pinyin/PKGBUILD
index d3c3833bc..6fcca98c0 100644
--- a/extra/scim-pinyin/PKGBUILD
+++ b/extra/scim-pinyin/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 188493 2013-06-15 00:05:57Z bisson $
+# $Id: PKGBUILD 198409 2013-10-30 14:41:45Z allan $
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
 # Contributer: Gan Lu <rhythm.gan@gmail.com>
 
@@ -13,7 +13,6 @@ depends=('scim')
 source=("http://downloads.sourceforge.net/sourceforge/scim/${pkgname}-${pkgver}.tar.xz")
 sha1sums=('d7c2d52a5712753af241a5301db23527ba438ea1')
 
-options=('!libtool')
 
 build() {
 	cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/scim-tables/PKGBUILD b/extra/scim-tables/PKGBUILD
index 1810ec6dc..cba955efe 100644
--- a/extra/scim-tables/PKGBUILD
+++ b/extra/scim-tables/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 188494 2013-06-15 00:05:58Z bisson $
+# $Id: PKGBUILD 198410 2013-10-30 14:42:08Z allan $
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
 # Contributor: Gan Lu <rhythm.gan@gmail.com>
 # Contributor: damir <damir@archlinux.org>
@@ -15,7 +15,6 @@ makedepends=('intltool')
 source=("http://downloads.sourceforge.net/sourceforge/scim/${pkgname}-${pkgver}.tar.xz")
 sha1sums=('75363466cfca30e3cdff804e0dad713f12521776')
 
-options=('!libtool')
 
 build() {
 	cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/scim-uim/PKGBUILD b/extra/scim-uim/PKGBUILD
index 0f4395780..481102180 100644
--- a/extra/scim-uim/PKGBUILD
+++ b/extra/scim-uim/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 188495 2013-06-15 00:05:59Z bisson $
+# $Id: PKGBUILD 198411 2013-10-30 14:42:35Z allan $
 # Maintainer: Gaetan Bisson <bisson@archlinux.org
 # Contributor: damir <damir@archlinux.org>
 
@@ -17,7 +17,6 @@ sha1sums=('456621d5969b6552c3c33c83cf295aa4134fff0a'
           'a9d67946f956d0572c73065e2b4b268bfdf149e3'
           '3b083260910f7855b5446960ab1203c052f4b56c')
 
-options=('!libtool')
 
 prepare() {
 	cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/scim/PKGBUILD b/extra/scim/PKGBUILD
index c6574a0d3..3d78e0397 100644
--- a/extra/scim/PKGBUILD
+++ b/extra/scim/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 189752 2013-07-07 08:50:55Z bisson $
+# $Id: PKGBUILD 198404 2013-10-30 14:39:57Z allan $
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
 # Contributor: damir <damir@archlinux.org>
 # Contributor: Gan Lu <rhythm.gan@gmail.com>
@@ -18,7 +18,6 @@ source=("http://downloads.sourceforge.net/project/${pkgname}/${pkgname}/${pkgver
 sha1sums=('73391be371dd7ef9f9af8b3a211e2bedec0cf71b')
 
 backup=('etc/scim/config' 'etc/scim/global')
-options=('!libtool')
 install=install
 
 build() {
diff --git a/extra/sdl2/PKGBUILD b/extra/sdl2/PKGBUILD
index c554f2083..76aa6c8c0 100644
--- a/extra/sdl2/PKGBUILD
+++ b/extra/sdl2/PKGBUILD
@@ -1,35 +1,34 @@
 # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
-
 pkgname=sdl2
-pkgver=2.0.0
-pkgrel=4
+pkgver=2.0.1
+pkgrel=2
 pkgdesc="A library for portable low-level access to a video framebuffer, audio output, mouse, and keyboard (Version 2)"
 arch=('i686' 'x86_64')
 url="http://www.libsdl.org"
 license=('MIT')
 depends=('glibc' 'libxext' 'libxrender' 'libx11' 'libgl')
-makedepends=('alsa-lib' 'mesa' 'libpulse' 'cmake' 'libxrandr' 'libxinerama')
+makedepends=('alsa-lib' 'mesa' 'libpulse' 'libxrandr' 'libxinerama')
 optdepends=('alsa-lib: ALSA audio driver'
             'libpulse: PulseAudio audio driver')
 source=("http://www.libsdl.org/release/SDL2-${pkgver}.tar.gz")
-md5sums=('beec89afb6edcc6f0abc4114f2e6bcf7')
-
-build() {
-  cd "${srcdir}/SDL2-${pkgver}"
+md5sums=('0eb97039488bf463e775295f7b18b227')
 
-  mkdir build && cd build
+prepare() {
+  mkdir build
+}
 
-  cmake .. \
-      -DCMAKE_INSTALL_PREFIX=/usr \
-      -DSDL_STATIC=OFF \
-      -DRPATH=OFF
+build() {
+  cd build
+  ../SDL2-$pkgver/configure --prefix=/usr \
+    --enable-sdl-dlopen \
+    --disable-arts --disable-esd --disable-nas \
+    --enable-alsa --enable-pulseaudio-shared \
+    --disable-rpath
   make
 }
 
 package() {
-  cd "${srcdir}/SDL2-${pkgver}/build"
-
-  make DESTDIR="${pkgdir}/" install
-
-  install -Dm644 ../COPYING.txt "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+  cd build
+  make DESTDIR="$pkgdir" install
+  install -Dm644 ../SDL2-$pkgver/COPYING.txt "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
 }
diff --git a/extra/sdl2_gfx/PKGBUILD b/extra/sdl2_gfx/PKGBUILD
index b302c886a..2f73cb43c 100644
--- a/extra/sdl2_gfx/PKGBUILD
+++ b/extra/sdl2_gfx/PKGBUILD
@@ -2,7 +2,7 @@
 # Contributor: Jameson Pugh <imntreal@gmail.com>
 
 pkgname=sdl2_gfx
-pkgver=5
+pkgver=7
 pkgrel=1
 pkgdesc="SDL Graphic Primitives (Version 2)"
 arch=('i686' 'x86_64')
@@ -10,7 +10,6 @@ url="http://www.ferzkopp.net/joomla/software-mainmenu-14/4-ferzkopps-linux-softw
 license=('zlib')
 depends=('sdl2')
 makedepends=('svn')
-options=(!libtool)
 source=("sdl2-gfx::svn://svn.code.sf.net/p/sdl2gfx/code/trunk#revision=$pkgver")
 md5sums=('SKIP')
 
diff --git a/extra/sdl2_image/PKGBUILD b/extra/sdl2_image/PKGBUILD
index fc17b5d2d..ecadfc976 100644
--- a/extra/sdl2_image/PKGBUILD
+++ b/extra/sdl2_image/PKGBUILD
@@ -2,16 +2,15 @@
 
 pkgname=sdl2_image
 pkgver=2.0.0
-pkgrel=1
+pkgrel=2
 pkgdesc="A simple library to load images of various formats as SDL surfaces (Version 2)"
 arch=('i686' 'x86_64')
-url="http://www.libsdl.org"
+url="http://www.libsdl.org/projects/SDL_image"
 license=('MIT')
 depends=('sdl2' 'libpng' 'libtiff' 'libjpeg' 'libwebp')
 makedepends=('cmake')
-options=(!libtool)
-source=("http://www.libsdl.org/tmp/SDL_image/release/SDL2_image-${pkgver}.tar.gz")
-sha1sums=('1a37f0f63421bd1b86dd6ddabcb04fa8f28874ce')
+source=("$url/release/SDL2_image-${pkgver}.tar.gz")
+sha1sums=('20b1b0db9dd540d6d5e40c7da8a39c6a81248865')
 
 build() {
   cd "${srcdir}/SDL2_image-${pkgver}/"
diff --git a/extra/sdl2_mixer/PKGBUILD b/extra/sdl2_mixer/PKGBUILD
index 760fee8a7..7d43335b5 100644
--- a/extra/sdl2_mixer/PKGBUILD
+++ b/extra/sdl2_mixer/PKGBUILD
@@ -1,18 +1,18 @@
-#Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
+# $Id: PKGBUILD 198415 2013-10-30 14:44:04Z allan $
+# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
 
 pkgname=sdl2_mixer
 pkgver=2.0.0
-pkgrel=1
+pkgrel=2
 pkgdesc="A simple multi-channel audio mixer (Version 2)"
 arch=('i686' 'x86_64')
-url="http://www.libsdl.org"
+url="http://www.libsdl.org/projects/SDL_mixer"
 license=('MIT')
 depends=('sdl2' 'libvorbis' 'libmodplug' 'smpeg2' 'flac')
 makedepends=('fluidsynth')
 optdepends=('fluidsynth: MIDI software synth, replaces built-in timidity')
-options=(!libtool)
-source=("http://www.libsdl.org/tmp/SDL_mixer/release/SDL2_mixer-${pkgver}.tar.gz")
-md5sums=('4c85cdc7b6d162afb918aed626436109')
+source=("$url/release/SDL2_mixer-${pkgver}.tar.gz")
+md5sums=('65f6d80df073a1fb3bb537fbda031b50')
 
 build() {
   cd "${srcdir}/SDL2_mixer-${pkgver}/"
diff --git a/extra/sdl2_net/PKGBUILD b/extra/sdl2_net/PKGBUILD
index 6deb7d889..0fb72721c 100644
--- a/extra/sdl2_net/PKGBUILD
+++ b/extra/sdl2_net/PKGBUILD
@@ -1,30 +1,28 @@
+# $Id: PKGBUILD 198416 2013-10-30 14:44:37Z allan $
 # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
 
 pkgname=sdl2_net
-pkgver=249
+epoch=1
+pkgver=2.0.0
 pkgrel=1
 pkgdesc="A small sample cross-platform networking library (Version 2)"
 arch=('i686' 'x86_64')
-url="http://www.libsdl.org"
+url="http://www.libsdl.org/projects/SDL_net"
 license=('MIT')
 depends=(sdl2)
-makedepends=(mercurial)
-options=(!libtool)
-source=("sdl2_net::hg+http://hg.libsdl.org/SDL_net#revision=$pkgver")
-md5sums=('SKIP')
+source=("$url/release/SDL2_net-${pkgver}.tar.gz")
+md5sums=('83bcd0e67796b81b35b08a014c677200')
 
 build() {
-  cd "${srcdir}/sdl2_net/"
+  cd "${srcdir}/SDL2_net-${pkgver}/"
 
-  ./autogen.sh
   ./configure --disable-static --prefix=/usr
   make
 }
 
 package() {
-  cd "${srcdir}/sdl2_net/"
-
-  make DESTDIR="${pkgdir}/" install
+  cd "${srcdir}/SDL2_net-${pkgver}/"
 
+  make DESTDIR="${pkgdir}" install
   install -Dm644 COPYING.txt "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
 }
diff --git a/extra/sdl2_ttf/PKGBUILD b/extra/sdl2_ttf/PKGBUILD
index fe743318c..c73cb3e39 100644
--- a/extra/sdl2_ttf/PKGBUILD
+++ b/extra/sdl2_ttf/PKGBUILD
@@ -1,23 +1,21 @@
+# $Id: PKGBUILD 198417 2013-10-30 14:44:59Z allan $
 # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
 
 pkgname=sdl2_ttf
 pkgver=2.0.12
-pkgrel=1
+pkgrel=2
 pkgdesc="A library that allows you to use TrueType fonts in your SDL applications (Version 2)"
 arch=('i686' 'x86_64')
-url="http://www.libsdl.org"
+url="http://www.libsdl.org/projects/SDL_ttf"
 license=('MIT')
 depends=('sdl2' 'freetype2')
 makedepends=('cmake')
-provides=(sdl2_ttf)
-options=(!libtool)
-source=("http://www.libsdl.org/tmp/SDL_ttf/release/SDL2_ttf-${pkgver}.tar.gz")
-md5sums=('a0925e117cc5f0fb7cf2a66c7968c117')
+source=("$url/release/SDL2_ttf-${pkgver}.tar.gz")
+md5sums=('79787216b56cb4707f39d538f2225e00')
 
 build() {
   cd "${srcdir}/SDL2_ttf-${pkgver}/"
 
-  ./autogen.sh
   ./configure --disable-static --prefix=/usr
   make
 }
@@ -26,6 +24,5 @@ package() {
   cd "${srcdir}/SDL2_ttf-${pkgver}/"
 
   make DESTDIR="${pkgdir}/" install
-
   install -Dm644 COPYING.txt "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
 }
diff --git a/extra/sdl_gfx/PKGBUILD b/extra/sdl_gfx/PKGBUILD
index c6256479c..4c20a897b 100644
--- a/extra/sdl_gfx/PKGBUILD
+++ b/extra/sdl_gfx/PKGBUILD
@@ -1,15 +1,14 @@
-# $Id: PKGBUILD 165865 2012-09-01 20:41:32Z heftig $
+# $Id: PKGBUILD 198418 2013-10-30 14:45:20Z allan $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Contributor: Allan McRae <allan@archlinux.org>
 # Contributor: Tom Newsom <Jeepster@gmx.co.uk>
 
 pkgname=sdl_gfx
 pkgver=2.0.24
-pkgrel=1.2
+pkgrel=2
 pkgdesc="SDL Graphic Primitives"
 arch=('i686' 'x86_64' 'mips64el')
 license=('LGPL')
-options=(!libtool)
 url="http://www.ferzkopp.net/joomla/software-mainmenu-14/4-ferzkopps-linux-software/19-sdlgfx"
 source=(http://www.ferzkopp.net/Software/SDL_gfx-2.0/SDL_gfx-${pkgver}.tar.gz)
 depends=('sdl')
diff --git a/extra/sdl_image/PKGBUILD b/extra/sdl_image/PKGBUILD
index 0df38e920..5a2f1e061 100644
--- a/extra/sdl_image/PKGBUILD
+++ b/extra/sdl_image/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 184433 2013-05-06 19:39:41Z foutrelis $
+# $Id: PKGBUILD 198419 2013-10-30 14:45:41Z allan $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Contributor: Allan McRae <allan@archlinux.org>
 # Contributor: Tom Newsom <Jeepster@gmx.co.uk>
@@ -10,7 +10,6 @@ pkgdesc="A simple library to load images of various formats as SDL surfaces"
 arch=('i686' 'x86_64' 'mips64el')
 license=('custom')
 depends=('sdl>=1.2.13' 'libpng' 'libjpeg>=7' 'libtiff' 'zlib')
-options=('!libtool')
 url="http://www.libsdl.org/projects/SDL_image/"
 source=(http://www.libsdl.org/projects/SDL_image/release/SDL_image-$pkgver.tar.gz)
 md5sums=('a0f9098ebe5400f0bdc9b62e60797ecb')
diff --git a/extra/sdl_mixer/PKGBUILD b/extra/sdl_mixer/PKGBUILD
index e1bad6295..354512c33 100644
--- a/extra/sdl_mixer/PKGBUILD
+++ b/extra/sdl_mixer/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 170804 2012-11-12 02:00:36Z heftig $
+# $Id: PKGBUILD 198420 2013-10-30 14:46:03Z allan $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Contributor: Allan McRae <allan@archlinux.org>
 # Contributor: Tom Newsom <Jeepster@gmx.co.uk>
@@ -14,7 +14,6 @@ license=('custom')
 depends=('sdl>=1.2.12' 'libvorbis' 'libmikmod' 'smpeg')
 makedepends=('fluidsynth')
 optdepends=('fluidsynth: MIDI software synth, replaces built-in timidity')
-options=('!libtool')
 source=(http://www.libsdl.org/projects/SDL_mixer/release/SDL_mixer-$pkgver.tar.gz
         mikmod1.patch mikmod2.patch fluidsynth-volume.patch double-free-crash.patch)
 md5sums=('e03ff73d77a55e3572ad0217131dc4a1'
diff --git a/extra/sdl_net/PKGBUILD b/extra/sdl_net/PKGBUILD
index 46c98b692..c7f0947e0 100644
--- a/extra/sdl_net/PKGBUILD
+++ b/extra/sdl_net/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 146689 2012-01-16 11:36:24Z heftig $
+# $Id: PKGBUILD 198421 2013-10-30 14:46:25Z allan $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Contributor: dorphell <dorphell@archlinux.org>
 # Contributor: Tom Newsom <Jeepster@gmx.co.uk>
@@ -11,7 +11,6 @@ arch=('i686' 'x86_64' 'mips64el')
 license=('custom')
 url="http://www.libsdl.org/projects/SDL_net/"
 depends=('sdl')
-options=('!libtool')
 source=(http://www.libsdl.org/projects/SDL_net/release/SDL_net-$pkgver.tar.gz)
 md5sums=('20e64e61d65662db66c379034f11f718')
 
diff --git a/extra/sdl_pango/PKGBUILD b/extra/sdl_pango/PKGBUILD
index 5054152d2..7d9852a5f 100644
--- a/extra/sdl_pango/PKGBUILD
+++ b/extra/sdl_pango/PKGBUILD
@@ -1,17 +1,16 @@
-# $Id: PKGBUILD 149427 2012-02-07 16:56:19Z heftig $
+# $Id: PKGBUILD 198422 2013-10-30 14:46:49Z allan $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Contributor: Allan McRae <allan@archlinux.com>
 # Contributor: gyo <nucleogeek@gmail.com>
 
 pkgname=sdl_pango
 pkgver=0.1.2
-pkgrel=4
+pkgrel=5
 pkgdesc="Pango SDL binding"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://sdlpango.sourceforge.net/"
 license=('LGPL')
 depends=('pango' 'sdl')
-options=('!libtool')
 source=(http://downloads.sourceforge.net/sourceforge/sdlpango/SDL_Pango-$pkgver.tar.gz
         SDL_Pango-$pkgver-API-adds.patch
         matrix_declarations.patch)
diff --git a/extra/sdl_sound/PKGBUILD b/extra/sdl_sound/PKGBUILD
index 7eef84341..70e492c00 100644
--- a/extra/sdl_sound/PKGBUILD
+++ b/extra/sdl_sound/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 170550 2012-11-08 15:28:40Z heftig $
+# $Id: PKGBUILD 198423 2013-10-30 14:47:11Z allan $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Contributor: Tom Newsom <Jeepster@gmx.co.uk>
 
@@ -10,7 +10,6 @@ arch=('i686' 'x86_64' 'mips64el')
 url="http://icculus.org/SDL_sound/"
 license=('LGPL')
 depends=('sdl' 'libmikmod' 'libvorbis' 'flac' 'speex' 'smpeg')
-options=('!libtool')
 source=(http://icculus.org/SDL_sound/downloads/SDL_sound-$pkgver.tar.gz 
         flac.patch)
 md5sums=('aa09cd52df85d29bee87a664424c94b5'
diff --git a/extra/sdl_ttf/PKGBUILD b/extra/sdl_ttf/PKGBUILD
index 7b9d66097..bd0ae7ab2 100644
--- a/extra/sdl_ttf/PKGBUILD
+++ b/extra/sdl_ttf/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 151697 2012-02-29 21:54:21Z heftig $
+# $Id: PKGBUILD 198424 2013-10-30 14:47:31Z allan $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Contributor: Allan McRae <allan@archlinux.org>
 # Contributor: Tom Newsom <Jeepster@gmx.co.uk>
@@ -11,7 +11,6 @@ arch=('i686' 'x86_64' 'mips64el')
 license=('custom')
 url="http://www.libsdl.org/projects/SDL_ttf/"
 depends=('sdl>=1.2.12' 'freetype2')
-options=('!libtool')
 source=(http://www.libsdl.org/projects/SDL_ttf/release/SDL_ttf-$pkgver.tar.gz
         bug1433.patch)
 md5sums=('61e29bd9da8d245bc2471d1b2ce591aa'
diff --git a/extra/seahorse-nautilus/PKGBUILD b/extra/seahorse-nautilus/PKGBUILD
index c5cf70f1a..5df94a34c 100644
--- a/extra/seahorse-nautilus/PKGBUILD
+++ b/extra/seahorse-nautilus/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 196136 2013-10-07 11:53:28Z jgc $
+# $Id: PKGBUILD 198426 2013-10-30 14:48:13Z allan $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Contributor: Balló György <ballogyor+arch at gmail dot com>
 
 pkgname=seahorse-nautilus
-pkgver=3.10.0
+pkgver=3.10.1
 pkgrel=1
 pkgdesc="PGP encryption and signing for nautilus"
 arch=('i686' 'x86_64' 'mips64el')
@@ -11,10 +11,9 @@ url="http://git.gnome.org/browse/seahorse-nautilus/"
 license=('GPL')
 depends=('libcryptui' 'gcr' 'nautilus')
 makedepends=('intltool')
-options=('!libtool')
 install=$pkgname.install
 source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('d54c5fbc2bade03296d39999f8412708cfa87e82bda3c5af8e0b8ad86b2fadf3')
+sha256sums=('eacaf33bba920cf117641393a6eef483dbc075009349082e77d22f79afbd823a')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
diff --git a/extra/seahorse/PKGBUILD b/extra/seahorse/PKGBUILD
index 4380a4549..be11d5103 100644
--- a/extra/seahorse/PKGBUILD
+++ b/extra/seahorse/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 196135 2013-10-07 11:53:27Z jgc $
+# $Id: PKGBUILD 198425 2013-10-30 14:47:52Z allan $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Contributor: Jan de Groot <jgc@archlinux.org>
 # Contributor: Michel Brabants <michel.linux@tiscali.be>
 
 pkgname=seahorse
-pkgver=3.10.0
+pkgver=3.10.1
 pkgrel=1
 pkgdesc="GNOME application for managing PGP keys."
 arch=(i686 x86_64 'mips64el')
@@ -14,12 +14,12 @@ depends=(gtk3 gcr libsecret libsoup gpgme desktop-file-utils hicolor-icon-theme
 makedepends=(libldap intltool yelp-tools gobject-introspection openssh libsm)
 optdepends=('openssh: SSH support')
 provides=(x11-ssh-askpass)
-options=('!libtool' '!emptydirs')
+options=('!emptydirs')
 groups=(gnome-extra)
 install=seahorse.install
 source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz
         seahorse-ssh-askpass.sh)
-sha256sums=('98023cb8805cf778163833ddba783ba1505c0595683e1ac92109d27e8556fbde'
+sha256sums=('1df307481988c272d5648a335b2e8bb545b568a00c3f2ca2f3aa732badb46985'
             '400ea9a6084acc93f1dbd4223b95622bbd48071b763063328efba00de378b68c')
 
 build() {
diff --git a/extra/seed/PKGBUILD b/extra/seed/PKGBUILD
index 447022f1e..2dde53069 100644
--- a/extra/seed/PKGBUILD
+++ b/extra/seed/PKGBUILD
@@ -1,15 +1,14 @@
-# $Id: PKGBUILD 183482 2013-04-21 22:21:02Z heftig $
+# $Id: PKGBUILD 198427 2013-10-30 14:48:37Z allan $
 #Maintainer : Ionut Biru <ibiru@archlinux.org>
 #Contributor: Jan de Groot <jgc@archlinux.org>
 
 pkgname=seed
 pkgver=3.8.1
-pkgrel=1
+pkgrel=2
 pkgdesc="Library and interpreter for JavaScript with GObject type system bindings."
 arch=('i686' 'x86_64' 'mips64el')
 url="http://live.gnome.org/Seed/"
 license=('LGPL')
-options=('!libtool')
 depends=('webkitgtk3' 'gobject-introspection' 'gnome-js-common' 'mpfr')
 makedepends=('intltool')
 source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/3.8/${pkgname}-${pkgver}.tar.xz
@@ -20,7 +19,7 @@ sha256sums=('80cb4db7fa6f6cf8d3e255fc45a81657388d458bc8bf23e4089e35f69eeaac32'
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
   install -m644 ../GLib.js extensions/
-  ./configure --prefix=/usr
+  ./configure --prefix=/usr --disable-static
   make
 }
 
diff --git a/extra/serf/PKGBUILD b/extra/serf/PKGBUILD
index 58c0c98b2..33e18236a 100644
--- a/extra/serf/PKGBUILD
+++ b/extra/serf/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 194737 2013-09-23 12:42:49Z angvp $
+# $Id: PKGBUILD 198428 2013-10-30 14:48:58Z allan $
 # Maintainer: Angel Velasquez <angvp@archlinux.org> 
 # Contributor: Stéphane Gaudreault <stephane@archlinux.org>
 
@@ -11,7 +11,7 @@ url="http://code.google.com/p/serf/"
 license=('Apache')
 depends=('apr-util')
 makedepends=('scons')
-options=('!libtool' '!staticlibs')
+options=('!staticlibs')
 source=(http://serf.googlecode.com/files/${pkgname}-${pkgver}.tar.bz2 'serf-ssl-allocator-v2.patch')
 md5sums=('da5aca0cad19fd9c19129c3f8f7393dd'
          'a0ff486ee26f86cb2825decfd1dc8355')
diff --git a/extra/sg3_utils/PKGBUILD b/extra/sg3_utils/PKGBUILD
index 061a34bc0..3e080c6fa 100644
--- a/extra/sg3_utils/PKGBUILD
+++ b/extra/sg3_utils/PKGBUILD
@@ -1,15 +1,14 @@
-#$Id: PKGBUILD 188647 2013-06-17 10:00:27Z jgc $
+#$Id: PKGBUILD 197372 2013-10-25 03:01:52Z allan $
 # Maintainer: Daniel Isenmann <daniel@archlinux.org>
 
 pkgname=sg3_utils
 pkgver=1.36
-pkgrel=1
+pkgrel=2
 pkgdesc="Generic SCSI utilities"
 arch=(i686 x86_64 'mips64el')
 url="http://sg.danny.cz/sg/sg3_utils.html"
 license=('GPL' 'custom:BSD')
 depends=('glibc')
-options=('!libtool')
 source=(http://sg.danny.cz/sg/p/${pkgname}-${pkgver}.tar.xz)
 md5sums=('5d1846c8aa03a2e39e1368cf05bf1cfd')
 
diff --git a/extra/shared-mime-info/PKGBUILD b/extra/shared-mime-info/PKGBUILD
index c007889e8..31b3f9b3e 100644
--- a/extra/shared-mime-info/PKGBUILD
+++ b/extra/shared-mime-info/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 178164 2013-02-17 17:13:54Z andyrtr $
+# $Id: PKGBUILD 197506 2013-10-26 08:14:56Z andyrtr $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=shared-mime-info
-pkgver=1.1
+pkgver=1.2
 pkgrel=1
 pkgdesc="Freedesktop.org Shared MIME Info"
 arch=('i686' 'x86_64' 'mips64el')
@@ -12,7 +12,7 @@ makedepends=('intltool' 'pkgconfig')
 install=shared-mime-info.install
 url="http://freedesktop.org/Software/shared-mime-info"
 source=(http://freedesktop.org/~hadess/${pkgname}-${pkgver}.tar.xz)
-md5sums=('12ba00bf1cb2e69bfba73127e708e833')
+md5sums=('8f90f3f2b8478fa47e70678d34013f99')
 options=(!makeflags)
 
 build() {
diff --git a/extra/shared-mime-info/pbm.patch b/extra/shared-mime-info/pbm.patch
deleted file mode 100644
index 95f9ab81f..000000000
--- a/extra/shared-mime-info/pbm.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-diff -Naur shared-mime-info-0.70-orig/freedesktop.org.xml shared-mime-info-0.70/freedesktop.org.xml
---- shared-mime-info-0.70-orig/freedesktop.org.xml	2010-02-06 02:39:24.000000000 -0500
-+++ shared-mime-info-0.70/freedesktop.org.xml	2010-02-06 02:48:01.000000000 -0500
-@@ -17025,12 +17025,10 @@
-     <magic priority="50">
-       <match value="P1" type="string" offset="0">
-         <match value="0x0a" type="byte" offset="2">
--	  <match value="#" type="string" offset="3"/>
-         </match>
-       </match>
-       <match value="P4" type="string" offset="0">
-         <match value="0x0a" type="byte" offset="2">
--	  <match value="#" type="string" offset="3"/>
-         </match>
-       </match>
-     </magic>
-@@ -17074,12 +17072,10 @@
-     <magic priority="50">
-       <match value="P2" type="string" offset="0">
-         <match value="0x0a" type="byte" offset="2">
--	  <match value="#" type="string" offset="3"/>
-         </match>
-       </match>
-       <match value="P5" type="string" offset="0">
-         <match value="0x0a" type="byte" offset="2">
--	  <match value="#" type="string" offset="3"/>
-         </match>
-       </match>
-     </magic>
-@@ -17123,12 +17119,10 @@
-     <magic priority="50">
-       <match value="P3" type="string" offset="0">
-         <match value="0x0a" type="byte" offset="2">
--	  <match value="#" type="string" offset="3"/>
-         </match>
-       </match>
-       <match value="P6" type="string" offset="0">
-         <match value="0x0a" type="byte" offset="2">
--	  <match value="#" type="string" offset="3"/>
- 	</match>
-       </match>
-     </magic>
diff --git a/extra/sharutils/PKGBUILD b/extra/sharutils/PKGBUILD
index 64e4aeb46..1e646b89c 100644
--- a/extra/sharutils/PKGBUILD
+++ b/extra/sharutils/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 182986 2013-04-16 16:21:08Z bisson $
+# $Id: PKGBUILD 196822 2013-10-20 09:31:59Z bisson $
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
 # Contributor: Kevin Piche <kevin@archlinux.org>
 # Contributor: Tom Newsom <Jeepster@gmx.co.uk>
 
 pkgname=sharutils
-pkgver=4.13.5
+pkgver=4.14
 pkgrel=1
 pkgdesc='Makes so-called shell archives out of many files'
 url='http://www.gnu.org/software/sharutils/'
@@ -12,7 +12,7 @@ license=('GPL')
 arch=('i686' 'x86_64' 'mips64el')
 depends=('perl' 'gettext' 'texinfo')
 source=("ftp://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.xz")
-sha1sums=('8c2e352860994332fa03f2a6c92d789097fb2e52')
+sha1sums=('5d2d76caa6ee816202fb78395415bd863043d81b')
 
 install=install
 
diff --git a/community/signon/PKGBUILD b/extra/signon/PKGBUILD
index c4d0840d1..51d85f4e7 100644
--- a/community/signon/PKGBUILD
+++ b/extra/signon/PKGBUILD
@@ -1,39 +1,44 @@
-# $Id: PKGBUILD 96925 2013-09-08 17:54:00Z bgyorgy $
-# Maintainer: Balló György <ballogyor+arch at gmail dot com>
+# $Id: PKGBUILD 197629 2013-10-27 14:39:15Z andrea $
+#Maintainer: Andrea Scarpino <andrea@archlinux.org>
+# Contributor: Balló György <ballogyor+arch at gmail dot com>
 
 pkgbase=signon
 pkgname=('signon' 'signon-doc')
 pkgver=8.54
-pkgrel=1
-pkgdesc="Framework to provide credential storage and authentication service"
+pkgrel=2
 arch=('i686' 'x86_64' 'mips64el')
 url="http://code.google.com/p/accounts-sso/"
 license=('LGPL')
-depends=('qt4' 'libproxy')
-makedepends=('doxygen' 'graphviz' 'ttf-dejavu')
-backup=(etc/signond.conf)
-install=$pkgname.install
-source=(http://accounts-sso.googlecode.com/files/$pkgbase-$pkgver.tar.bz2
-        use_keyring.patch)
+makedepends=('qt4' 'libproxy' 'doxygen' 'graphviz' 'ttf-font')
+options=('!emptydirs')
+source=("http://accounts-sso.googlecode.com/files/$pkgbase-$pkgver.tar.bz2"
+        'use_keyring.patch')
 sha1sums=('a29a12d6fe3747930e94932f6e1b1339b471d108'
           'cfdd48b494ad267654ceba23f1b81bcb8f56b9a1')
 
-build() {
-  cd "$srcdir/$pkgbase-$pkgver"
-
+prepare() {
+  cd $pkgbase-$pkgver
+  
   # Use gnome-keyring secrets storage if signon-keyring-extension is available
   patch -Np1 -i "$srcdir/use_keyring.patch"
-
+  
   # qt4 fix
   sed -i 's/qdbusxml2cpp/qdbusxml2cpp-qt4/' src/signond/signond.pro
+}
 
+build() {
+  cd $pkgbase-$pkgver
   qmake-qt4 PREFIX=/usr LIBDIR=/usr/lib
   make
 }
 
 package_signon() {
-  cd "$srcdir/$pkgbase-$pkgver"
+  pkgdesc="Framework to provide credential storage and authentication service"
+  depends=('qt4' 'libproxy')
+  backup=('etc/signond.conf')
+  install=$pkgname.install
 
+  cd $pkgbase-$pkgver
   make INSTALL_ROOT="$pkgdir" install
 
   # Split out documentation
@@ -42,10 +47,6 @@ package_signon() {
 
 package_signon-doc() {
   pkgdesc="Developer documention of signon"
-  depends=()
-  options=('!emptydirs')
-  backup=()
-  install=
 
   mkdir -p "$pkgdir/usr/share"
   mv "$srcdir/doc" "$pkgdir/usr/share"
diff --git a/community/signon/signon.install b/extra/signon/signon.install
index 4ccb62fcb..4ccb62fcb 100644
--- a/community/signon/signon.install
+++ b/extra/signon/signon.install
diff --git a/community/signon/use_keyring.patch b/extra/signon/use_keyring.patch
index 55b593a26..55b593a26 100644
--- a/community/signon/use_keyring.patch
+++ b/extra/signon/use_keyring.patch
diff --git a/extra/sip/PKGBUILD b/extra/sip/PKGBUILD
index 27b0344b4..62040c654 100644
--- a/extra/sip/PKGBUILD
+++ b/extra/sip/PKGBUILD
@@ -1,18 +1,18 @@
-# $Id: PKGBUILD 194372 2013-09-15 07:17:44Z andrea $
+# $Id: PKGBUILD 196672 2013-10-16 15:13:03Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Douglas Soares de Andrade <douglas@archlinux.org>
 # Contributor: riai <riai@bigfoot.com>, Ben <ben@benmazer.net>
 
 pkgbase=sip
 pkgname=('sip' 'python-sip' 'python2-sip')
-pkgver=4.15.2
+pkgver=4.15.3
 pkgrel=1
 arch=('i686' 'x86_64' 'mips64el')
 url='http://www.riverbankcomputing.com/software/sip/intro'
 license=('custom:"sip"')
 makedepends=('python' 'python2')
 source=("http://downloads.sourceforge.net/pyqt/${pkgbase}-${pkgver}.tar.gz")
-md5sums=('52abe824ca7f530a5643abfa3ee715d7')
+md5sums=('f04015ff2482f626f1ae14f0561a9602')
 
 build() {
   cp -r ${pkgbase}-${pkgver} python2-${pkgbase}-${pkgver}
diff --git a/extra/slang/PKGBUILD b/extra/slang/PKGBUILD
index 9dc80cda9..c07fce792 100644
--- a/extra/slang/PKGBUILD
+++ b/extra/slang/PKGBUILD
@@ -1,34 +1,33 @@
-# $Id: PKGBUILD 149970 2012-02-11 23:31:28Z allan $
+# $Id: PKGBUILD 197459 2013-10-26 07:19:12Z eric $
 # Maintainer: Eric Belanger <eric@archlinux.org>
 # Contributor: Tom Newsom <Jeepster@gmx.co.uk>
 
 pkgname=slang
 pkgver=2.2.4
-pkgrel=2.2
+pkgrel=3
 pkgdesc="S-Lang is a powerful interpreted language"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.jedsoft.org/slang/"
 license=('GPL')
-depends=('glibc' 'pcre' 'zlib')
+depends=('pcre' 'zlib')
 backup=('etc/slsh.rc')
 options=('!makeflags')
 source=(ftp://ftp.fu-berlin.de/pub/unix/misc/slang/v${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2{,.asc})
 md5sums=('7fcfd447e378f07dd0c0bae671fe6487'
-         '0e37091fe52b4ef609c3cee8eda0e101')
+         'SKIP')
 
 build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr \
-              --sysconfdir=/etc
+  cd ${pkgname}-${pkgver}
+  ./configure --prefix=/usr --sysconfdir=/etc
   make
 }
 
 check() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+  cd ${pkgname}-${pkgver}
   make check
 }
 
 package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+  cd ${pkgname}-${pkgver}
   make DESTDIR="${pkgdir}" install-all
 }
diff --git a/extra/smb4k/PKGBUILD b/extra/smb4k/PKGBUILD
index e81a10f01..db21950eb 100644
--- a/extra/smb4k/PKGBUILD
+++ b/extra/smb4k/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 186369 2013-05-26 07:53:25Z giovanni $
+# $Id: PKGBUILD 197642 2013-10-27 16:28:17Z giovanni $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Emanuele Rampichini <emanuele.rampichini@gmail.com>
 
 pkgname=smb4k
-pkgver=1.0.7
+pkgver=1.0.8
 pkgrel=1
 pkgdesc="A KDE program that browses samba shares"
 arch=('i686' 'x86_64' 'mips64el')
@@ -13,7 +13,7 @@ depends=('kdebase-runtime')
 makedepends=('cmake' 'automoc4')
 install=smb4k.install
 source=("http://downloads.sourceforge.net/project/${pkgname}/Smb4K%20%28stable%20releases%29/${pkgver}/${pkgname}-${pkgver}.tar.bz2")
-md5sums=('1b15d7f0f4ad89b0fe730629ec53c2ae')
+md5sums=('8dac25845830cee18b72776d0f90d62c')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/smpeg/PKGBUILD b/extra/smpeg/PKGBUILD
index 7d93b22e1..bf502c9af 100644
--- a/extra/smpeg/PKGBUILD
+++ b/extra/smpeg/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 168611 2012-10-13 11:49:26Z andyrtr $
+# $Id: PKGBUILD 198431 2013-10-30 14:50:00Z allan $
 # Maintainer: Eric Belanger <eric@archlinux.org>
 # Contributor: Jan de Groot <jgc@archlinux.org>
 
@@ -12,7 +12,7 @@ license=('LGPL')
 depends=('sdl')
 makedepends=('gtk' 'mesa' 'glu')
 optdepends=('gtk: to use gtv ' 'glu: to use glmovie')
-options=('!libtool' '!makeflags')
+options=('!makeflags')
 source=(http://mirrors.dotsrc.org/lokigames/open-source/smpeg/${pkgname}-${pkgver}.tar.gz
         smpeg-0.4.4-gcc41.patch)
 md5sums=('59c76ac704088ef5539210190c4e1fe3'
diff --git a/extra/smpeg2/PKGBUILD b/extra/smpeg2/PKGBUILD
index 1f7dd4856..9a39c06f0 100644
--- a/extra/smpeg2/PKGBUILD
+++ b/extra/smpeg2/PKGBUILD
@@ -1,29 +1,27 @@
 # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
 
 pkgname=smpeg2
-pkgver=412
-pkgrel=2
+epoch=1
+pkgver=2.0.0
+pkgrel=1
 pkgdesc="SDL2 MPEG Player Library"
 arch=('i686' 'x86_64')
 url="http://icculus.org/smpeg/"
 license=('LGPL')
-depends=('sdl2')
-makedepends=('gtk' 'mesa' 'glu' 'svn')
-optdepends=('gtk: to use gtv ' 'glu: to use glmovie')
-options=('!libtool')
-source=(svn://svn.icculus.org/smpeg/trunk#revision=$pkgver)
+depends=('sdl2' 'gcc-libs')
+makedepends=('svn')
+source=("${pkgname}::svn://svn.icculus.org/smpeg/tags/release_${pkgver//./_}")
 md5sums=('SKIP')
 
 build() {
-  cd ${srcdir}/trunk
-  sed -i s/SDL_CONFIG/SDL2_CONFIG/g smpeg2-config.in
+  cd ${srcdir}/${pkgname}
   ./autogen.sh
   ./configure --prefix=/usr --mandir=/usr/share/man --disable-static
   make
 }
 
 package() {
-  cd ${srcdir}/trunk
+  cd ${srcdir}/${pkgname}
   make DESTDIR=${pkgdir} install
 
   # hacky way of resolving conflicts
diff --git a/extra/snappy/PKGBUILD b/extra/snappy/PKGBUILD
index 3e7d7a387..85e15cd87 100644
--- a/extra/snappy/PKGBUILD
+++ b/extra/snappy/PKGBUILD
@@ -1,17 +1,16 @@
-# $Id: PKGBUILD 178016 2013-02-13 16:35:15Z dreisner $
+# $Id: PKGBUILD 198433 2013-10-30 14:50:42Z allan $
 # Maintainer: Dave Reisner <dreisner@archlinux.org>
 # Contributor: Antony Male <antony dot male at geemail dot com>>
 
 pkgname=snappy
 pkgver=1.1.0
-pkgrel=1
+pkgrel=2
 pkgdesc='A fast compressor/decompressor library'
 arch=('i686' 'x86_64' 'mips64el')
 url="http://code.google.com/p/snappy/"
 license=('BSD')
 depends=('glibc' 'gcc-libs')
 checkdepends=('zlib')
-options=('!libtool')
 source=("http://snappy.googlecode.com/files/$pkgname-$pkgver.tar.gz")
 md5sums=('c8f3ef29b5281e78f4946b2d739cea4f')
 
diff --git a/extra/snd/PKGBUILD b/extra/snd/PKGBUILD
index f8185ed5b..2a23dc657 100644
--- a/extra/snd/PKGBUILD
+++ b/extra/snd/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 193060 2013-08-15 10:40:13Z schiv $
+# $Id: PKGBUILD 197656 2013-10-27 21:04:41Z schiv $
 # Maintainer: Ray Rashif <schiv@archlinux.org>
 # Contributor: Juergen Hoetzel <juergen@archlinux.org>
 # Contributor: see .contrib
 
 pkgname=snd
-pkgver=13.9
+pkgver=14.1
 pkgrel=1
 pkgdesc="An advanced sound editor"
 arch=('i686' 'x86_64')
@@ -16,8 +16,17 @@ makedepends=('ladspa' 'wavpack' 'flac' 'speex' 'gmp'
 optdepends=('wavpack' 'flac' 'speex' 'mpg123'
             'timidity++' 'vorbis-tools')
 install=$pkgname.install
-source=("ftp://ccrma-ftp.stanford.edu/pub/Lisp/$pkgname-$pkgver.tar.gz")
-md5sums=('acceab2d1e30720640aca54d4b68d45b')
+source=("ftp://ccrma-ftp.stanford.edu/pub/Lisp/$pkgname-$pkgver.tar.gz"
+        'type_error.patch')
+md5sums=('955ca19ca70ac0e4d03cd710516c0174'
+         '6e96d59346b53a1c73060857f688dbd0')
+
+prepare() {
+  cd "$srcdir/$pkgname-$pkgver"
+
+  # work around incomplete type error
+  patch -Np1 -i "$srcdir/type_error.patch"
+}
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
diff --git a/extra/snd/type_error.patch b/extra/snd/type_error.patch
new file mode 100644
index 000000000..e7bf9ab91
--- /dev/null
+++ b/extra/snd/type_error.patch
@@ -0,0 +1,20 @@
+diff -ur snd-14.1.orig/vct.h snd-14.1/vct.h
+--- snd-14.1.orig/vct.h	2013-10-28 02:22:35.073798054 +0800
++++ snd-14.1/vct.h	2013-10-28 02:45:27.166364791 +0800
+@@ -1,11 +1,11 @@
+ #ifndef VCT_H
+ #define VCT_H
+ 
+-#if HAVE_SCHEME
+-  typedef struct s7_cell vct;
+-#else
+-typedef struct vct vct;
+-#endif
++typedef struct {
++  mus_long_t length;
++  mus_float_t *data;
++  bool dont_free;
++} vct;
+ 
+ #ifdef __cplusplus
+ extern "C" {
diff --git a/extra/sofia-sip/PKGBUILD b/extra/sofia-sip/PKGBUILD
index b2974f1f4..e8ee92732 100644
--- a/extra/sofia-sip/PKGBUILD
+++ b/extra/sofia-sip/PKGBUILD
@@ -1,25 +1,25 @@
-# $Id: PKGBUILD 120138 2011-04-20 11:51:10Z ibiru $
+# $Id: PKGBUILD 198717 2013-11-02 09:04:22Z ioni $
 # Maintainer : Ionut Biru <ibiru@archlinux.org>
 # Contributor: Bjorn Lindeijer <bjorn lindeijer nl>
 pkgname=sofia-sip
 pkgver=1.12.11
-pkgrel=1.2
+pkgrel=2
 pkgdesc="An open-source SIP User-Agent library"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://sofia-sip.sourceforge.net"
-options=('!libtool' 'zipman')
+options=('zipman')
 license=('LGPL')
 depends=('glib2' 'openssl')
 source=(http://downloads.sourceforge.net/sofia-sip/${pkgname}-${pkgver}.tar.gz)
 md5sums=('f3582c62080eeecd3fa4cd5d4ccb4225')
 
 build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+  cd $pkgname-$pkgver
   ./configure --prefix=/usr --with-openssl
   make
 }
 
 package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
+  cd $pkgname-$pkgver
+  make DESTDIR="$pkgdir" install
 }
diff --git a/extra/sonata/PKGBUILD b/extra/sonata/PKGBUILD
index 59491036f..fcb0c2f4c 100644
--- a/extra/sonata/PKGBUILD
+++ b/extra/sonata/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 188210 2013-06-13 03:01:29Z angvp $
+# $Id: PKGBUILD 198683 2013-11-02 04:54:33Z bisson $
 # Maintainer: Angel Velasquez <angvp@archlinux.org> 
 # Contributor: William Rea <sillywilly@gmail.com>
 
 pkgname=sonata
 pkgver=1.6.2.1
-pkgrel=10
+pkgrel=11
 pkgdesc="Elegant GTK+ music client for MPD"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://sonata.berlios.de/"
@@ -15,12 +15,15 @@ optdepends=('python2-egg: Enhanced system tray support'
             'python2-dbus: Various extra functionality (e.g. multimedia keys support)')
 provides=('python2-mmkeys')
 source=(http://download.berlios.de/${pkgname}/${pkgname}-$pkgver.tar.gz
+        mpd-0.18.patch
         info.py.patch)
 md5sums=('0b912325e7175abad3bf6c0edc071e05'
+         '9bc61f5015f415dc16ceb84a95c99f5e'
          '595fcf7615035829b264afecb5a1beeb')
 
 build() {
   cd ${pkgname}-$pkgver
+  patch -Np1 -i "$srcdir/mpd-0.18.patch"
   patch -Np0 -i "$srcdir/info.py.patch"
   sed -i 's|/usr/bin/env python|/usr/bin/env python2|' sonata/breadcrumbs.py
 }
diff --git a/extra/sonata/mpd-0.18.patch b/extra/sonata/mpd-0.18.patch
new file mode 100644
index 000000000..681fb1665
--- /dev/null
+++ b/extra/sonata/mpd-0.18.patch
@@ -0,0 +1,25 @@
+diff -aur sonata-1.6.2.1/sonata/main.py sonata-1.6.2.1.new/sonata/main.py
+--- sonata-1.6.2.1/sonata/main.py	2009-09-22 01:02:16.000000000 +0400
++++ sonata-1.6.2.1.new/sonata/main.py	2013-11-01 15:59:08.919054767 +0400
+@@ -989,13 +989,14 @@
+ 						self.repeatmenu.set_active(self.status['repeat'] == '1')
+ 					if not self.last_random or self.last_random != self.status['random']:
+ 						self.randommenu.set_active(self.status['random'] == '1')
+-					if self.status['xfade'] == '0':
+-						self.config.xfade_enabled = False
+-					else:
+-						self.config.xfade_enabled = True
+-						self.config.xfade = int(self.status['xfade'])
+-						if self.config.xfade > 30:
+-							self.config.xfade = 30
++					#if self.status['xfade'] == '0':
++					#	self.config.xfade_enabled = False
++					#else:
++					#	self.config.xfade_enabled = True
++					#	self.config.xfade = int(self.status['xfade'])
++					#	if self.config.xfade > 30:
++					#		self.config.xfade = 30
++					self.config.xfade_enabled = False
+ 					self.last_repeat = self.status['repeat']
+ 					self.last_random = self.status['random']
+ 					return
diff --git a/extra/soundtouch/PKGBUILD b/extra/soundtouch/PKGBUILD
index 3036fbba6..b494e33c1 100644
--- a/extra/soundtouch/PKGBUILD
+++ b/extra/soundtouch/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 174146 2013-01-03 05:00:13Z eric $
+# $Id: PKGBUILD 198435 2013-10-30 14:51:23Z allan $
 # Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgname=soundtouch
@@ -9,7 +9,6 @@ arch=('i686' 'x86_64' 'mips64el')
 url="http://www.surina.net/soundtouch/"
 license=('LGPL')
 depends=('gcc-libs')
-options=('!libtool')
 source=(http://www.surina.net/soundtouch/${pkgname}-${pkgver}.tar.gz)
 sha1sums=('8b1a461754853f9c7328571449b7f9b8bd578a89')
 
diff --git a/extra/source-highlight/PKGBUILD b/extra/source-highlight/PKGBUILD
index 95e0062a5..86b6509e0 100644
--- a/extra/source-highlight/PKGBUILD
+++ b/extra/source-highlight/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 190049 2013-07-13 12:42:47Z svenstaro $
+# $Id: PKGBUILD 198436 2013-10-30 14:51:45Z allan $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Douglas Soares de Andrade <douglas@archlinux.org>
 
@@ -11,7 +11,6 @@ url="http://www.gnu.org/software/src-highlite/"
 license=('GPL')
 depends=('bash' 'boost-libs')
 makedepends=('ctags' 'boost')
-options=('!libtool')
 install=$pkgname.install
 source=("ftp://ftp.gnu.org/gnu/src-highlite/${pkgname}-${pkgver}.tar.gz")
 md5sums=('0ff81588d3536b4c4e571122ba940595')
diff --git a/extra/sox/PKGBUILD b/extra/sox/PKGBUILD
index 587621f0b..3db270472 100644
--- a/extra/sox/PKGBUILD
+++ b/extra/sox/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 191908 2013-08-01 06:53:41Z bpiotrowski $
+# $Id: PKGBUILD 197426 2013-10-25 19:25:05Z eric $
 # Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgname=sox
 pkgver=14.4.1
-pkgrel=3
+pkgrel=4
 pkgdesc="The Swiss Army knife of sound processing tools"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://sox.sourceforge.net/"
@@ -16,7 +16,6 @@ optdepends=('libao: for ao plugin'
             'libid3tag: for mp3 plugin'
             'wavpack: for wavpack plugin'
             'libpulse: for pulse plugin')
-options=('!libtool')
 source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2)
 sha1sums=('4775f9e9eebb5a2fe79df548908a7a24088118d9')
 
diff --git a/extra/spandsp/PKGBUILD b/extra/spandsp/PKGBUILD
index 0a9c83273..cb0f64879 100644
--- a/extra/spandsp/PKGBUILD
+++ b/extra/spandsp/PKGBUILD
@@ -1,30 +1,29 @@
-# $Id: PKGBUILD 165523 2012-08-22 19:37:34Z tpowa $
+# $Id: PKGBUILD 197565 2013-10-26 23:18:17Z eric $
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 
 pkgname=spandsp
 pkgver=0.0.6pre21
-pkgrel=1.1
+pkgrel=2
 pkgdesc="A DSP library for telephony"
 arch=(i686 x86_64 mips64el)
 license=('GPL')
 url="http://www.soft-switch.org/"
 depends=('libtiff')
 source=(http://www.soft-switch.org/downloads/$pkgname/$pkgname-$pkgver.tgz)
-options=(!libtool)
+md5sums=('492f3790439891c07d8c06e97ccbfcf1')
 
 build() {
-  cd $srcdir/$pkgname-0.0.6
+  cd $pkgname-0.0.6
   ./configure --prefix=/usr
   make
 }
 
 check() {
-   cd $srcdir/$pkgname-0.0.6
+   cd $pkgname-0.0.6
    make check
 }  
 
 package() {
-  cd $srcdir/$pkgname-0.0.6
-  make DESTDIR=$pkgdir install
+  cd $pkgname-0.0.6
+  make DESTDIR="$pkgdir" install
 }
-md5sums=('492f3790439891c07d8c06e97ccbfcf1')
diff --git a/extra/speech-dispatcher/PKGBUILD b/extra/speech-dispatcher/PKGBUILD
index 9eec7b513..7a2541d27 100644
--- a/extra/speech-dispatcher/PKGBUILD
+++ b/extra/speech-dispatcher/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 179645 2013-03-09 01:49:56Z eric $
+# $Id: PKGBUILD 197563 2013-10-26 23:08:53Z eric $
 # Maintainer:
 # Contributor: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Steve Holmes <steve.holmes88@gmail.com>
@@ -8,7 +8,7 @@
 
 pkgname=speech-dispatcher
 pkgver=0.8
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64' 'mips64el')
 pkgdesc="High-level device independent layer for speech synthesis interface"
 url="http://www.freebsoft.org/speechd"
@@ -19,7 +19,6 @@ optdepends=('festival: Speech output using Festival'
         'espeak: Speech output using ESpeak'
         'pulseaudio: PulseAudio support')
 provides=("speechd=${pkgver}")
-options=('!libtool') 
 backup=(etc/speech-dispatcher/clients/gnome-speech.conf
 	etc/speech-dispatcher/clients/emacs.conf
 	etc/speech-dispatcher/modules/ibmtts.conf
@@ -42,7 +41,7 @@ md5sums=('d88691a64c676122f996230c107c392f'
          'd26f52e2e95a30eaa83560f0e63faca5')
 
 build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+  cd ${pkgname}-${pkgver}
   
   ./configure --prefix=/usr \
     --sysconfdir=/etc \
@@ -51,7 +50,7 @@ build() {
 }
 
 package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+  cd ${pkgname}-${pkgver}
   make DESTDIR="${pkgdir}" install
 
   install -Dm644 "${srcdir}"/speech-dispatcherd.service "${pkgdir}/usr/lib/systemd/system/speech-dispatcherd.service"
diff --git a/extra/speex/PKGBUILD b/extra/speex/PKGBUILD
index e385410b5..f3716a7ff 100644
--- a/extra/speex/PKGBUILD
+++ b/extra/speex/PKGBUILD
@@ -1,22 +1,21 @@
-# $Id: PKGBUILD 176866 2013-02-02 03:18:03Z heftig $
+# $Id: PKGBUILD 198437 2013-10-30 14:52:06Z allan $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Contributer: Jason Chu <jason@archlinux.org>
 
 pkgname=speex
 pkgver=1.2rc1
-pkgrel=3
+pkgrel=4
 pkgdesc="A free codec for free speech"
 arch=(i686 x86_64 mips64el)
 url="http://www.speex.org/"
 license=(BSD)
 depends=(libogg)
-options=('!libtool')
 source=(http://downloads.us.xiph.org/releases/$pkgname/$pkgname-$pkgver.tar.gz)
 md5sums=('c4438b22c08e5811ff10e2b06ee9b9ae')
 
 build() {
   cd $pkgname-$pkgver
-  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var
+  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --disable-static
   make
 }
 
diff --git a/extra/spice/PKGBUILD b/extra/spice/PKGBUILD
index b5878e11d..0e209a9e1 100644
--- a/extra/spice/PKGBUILD
+++ b/extra/spice/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 196189 2013-10-08 07:21:39Z tpowa $
+# $Id: PKGBUILD 198438 2013-10-30 14:52:32Z allan $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: Patryk Kowalczyk < patryk at kowalczyk dot ws>
 
@@ -11,7 +11,6 @@ url="http://spice-space.org"
 license=('LGPL2.1')
 depends=(alsa-lib celt0.5.1 libcacard libjpeg-turbo libsasl libxinerama libxfixes libxrandr pixman)
 makedepends=(python2-pyparsing qemu spice-protocol)
-options=(!libtool)
 source=(http://spice-space.org/download/releases/$pkgname-$pkgver.tar.bz2)
 md5sums=('325b1c42ce24e75de45a75876b73a8bd')
 
diff --git a/extra/sqlite/PKGBUILD b/extra/sqlite/PKGBUILD
index 63838f52d..6cef631d0 100644
--- a/extra/sqlite/PKGBUILD
+++ b/extra/sqlite/PKGBUILD
@@ -1,14 +1,14 @@
-# $Id: PKGBUILD 194286 2013-09-13 07:06:54Z andyrtr $
+# $Id: PKGBUILD 198439 2013-10-30 14:52:53Z allan $
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 # Contributor: Tom Newsom <Jeepster@gmx.co.uk>
 
 pkgbase="sqlite"
 pkgname=('sqlite' 'sqlite-tcl') 
-_amalgamationver=3080002
+_amalgamationver=3080100
 _docver=${_amalgamationver}
 #_docver=3080001
-pkgver=3.8.0.2
-pkgrel=1
+pkgver=3.8.1
+pkgrel=2
 pkgdesc="A C library that implements an SQL database engine"
 arch=('i686' 'x86_64' 'mips64el')
 license=('custom:Public Domain')
@@ -16,9 +16,13 @@ url="http://www.sqlite.org/"
 makedepends=('tcl' 'readline')
 source=( # tarball containing the amalgamation for SQLite >= 3.7.5 together with a configure script and makefile for building it; includes now also the Tcl Extension Architecture (TEA)
 	http://www.sqlite.org/2013/sqlite-autoconf-$_amalgamationver.tar.gz
+	http://www.sqlite.org/2013/sqlite-doc-${_docver}.zip
+	xbmc.patch
 	license.txt)
-options=('!libtool' '!emptydirs')
-sha1sums=('294c30e882a0d45877bce09afe72d08ccfc6b650'
+options=('!emptydirs')
+sha1sums=('42464b07df2d6f8aa28f73ce4cc6d48b47be810e'
+          'd7cb698f32318fbf5dce9f10c9cd7b84c3d70105'
+          '01bcbffc422b354a4ad6737e472f06b321ce52ef'
           'f34f6daa4ab3073d74e774aad21d66878cf26853')
 
 build() {
@@ -26,6 +30,11 @@ build() {
 
   # build sqlite
   cd "$srcdir"/sqlite-autoconf-$_amalgamationver
+
+  # fix http://www.sqlite.org/src/info/9aac4e588c?sbs=0
+  # https://bugs.archlinux.org/task/37417
+  patch -Np1 -i $srcdir/xbmc.patch
+
   ./configure --prefix=/usr \
 	--disable-static
   make
diff --git a/extra/sqlite/xbmc.patch b/extra/sqlite/xbmc.patch
new file mode 100644
index 000000000..3a58dd242
--- /dev/null
+++ b/extra/sqlite/xbmc.patch
@@ -0,0 +1,22 @@
+Index: src/where.c
+==================================================================
+--- src/sqlite3.c
++++ src/sqlite3.c
+@@ -876,11 +876,14 @@
+   while( pScan->iEquiv<=pScan->nEquiv ){
+     iCur = pScan->aEquiv[pScan->iEquiv-2];
+     iColumn = pScan->aEquiv[pScan->iEquiv-1];
+     while( (pWC = pScan->pWC)!=0 ){
+       for(pTerm=pWC->a+k; k<pWC->nTerm; k++, pTerm++){
+-        if( pTerm->leftCursor==iCur && pTerm->u.leftColumn==iColumn ){
++        if( pTerm->leftCursor==iCur
++         && pTerm->u.leftColumn==iColumn
++         && (pScan->iEquiv<=2 || !ExprHasProperty(pTerm->pExpr, EP_FromJoin))
++        ){
+           if( (pTerm->eOperator & WO_EQUIV)!=0
+            && pScan->nEquiv<ArraySize(pScan->aEquiv)
+           ){
+             int j;
+             pX = sqlite3ExprSkipCollate(pTerm->pExpr->pRight);
+
+
diff --git a/extra/startup-notification/PKGBUILD b/extra/startup-notification/PKGBUILD
index 502bb0fbe..e313e51b3 100644
--- a/extra/startup-notification/PKGBUILD
+++ b/extra/startup-notification/PKGBUILD
@@ -1,15 +1,14 @@
-# $Id: PKGBUILD 160613 2012-06-02 21:14:51Z andyrtr $
+# $Id: PKGBUILD 198440 2013-10-30 14:53:14Z allan $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: dorphell <dorphell@archlinux.org>
 
 pkgname=startup-notification
 pkgver=0.12
-pkgrel=3
+pkgrel=4
 pkgdesc="Monitor and display application startup"
 arch=(i686 x86_64 'mips64el')
 license=('LGPL')
 depends=('libx11' 'xcb-util>=0.3.9')
-options=('!libtool')
 url="http://www.freedesktop.org"
 source=(http://www.freedesktop.org/software/startup-notification/releases/${pkgname}-${pkgver}.tar.gz)
 md5sums=('2cd77326d4dcaed9a5a23a1232fb38e9')
diff --git a/extra/stellarium/PKGBUILD b/extra/stellarium/PKGBUILD
index 5d83aa15b..7186133f0 100644
--- a/extra/stellarium/PKGBUILD
+++ b/extra/stellarium/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 192489 2013-08-13 06:26:20Z bpiotrowski $
+# $Id: PKGBUILD 196715 2013-10-16 19:47:13Z ronald $
 # Maintainer: Ronald van Haren <ronald.archlinux.org>
 # Contributor: Damir Perisa <damir.perisa@bluewin.ch>
 
 pkgname=stellarium
-pkgver=0.12.2
+pkgver=0.12.4
 pkgrel=1
 pkgdesc="A stellarium with great graphics and a nice database of sky-objects"
 arch=("i686" "x86_64" 'mips64el')
@@ -16,7 +16,7 @@ makedepends=('cmake' 'boost' 'mesa' 'mesa-libgl')
 source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz
 	stellarium.desktop
         stellarium.png)
-sha1sums=('35752a24bdeb461b9c16e8533b13689b05a87105'
+sha1sums=('6d3cc4dc186db831af76830fe2e636ff1f7bbc90'
           'c9cc79212542238227b5bd6af99f60fe056f4ab2'
           'b890d3b6c4dcfcfcc696514202af11b2a50c0fea')
 	
diff --git a/extra/streamripper/PKGBUILD b/extra/streamripper/PKGBUILD
index 53427efbf..6f7315850 100644
--- a/extra/streamripper/PKGBUILD
+++ b/extra/streamripper/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 137607 2011-09-10 03:20:46Z eric $
+# $Id: PKGBUILD 198441 2013-10-30 14:53:35Z allan $
 # Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgname=streamripper
@@ -9,7 +9,6 @@ arch=('i686' 'x86_64' 'mips64el')
 url="http://streamripper.sourceforge.net"
 license=('GPL')
 depends=('glib2' 'libmad' 'faad2' 'libvorbis')
-options=('!libtool')
 source=(http://downloads.sourceforge.net/sourceforge/streamripper/streamripper-${pkgver}.tar.gz)
 md5sums=('a37a1a8b8f9228522196a122a1c2dd32')
 sha1sums=('bc8a8d3ad045e0772ca691d2063c39efcc0dca45')
diff --git a/extra/subversion/PKGBUILD b/extra/subversion/PKGBUILD
index f788f2d4a..d0bc12d08 100644
--- a/extra/subversion/PKGBUILD
+++ b/extra/subversion/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 194714 2013-09-23 03:35:04Z angvp $
+# $Id: PKGBUILD 198442 2013-10-30 14:53:59Z allan $
 # Maintainer: Angel Velasquez <angvp@archlinux.org> 
 # Contributor: Stéphane Gaudreault <stephane@archlinux.org>
 # Contributor: Paul Mattal <paul@archlinux.org>
@@ -23,7 +23,7 @@ optdepends=('libgnome-keyring: for GNOME Keyring for auth credentials'
         'ruby: for some hook scripts')
 provides=('svn')
 backup=('etc/xinetd.d/svn' 'etc/conf.d/svnserve')
-options=('!makeflags' '!libtool' '!emptydirs')
+options=('!makeflags' '!emptydirs')
 install=${pkgname}.install
 source=(http://www.apache.org/dist/subversion/subversion-${pkgver}.tar.bz2{,.asc}
         svn
diff --git a/extra/sushi/PKGBUILD b/extra/sushi/PKGBUILD
index 1f59a11c6..ed805f0d9 100644
--- a/extra/sushi/PKGBUILD
+++ b/extra/sushi/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 196137 2013-10-07 11:53:29Z jgc $
+# $Id: PKGBUILD 198443 2013-10-30 14:54:20Z allan $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 
 pkgname=sushi
@@ -12,7 +12,6 @@ groups=(gnome)
 depends=('clutter-gtk' 'clutter-gst' 'gjs' 'libmusicbrainz5' 'webkitgtk3' 'gtksourceview3' 'evince')
 install=sushi.install
 makedepends=('intltool' 'gobject-introspection')
-options=(!libtool)
 source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
 sha256sums=('cffcf28b170f5825e84983a979972d4d901a453b61cbe3e560d362e8dd4b4bc8')
 
diff --git a/extra/swell-foop/PKGBUILD b/extra/swell-foop/PKGBUILD
index dabe2ea53..0c252a135 100644
--- a/extra/swell-foop/PKGBUILD
+++ b/extra/swell-foop/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 196386 2013-10-12 16:49:43Z heftig $
+# $Id: PKGBUILD 198444 2013-10-30 14:54:45Z allan $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Contributor: Jan de Groot <jgc@archlinux.org>
 
@@ -12,7 +12,7 @@ depends=('desktop-file-utils' 'hicolor-icon-theme' 'clutter-gtk' 'librsvg')
 makedepends=('intltool' 'itstool' 'gobject-introspection')
 conflicts=('gnome-games')
 replaces=('gnome-games')
-options=('!emptydirs' '!libtool')
+options=('!emptydirs')
 install=swell-foop.install
 url="https://live.gnome.org/Swell%20Foop"
 groups=('gnome-extra')
diff --git a/extra/syslog-ng/PKGBUILD b/extra/syslog-ng/PKGBUILD
index 7fdcad403..585357deb 100644
--- a/extra/syslog-ng/PKGBUILD
+++ b/extra/syslog-ng/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 193122 2013-08-16 23:00:07Z dreisner $
+# $Id: PKGBUILD 198445 2013-10-30 14:55:06Z allan $
 # Maintainer: Dave Reisner <dreisner@archlinux.org>
 # Contributor: Eric Bélanger <eric@archlinux.org>
 # Contributor: Aaron Griffin <aaron@archlinux.org>
@@ -13,7 +13,6 @@ url="http://www.balabit.com/network-security/syslog-ng/"
 depends=('awk' 'eventlog' 'glib2' 'libcap' 'openssl' 'systemd')
 makedepends=('flex' 'pkg-config' 'python2')
 optdepends=('logrotate: for rotating log files')
-options=('!libtool')
 backup=('etc/syslog-ng/scl.conf'
         'etc/syslog-ng/syslog-ng.conf'
         'etc/logrotate.d/syslog-ng')
diff --git a/extra/t1lib/PKGBUILD b/extra/t1lib/PKGBUILD
index 1b75bcc67..251c98d9c 100644
--- a/extra/t1lib/PKGBUILD
+++ b/extra/t1lib/PKGBUILD
@@ -1,16 +1,15 @@
-# $Id: PKGBUILD 137602 2011-09-10 01:36:02Z allan $
+# $Id: PKGBUILD 197366 2013-10-25 02:59:44Z allan $
 # Maintainer: tobias <tobias@archlinux.org>
 # Contributor: Rainer Moll <renari@arcor.de>
 
 pkgname=t1lib
 pkgver=5.1.2
-pkgrel=3.2
+pkgrel=4
 pkgdesc="Library for generating character- and string-glyphs from Adobe Type 1 fonts"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.ibiblio.org/pub/Linux/libs/graphics/!INDEX.html"
 license=('GPL')
 depends=('libxaw')
-options=(!libtool)
 source=(http://www.ibiblio.org/pub/Linux/libs/graphics/${pkgname}-${pkgver}.tar.gz )
 md5sums=('a5629b56b93134377718009df1435f3c')
 
diff --git a/extra/taglib/PKGBUILD b/extra/taglib/PKGBUILD
index 5eaaaed56..dcfb6d191 100644
--- a/extra/taglib/PKGBUILD
+++ b/extra/taglib/PKGBUILD
@@ -1,21 +1,20 @@
-# $Id: PKGBUILD 166944 2012-09-22 20:46:26Z tomegun $
+# $Id: PKGBUILD 198446 2013-10-30 14:55:27Z allan $
 # Maintainer: Tom Gundersen <teg@jklm.no>
 # Contributor: Ike Devolder <ike.devolder@gmail.com>
 # Contributor: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Tobias Powalowski <tpowa@archlinux.org>
 
 pkgname=taglib
-pkgver=1.8
-pkgrel=1.1
+pkgver=1.9.1
+pkgrel=1
 pkgdesc="A Library for reading and editing the meta-data of several popular audio formats"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://developer.kde.org/~wheeler/taglib.html"
 license=('LGPL' 'MPL')
 depends=('sh' 'zlib' 'gcc-libs')
 makedepends=('cmake' 'pkg-config')
-options=('!libtool')
-source=("https://github.com/downloads/$pkgname/$pkgname/$pkgname-$pkgver.tar.gz")
-md5sums=('dcb8bd1b756f2843e18b1fdf3aaeee15')
+source=("http://${pkgname}.github.io/releases/${pkgname}-${pkgver}.tar.gz")
+md5sums=('0d35df96822bbd564c5504cb3c2e4d86')
 
 build() {
   cd "${srcdir}"/${pkgname}-${pkgver}
diff --git a/extra/tali/PKGBUILD b/extra/tali/PKGBUILD
index 8f24ac5be..ddeb7113c 100644
--- a/extra/tali/PKGBUILD
+++ b/extra/tali/PKGBUILD
@@ -12,7 +12,7 @@ depends=('desktop-file-utils' 'hicolor-icon-theme' 'gtk3' 'librsvg')
 makedepends=('intltool' 'itstool' 'gobject-introspection')
 conflicts=('gnome-games')
 replaces=('gnome-games')
-options=('!emptydirs' '!libtool')
+options=('!emptydirs')
 install=tali.install
 url="https://live.gnome.org/Tali"
 groups=('gnome-extra')
diff --git a/extra/tcl/PKGBUILD b/extra/tcl/PKGBUILD
index 22d4c871f..70dd07dfc 100644
--- a/extra/tcl/PKGBUILD
+++ b/extra/tcl/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 194660 2013-09-20 16:55:21Z eric $
+# $Id: PKGBUILD 197360 2013-10-25 02:54:13Z allan $
 # Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgname=tcl
@@ -9,6 +9,7 @@ arch=('i686' 'x86_64' 'mips64el')
 url="http://tcl.sourceforge.net/"
 license=('custom')
 depends=('zlib')
+options=('staticlibs')
 source=(http://downloads.sourceforge.net/sourceforge/tcl/tcl${pkgver}-src.tar.gz)
 sha1sums=('5c83d44152cc0496cc0847a2495f659502a30e40')
 
diff --git a/extra/telepathy-farstream/PKGBUILD b/extra/telepathy-farstream/PKGBUILD
index 1f0ac092c..7f258a543 100644
--- a/extra/telepathy-farstream/PKGBUILD
+++ b/extra/telepathy-farstream/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 169977 2012-10-30 22:59:51Z heftig $
+# $Id: PKGBUILD 198448 2013-10-30 14:56:09Z allan $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 
 pkgname=telepathy-farstream
@@ -12,7 +12,6 @@ depends=('telepathy-glib' 'farstream')
 makedepends=('dbus-glib' 'gobject-introspection')
 conflicts=('telepathy-farsight')
 replaces=('telepathy-farsight')
-options=('!libtool')
 source=(http://telepathy.freedesktop.org/releases/$pkgname/$pkgname-$pkgver.tar.gz)
 md5sums=('d154350f9f1e3bdba87617c0668481a5')
 
diff --git a/extra/telepathy-gabble/PKGBUILD b/extra/telepathy-gabble/PKGBUILD
index b770ba6d9..b5ed216dd 100644
--- a/extra/telepathy-gabble/PKGBUILD
+++ b/extra/telepathy-gabble/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 194217 2013-09-10 16:04:59Z andrea $
+# $Id: PKGBUILD 198714 2013-11-02 08:58:18Z ioni $
 # Maintainer : Ionut Biru <ibiru@archlinux.org>
 # Contributor: Daniel Balieiro <daniel@balieiro.com>
 # Contributor: Rodrigo L. M. Flores <mail@rodrigoflores.org>
 pkgname=telepathy-gabble
 pkgver=0.18.1
-pkgrel=1
+pkgrel=2
 pkgdesc="A Jabber/XMPP connection manager for Telepathy"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://telepathy.freedesktop.org"
@@ -12,7 +12,7 @@ groups=('telepathy')
 license=('LGPL2.1')
 depends=('telepathy-glib' 'libsoup' 'libnice' 'sqlite')
 makedepends=('libxslt' 'python2')
-options=('!libtool' '!emptydirs')
+options=('!emptydirs')
 source=(http://telepathy.freedesktop.org/releases/$pkgname/$pkgname-$pkgver.tar.gz)
 install=telepathy-gabble.install
 md5sums=('a5384758df829b80d47fbc8a672609ad')
diff --git a/extra/telepathy-glib/PKGBUILD b/extra/telepathy-glib/PKGBUILD
index 5b2bb7fa5..4320149c4 100644
--- a/extra/telepathy-glib/PKGBUILD
+++ b/extra/telepathy-glib/PKGBUILD
@@ -1,20 +1,20 @@
-# $Id: PKGBUILD 191840 2013-07-31 09:36:38Z ioni $
+# $Id: PKGBUILD 198696 2013-11-02 08:04:56Z ioni $
 # Maintainer:  Ionut Biru <ibiru@archlinux.org>
 # Contributor: Kessia 'even' Pinheiro <kessiapinheiro at gmail.com
 # Contributor: Bjorn Lindeijer <bjorn lindeijer nl>
 
 pkgname=telepathy-glib
-pkgver=0.20.4
+pkgver=0.22.0
 pkgrel=1
 pkgdesc="GLib bindings for the Telepathy D-Bus protocol"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://telepathy.freedesktop.org"
 license=('LGPL2.1')
-options=('!libtool' '!emptydirs')
+options=('!emptydirs')
 depends=('dbus-glib')
 makedepends=('libxslt' 'vala' 'gobject-introspection')
 source=(http://telepathy.freedesktop.org/releases/$pkgname/$pkgname-$pkgver.tar.gz)
-md5sums=('78be56307d2da7c580cf6df33a225ba0')
+md5sums=('c333ceb21a9ca1c52a0e6e36432943d1')
 
 build() {
     cd $pkgname-$pkgver
diff --git a/extra/telepathy-haze/PKGBUILD b/extra/telepathy-haze/PKGBUILD
index 32d35ccb4..92172f940 100644
--- a/extra/telepathy-haze/PKGBUILD
+++ b/extra/telepathy-haze/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 183633 2013-04-25 18:08:02Z ioni $
+# $Id: PKGBUILD 198705 2013-11-02 08:21:07Z ioni $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 # Contributor: Timm Preetz <timm@preetz.us>
 pkgname=telepathy-haze
-pkgver=0.7.0
+pkgver=0.8.0
 pkgrel=1
 pkgdesc="A telepathy-backend to use libpurple (Pidgin) protocols."
 arch=('i686' 'x86_64' 'mips64el')
@@ -14,7 +14,7 @@ replaces=('telepathy-butterfly')
 install=telepathy-haze.install
 groups=('telepathy')
 source=(http://telepathy.freedesktop.org/releases/$pkgname/$pkgname-$pkgver.tar.gz)
-md5sums=('85ae58b06a3a94ccfab7080a834bc684')
+md5sums=('b9ee3638833fb50db6276d1b771820b0')
 
 build() {
   cd "$pkgname-$pkgver"
diff --git a/extra/telepathy-idle/PKGBUILD b/extra/telepathy-idle/PKGBUILD
index 8a726cd20..47ca43df5 100644
--- a/extra/telepathy-idle/PKGBUILD
+++ b/extra/telepathy-idle/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 186515 2013-05-28 09:58:49Z ioni $
+# $Id: PKGBUILD 198703 2013-11-02 08:15:39Z ioni $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 # Contributor: Bjorn Lindeijer <bjorn lindeijer nl>
 # Contributor: Samuel Mendes <heka.lok@gmail.com>
 
 pkgname=telepathy-idle
-pkgver=0.1.16
+pkgver=0.2.0
 pkgrel=1
 pkgdesc="An IRC connection manager for Telepathy"
 arch=('i686' 'x86_64' 'mips64el')
@@ -15,7 +15,7 @@ depends=('telepathy-glib')
 makedepends=('libxslt' 'python2')
 install=telepathy-idle.install
 source=(http://telepathy.freedesktop.org/releases/$pkgname/$pkgname-$pkgver.tar.gz)
-md5sums=('afabda908a798aac3a427f4564af113a')
+md5sums=('92a2de5198284cbd3c430b0d1a971a86')
 
 build() {
     cd $pkgname-$pkgver
diff --git a/extra/telepathy-kde-accounts-kcm/PKGBUILD b/extra/telepathy-kde-accounts-kcm/PKGBUILD
index f04c3c4cd..7d6b77f3d 100644
--- a/extra/telepathy-kde-accounts-kcm/PKGBUILD
+++ b/extra/telepathy-kde-accounts-kcm/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 192364 2013-08-10 10:59:23Z andrea $
+# $Id: PKGBUILD 197604 2013-10-27 14:19:14Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Laurent Carlier <lordheavym@gmail.com>
 
 pkgname=telepathy-kde-accounts-kcm
 _pkgname=ktp-accounts-kcm
-pkgver=0.6.3
+pkgver=0.7.0
 pkgrel=1
 pkgdesc="KCM Module for configuring Telepathy Instant Messaging Accounts"
 arch=('i686' 'x86_64' 'mips64el')
@@ -17,11 +17,14 @@ optdepends=('telepathy-gabble: XMPP/Jabber/GTalk support'
 groups=('kde-telepathy')
 conflicts=('telepathy-kde-accounts-kcm-plugins')
 replaces=('telepathy-kde-accounts-kcm-plugins')
-source=("http://download.kde.org/stable/kde-telepathy/${pkgver}/src/${_pkgname}-${pkgver}.tar.bz2")
-sha1sums=('9646cfe13c4cf155acd97d6ea66ea9bf3c8a73d7')
+source=("http://download.kde.org/stable/kde-telepathy/${pkgver}/${_pkgname}-${pkgver}.tar.bz2")
+sha1sums=('8791acef43bb125259d218f2385ddf50a1ec857c')
 
-build() {
+prepare() {
   mkdir build
+}
+
+build() {
   cd build
   cmake ../${_pkgname}-${pkgver} \
     -DCMAKE_INSTALL_PREFIX=/usr \
diff --git a/extra/telepathy-kde-approver/PKGBUILD b/extra/telepathy-kde-approver/PKGBUILD
index 2172fa537..aa1b49953 100644
--- a/extra/telepathy-kde-approver/PKGBUILD
+++ b/extra/telepathy-kde-approver/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 192366 2013-08-10 10:59:48Z andrea $
+# $Id: PKGBUILD 197606 2013-10-27 14:19:28Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Laurent Carlier <lordheavym@gmail.com>
 
 pkgname=telepathy-kde-approver
 _pkgname=ktp-approver
-pkgver=0.6.3
+pkgver=0.7.0
 pkgrel=1
 pkgdesc="KDE Channel Approver for Telepathy"
 arch=('i686' 'x86_64' 'mips64el')
@@ -13,11 +13,14 @@ license=('GPL')
 depends=('telepathy-kde-common-internals' 'telepathy-kde-contact-list')
 makedepends=('cmake' 'automoc4')
 groups=('kde-telepathy')
-source=("http://download.kde.org/stable/kde-telepathy/${pkgver}/src/${_pkgname}-${pkgver}.tar.bz2")
-sha1sums=('a29415946b45160aa0469e8aa7e4b6c20209569c')
+source=("http://download.kde.org/stable/kde-telepathy/${pkgver}/${_pkgname}-${pkgver}.tar.bz2")
+sha1sums=('f250514208481a328732d73e1d3807e72f375d27')
 
-build() {
+prepare() {
   mkdir build
+}
+
+build() {
   cd build
   cmake ../${_pkgname}-${pkgver} \
     -DCMAKE_INSTALL_PREFIX=/usr \
diff --git a/extra/telepathy-kde-auth-handler/PKGBUILD b/extra/telepathy-kde-auth-handler/PKGBUILD
index 163b5dc50..16362720e 100644
--- a/extra/telepathy-kde-auth-handler/PKGBUILD
+++ b/extra/telepathy-kde-auth-handler/PKGBUILD
@@ -1,22 +1,25 @@
-# $Id: PKGBUILD 193542 2013-08-22 21:22:10Z andrea $
+# $Id: PKGBUILD 197623 2013-10-27 14:21:06Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=telepathy-kde-auth-handler
 _pkgname=ktp-auth-handler
-pkgver=0.6.3
-pkgrel=2
+pkgver=0.7.0
+pkgrel=1
 pkgdesc="Provide UI/KWallet Integration For Passwords and SSL Errors on Account Connect"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://community.kde.org/Real-Time_Communication_and_Collaboration"
 license=('GPL')
-depends=('telepathy-kde-common-internals' 'qjson' 'qca-ossl')
+depends=('telepathy-kde-common-internals' 'qjson' 'qca-ossl' 'libaccounts-qt' 'signon')
 makedepends=('cmake' 'automoc4')
 groups=('kde-telepathy')
-source=("http://download.kde.org/stable/kde-telepathy/${pkgver}/src/${_pkgname}-${pkgver}.tar.bz2")
-sha1sums=('027697f01a41e70d10cebb78b15e7bc783617be3')
+source=("http://download.kde.org/stable/kde-telepathy/${pkgver}/${_pkgname}-${pkgver}.tar.bz2")
+sha1sums=('0abeef4bc6905f0b975505f9a215bfbafa4b02a3')
 
-build() {
+prepare() {
   mkdir build
+}
+
+build() {
   cd build
   cmake ../${_pkgname}-${pkgver} \
     -DCMAKE_INSTALL_PREFIX=/usr \
diff --git a/extra/telepathy-kde-common-internals/PKGBUILD b/extra/telepathy-kde-common-internals/PKGBUILD
index 32a2b36bc..1258d21f3 100644
--- a/extra/telepathy-kde-common-internals/PKGBUILD
+++ b/extra/telepathy-kde-common-internals/PKGBUILD
@@ -1,19 +1,19 @@
-# $Id: PKGBUILD 192370 2013-08-10 11:00:20Z andrea $
+# $Id: PKGBUILD 197602 2013-10-27 14:18:27Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=telepathy-kde-common-internals
 _pkgname=ktp-common-internals
-pkgver=0.6.3
+pkgver=0.7.0
 pkgrel=1
 pkgdesc="Common components for KDE-Telepathy"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://community.kde.org/Real-Time_Communication_and_Collaboration"
 license=('GPL')
-depends=('kdelibs' 'telepathy-logger-qt' 'telepathy-mission-control')
+depends=('libkpeople' 'telepathy-logger-qt' 'telepathy-mission-control')
 makedepends=('cmake' 'automoc4' 'boost' 'doxygen')
 install=${pkgname}.install
-source=("http://download.kde.org/stable/kde-telepathy/${pkgver}/src/${_pkgname}-${pkgver}.tar.bz2")
-sha1sums=('d4934f760b62da5859d81fc1d264315f4d5473e8')
+source=("http://download.kde.org/stable/kde-telepathy/${pkgver}/${_pkgname}-${pkgver}.tar.bz2")
+sha1sums=('9610eb4b606166200aacbb8d311b63c30724403e')
 
 prepare() {
   mkdir build
diff --git a/extra/telepathy-kde-contact-list/PKGBUILD b/extra/telepathy-kde-contact-list/PKGBUILD
index 20c8d634d..60d53dd55 100644
--- a/extra/telepathy-kde-contact-list/PKGBUILD
+++ b/extra/telepathy-kde-contact-list/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 192372 2013-08-10 11:00:34Z andrea $
+# $Id: PKGBUILD 197610 2013-10-27 14:19:52Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Laurent Carlier <lordheavym@gmail.com>
 
 pkgname=telepathy-kde-contact-list
 _pkgname=ktp-contact-list
-pkgver=0.6.3
+pkgver=0.7.0
 pkgrel=1
 pkgdesc="Telepathy contact list application"
 arch=('i686' 'x86_64' 'mips64el')
@@ -14,11 +14,14 @@ depends=('telepathy-kde-common-internals' 'kdebase-runtime')
 makedepends=('cmake' 'automoc4' 'boost')
 groups=('kde-telepathy')
 install=${pkgname}.install
-source=("http://download.kde.org/stable/kde-telepathy/${pkgver}/src/${_pkgname}-${pkgver}.tar.bz2")
-sha1sums=('f26eb5d1cf546b87921447d455b4b47ac8772673')
+source=("http://download.kde.org/stable/kde-telepathy/${pkgver}/${_pkgname}-${pkgver}.tar.bz2")
+sha1sums=('493a7c0f5d3e46c1c2011130670f907a295fc4a4')
 
-build() {
+prepare() {
   mkdir build
+}
+
+build() {
   cd build
   cmake ../${_pkgname}-${pkgver} \
     -DCMAKE_INSTALL_PREFIX=/usr \
diff --git a/extra/telepathy-kde-contact-runner/PKGBUILD b/extra/telepathy-kde-contact-runner/PKGBUILD
index bb11e5843..ed999f9a5 100644
--- a/extra/telepathy-kde-contact-runner/PKGBUILD
+++ b/extra/telepathy-kde-contact-runner/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 192374 2013-08-10 11:00:51Z andrea $
+# $Id: PKGBUILD 197612 2013-10-27 14:20:03Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=telepathy-kde-contact-runner
 _pkgname=ktp-contact-runner
-pkgver=0.6.3
+pkgver=0.7.0
 pkgrel=1
 pkgdesc="KRunner plugin for KDE Telepathy"
 arch=('i686' 'x86_64' 'mips64el')
@@ -12,11 +12,14 @@ license=('GPL')
 depends=('telepathy-kde-common-internals')
 makedepends=('cmake' 'automoc4')
 groups=('kde-telepathy')
-source=("http://download.kde.org/stable/kde-telepathy/${pkgver}/src/${_pkgname}-${pkgver}.tar.bz2")
-sha1sums=('1fa8321597c54ad75db23e57ded46818c1f923cd')
+source=("http://download.kde.org/stable/kde-telepathy/${pkgver}/${_pkgname}-${pkgver}.tar.bz2")
+sha1sums=('cbba565c8fbb56857824ff8c18a14bf8094fc4e9')
 
-build() {
+prepare() {
   mkdir build
+}
+
+build() {
   cd build
   cmake ../${_pkgname}-${pkgver} \
     -DCMAKE_INSTALL_PREFIX=/usr \
diff --git a/extra/telepathy-kde-desktop-applets/PKGBUILD b/extra/telepathy-kde-desktop-applets/PKGBUILD
index 8d510f6b6..50b216a0c 100644
--- a/extra/telepathy-kde-desktop-applets/PKGBUILD
+++ b/extra/telepathy-kde-desktop-applets/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 192376 2013-08-10 11:01:07Z andrea $
+# $Id: PKGBUILD 197614 2013-10-27 14:20:13Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=telepathy-kde-desktop-applets
 _pkgname=ktp-desktop-applets
-pkgver=0.6.3
+pkgver=0.7.0
 pkgrel=1
 pkgdesc="The KDE-Telepathy Plasma desktop applets"
 arch=('i686' 'x86_64' 'mips64el')
@@ -14,11 +14,14 @@ makedepends=('cmake' 'automoc4')
 groups=('kde-telepathy')
 conflicts=('telepathy-kde-contact-applet' 'telepathy-kde-presence-applet')
 replaces=('telepathy-kde-contact-applet' 'telepathy-kde-presence-applet')
-source=("http://download.kde.org/stable/kde-telepathy/${pkgver}/src/${_pkgname}-${pkgver}.tar.bz2")
-sha1sums=('c6482ecd6fc009b6c0da3d428506e21a65561eb8')
+source=("http://download.kde.org/stable/kde-telepathy/${pkgver}/${_pkgname}-${pkgver}.tar.bz2")
+sha1sums=('0e968a850bd579ce0557773daf5b4fb33e9ff711')
 
-build() {
+prepare() {
   mkdir build
+}
+
+build() {
   cd build
   cmake ../${_pkgname}-${pkgver} \
     -DCMAKE_INSTALL_PREFIX=/usr \
diff --git a/extra/telepathy-kde-filetransfer-handler/PKGBUILD b/extra/telepathy-kde-filetransfer-handler/PKGBUILD
index 636aa5ac1..346aa35e1 100644
--- a/extra/telepathy-kde-filetransfer-handler/PKGBUILD
+++ b/extra/telepathy-kde-filetransfer-handler/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 192378 2013-08-10 11:01:25Z andrea $
+# $Id: PKGBUILD 197616 2013-10-27 14:20:23Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=telepathy-kde-filetransfer-handler
 _pkgname=ktp-filetransfer-handler
-pkgver=0.6.3
+pkgver=0.7.0
 pkgrel=1
 pkgdesc="Telepathy file transfer handler"
 arch=('i686' 'x86_64' 'mips64el')
@@ -12,11 +12,14 @@ license=('GPL')
 depends=('telepathy-kde-common-internals')
 makedepends=('cmake' 'automoc4')
 groups=('kde-telepathy')
-source=("http://download.kde.org/stable/kde-telepathy/${pkgver}/src/${_pkgname}-${pkgver}.tar.bz2")
-sha1sums=('f9acb53cadc4d63acedcb5017f6c4a5f95a1c2b5')
+source=("http://download.kde.org/stable/kde-telepathy/${pkgver}/${_pkgname}-${pkgver}.tar.bz2")
+sha1sums=('5586256d77b2675aa3c1bb036fb3832a7993e415')
 
-build() {
+prepare() {
   mkdir build
+}
+
+build() {
   cd build
   cmake ../${_pkgname}-${pkgver} \
     -DCMAKE_INSTALL_PREFIX=/usr \
diff --git a/extra/telepathy-kde-integration-module/PKGBUILD b/extra/telepathy-kde-integration-module/PKGBUILD
index c1ae0356a..bb212eb14 100644
--- a/extra/telepathy-kde-integration-module/PKGBUILD
+++ b/extra/telepathy-kde-integration-module/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 192380 2013-08-10 11:01:40Z andrea $
+# $Id: PKGBUILD 197618 2013-10-27 14:20:33Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=telepathy-kde-integration-module
 _pkgname=ktp-kded-integration-module
-pkgver=0.6.3
+pkgver=0.7.0
 pkgrel=1
 pkgdesc="Sits in KDED and takes care of various bits of system integration like setting user to auto-away or handling connection errors"
 arch=('i686' 'x86_64' 'mips64el')
@@ -12,11 +12,14 @@ license=('GPL')
 depends=('telepathy-kde-common-internals')
 makedepends=('cmake' 'automoc4')
 groups=('kde-telepathy')
-source=("http://download.kde.org/stable/kde-telepathy/${pkgver}/src/${_pkgname}-${pkgver}.tar.bz2")
-sha1sums=('e8faf0e651053718077865f388fe209f2c06f537')
+source=("http://download.kde.org/stable/kde-telepathy/${pkgver}/${_pkgname}-${pkgver}.tar.bz2")
+sha1sums=('0ce145e4a9354e40d19806febf5d8ad8097b13de')
 
-build() {
+prepare() {
   mkdir build
+}
+
+build() {
   cd build
   cmake ../${_pkgname}-${pkgver} \
     -DCMAKE_INSTALL_PREFIX=/usr \
diff --git a/extra/telepathy-kde-send-file/PKGBUILD b/extra/telepathy-kde-send-file/PKGBUILD
index e4d3c8a8b..423d5b2bd 100644
--- a/extra/telepathy-kde-send-file/PKGBUILD
+++ b/extra/telepathy-kde-send-file/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 192382 2013-08-10 11:01:57Z andrea $
+# $Id: PKGBUILD 197620 2013-10-27 14:20:43Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=telepathy-kde-send-file
 _pkgname=ktp-send-file
-pkgver=0.6.3
+pkgver=0.7.0
 pkgrel=1
 pkgdesc="A File manager plugin to launch a file transfer job with a specified contact"
 arch=('i686' 'x86_64' 'mips64el')
@@ -13,11 +13,14 @@ depends=('telepathy-kde-filetransfer-handler' 'telepathy-kde-contact-list')
 makedepends=('cmake' 'automoc4')
 groups=('kde-telepathy')
 install=${pkgname}.install
-source=("http://download.kde.org/stable/kde-telepathy/${pkgver}/src/${_pkgname}-${pkgver}.tar.bz2")
-sha1sums=('a1fb83c768967483896541f81a78820fb67dff78')
+source=("http://download.kde.org/stable/kde-telepathy/${pkgver}/${_pkgname}-${pkgver}.tar.bz2")
+sha1sums=('16c5fa9437b4952c045957c2344eafec665b7bcb')
 
-build() {
+prepare() {
   mkdir build
+}
+
+build() {
   cd build
   cmake ../${_pkgname}-${pkgver} \
     -DCMAKE_INSTALL_PREFIX=/usr \
diff --git a/extra/telepathy-kde-text-ui/PKGBUILD b/extra/telepathy-kde-text-ui/PKGBUILD
index 1b19ea826..f086be5e9 100644
--- a/extra/telepathy-kde-text-ui/PKGBUILD
+++ b/extra/telepathy-kde-text-ui/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 192384 2013-08-10 11:02:14Z andrea $
+# $Id: PKGBUILD 197622 2013-10-27 14:20:52Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Laurent Carlier <lordheavym@gmail.com>
 
 pkgname=telepathy-kde-text-ui
 _pkgname=ktp-text-ui
-pkgver=0.6.3
+pkgver=0.7.0
 pkgrel=1
 pkgdesc="Telepathy handler for Text Chats"
 arch=('i686' 'x86_64' 'mips64el')
@@ -13,11 +13,14 @@ license=('GPL')
 depends=('telepathy-kde-contact-list' 'telepathy-logger-qt')
 makedepends=('cmake' 'automoc4' 'boost')
 groups=('kde-telepathy')
-source=("http://download.kde.org/stable/kde-telepathy/${pkgver}/src/${_pkgname}-${pkgver}.tar.bz2")
-sha1sums=('480a634f95e75306efa7694526b8a137b18f9e49')
+source=("http://download.kde.org/stable/kde-telepathy/${pkgver}/${_pkgname}-${pkgver}.tar.bz2")
+sha1sums=('f940e7ae031d5ad897906efad3b8f37e3197bd95')
 
-build() {
+prepare() {
   mkdir build
+}
+
+build() {
   cd build
   cmake ../${_pkgname}-${pkgver} \
     -DCMAKE_INSTALL_PREFIX=/usr \
diff --git a/extra/telepathy-logger/PKGBUILD b/extra/telepathy-logger/PKGBUILD
index 138ef6e97..a44ddb98a 100644
--- a/extra/telepathy-logger/PKGBUILD
+++ b/extra/telepathy-logger/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 179904 2013-03-11 17:10:13Z ioni $
+# $Id: PKGBUILD 198451 2013-10-30 14:57:15Z allan $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 pkgname=telepathy-logger
 pkgver=0.8.0
@@ -9,7 +9,6 @@ url="http://telepathy.freedesktop.org/wiki/Logger"
 license=('LGPL2.1')
 depends=('telepathy-glib' 'sqlite' 'libxml2' 'dconf')
 makedepends=('intltool' 'gnome-doc-utils' 'gobject-introspection')
-options=('!libtool')
 install=telepathy-logger.install
 source=(http://telepathy.freedesktop.org/releases/$pkgname/$pkgname-$pkgver.tar.bz2)
 md5sums=('e513eaa767344821073a0b7bb8b45217')
diff --git a/extra/telepathy-mission-control/PKGBUILD b/extra/telepathy-mission-control/PKGBUILD
index 90e855186..73c4e93c8 100644
--- a/extra/telepathy-mission-control/PKGBUILD
+++ b/extra/telepathy-mission-control/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 191309 2013-07-23 13:29:40Z jgc $
+# $Id: PKGBUILD 198697 2013-11-02 08:05:33Z ioni $
 # Maintainer:  Ionut Biru <ibiru@archlinux.org>
 # Contributor: Ju Liu <liuju86 at gmail dot com>
 # Contributor: Bjorn Lindeijer <bjorn lindeijer nl>
 # Contributor: Andreas Zwinkau <beza1e1@web.de>
 
 pkgname=telepathy-mission-control
-pkgver=5.14.1
+pkgver=5.16.0
 pkgrel=1
 pkgdesc="A Telepathy component providing abstraction of some of the details of connection managers."
 arch=('i686' 'x86_64' 'mips64el')
@@ -14,9 +14,8 @@ license=('LGPL2.1')
 depends=('telepathy-glib' 'libgnome-keyring' 'dconf' 'upower' 'networkmanager')
 makedepends=('libxslt' 'python2')
 install=telepathy-mission-control.install
-options=('!libtool')
 source=(http://telepathy.freedesktop.org/releases/$pkgname/$pkgname-$pkgver.tar.gz)
-md5sums=('e06fb0399ec435e59c74d79a2ace8a2d')
+md5sums=('736ae9d71028d8e6d95017433c07fa06')
 
 build() {
     cd "$pkgname-$pkgver"
diff --git a/extra/telepathy-qt/PKGBUILD b/extra/telepathy-qt/PKGBUILD
index cefff521c..671efdab3 100644
--- a/extra/telepathy-qt/PKGBUILD
+++ b/extra/telepathy-qt/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 179901 2013-03-11 14:05:45Z andrea $
+# $Id: PKGBUILD 198453 2013-10-30 14:57:56Z allan $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
@@ -9,7 +9,6 @@ pkgdesc="A library for Qt-based Telepathy clients"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://telepathy.freedesktop.org/wiki/"
 license=('LGPL')
-options=('!libtool')
 depends=('qt4' 'telepathy-farstream' 'gstreamer0.10-base')
 makedepends=('libxslt' 'python2' 'cmake' 'doxygen')
 conflicts=('telepathy-qt4')
diff --git a/extra/telepathy-rakia/0001-Check-for-gio-to-avoid-linking-issue.patch b/extra/telepathy-rakia/0001-Check-for-gio-to-avoid-linking-issue.patch
deleted file mode 100644
index 7f3b033bd..000000000
--- a/extra/telepathy-rakia/0001-Check-for-gio-to-avoid-linking-issue.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 797d2b3792a0d4c4260075c2b05a1aba63715363 Mon Sep 17 00:00:00 2001
-From: Ionut Biru <ibiru@archlinux.org>
-Date: Wed, 9 May 2012 17:34:10 +0000
-Subject: [PATCH] Check for gio to avoid linking issue
-
-/usr/bin/ld: note: 'g_inet_address_new_from_string' is defined in DSO
-/usr/lib/libgio-2.0.so.0 so try adding it to the linker command line
-
-Signed-off-by: Ionut Biru <ibiru@archlinux.org>
----
- configure.ac |    2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/configure.ac b/configure.ac
-index 2a6cb2a..461d464 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -62,7 +62,7 @@ dnl GTK docs
- GTK_DOC_CHECK
- 
- dnl Check for Glib 
--PKG_CHECK_MODULES(GLIB, gobject-2.0 >= 2.30, have_glib=yes, have_glib=no)
-+PKG_CHECK_MODULES(GLIB, [gobject-2.0 >= 2.30, gio-2.0 >= 2.30], have_glib=yes, have_glib=no)
- 
- if test x$have_glib = xno ; then
-     AC_MSG_ERROR([GLib development libraries not found])
--- 
-1.7.10.1
-
diff --git a/extra/telepathy-rakia/PKGBUILD b/extra/telepathy-rakia/PKGBUILD
index 12338fa1f..35f14853e 100644
--- a/extra/telepathy-rakia/PKGBUILD
+++ b/extra/telepathy-rakia/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 158778 2012-05-09 17:40:49Z ibiru $
+# $Id: PKGBUILD 198701 2013-11-02 08:12:22Z ioni $
 # Maintainer : Ionut Biru <ibiru@archlinux.org>
 
 pkgname=telepathy-rakia
-pkgver=0.7.4
+pkgver=0.8.0
 pkgrel=1
 pkgdesc="SIP connection manager for Telepathy"
 arch=('i686' 'x86_64' 'mips64el')
@@ -13,15 +13,11 @@ makedepends=('libxslt' 'python2')
 install=telepathy-rakia.install
 groups=('telepathy')
 replaces=('telepathy-sofiasip')
-source=(http://telepathy.freedesktop.org/releases/$pkgname/$pkgname-$pkgver.tar.gz
-        0001-Check-for-gio-to-avoid-linking-issue.patch)
-md5sums=('f9f47f18db033afe29fd6963c7748e37'
-         '6d0372c4c8a22bf9682e4b45ee614d5c')
+source=(http://telepathy.freedesktop.org/releases/$pkgname/$pkgname-$pkgver.tar.gz)
+md5sums=('09038d4625fcf81e9d3228ebf18bc378')
 
 build() {
   cd "$pkgname-$pkgver"
-  patch -Np1 -i $srcdir/0001-Check-for-gio-to-avoid-linking-issue.patch
-  autoreconf -fi
   ./configure --prefix=/usr --libexecdir=/usr/lib/telepathy
   make
 }
diff --git a/extra/telepathy-salut/PKGBUILD b/extra/telepathy-salut/PKGBUILD
index bf536dc01..d52a2e1d3 100644
--- a/extra/telepathy-salut/PKGBUILD
+++ b/extra/telepathy-salut/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 171114 2012-11-16 17:14:40Z ibiru $
+# $Id: PKGBUILD 198454 2013-10-30 14:58:17Z allan $
 # Maintainer:  Ionut Biru <ibiru@archlinux.org>
 # Contributor: Daniel Balieiro <daniel@balieiro.com>
 
@@ -13,7 +13,6 @@ license=('LGPL')
 depends=('telepathy-glib' 'avahi' 'libsoup' 'sqlite3' 'util-linux')
 makedepends=('libxslt' 'python2' 'xmldiff')
 install=telepathy-salut.install
-options=(!libtool)
 source=(http://telepathy.freedesktop.org/releases/$pkgname/$pkgname-$pkgver.tar.gz)
 md5sums=('7516e6f6fa56a61054413a03642b938d')
 
diff --git a/extra/thinkfinger/PKGBUILD b/extra/thinkfinger/PKGBUILD
index 20de4c0ba..5e82da674 100644
--- a/extra/thinkfinger/PKGBUILD
+++ b/extra/thinkfinger/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 185609 2013-05-15 22:56:59Z tomegun $
+# $Id: PKGBUILD 198456 2013-10-30 14:59:04Z allan $
 # Maintainer: Tom Gundersen <teg@jklm.no>
 # Contributor: François Charette <francois.archlinux.org>
 # Contributor: Damir Perisa <damir.archlinux.org>
@@ -12,7 +12,7 @@ url="http://thinkfinger.sourceforge.net/"
 arch=('i686' 'x86_64' 'mips64el')
 license=("GPL")
 depends=('pam' 'libusb-compat')
-options=('!libtool' 'emptydirs')
+options=('emptydirs')
 source=("http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz"
         'thinkfinger-uinput-hack.patch'
         'gcc46.patch')
diff --git a/extra/thunar-archive-plugin/PKGBUILD b/extra/thunar-archive-plugin/PKGBUILD
index a882d8ec4..d2b7defc2 100644
--- a/extra/thunar-archive-plugin/PKGBUILD
+++ b/extra/thunar-archive-plugin/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 195948 2013-10-06 07:06:40Z foutrelis $
+# $Id: PKGBUILD 198458 2013-10-30 14:59:45Z allan $
 # Maintainer: Evangelos Foutras <evangelos@foutrelis.com>
 # Contributor: Tobias Kieslich <tobias (at) archlinux.org>
 
@@ -14,7 +14,6 @@ depends=('thunar' 'hicolor-icon-theme')
 makedepends=('intltool')
 optdepends=('file-roller'
             'kdeutils-ark')
-options=('!libtool')
 install=$pkgname.install
 source=(http://archive.xfce.org/src/thunar-plugins/$pkgname/0.3/$pkgname-$pkgver.tar.bz2)
 sha256sums=('9ad559b0c11308f6897ad56604e5a06dc8f369f649eb20120b2d3018ef5da54c')
diff --git a/extra/thunar-media-tags-plugin/PKGBUILD b/extra/thunar-media-tags-plugin/PKGBUILD
index b5637d05e..70a890bab 100644
--- a/extra/thunar-media-tags-plugin/PKGBUILD
+++ b/extra/thunar-media-tags-plugin/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 185139 2013-05-11 13:34:39Z foutrelis $
+# $Id: PKGBUILD 198459 2013-10-30 15:00:06Z allan $
 # Maintainer:
 # Contributor: Andrew Simmons <andrew.simmons@gmail.com>
 
@@ -12,7 +12,6 @@ url="http://goodies.xfce.org/projects/thunar-plugins/thunar-media-tags-plugin"
 groups=('xfce4-goodies')
 depends=('taglib' 'thunar')
 makedepends=('intltool')
-options=('!libtool')
 source=(http://archive.xfce.org/src/thunar-plugins/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2)
 sha256sums=('056d012a10403ee3e2e55b6ff2faecb796821de9ebee000315589b95d95ed253')
 
diff --git a/extra/thunar-volman/PKGBUILD b/extra/thunar-volman/PKGBUILD
index dbb193461..e775d244d 100644
--- a/extra/thunar-volman/PKGBUILD
+++ b/extra/thunar-volman/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 157833 2012-04-30 04:19:55Z foutrelis $
+# $Id: PKGBUILD 198460 2013-10-30 15:00:29Z allan $
 # Maintainer: Evangelos Foutras <evangelos@foutrelis.com>
 # Contributor: Tobias Kieslich <tobias (at) archlinux.org>
 
@@ -12,7 +12,6 @@ license=('GPL2')
 groups=('xfce4')
 depends=('thunar' 'libxfce4ui' 'hicolor-icon-theme')
 makedepends=('intltool')
-options=('!libtool')
 install=$pkgname.install
 source=(http://archive.xfce.org/src/apps/$pkgname/0.8/$pkgname-$pkgver.tar.bz2)
 sha256sums=('ff0887c862b578580d05f4cd7db66081382ff143f9cc7ea3c9ba58cf5d02bceb')
diff --git a/extra/thunar/PKGBUILD b/extra/thunar/PKGBUILD
index 0a67af680..ad4c50162 100644
--- a/extra/thunar/PKGBUILD
+++ b/extra/thunar/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 184280 2013-05-05 17:42:44Z foutrelis $
+# $Id: PKGBUILD 198457 2013-10-30 14:59:25Z allan $
 # Maintainer: Evangelos Foutras <evangelos@foutrelis.com>
 # Contributor: Andrew Simmons <andrew.simmons@gmail.com>
 
@@ -20,7 +20,6 @@ optdepends=('gvfs: for trash support, mounting with udisk and remote filesystems
             'thunar-volman: manages removable devices'
             'thunar-archive-plugin: create and deflate archives'
             'thunar-media-tags-plugin: view/edit id3/ogg tags')
-options=('!libtool')
 install=$pkgname.install
 source=(http://archive.xfce.org/src/xfce/$pkgname/1.6/Thunar-$pkgver.tar.bz2)
 sha256sums=('9a2706f6881ac29cda9f0b0325d179153bc09e37bcbafcab9823c1c1ec89579d')
diff --git a/extra/tidyhtml/PKGBUILD b/extra/tidyhtml/PKGBUILD
index 9b001147b..22b02a1e0 100644
--- a/extra/tidyhtml/PKGBUILD
+++ b/extra/tidyhtml/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 146404 2012-01-10 21:14:26Z andrea $
+# $Id: PKGBUILD 197005 2013-10-21 12:38:07Z andrea $
 # Maintainer:
 # Contributor: eric <eric@archlinux.org>
 # Contributor: Markus Meissner <markus@meissna.de>
@@ -6,13 +6,12 @@
 pkgname=tidyhtml
 # obtain pkgver from http://tidy.cvs.sourceforge.net/tidy/tidy/src/version.h?view=markup
 pkgver=1.46
-pkgrel=2.1
+pkgrel=3
 pkgdesc="A tool to tidy down your HTML code to a clean style"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://tidy.sourceforge.net/"
 license=('custom')
 depends=('glibc')
-options=('!libtool')
 source=("ftp://ftp.archlinux.org/other/${pkgname}/${pkgname}-${pkgver}.tar.bz2")
 md5sums=('3d970d54be83c5ec985687e9976a2832')
 
@@ -26,17 +25,17 @@ mksource() {
 }
 
 build(){
-  cd $srcdir/${pkgname}-${pkgver}/tidy
+  cd ${pkgname}-${pkgver}/tidy
   source build/gnuauto/setup.sh
-  
+
   ./configure --prefix=/usr
   make
 }
 
 package() {
-  cd $srcdir/${pkgname}-${pkgver}/tidy
+  cd ${pkgname}-${pkgver}/tidy
   make DESTDIR=$pkgdir install
-  
+
   install -Dm644 htmldoc/license.html \
-    ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
+    "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE
 }
diff --git a/extra/tk/PKGBUILD b/extra/tk/PKGBUILD
index 1d2ceed17..bd5f87744 100644
--- a/extra/tk/PKGBUILD
+++ b/extra/tk/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 194661 2013-09-20 16:55:22Z eric $
+# $Id: PKGBUILD 197364 2013-10-25 02:55:42Z allan $
 # Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgname=tk
@@ -9,6 +9,7 @@ arch=('i686' 'x86_64' 'mips64el')
 url="http://tcl.sourceforge.net/"
 license=('custom')
 depends=("tcl=${pkgver}" 'libxss' 'libxft')
+options=('staticlibs')
 source=(http://downloads.sourceforge.net/sourceforge/tcl/tk${pkgver}-src.tar.gz)
 sha1sums=('ecfcc20833c04d6890b14a7920a04d16f2123a51')
 
diff --git a/extra/tomboy/PKGBUILD b/extra/tomboy/PKGBUILD
index 05b159ff6..ad4f987eb 100644
--- a/extra/tomboy/PKGBUILD
+++ b/extra/tomboy/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 185355 2013-05-13 17:25:26Z heftig $
+# $Id: PKGBUILD 198461 2013-10-30 15:00:57Z allan $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=tomboy
@@ -10,7 +10,7 @@ license=('GPL')
 url="http://www.gnome.org/projects/tomboy/"
 depends=('gtk2' 'gtkspell' 'gconf' 'gconf-sharp' 'dbus-sharp' 'dbus-sharp-glib' 'mono-addins' 'hicolor-icon-theme')
 makedepends=('intltool' 'pkgconfig'  'gnome-doc-utils')
-options=('!libtool' '!emptydirs' '!makeflags')
+options=('!emptydirs' '!makeflags')
 install=tomboy.install
 source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver:0:4}/$pkgname-$pkgver.tar.xz)
 sha256sums=('f9e81fd9c9a9180e8ddcb4b9237ead0c842aa5b5ac21af87e97939e5015af018')
diff --git a/extra/tomcat-native/PKGBUILD b/extra/tomcat-native/PKGBUILD
index 22e7cd0bc..ae227ef59 100644
--- a/extra/tomcat-native/PKGBUILD
+++ b/extra/tomcat-native/PKGBUILD
@@ -2,7 +2,7 @@
 # Contributor: Vitaliy Berdinskikh ur6lad[at]i.ua
 
 pkgname=tomcat-native
-pkgver=1.1.27
+pkgver=1.1.29
 pkgrel=1
 pkgdesc='The Apache Tomcat Native Library'
 arch=('i686' 'x86_64')
@@ -10,9 +10,9 @@ url='http://tomcat.apache.org/'
 license=('APACHE')
 depends=('apr' 'openssl')
 makedepends=('java-environment')
-options=(!emptydirs)
+options=('!emptydirs')
 source=(http://www.apache.org/dist/tomcat/tomcat-connectors/native/${pkgver}/source/${pkgname}-${pkgver}-src.tar.gz)
-sha256sums=('7f78e71060dc029f9005490080babc45a2b702ea54263c440c52a9a7c02609e4')
+sha256sums=('25fc6f3d65aeb3ac93142a4b536587b1231ac925eaf32a40f55c92a0991cf232')
 
 build() {
   cd "${srcdir}/tomcat-native-${pkgver}-src/jni/native"
diff --git a/extra/totem-plparser/PKGBUILD b/extra/totem-plparser/PKGBUILD
index b44bc6bf2..7dea33a64 100644
--- a/extra/totem-plparser/PKGBUILD
+++ b/extra/totem-plparser/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 196141 2013-10-07 11:53:36Z jgc $
+# $Id: PKGBUILD 198463 2013-10-30 15:01:39Z allan $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Contributor: Jan de Groot <jgc@archlinux.org>
 
@@ -12,7 +12,6 @@ arch=(i686 x86_64 'mips64el')
 depends=('gmime' 'libsoup' 'libarchive')
 makedepends=('intltool' 'gobject-introspection' 'libquvi')
 optdepends=('libquvi: video site handling (Youtube etc.)')
-options=('!libtool')
 source=(http://ftp.gnome.org/pub/gnome/sources/totem-pl-parser/${pkgver%.*}/totem-pl-parser-$pkgver.tar.xz)
 sha256sums=('87eac3fdf2b632dfac0edda07906a3e84f1ce4442b8127394414020dafe41aa9')
 
diff --git a/extra/totem/PKGBUILD b/extra/totem/PKGBUILD
index 5b63d4ad2..284578699 100644
--- a/extra/totem/PKGBUILD
+++ b/extra/totem/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 196140 2013-10-07 11:53:34Z jgc $
+# $Id: PKGBUILD 198462 2013-10-30 15:01:19Z allan $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Contributor: Jan de Groot <jgc@archlinux.org>
 
@@ -16,7 +16,7 @@ depends=(gst-plugins-base gst-plugins-good totem-plparser desktop-file-utils iso
 makedepends=(intltool libnautilus-extension lirc-utils vala grilo dbus-glib zeitgeist
              itstool docbook-xsl python-pylint)
 [ "$CARCH" != "mips64el" ] && makedepends+=('lirc-utils')
-options=('!libtool' '!emptydirs')
+options=('!emptydirs')
 source=(http://ftp.gnome.org/pub/gnome/sources/$pkgbase/${pkgver%.*}/$pkgbase-$pkgver.tar.xz
         browser-plugins.ini bugreport.patch)
 sha256sums=('b6b6038c9104965671a6d25e98496a487c3a9c590c9c104f668bd9f4fa7be9e2'
diff --git a/extra/tracker/PKGBUILD b/extra/tracker/PKGBUILD
index 02ed8e51b..7cc1868a5 100644
--- a/extra/tracker/PKGBUILD
+++ b/extra/tracker/PKGBUILD
@@ -1,13 +1,13 @@
-# $Id: PKGBUILD 196142 2013-10-07 11:53:37Z jgc $
+# $Id: PKGBUILD 198661 2013-11-01 15:51:58Z heftig $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Alexander Fehr <pizzapunk gmail com>
 
 pkgbase=tracker
 pkgname=(tracker libtracker-sparql)
-pkgver=0.16.2
+pkgver=0.16.3
 _tver=${pkgver%.*}
-pkgrel=2
+pkgrel=1
 pkgdesc="All-in-one indexer, search tool and metadata database"
 arch=(i686 x86_64 mips64el)
 license=(GPL)
@@ -17,9 +17,9 @@ makedepends=(libgee libsecret upower libexif exempi
              intltool giflib gst-plugins-base-libs totem-plparser
              taglib libvorbis flac vala libgxps libnautilus-extension)
 url="http://www.gnome.org"
-options=('!libtool' '!emptydirs')
+options=('!emptydirs')
 source=(http://ftp.gnome.org/pub/gnome/sources/$pkgbase/$_tver/$pkgbase-$pkgver.tar.xz)
-sha256sums=('033394636835628e01eb90efb55883fd88ec581910915b5948081f8f41df7409')
+sha256sums=('c5299cbfb2b33f62f06afeb2ebca5b7095b77438fc6c8db6a24dc2ef649537ba')
 
 build() {
   cd $pkgbase-$pkgver
diff --git a/extra/transcode/PKGBUILD b/extra/transcode/PKGBUILD
index 63f3122f6..20d49318e 100644
--- a/extra/transcode/PKGBUILD
+++ b/extra/transcode/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 194278 2013-09-12 20:45:23Z eric $
+# $Id: PKGBUILD 198465 2013-10-30 15:02:22Z allan $
 # Maintainer:
 # Contributor: Sarah Hay <sarahhay@mb.sympatico.ca>
 # Contributor: roberto <roberto@archlinux.org>
@@ -14,7 +14,6 @@ license=('GPL')
 depends=('gawk' 'imagemagick' 'lzo2' 'libdvdread' 'ffmpeg' 'mjpegtools'
 	 'libmpeg2' 'libxaw' 'libxv' 'a52dec')
 makedepends=('nasm')
-options=('!libtool')
 source=(https://bitbucket.org/france/transcode-tcforge/downloads/${pkgname}-${pkgver}.tar.bz2
 	http://downloads.sourceforge.net/sourceforge/subtitleripper/subtitleripper-${_sripver}.tgz
         subtitleripper-0.3.4-linkingorder.patch
diff --git a/extra/tumbler/PKGBUILD b/extra/tumbler/PKGBUILD
index 2567af35f..af38e2b03 100644
--- a/extra/tumbler/PKGBUILD
+++ b/extra/tumbler/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 184441 2013-05-06 19:39:59Z foutrelis $
+# $Id: PKGBUILD 198466 2013-10-30 15:02:49Z allan $
 # Maintainer: Evangelos Foutras <evangelos@foutrelis.com>
 # Contributor: Andreas Radke <andyrtr@archlinux.org>
 # Contributor: Jan Jezek <honzin.jezek@gmail.com>
@@ -19,7 +19,6 @@ optdepends=('ffmpegthumbnailer: for video thumbnails'
             'libgsf: for ODF thumbnails'
             'libopenraw: for RAW thumbnails'
             'freetype2: for font thumbnails')
-options=('!libtool')
 source=(http://archive.xfce.org/src/apps/$pkgname/0.1/$pkgname-$pkgver.tar.bz2)
 sha256sums=('c3bac4ee609e22be6c7f01a4fdf6086bc6b57940d82f99570a2d9d547a32fc93')
 
diff --git a/extra/ucommon/PKGBUILD b/extra/ucommon/PKGBUILD
index bd938c094..1902c97d9 100644
--- a/extra/ucommon/PKGBUILD
+++ b/extra/ucommon/PKGBUILD
@@ -1,16 +1,15 @@
-# $Id: PKGBUILD 194209 2013-09-10 14:36:48Z bpiotrowski $
+# $Id: PKGBUILD 197457 2013-10-26 07:03:21Z eric $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 
 pkgname=ucommon
 pkgver=6.0.7
-pkgrel=1
+pkgrel=2
 pkgdesc="A light-weight C++ library to facilitate using C++ design patterns"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.gnutelephony.org/index.php/GNU_uCommon_C++"
 license=('GPL3' 'LGPL3')
 depends=('openssl')
-options=('!libtool')
-source=("http://ftp.gnu.org/pub/gnu/commoncpp/$pkgname-$pkgver.tar.gz"{,.sig})
+source=(http://ftp.gnu.org/pub/gnu/commoncpp/$pkgname-$pkgver.tar.gz{,.sig})
 md5sums=('0774a0315beac7b26ec75d44d925f208'
          'SKIP')
 
diff --git a/extra/udisks/PKGBUILD b/extra/udisks/PKGBUILD
index d2ec948de..7b5ddcf2b 100644
--- a/extra/udisks/PKGBUILD
+++ b/extra/udisks/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 186141 2013-05-21 09:11:20Z tpowa $
+# $Id: PKGBUILD 198467 2013-10-30 15:03:09Z allan $
 # Maintainer: Tom Gundersen <teg@jklm.no>
 
 pkgname=udisks
@@ -10,7 +10,6 @@ url="http://www.freedesktop.org/wiki/Software/udisks"
 license=('GPL')
 depends=('systemd' 'util-linux' 'sg3_utils' 'glib2' 'dbus-glib' 'polkit' 'parted' 'device-mapper' 'libatasmart' 'lsof')
 makedepends=('intltool' 'docbook-xsl')
-options=(!libtool)
 source=(http://hal.freedesktop.org/releases/${pkgname}-${pkgver}.tar.gz udisks.service drop-pci-db.patch)
 
 build() {
diff --git a/extra/udisks2/PKGBUILD b/extra/udisks2/PKGBUILD
index e16ad7efb..253a31df4 100644
--- a/extra/udisks2/PKGBUILD
+++ b/extra/udisks2/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 195132 2013-09-25 13:30:53Z jgc $
+# $Id: PKGBUILD 198468 2013-10-30 15:03:29Z allan $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 
 pkgname=udisks2
@@ -14,7 +14,6 @@ optdepends=('parted: partition management'
             'gptfdisk: GUID partition table support'
             'ntfs-3g: NTFS filesystem management support'
             'dosfstools: VFAT filesystem management support')
-options=(!libtool)
 source=(http://udisks.freedesktop.org/releases/udisks-$pkgver.tar.bz2)
 sha256sums=('013b09ff38aa256b89c01525771f4565cb088724d5c8c79b32e9f811e88086fb')
 
diff --git a/extra/uim/PKGBUILD b/extra/uim/PKGBUILD
index cb424a7fb..f111a1b8e 100644
--- a/extra/uim/PKGBUILD
+++ b/extra/uim/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 196248 2013-10-09 16:10:58Z bisson $
+# $Id: PKGBUILD 198469 2013-10-30 15:03:50Z allan $
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
 # Contributor: damir <damir@archlinux.org>
 
@@ -14,7 +14,6 @@ makedepends=('intltool' 'gettext' 'qt4' 'gtk2' 'gtk3')
 optdepends=('qt4: immodule and helper applications'
             'gtk2: immodule and helper applications'
             'gtk3: immodules and helper applications')
-options=('!libtool')
 source=("https://uim.googlecode.com/files/${pkgname}-${pkgver}.tar.gz")
 sha1sums=('409c30b31b9e58e3c18cb7862933487b0585cd1d')
 
diff --git a/extra/unixodbc/PKGBUILD b/extra/unixodbc/PKGBUILD
index 5422531ea..da109776e 100644
--- a/extra/unixodbc/PKGBUILD
+++ b/extra/unixodbc/PKGBUILD
@@ -1,28 +1,32 @@
-# $Id: PKGBUILD 145345 2011-12-21 20:47:39Z andrea $
+# $Id: PKGBUILD 197416 2013-10-25 18:23:06Z andyrtr $
 # Maintainer: AndyRTR <andyrtr@archlinux.org>
 # Contributor: Judd Vinet <jvinet@zeroflux.org>
 # Contributor: Tom Newsom <Jeepster@gmx.co.uk>
 
 pkgname=unixodbc
-pkgver=2.3.1
-pkgrel=1.1
+pkgver=2.3.2
+pkgrel=1
 pkgdesc="ODBC is an open specification for providing application developers with a predictable API with which to access Data Sources"
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL2' 'LGPL2.1')
 url="http://www.unixodbc.org/"
 backup=('etc/odbc.ini' 'etc/odbcinst.ini')
 depends=('readline' 'libltdl')
-options=('!libtool')
 source=("http://www.unixodbc.org/unixODBC-$pkgver.tar.gz")
-md5sums=('86788d4006620fa1f171c13d07fdcaab')
+md5sums=('5e4528851eda5d3d4aed249b669bd05b')
 
 build() {
-    cd ${srcdir}/unixODBC-${pkgver}
+    cd unixODBC-${pkgver}
     ./configure --prefix=/usr --sysconfdir=/etc
     make
 }
 
+check() {
+    cd unixODBC-${pkgver}
+    make -k check
+}
+
 package() {
-    cd ${srcdir}/unixODBC-${pkgver}
+    cd unixODBC-${pkgver}
     make DESTDIR=${pkgdir} install
 }
diff --git a/extra/upower/PKGBUILD b/extra/upower/PKGBUILD
index 5daa68aa3..15586e6ad 100644
--- a/extra/upower/PKGBUILD
+++ b/extra/upower/PKGBUILD
@@ -1,31 +1,33 @@
-# $Id: PKGBUILD 185169 2013-05-11 16:16:34Z tomegun $
+# $Id: PKGBUILD 198471 2013-10-30 15:04:10Z allan $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=upower
-pkgver=0.9.20
+pkgver=0.9.23
 pkgrel=2
 pkgdesc="Abstraction for enumerating power devices, listening to device events and querying history and statistics"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://upower.freedesktop.org"
 license=('GPL')
-depends=('systemd-tools' 'libsystemd' 'libusb' 'polkit' 'pm-utils' 'dbus-glib' 'libimobiledevice')
+depends=('systemd-tools' 'libsystemd' 'libusb' 'polkit' 'dbus-glib' 'libimobiledevice')
 makedepends=('intltool' 'docbook-xsl' 'gobject-introspection' 'systemd')
-options=('!libtool')
-source=($url/releases/$pkgname-$pkgver.tar.xz)
-md5sums=('f175984d142dc8d2353a7da609836b69')
+backup=('etc/UPower/UPower.conf')
+source=($url/releases/$pkgname-$pkgver.tar.xz
+        linux-clamp-percentage-for-overfull-batteries.patch)
+md5sums=('39cfd97bfaf7d30908f20cf937a57634'
+         'cd8eeb40c2338d28df46e22529bece62')
+
+prepare() {
+  cd $pkgname-$pkgver
+  patch -Np1 -i ../linux-clamp-percentage-for-overfull-batteries.patch
+}
 
 build() {
   cd "$pkgname-$pkgver"
 
-  # put udev files in /usr/lib
-  # should be dropped as of 0.9.21!!
-  sed -i "/slashlibdir=/s#/lib#/usr/lib#" configure
-
   ./configure --prefix=/usr --sysconfdir=/etc \
     --localstatedir=/var \
     --libexecdir=/usr/lib/$pkgname \
-    --disable-static \
-    --enable-deprecated
+    --disable-static
   make
 }
 
diff --git a/extra/upower/linux-clamp-percentage-for-overfull-batteries.patch b/extra/upower/linux-clamp-percentage-for-overfull-batteries.patch
new file mode 100644
index 000000000..6e643c42d
--- /dev/null
+++ b/extra/upower/linux-clamp-percentage-for-overfull-batteries.patch
@@ -0,0 +1,72 @@
+From b8fe9902f3c6c50ca6a23e24fcea99582beebc65 Mon Sep 17 00:00:00 2001
+From: Martin Pitt <martinpitt@gnome.org>
+Date: Tue, 22 Oct 2013 08:02:51 +0000
+Subject: linux: Clamp percentage for overfull batteries
+
+Some batteries report energy > energy_full and a percentage ("capacity"
+attribute) > 100%. Clamp these within 0 and 100% for both plausibility as well
+as to avoid setting an out-of-range property which would then become 0%.
+
+https://launchpad.net/bugs/1240673
+---
+diff --git a/src/linux/integration-test b/src/linux/integration-test
+index 8489bf3..4be1922 100755
+--- a/src/linux/integration-test
++++ b/src/linux/integration-test
+@@ -442,6 +442,39 @@ class Tests(unittest.TestCase):
+         self.assertEqual(self.get_dbus_property('OnLowBattery'), False)
+         self.stop_daemon()
+ 
++    def test_battery_overfull(self):
++        '''battery which reports a > 100% percentage for a full battery'''
++
++        self.testbed.add_device('power_supply', 'BAT0', None,
++                                ['type', 'Battery',
++                                 'present', '1',
++                                 'status', 'Full',
++                                 'current_now', '1000',
++                                 'charge_now', '11000000',
++                                 'charge_full', '10000000',
++                                 'charge_full_design', '11000000',
++                                 'capacity', '110',
++                                 'voltage_now', '12000000'], [])
++
++        self.start_daemon()
++        devs = self.proxy.EnumerateDevices()
++        self.assertEqual(len(devs), 1)
++        bat0_up = devs[0]
++
++        # should clamp percentage
++        self.assertEqual(self.get_dbus_dev_property(bat0_up, 'Percentage'), 100.0)
++        self.assertEqual(self.get_dbus_dev_property(bat0_up, 'IsPresent'), True)
++        self.assertEqual(self.get_dbus_dev_property(bat0_up, 'State'),
++                         UP_DEVICE_STATE_FULLY_CHARGED)
++        self.assertEqual(self.get_dbus_dev_property(bat0_up, 'Energy'), 132.0)
++        # should adjust EnergyFull to reality, not what the battery claims
++        self.assertEqual(self.get_dbus_dev_property(bat0_up, 'EnergyFull'), 132.0)
++        self.assertEqual(self.get_dbus_dev_property(bat0_up, 'EnergyFullDesign'), 132.0)
++        self.assertEqual(self.get_dbus_dev_property(bat0_up, 'Voltage'), 12.0)
++        self.assertEqual(self.get_dbus_dev_property(bat0_up, 'PowerSupply'), True)
++        self.assertEqual(self.get_dbus_dev_property(bat0_up, 'Type'), 2)
++        self.stop_daemon()
++
+     def test_battery_temperature(self):
+         '''battery which reports temperature'''
+ 
+diff --git a/src/linux/up-device-supply.c b/src/linux/up-device-supply.c
+index 8020277..b953d65 100644
+--- a/src/linux/up-device-supply.c
++++ b/src/linux/up-device-supply.c
+@@ -708,6 +708,10 @@ up_device_supply_refresh_battery (UpDeviceSupply *supply)
+ 	/* get a precise percentage */
+         if (sysfs_file_exists (native_path, "capacity")) {
+ 		percentage = sysfs_get_double (native_path, "capacity");
++		if (percentage < 0.0f)
++			percentage = 0.0f;
++		if (percentage > 100.0f)
++			percentage = 100.0f;
+                 /* for devices which provide capacity, but not {energy,charge}_now */
+                 if (energy < 0.1f && energy_full > 0.0f)
+                     energy = energy_full * percentage / 100;
+--
+cgit v0.9.0.2-2-gbebe
diff --git a/extra/v4l-utils/PKGBUILD b/extra/v4l-utils/PKGBUILD
index 32eba6ff4..d7a85848c 100644
--- a/extra/v4l-utils/PKGBUILD
+++ b/extra/v4l-utils/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 196345 2013-10-11 18:25:19Z thomas $
+# $Id: PKGBUILD 196834 2013-10-20 12:03:29Z thomas $
 # Maintainer: Thomas Bächler <thomas@archlinux.org>
 pkgname=v4l-utils
 pkgver=1.0.0
-pkgrel=1
+pkgrel=2
 pkgdesc="Userspace tools and conversion library for Video 4 Linux"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://freshmeat.net/projects/libv4l"
@@ -18,7 +18,6 @@ source=(http://linuxtv.org/downloads/v4l-utils/${pkgname}-${pkgver}.tar.bz2
         http://linuxtv.org/downloads/v4l-utils/${pkgname}-${pkgver}.tar.bz2.asc)
 sha256sums=('1de3882099e04e89e354675ee408b82c8ac8afd3ca6ab27ea321771901285f30'
             'SKIP')
-options=(!libtool)
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/vala/PKGBUILD b/extra/vala/PKGBUILD
index 7860d9d6b..f1a689a05 100644
--- a/extra/vala/PKGBUILD
+++ b/extra/vala/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 196143 2013-10-07 11:53:39Z jgc $
+# $Id: PKGBUILD 198473 2013-10-30 15:04:37Z allan $
 # Maintainer : Ionut Biru <ibiru@archlinux.org>
 # Contributor: Timm Preetz <timm@preetz.us>
 
@@ -11,7 +11,6 @@ url="http://live.gnome.org/Vala"
 license=('LGPL')
 depends=('glib2')
 makedepends=('libxslt')
-options=('!libtool')
 source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
 sha256sums=('2f60a7ff887fcb16ed70fa84bb5872c2c54099a0732ce3f9e2c56e51a9208037')
 
diff --git a/extra/valgrind/PKGBUILD b/extra/valgrind/PKGBUILD
index a27f7cabb..6123b6b6f 100644
--- a/extra/valgrind/PKGBUILD
+++ b/extra/valgrind/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 194381 2013-09-15 10:04:52Z allan $
+# $Id: PKGBUILD 196839 2013-10-20 12:23:36Z allan $
 # Maintainer: Dan McGee <dan@archlinux.org>
 # Maintainer: Allan McRae <allan@archlinux.org>
 
@@ -11,7 +11,7 @@ license=('GPL')
 url="http://valgrind.org/"
 depends=('glibc>=2.18' 'glibc<2.19' 'perl')
 makedepends=('gdb')
-options=('!emptydirs')
+options=('staticlibs' '!emptydirs')
 source=(http://valgrind.org/downloads/${pkgname}-${pkgver}.tar.bz2
         valgrind-3.8.1-glibc-2.18.patch
         valgrind-3.8.1-ptrace-build-fix.patch
diff --git a/extra/vamp-plugin-sdk/PKGBUILD b/extra/vamp-plugin-sdk/PKGBUILD
index b537013c9..bc6751e26 100644
--- a/extra/vamp-plugin-sdk/PKGBUILD
+++ b/extra/vamp-plugin-sdk/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 185824 2013-05-19 13:06:56Z schiv $
+# $Id: PKGBUILD 198474 2013-10-30 15:05:08Z allan $
 # Maintainer: Ray Rashif <schiv@archlinux.org>
 # Contributor: Orivej Desh <smpuj@bk.ru>
 
@@ -11,7 +11,6 @@ arch=('i686' 'x86_64' 'mips64el')
 url="http://www.vamp-plugins.org/"
 license=('BSD')
 depends=('gcc-libs' 'libsndfile')
-options=('!libtool')
 source=("http://code.soundsoftware.ac.uk/attachments/download/$_dir/$pkgname-$pkgver.tar.gz")
 md5sums=('199872997f74951f6769b982bf0d0646')
 
diff --git a/extra/varnish/PKGBUILD b/extra/varnish/PKGBUILD
index 5b31b6d97..537dae473 100644
--- a/extra/varnish/PKGBUILD
+++ b/extra/varnish/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 188735 2013-06-18 17:08:27Z dreisner $
+# $Id: PKGBUILD 198475 2013-10-30 15:05:30Z allan $
 # Maintainer: Dave Reisner <dreisner@archlinux.org>
 # Contributor: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
 # Contributor: Douglas Soares de Andrade
@@ -6,7 +6,7 @@
 
 pkgname=varnish
 pkgver=3.0.4
-pkgrel=1
+pkgrel=2
 pkgdesc="High-performance HTTP accelerator"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.varnish-cache.org/"
@@ -14,7 +14,6 @@ license=('BSD')
 depends=('gcc' 'libedit' 'pcre')
 backup=('etc/varnish/default.vcl')
 install=$pkgname.install
-options=('!libtool')
 source=("http://repo.varnish-cache.org/source/$pkgname-$pkgver.tar.gz"
         varnish-vcl-reload
         varnish.service)
diff --git a/extra/vc/PKGBUILD b/extra/vc/PKGBUILD
index 77a4e49f9..5ac53741f 100644
--- a/extra/vc/PKGBUILD
+++ b/extra/vc/PKGBUILD
@@ -1,20 +1,24 @@
-# $Id: PKGBUILD 188826 2013-06-22 07:21:35Z andrea $
+# $Id: PKGBUILD 197134 2013-10-22 12:37:05Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: PedsXing <pedsxing at gmx dot net>
 
 pkgname=vc
-pkgver=0.7.2
-pkgrel=1
+pkgver=0.7.3
+pkgrel=3
 pkgdesc="A library to ease explicit vectorization of C++ code"
 url='http://code.compeng.uni-frankfurt.de/projects/vc/'
 arch=('x86_64' 'i686')
 license=('LGPL3')
 makedepends=('cmake')
-source=("http://code.compeng.uni-frankfurt.de/attachments/download/164/Vc-${pkgver}.tar.gz")
-md5sums=('f54dd2945f9e5a38945e50b4a3f7a901')
- 
+options=('staticlibs')
+source=("http://code.compeng.uni-frankfurt.de/attachments/download/174/Vc-${pkgver}.tar.gz")
+md5sums=('a55e2871a33dbcbbe444c22ccef47dbd')
+
+prepare() {
+  mkdir build
+}
+
 build() {
-  mkdir build 
   cd build
   cmake ../Vc-${pkgver} \
     -DCMAKE_INSTALL_PREFIX=/usr \
diff --git a/extra/vcdimager/PKGBUILD b/extra/vcdimager/PKGBUILD
index 35e536cb3..c31bd530a 100644
--- a/extra/vcdimager/PKGBUILD
+++ b/extra/vcdimager/PKGBUILD
@@ -1,30 +1,33 @@
-# $Id: PKGBUILD 175148 2013-01-15 11:34:24Z jgc $
+# $Id: PKGBUILD 197455 2013-10-26 06:55:11Z eric $
 # Maintainer: damir <damir@archlinux.org>
 # Contributor: Tom Newsom <Jeepster@gmx.co.uk>
 
 pkgname=vcdimager
 pkgver=0.7.24
-pkgrel=3
+pkgrel=4
 pkgdesc="A full-featured mastering suite for authoring disassembling and analyzing Video CD's and Super Video CD's"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.vcdimager.org/"
 license=('GPL')
 depends=('libcdio' 'libxml2' 'popt')
-options=('!libtool')
 install=vcdimager.install
 source=(ftp://ftp.gnu.org/gnu/vcdimager/${pkgname}-${pkgver}.tar.gz
         vcdimager-0.7.24-libcdio-0.83.patch)
 md5sums=('3af22978fd79c79d5fda6513b6811145'
          'f4e7376fd9d975951d2b93a5e9123fdc')
 
+prepare() {
+  cd ${pkgname}-${pkgver}
+  patch -p1 -i "$srcdir/vcdimager-0.7.24-libcdio-0.83.patch"
+}
+
 build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  patch -Np1 -i $srcdir/vcdimager-0.7.24-libcdio-0.83.patch
+  cd ${pkgname}-${pkgver}
   ./configure --prefix=/usr
   make
 }
 
 package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+  cd ${pkgname}-${pkgver}
   make DESTDIR="${pkgdir}" install
 }
diff --git a/extra/vde2/PKGBUILD b/extra/vde2/PKGBUILD
index 392586b3d..e109ccd4d 100644
--- a/extra/vde2/PKGBUILD
+++ b/extra/vde2/PKGBUILD
@@ -1,23 +1,22 @@
-# $Id: PKGBUILD 186164 2013-05-21 13:35:09Z tpowa $
+# $Id: PKGBUILD 198476 2013-10-30 15:05:50Z allan $
 # Contributor: Sergej Pupykin
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 pkgname=vde2
 pkgver=2.3.2
-pkgrel=4
+pkgrel=5
 pkgdesc="Virtual Distributed Ethernet for emulators like qemu"
 url="http://sourceforge.net/projects/vde/"
 license=("GPL" "LGPL" "CUSTOM")
 arch=('i686' 'x86_64' 'mips64el')
 depends=('bash' 'libpcap' 'openssl')
 makedepends=('python')
-backup=(etc/conf.d/vde)
 source=(http://downloads.sourceforge.net/vde/$pkgname-$pkgver.tar.bz2
         dhcpd.conf.sample
         iptables.rules.sample
         vde-config.sample
         vde-connection.sample)
 install=vde2.install
-options=(!libtool !makeflags)
+options=(!makeflags)
 
 build() {
   cd $srcdir/$pkgname-$pkgver
@@ -39,10 +38,5 @@ package() {
 md5sums=('46fbc5f97f03dc517aa3b2c9d9ea6628'
          '7d9bc56d2e561d849e915000d1c0f269'
          'a920123fc620bcedbccb703a8d1bdc55'
-         'cb8ace28e8efd4dad128be4be71b3b07'
-         '63033c33565e2030541c5e05e9d9b063')
-md5sums=('46fbc5f97f03dc517aa3b2c9d9ea6628'
-         '7d9bc56d2e561d849e915000d1c0f269'
-         'a920123fc620bcedbccb703a8d1bdc55'
          'f47d3372382dc9d67c1174d2796729fe'
          '63033c33565e2030541c5e05e9d9b063')
diff --git a/extra/vigra/PKGBUILD b/extra/vigra/PKGBUILD
index 2f6e1f820..3f1c3e15b 100644
--- a/extra/vigra/PKGBUILD
+++ b/extra/vigra/PKGBUILD
@@ -1,19 +1,18 @@
-# $Id: PKGBUILD 191605 2013-07-27 08:12:19Z andyrtr $
+# $Id: PKGBUILD 197516 2013-10-26 12:19:28Z andyrtr $
 # Maintainer: AndyRTR <andyrtr@archlinux.org>
 # Contributor: Lukas Jirkovsky <l.jirkovsky@gmail.com>
 
 pkgbase=vigra
 pkgname=('vigra' 'vigra-doc')
 pkgver=1.9.0
-pkgrel=5
+pkgrel=7
 arch=('i686' 'x86_64' 'mips64el')
 url="http://hci.iwr.uni-heidelberg.de/vigra/"
 license=('custom:MIT')
 makedepends=(# runtime deps
-             'libpng>=1.5.7' 'libtiff>=4.0.0' 'openexr' 'gcc-libs' 'sh' 'hdf5>=1.8.7' 'fftw'
-	     # additional makedeps
-             'cmake' 'python2-nose' 'doxygen' 'python2-sphinx' 'boost>=1.54.0' 'python2-numpy')
-options=('!libtool')
+             'libpng' 'libtiff' 'openexr' 'gcc-libs' 'sh' 'hdf5' 'fftw'
+	         # additional makedeps
+             'cmake' 'python2-nose' 'doxygen' 'python2-sphinx' 'boost' 'python2-numpy')
 source=(http://kogs-www.informatik.uni-hamburg.de/~koethe/vigra/${pkgname}-${pkgver}-src.tar.gz)
 md5sums=('b6155afe1ea967917d2be16d98a85404')
 
@@ -34,7 +33,7 @@ check() {
 
 package_vigra() {
   pkgdesc="Computer vision library"
-  depends=('libpng>=1.5.7' 'libtiff>=4.0.0' 'openexr' 'gcc-libs' 'sh' 'hdf5>=1.8.7' 'fftw')
+  depends=('libpng' 'libtiff' 'openexr' 'gcc-libs' 'sh' 'hdf5' 'fftw')
   optdepends=('python2: for python bindings'
               'boost-libs: for python bindings')
 
diff --git a/extra/vinagre/PKGBUILD b/extra/vinagre/PKGBUILD
index 4b2923ce1..474e69271 100644
--- a/extra/vinagre/PKGBUILD
+++ b/extra/vinagre/PKGBUILD
@@ -1,12 +1,12 @@
-# $Id: PKGBUILD 196144 2013-10-07 11:53:40Z jgc $
+# $Id: PKGBUILD 198477 2013-10-30 15:06:10Z allan $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Contributor: Jan de Groot <jgc@archlinux.org>
 # Contributor: Allan McRae <mcrae_allan@hotmail.com>
 # Contributor: lp76 <l.peduto@gmail.com>
 
 pkgname=vinagre
-pkgver=3.10.0
-pkgrel=2
+pkgver=3.10.1
+pkgrel=1
 pkgdesc="A VNC Client for the GNOME Desktop"
 arch=('i686' 'x86_64' 'mips64el')
 license=(GPL)
@@ -16,16 +16,16 @@ depends=(libsecret gtk-vnc vte3 telepathy-glib avahi desktop-file-utils dconf sh
          gnome-icon-theme spice-gtk3)
 optdepends=('openssh: SSH plugin'
             'freerdp: RDP plugin')
-makedepends=(docbook-xsl intltool freerdp openssh itstool)
+makedepends=(docbook-xsl intltool freerdp openssh itstool spice-protocol)
 groups=(gnome-extra)
-options=('!emptydirs' '!libtool')
+options=('!emptydirs')
 source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('d90ca19d1075149d044a58274016bb3976b2201774ae079d661fd7c3859a1900')
+sha256sums=('ea8cc79e227148359d3582ff121dab864913eb1dfcba6458e11da32d4dfec503')
 
 build() {
   cd $pkgname-$pkgver
   ./configure --prefix=/usr --sysconfdir=/etc \
-      --libexecdir=/usr/lib/$pkgname --enable-rdp
+      --libexecdir=/usr/lib/$pkgname --enable-rdp --enable-spice
   make
 }
 
diff --git a/extra/vino/PKGBUILD b/extra/vino/PKGBUILD
index a2564736f..28686520c 100644
--- a/extra/vino/PKGBUILD
+++ b/extra/vino/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 196145 2013-10-07 11:53:41Z jgc $
+# $Id: PKGBUILD 196510 2013-10-14 15:43:19Z heftig $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Contributor: Jan de Groot <jgc@archlinux.org>
 
 pkgname=vino
-pkgver=3.10.0
+pkgver=3.10.1
 pkgrel=1
 pkgdesc="a VNC server for the GNOME desktop"
 arch=('i686' 'x86_64' 'mips64el')
@@ -15,7 +15,7 @@ url="http://www.gnome.org"
 options=(!emptydirs)
 install=vino.install
 source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('927b71eaafc5ac4c6e098fb9ff0164899eae3ca599a32f5d18897a02b4be1fdd')
+sha256sums=('faf10d667c43d00cd37dc6343b44012456de9d2e39d8ce679c719e65d2dfbe46')
 
 build() {
   cd $pkgname-$pkgver
diff --git a/extra/virtuoso/PKGBUILD b/extra/virtuoso/PKGBUILD
index 7785c44ea..0f4f4e2f7 100644
--- a/extra/virtuoso/PKGBUILD
+++ b/extra/virtuoso/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 194330 2013-09-13 15:52:26Z andrea $
+# $Id: PKGBUILD 197128 2013-10-22 10:14:37Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Massimiliano Torromeo <massimiliano DOT torromeo AT google mail service>
 
@@ -6,12 +6,11 @@ pkgbase=virtuoso
 pkgname=('virtuoso' 'virtuoso-base')
 epoch=1
 pkgver=6.1.7
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64' 'mips64el')
 url='http://virtuoso.openlinksw.com/wiki/main/Main/'
 license=('GPL')
 makedepends=('libldap' 'bison' 'flex' 'gperf' 'net-tools' 'libxml2' 'optipng')
-options=('!libtool')
 source=("http://downloads.sourceforge.net/${pkgbase}/${pkgbase}-opensource-${pkgver}.tar.gz")
 md5sums=('88885e84e8f7b61e59516f696b1d3be5')
 
@@ -59,9 +58,8 @@ package_virtuoso() {
   # remove conflicts with virtuoso-base
   rm "${pkgdir}"/usr/bin/isql{,w-vt}
   rm "${pkgdir}"/usr/bin/virtuoso-t
-  rm "${pkgdir}"/usr/lib/libvirtuoso-t.a
-  rm "${pkgdir}"/usr/lib/virtodbc.{a,so}
-  rm "${pkgdir}"/usr/lib/virtodbc_r.{a,so}
-  rm "${pkgdir}"/usr/lib/virtodbcu.{a,so}
-  rm "${pkgdir}"/usr/lib/virtodbcu_r.{a,so}
+  rm "${pkgdir}"/usr/lib/virtodbc.so
+  rm "${pkgdir}"/usr/lib/virtodbc_r.so
+  rm "${pkgdir}"/usr/lib/virtodbcu.so
+  rm "${pkgdir}"/usr/lib/virtodbcu_r.so
 }
diff --git a/extra/vlc/PKGBUILD b/extra/vlc/PKGBUILD
index 4b52b0d8c..d091bb6e8 100644
--- a/extra/vlc/PKGBUILD
+++ b/extra/vlc/PKGBUILD
@@ -1,18 +1,18 @@
-# $Id: PKGBUILD 195902 2013-10-04 17:29:00Z bpiotrowski $
+# $Id: PKGBUILD 198478 2013-10-30 15:06:33Z allan $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Sarah Hay <sarahhay@mb.sympatico.ca>
 # Contributor: Martin Sandsmark <martin.sandsmark@kde.org>
 
 pkgname=vlc
 pkgver=2.1.0
-pkgrel=3
+pkgrel=5
 pkgdesc="A multi-platform MPEG, VCD/DVD, and DivX player"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.videolan.org/vlc/"
 license=('LGPL2.1' 'GPL2')
 depends=('a52dec' 'libdvbpsi' 'libxpm' 'libdca' 'qt4' 'libproxy' 
          'sdl_image' 'libdvdnav' 'libtiger' 'lua' 'libmatroska' 
-         'zvbi' 'taglib' 'libmpcdec' 'ffmpeg-compat' 'faad2' 'libupnp' 
+         'zvbi' 'taglib' 'libmpcdec' 'ffmpeg' 'faad2' 'libupnp' 
          'libshout' 'libmad' 'libmpeg2' 'xcb-util-keysyms')
 makedepends=('live-media' 'libnotify' 'libbluray' 'flac' 'kdelibs'
              'libdc1394' 'libavc1394' 'libcaca' 
@@ -55,7 +55,7 @@ conflicts=('vlc-plugin')
 replaces=('vlc-plugin')
 backup=('usr/share/vlc/lua/http/.hosts'
         'usr/share/vlc/lua/http/dialogs/.hosts')
-options=('!libtool' '!emptydirs')
+options=('!emptydirs')
 install=vlc.install
 source=("http://download.videolan.org/pub/videolan/${pkgname}/${pkgver/.a}/${pkgname}-${pkgver/.a/a}.tar.xz"
 vlc-2.0.7-vaapi-compat.patch)
@@ -76,7 +76,6 @@ build() {
 
   [ "$CARCH" = "mips64el" ] && extraconf="--disable-lirc"
   CFLAGS+="-I/usr/include/samba-4.0" CPPFLAGS+="-I/usr/include/samba-4.0" \
-  PKG_CONFIG_PATH+="/usr/lib/ffmpeg-compat/pkgconfig" \
   ./configure --prefix=/usr \
               --sysconfdir=/etc \
               --disable-rpath \
diff --git a/extra/vte/PKGBUILD b/extra/vte/PKGBUILD
index 346232971..da983b0b3 100644
--- a/extra/vte/PKGBUILD
+++ b/extra/vte/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 188481 2013-06-14 22:21:14Z heftig $
+# $Id: PKGBUILD 198479 2013-10-30 15:06:54Z allan $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=vte
@@ -7,7 +7,7 @@ pkgrel=3.2
 pkgdesc="Virtual Terminal Emulator widget for use with GTK2"
 arch=('i686' 'x86_64' 'mips64el')
 license=('LGPL')
-options=('!libtool' '!emptydirs')
+options=('!emptydirs')
 depends=('gtk2' 'vte-common')
 makedepends=('pygtk' 'intltool' 'gobject-introspection' 'pygobject2-devel')
 url="http://www.gnome.org"
diff --git a/extra/vte3/PKGBUILD b/extra/vte3/PKGBUILD
index efc91321d..8bff41b9d 100644
--- a/extra/vte3/PKGBUILD
+++ b/extra/vte3/PKGBUILD
@@ -1,18 +1,18 @@
-# $Id: PKGBUILD 194827 2013-09-23 18:45:48Z heftig $
+# $Id: PKGBUILD 198480 2013-10-30 15:07:15Z allan $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 
 pkgbase=vte3
 pkgname=(vte3 vte-common)
-pkgver=0.34.8
+pkgver=0.34.9
 pkgrel=1
 pkgdesc="Virtual Terminal Emulator widget for use with GTK3"
 arch=('i686' 'x86_64' 'mips64el')
 license=('LGPL')
-options=('!libtool' '!emptydirs')
+options=('!emptydirs')
 makedepends=('intltool' 'gobject-introspection' 'gtk3')
 url="http://www.gnome.org"
 source=(http://download.gnome.org/sources/vte/${pkgver::4}/vte-$pkgver.tar.xz)
-sha256sums=('126ffb7d5a5da35639df003c84ff11ccc92f3fc8b1556d3e8b0f7314c8d909d0')
+sha256sums=('6f38c5edf57d0a5b870c4e5e210731cccfb4899d0856ba7a3dc599f2ba6e23e1')
 
 build() {
   cd "vte-$pkgver"
diff --git a/extra/wavpack/PKGBUILD b/extra/wavpack/PKGBUILD
index 0e2974f09..7f7cfbaf2 100644
--- a/extra/wavpack/PKGBUILD
+++ b/extra/wavpack/PKGBUILD
@@ -1,34 +1,26 @@
-# $Id: PKGBUILD 146400 2012-01-10 20:33:06Z andrea $
-# Maintainer:
-# Contributor: François Charette <firmicus ατ gmx δοτ net> 
-# Contributor: Shinlun Hsieh <yngwiexx@yahoo.com.tw>
-# Contributor: Michal Hybner <dta081@gmail.com>
+# $Id: PKGBUILD 198610 2013-10-30 20:57:15Z eric $
+# Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgname=wavpack
-pkgver=4.60.1
-pkgrel=2.2
-pkgdesc="Audio compression format with lossless, lossy, and hybrid compression modes"
+pkgver=4.70.0
+pkgrel=2
+pkgdesc="Audio compression format with lossless, lossy and hybrid compression modes"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.wavpack.com/"
-license=('custom')
+license=('BSD')
 depends=('glibc')
-options=('!libtool')
-source=("http://www.wavpack.com/${pkgname}-${pkgver}.tar.bz2")
-md5sums=('7bb1528f910e4d0003426c02db856063')
+source=(http://www.wavpack.com/${pkgname}-${pkgver}.tar.bz2)
+sha1sums=('7bf2022c988c19067196ee1fdadc919baacf46d1')
 
 build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
+  cd ${pkgname}-${pkgver}
   [ "$CARCH" = "mips64el" ] || extra=--enable-mmx
-  ./configure --prefix=/usr \
-    $extra \
-    --disable-static
+    ./configure --prefix=/usr --libdir=/usr/lib --enable-mmx $extra
   make
 }
 
 package() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  make DESTDIR=${pkgdir} install
-
-  install -Dm644 license.txt \
-    ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
+  cd ${pkgname}-${pkgver}
+  make DESTDIR="${pkgdir}" install
+  install -Dm644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
 }
diff --git a/extra/wayland/PKGBUILD b/extra/wayland/PKGBUILD
index 24faa49fd..2928796cf 100644
--- a/extra/wayland/PKGBUILD
+++ b/extra/wayland/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 196331 2013-10-11 14:56:14Z tomegun $
+# $Id: PKGBUILD 198481 2013-10-30 15:07:38Z allan $
 # Maintainer: Tom Gundersen <teg@jklm.no>
 # Contributor: Sébastien Luttringer
 # Contributor: Joel Teichroeb <joel@teichroeb.net>
@@ -12,7 +12,6 @@ url='http://wayland.freedesktop.org'
 license=('MIT')
 depends=('libffi' 'expat')
 makedepends=('doxygen')
-options=(!libtool)
 source=("http://wayland.freedesktop.org/releases/$pkgname-$pkgver.tar.xz")
 sha1sums=('febbbfc8d76ed0b2157077d50cb6e5ceb1aa47de')
 
diff --git a/extra/wcslib/PKGBUILD b/extra/wcslib/PKGBUILD
index 4f939fa74..142469968 100644
--- a/extra/wcslib/PKGBUILD
+++ b/extra/wcslib/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 183302 2013-04-21 06:02:20Z andrea $
-# Maintainer: Your Name <youremail@domain.com>
+# $Id: PKGBUILD 197080 2013-10-21 16:11:19Z andrea $
+# Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=wcslib
-pkgver=4.17
+pkgver=4.19
 pkgrel=1
 pkgdesc="A C library that implements the 'World Coordinate System' (WCS) standard in FITS"
 arch=('i686' 'x86_64' 'mips64el')
@@ -11,7 +11,7 @@ license=('GPL3')
 depends=('cfitsio')
 makedepends=('gcc-fortran')
 source=("ftp://ftp.atnf.csiro.au/pub/software/${pkgname}/${pkgname}.tar.bz2")
-md5sums=('81f739c84789b84626db9fe4cd866081')
+md5sums=('79d47ab10dfde08d91c0e6184cf73bda')
 
 build() {
   cd $pkgname-$pkgver
@@ -21,6 +21,7 @@ build() {
   make
 }
 
+# Fails on i686
 #check() {
 #  cd $pkgname-$pkgver
 #  make -k check
diff --git a/extra/webkitgtk/PKGBUILD b/extra/webkitgtk/PKGBUILD
index cf2265f70..e5e2a4eb0 100644
--- a/extra/webkitgtk/PKGBUILD
+++ b/extra/webkitgtk/PKGBUILD
@@ -1,9 +1,10 @@
-# $Id: PKGBUILD 196146 2013-10-07 11:53:43Z jgc $
+# $Id: PKGBUILD 198482 2013-10-30 15:07:59Z allan $
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 
 pkgname=webkitgtk
 pkgver=2.2.0
-pkgrel=1
+pkgrel=2
+pkgdesc="GTK+ Web content engine library"
 arch=(i686 x86_64 mips64el)
 url="http://webkitgtk.org/"
 license=(custom)
@@ -14,7 +15,7 @@ optdepends=('gtk2: Netscape plugin support')
 provides=("webkitgtk3=${pkgver}" "libwebkit3=${pkgver}")
 conflicts=(webkitgtk3 libwebkit3)
 replaces=(webkitgtk3 libwebkit3)
-options=(!libtool !emptydirs)
+options=(!emptydirs)
 source=(http://webkitgtk.org/releases/$pkgname-${pkgver}.tar.xz)
 sha256sums=('84902e3255dcc6efa1298c8a1f2d2a49674126dcacea383f309aeed9e734d538')
 
diff --git a/extra/webkitgtk2/PKGBUILD b/extra/webkitgtk2/PKGBUILD
index c7a7d2206..e2e8aa1b6 100644
--- a/extra/webkitgtk2/PKGBUILD
+++ b/extra/webkitgtk2/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 188485 2013-06-14 23:12:24Z heftig $
+# $Id: PKGBUILD 198483 2013-10-30 15:08:20Z allan $
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 
 pkgname=webkitgtk2
 pkgver=1.10.2
-pkgrel=7
+pkgrel=8
 pkgdesc="GTK+ Web content engine library for GTK+ 2.0"
 arch=(i686 x86_64 mips64el)
 url="http://webkitgtk.org/"
@@ -15,9 +15,16 @@ optdepends=()
 provides=("libwebkit=${pkgver}")
 conflicts=(libwebkit)
 replaces=(libwebkit)
-options=(!libtool !emptydirs)
-source=(http://webkitgtk.org/releases/webkitgtk-$pkgver.tar.xz)
-sha256sums=('19234f8e4edfaefe91ed06471a2aa8c71d26dd55d33787eede1dcfc9a3a96d9c')
+options=(!emptydirs)
+source=(http://webkitgtk.org/releases/webkitgtk-${pkgver}.tar.xz
+        bison3.patch)
+sha256sums=('19234f8e4edfaefe91ed06471a2aa8c71d26dd55d33787eede1dcfc9a3a96d9c'
+            '0996b25d17be61470678c18db9bfad1bf807aac410690fb8935370dbc8b3ce34')
+
+prepare() {
+  cd webkitgtk-$pkgver
+  patch -Np1 -i ../bison3.patch
+}
 
 build() {
   cd webkitgtk-$pkgver
diff --git a/extra/webkitgtk2/bison3.patch b/extra/webkitgtk2/bison3.patch
new file mode 100644
index 000000000..9c9dabb82
--- /dev/null
+++ b/extra/webkitgtk2/bison3.patch
@@ -0,0 +1,11 @@
+diff -u -r webkitgtk-1.10.2/Source/ThirdParty/ANGLE/src/compiler/glslang.y webkitgtk-1.10.2-bison3/Source/ThirdParty/ANGLE/src/compiler/glslang.y
+--- webkitgtk-1.10.2/Source/ThirdParty/ANGLE/src/compiler/glslang.y	2012-11-23 21:12:16.000000000 +0100
++++ webkitgtk-1.10.2-bison3/Source/ThirdParty/ANGLE/src/compiler/glslang.y	2013-10-12 20:42:54.531301735 +0200
+@@ -47,6 +47,7 @@
+ %expect 1 /* One shift reduce conflict because of if | else */
+ %pure-parser
+ %parse-param {TParseContext* context}
++%lex-param {YYLEX_PARAM}
+ 
+ %union {
+     struct {
diff --git a/extra/webrtc-audio-processing/PKGBUILD b/extra/webrtc-audio-processing/PKGBUILD
index 1dfa2d2bb..58bdf6e9c 100644
--- a/extra/webrtc-audio-processing/PKGBUILD
+++ b/extra/webrtc-audio-processing/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 158825 2012-05-11 21:11:52Z heftig $
+# $Id: PKGBUILD 198484 2013-10-30 15:08:43Z allan $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 
 pkgname=webrtc-audio-processing
@@ -10,7 +10,6 @@ arch=(i686 x86_64 mips64el)
 url="http://freedesktop.org/software/pulseaudio/webrtc-audio-processing"
 license=(custom)
 depends=(gcc-libs)
-options=(!libtool)
 source=("$url/$pkgname-$pkgver.tar.xz"
         0001-Don-t-error-or-set-options-for-unknown-architectures.patch)
 sha256sums=('ed4b52f9c2688b97628035a5565377d74704d7c04de4254a768df3342c7afedc'
diff --git a/extra/weechat/PKGBUILD b/extra/weechat/PKGBUILD
index 8154b0a98..d831a5712 100644
--- a/extra/weechat/PKGBUILD
+++ b/extra/weechat/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 196288 2013-10-10 15:27:58Z giovanni $
+# $Id: PKGBUILD 198485 2013-10-30 15:09:03Z allan $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: lucke <lucke at o2 dot pl>
 
@@ -12,7 +12,6 @@ license=('GPL')
 depends=('gnutls' 'curl' 'libgcrypt')
 makedepends=('cmake' 'pkg-config' 'perl' 'python2' 'lua' 'tcl' 'ruby' 'aspell' 'guile')
 optdepends=('perl' 'python2' 'lua' 'tcl' 'ruby' 'aspell' 'guile')
-options=('!libtool')
 source=("http://www.weechat.org/files/src/${pkgname}-${pkgver}.tar.bz2")
 md5sums=('fbbb4c319474d4a3b123fea7e8402fa2')
 
diff --git a/extra/wildmidi/PKGBUILD b/extra/wildmidi/PKGBUILD
index 5ff568a57..bcdb6e326 100644
--- a/extra/wildmidi/PKGBUILD
+++ b/extra/wildmidi/PKGBUILD
@@ -10,7 +10,7 @@ arch=('i686' 'x86_64' 'mips64el')
 url='http://wildmidi.sourceforge.net/'
 license=('LGPL3')
 depends=('alsa-lib')
-options=(!makeflags !libtool)
+options=(!makeflags)
 source=(http://sourceforge.net/projects/wildmidi/files/${pkgname}/${pkgname}-${pkgver}.tar.gz)
 md5sums=('44583c95fd67761f8cd6275fd1c312f2')
 
diff --git a/extra/windowmaker/PKGBUILD b/extra/windowmaker/PKGBUILD
index fba240c38..2a17fdd5b 100644
--- a/extra/windowmaker/PKGBUILD
+++ b/extra/windowmaker/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 194337 2013-09-13 20:35:50Z daniel $
+# $Id: PKGBUILD 198487 2013-10-30 15:09:48Z allan $
 # Maintainer: Daniel Isenmann <daniel@archlinux.org>
 # Contributor: Judd Vinet <jvinet@zeroflux.org>
 pkgname=windowmaker
@@ -9,7 +9,6 @@ arch=(i686 x86_64 'mips64el')
 url="http://www.windowmaker.org/"
 license=('GPL' 'custom')
 depends=('libxinerama' 'libxrandr' 'libxmu' 'libpng' 'libxpm' 'libxft' 'libtiff' 'giflib')
-options=('!libtool')
 source=(http://windowmaker.org/pub/source/release/WindowMaker-$pkgver.tar.gz
         wmaker.desktop
         wm-giflib.patch)
diff --git a/extra/wv/PKGBUILD b/extra/wv/PKGBUILD
index bcee31fbb..da58e0a96 100644
--- a/extra/wv/PKGBUILD
+++ b/extra/wv/PKGBUILD
@@ -1,29 +1,27 @@
-# $Id: PKGBUILD 184449 2013-05-06 19:40:11Z foutrelis $
+# $Id: PKGBUILD 198488 2013-10-30 15:10:09Z allan $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: William Rea <sillywilly@gmail.com>
 pkgname=wv
 pkgver=1.2.9
-pkgrel=2
+pkgrel=3
 pkgdesc="MSWord library can load and parse Word 2000, 97, 95 and 6 file formats"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://sourceforge.net/projects/wvware"
 license=('GPL')
-depends=('libgsf' 'libpng' 'sh')
-makedepends=('pkg-config')
-options=('!libtool')
-source=("http://www.abisource.com/downloads/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.gz")
+depends=(libgsf libpng sh)
+source=(http://www.abisource.com/downloads/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.gz)
 md5sums=('dbccf2e9f747e50c913b7e3d126b73f7')
+sha1sums=('db4717a151742dbdb492318f104504a92075543a')
 
 build() {
-  cd ${pkgname}-${pkgver}
+  cd $pkgname-$pkgver
 
   ./configure --prefix=/usr \
-              --mandir=/usr/share/man
+    --mandir=/usr/share/man --disable-static
   make
 }
 
 package() {
-  cd ${pkgname}-${pkgver}
-
+  cd $pkgname-$pkgver
   make DESTDIR="${pkgdir}" install
 }
diff --git a/extra/wv/fix-soname.patch b/extra/wv/fix-soname.patch
deleted file mode 100644
index 81dff86e6..000000000
--- a/extra/wv/fix-soname.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -ru wv-1.2.7.orig//configure wv-1.2.7//configure
---- wv-1.2.7.orig//configure	2009-09-21 12:22:46.000000000 +0200
-+++ wv-1.2.7//configure	2010-06-08 12:00:27.948857203 +0200
-@@ -2082,8 +2082,8 @@
- WV_MAJOR_VERSION=1
- WV_MINOR_VERSION=2
- WV_MICRO_VERSION=7
--WV_INTERFACE_AGE=3
--WV_BINARY_AGE=3
-+WV_INTERFACE_AGE=4
-+WV_BINARY_AGE=4
- WV_VERSION=$WV_MAJOR_VERSION.$WV_MINOR_VERSION.$WV_MICRO_VERSION
- 
- 
diff --git a/extra/xaw3d/PKGBUILD b/extra/xaw3d/PKGBUILD
index 1ffe7741e..d4bdc36a8 100644
--- a/extra/xaw3d/PKGBUILD
+++ b/extra/xaw3d/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 154650 2012-03-30 14:26:30Z andyrtr $
+# $Id: PKGBUILD 198489 2013-10-30 15:10:33Z allan $
 # Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgname=xaw3d
@@ -10,7 +10,6 @@ url="http://directory.fsf.org/project/xaw3d/"
 license=('MIT')
 depends=('libxmu')
 makedepends=('xorg-util-macros')
-options=('!libtool')
 source=(http://xorg.freedesktop.org/archive/individual/lib/libXaw3d-${pkgver}.tar.bz2)
 sha1sums=('0b1db72e9d5be0edae57cda213860c0289fac12f')
 
diff --git a/extra/xbase/PKGBUILD b/extra/xbase/PKGBUILD
index c028b85ad..b0410ec8a 100644
--- a/extra/xbase/PKGBUILD
+++ b/extra/xbase/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 156152 2012-04-14 16:31:07Z andrea $
+# $Id: PKGBUILD 198490 2013-10-30 15:10:54Z allan $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Xiao-Long Chen <chenxiaolong@cxl.epac.to>
 
@@ -10,7 +10,6 @@ arch=('i686' 'x86_64' 'mips64el')
 url='http://linux.techass.com/projects/xdb/'
 license=('LGPL')
 depends=('bash' 'gcc-libs')
-options=('!libtool')
 source=("http://downloads.sourceforge.net/xdb/${pkgname}-${pkgver}.tar.gz"
         'fix-build.patch'
         'gcc43.patch'
diff --git a/extra/xcb-util-image/PKGBUILD b/extra/xcb-util-image/PKGBUILD
index e20ef6b33..7c9b4091f 100644
--- a/extra/xcb-util-image/PKGBUILD
+++ b/extra/xcb-util-image/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 160617 2012-06-02 21:14:58Z andyrtr $
+# $Id: PKGBUILD 198492 2013-10-30 15:11:36Z allan $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 
@@ -11,7 +11,6 @@ url="http://xcb.freedesktop.org"
 license=('custom')
 depends=('libxcb>=1.7' 'xcb-util>=0.3.9')
 makedepends=('xorg-util-macros')
-options=('!libtool')
 source=("http://xcb.freedesktop.org/dist/${pkgname}-${pkgver}.tar.bz2"
         'LICENSE')
 sha256sums=('d35a3c0eaae171f5081ec127fb9cec174b716ce5d78196a87f2785376da021df'
diff --git a/extra/xcb-util-keysyms/PKGBUILD b/extra/xcb-util-keysyms/PKGBUILD
index e3093f4f6..02c057083 100644
--- a/extra/xcb-util-keysyms/PKGBUILD
+++ b/extra/xcb-util-keysyms/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 160619 2012-06-02 21:15:01Z andyrtr $
+# $Id: PKGBUILD 198493 2013-10-30 15:11:57Z allan $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 
@@ -11,7 +11,6 @@ url="http://xcb.freedesktop.org"
 license=('custom')
 depends=('libxcb>=1.7')
 makedepends=('xorg-util-macros')
-options=('!libtool')
 source=("http://xcb.freedesktop.org/dist/${pkgname}-${pkgver}.tar.bz2"
         'LICENSE')
 sha256sums=('7be1acf053bd68a1910fc861b2cbcbad7637b5618590dd5484d43a96f7995c6e'
diff --git a/extra/xcb-util-renderutil/PKGBUILD b/extra/xcb-util-renderutil/PKGBUILD
index 04d58f2c1..70b9e40f7 100644
--- a/extra/xcb-util-renderutil/PKGBUILD
+++ b/extra/xcb-util-renderutil/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 144433 2011-12-05 19:49:29Z andyrtr $
+# $Id: PKGBUILD 198494 2013-10-30 15:12:17Z allan $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 
@@ -11,7 +11,6 @@ url="http://xcb.freedesktop.org"
 license=('custom')
 depends=('libxcb>=1.7')
 makedepends=('xorg-util-macros')
-options=('!libtool')
 source=("http://xcb.freedesktop.org/dist/${pkgname}-${pkgver}.tar.bz2"
         'LICENSE')
 md5sums=('b346ff598ee093c141f836fbc0f8f721'
diff --git a/extra/xcb-util-wm/PKGBUILD b/extra/xcb-util-wm/PKGBUILD
index eb261b59d..c0ea83cff 100644
--- a/extra/xcb-util-wm/PKGBUILD
+++ b/extra/xcb-util-wm/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 160621 2012-06-02 21:15:05Z andyrtr $
+# $Id: PKGBUILD 198495 2013-10-30 15:12:43Z allan $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 
@@ -11,7 +11,6 @@ url="http://xcb.freedesktop.org"
 license=('custom')
 depends=('libxcb>=1.7')
 makedepends=('xorg-util-macros')
-options=('!libtool')
 source=("http://xcb.freedesktop.org/dist/${pkgname}-${pkgver}.tar.bz2"
         'LICENSE')
 sha256sums=('038f9bdb917b1f6d98a164f57dfb32212a102d771ab6f03de49fef3786746030'
diff --git a/extra/xcb-util/PKGBUILD b/extra/xcb-util/PKGBUILD
index 78b252ce8..637aae039 100644
--- a/extra/xcb-util/PKGBUILD
+++ b/extra/xcb-util/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 160615 2012-06-02 21:14:55Z andyrtr $
+# $Id: PKGBUILD 198491 2013-10-30 15:11:15Z allan $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 # Contributor: Andrea Scarpino <andrea@archlinux.org>
@@ -12,7 +12,6 @@ url="http://xcb.freedesktop.org"
 license=('custom')
 depends=('libxcb>=1.7')
 makedepends=('gperf' 'xorg-util-macros')
-options=('!libtool')
 source=("http://xcb.freedesktop.org/dist/${pkgname}-${pkgver}.tar.bz2"
         'LICENSE')
 sha256sums=('c611259c0ab20fd76f79f48f4684843c18ea9c967eba78a45e8b3636315c18c4'
diff --git a/extra/xdg-user-dirs-gtk/PKGBUILD b/extra/xdg-user-dirs-gtk/PKGBUILD
index 8abfcff63..ff309b0bf 100644
--- a/extra/xdg-user-dirs-gtk/PKGBUILD
+++ b/extra/xdg-user-dirs-gtk/PKGBUILD
@@ -1,4 +1,4 @@
-#  $Id: PKGBUILD 180620 2013-03-25 01:38:50Z eric $
+#  $Id: PKGBUILD 198497 2013-10-30 15:13:24Z allan $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 
 pkgname=xdg-user-dirs-gtk
@@ -9,7 +9,7 @@ arch=(i686 x86_64 mips64el)
 license=('GPL')
 depends=('gtk3' 'xdg-user-dirs')
 makedepends=('intltool')
-options=('!libtool' '!emptydirs')
+options=('!emptydirs')
 url="http://www.gnome.org"
 groups=('gnome')
 source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.xz)
diff --git a/extra/xerces-c/PKGBUILD b/extra/xerces-c/PKGBUILD
index 1038744a1..2d287ab47 100644
--- a/extra/xerces-c/PKGBUILD
+++ b/extra/xerces-c/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 184762 2013-05-08 07:12:02Z andrea $
+# $Id: PKGBUILD 197079 2013-10-21 16:11:01Z andrea $
 # Maintainer:
 # Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Geoffroy Carrier <geoffroy@archlinux.org>
@@ -6,13 +6,12 @@
 
 pkgname=xerces-c
 pkgver=3.1.1
-pkgrel=4
+pkgrel=5
 pkgdesc="A validating XML parser written in a portable subset of C++"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://xerces.apache.org/xerces-c/"
 license=('APACHE')
 depends=('gcc-libs' 'curl')
-options=('!libtool')
 source=("http://apache.osuosl.org/xerces/c/3/sources/${pkgname}-${pkgver}.tar.gz")
 md5sums=('6a8ec45d83c8cfb1584c5a5345cb51ae')
 
diff --git a/extra/xf86-input-acecad/PKGBUILD b/extra/xf86-input-acecad/PKGBUILD
index 2d758826f..8ba910b19 100644
--- a/extra/xf86-input-acecad/PKGBUILD
+++ b/extra/xf86-input-acecad/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 180179 2013-03-18 16:08:51Z andyrtr $
+# $Id: PKGBUILD 198498 2013-10-30 15:13:45Z allan $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=xf86-input-acecad
@@ -11,7 +11,6 @@ license=('custom')
 depends=('sysfsutils')
 makedepends=('xorg-server-devel' 'X-ABI-XINPUT_VERSION=19' 'resourceproto' 'scrnsaverproto')
 conflicts=('xorg-server<1.14' 'X-ABI-XINPUT_VERSION<19' 'X-ABI-XINPUT_VERSION>=20')
-options=('!libtool')
 source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2
         assign-local-private-after-allocating.patch)
 sha1sums=('410cee68e4435dc95774fb389fcefae1b2ffe3d1'
diff --git a/extra/xf86-input-aiptek/PKGBUILD b/extra/xf86-input-aiptek/PKGBUILD
index c55148943..093f62d9d 100644
--- a/extra/xf86-input-aiptek/PKGBUILD
+++ b/extra/xf86-input-aiptek/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 180180 2013-03-18 16:08:51Z andyrtr $
+# $Id: PKGBUILD 198499 2013-10-30 15:14:06Z allan $
 #Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=xf86-input-aiptek
@@ -11,7 +11,6 @@ license=('custom')
 depends=('glibc')
 makedepends=('xorg-server-devel' 'X-ABI-XINPUT_VERSION=19' 'resourceproto' 'scrnsaverproto')
 conflicts=('xorg-server<1.14' 'X-ABI-XINPUT_VERSION<19' 'X-ABI-XINPUT_VERSION>=20')
-options=('!libtool')
 source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
 sha1sums=('55ea7d12d3e24fd72eacc966a59262864dce7769')
 
diff --git a/extra/xf86-input-elographics/PKGBUILD b/extra/xf86-input-elographics/PKGBUILD
index 055524671..9fab3d0a3 100644
--- a/extra/xf86-input-elographics/PKGBUILD
+++ b/extra/xf86-input-elographics/PKGBUILD
@@ -11,7 +11,6 @@ url="http://xorg.freedesktop.org/"
 depends=('glibc')
 makedepends=('xorg-server-devel' 'X-ABI-XINPUT_VERSION=19' 'resourceproto' 'scrnsaverproto')
 conflicts=('xorg-server<1.14' 'X-ABI-XINPUT_VERSION<19' 'X-ABI-XINPUT_VERSION>=20')
-options=('!libtool')
 source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
 sha256sums=('a21af744d57f158e6dff9d60a68aaac46b8d726d602911940cb61f4d6bb2c6a4')
 
diff --git a/extra/xf86-input-evdev/PKGBUILD b/extra/xf86-input-evdev/PKGBUILD
index e42083917..c15ba2cff 100644
--- a/extra/xf86-input-evdev/PKGBUILD
+++ b/extra/xf86-input-evdev/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 195989 2013-10-07 07:38:43Z jgc $
+# $Id: PKGBUILD 198501 2013-10-30 15:14:49Z allan $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: Alexander Baldeck <Alexander@archlinux.org
 
@@ -12,7 +12,7 @@ license=('custom')
 depends=('glibc' 'systemd-tools' 'mtdev')
 makedepends=('xorg-server-devel' 'resourceproto' 'scrnsaverproto')
 conflicts=('xorg-server<1.14.0' 'X-ABI-XINPUT_VERSION<19' 'X-ABI-XINPUT_VERSION>=20')
-options=('!libtool' '!makeflags')
+options=('!makeflags')
 groups=('xorg-drivers' 'xorg')
 source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
 sha256sums=('750461749a83bdee7771592aa5c0db5e267b18d847078a4b8622f55b04797eb3')
diff --git a/extra/xf86-input-joystick/PKGBUILD b/extra/xf86-input-joystick/PKGBUILD
index cdeabcae3..85ad66cfb 100644
--- a/extra/xf86-input-joystick/PKGBUILD
+++ b/extra/xf86-input-joystick/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 180183 2013-03-18 16:08:54Z andyrtr $
+# $Id: PKGBUILD 198502 2013-10-30 15:15:18Z allan $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=xf86-input-joystick
@@ -13,7 +13,6 @@ makedepends=('xorg-server-devel' 'X-ABI-XINPUT_VERSION=19' 'resourceproto' 'scrn
 conflicts=('xorg-server<1.14.0' 'X-ABI-XINPUT_VERSION<19' 'X-ABI-XINPUT_VERSION>=20')
 backup=('etc/X11/xorg.conf.d/50-joystick.conf')
 groups=('xorg-drivers' 'xorg')
-options=('!libtool')
 source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2
         50-joystick.conf)
 sha1sums=('61658b8d829fdaed6064c7c26232c3884d359187'
diff --git a/extra/xf86-input-keyboard/PKGBUILD b/extra/xf86-input-keyboard/PKGBUILD
index 97a5dea9b..bbc192f50 100644
--- a/extra/xf86-input-keyboard/PKGBUILD
+++ b/extra/xf86-input-keyboard/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 180909 2013-03-27 23:09:53Z andyrtr $
+# $Id: PKGBUILD 198711 2013-11-02 08:52:08Z andyrtr $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=xf86-input-keyboard
-pkgver=1.7.0
+pkgver=1.8.0
 pkgrel=1
 pkgdesc="X.Org keyboard input driver"
 arch=(i686 x86_64)
@@ -11,19 +11,18 @@ url="http://xorg.freedesktop.org/"
 depends=('glibc')
 makedepends=('xorg-server-devel' 'X-ABI-XINPUT_VERSION=19' 'resourceproto' 'scrnsaverproto')
 conflicts=('xorg-server<1.14.0' 'X-ABI-XINPUT_VERSION<19' 'X-ABI-XINPUT_VERSION>=20')
-options=('!libtool')
 groups=('xorg-drivers' 'xorg')
 source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('0cd5e2845149c7f0e19ec830c6914b7f3d154bff134ce84519e39f16ce65523c')
+sha256sums=('41c51c4e0a87aad6a1c4973c68a8de23b61162d0223f4ab36c627c307830cb5b')
 
 build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+  cd ${pkgname}-${pkgver}
   ./configure --prefix=/usr
   make
 }
 
 package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+  cd ${pkgname}-${pkgver}
   make DESTDIR="${pkgdir}" install
   install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
   install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"
diff --git a/extra/xf86-input-mouse/PKGBUILD b/extra/xf86-input-mouse/PKGBUILD
index 585b3a69b..b4d1b3999 100644
--- a/extra/xf86-input-mouse/PKGBUILD
+++ b/extra/xf86-input-mouse/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 180912 2013-03-27 23:12:17Z andyrtr $
+# $Id: PKGBUILD 198504 2013-10-30 15:16:22Z allan $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=xf86-input-mouse
@@ -11,7 +11,6 @@ url="http://xorg.freedesktop.org/"
 depends=('glibc')
 makedepends=('xorg-server-devel' 'X-ABI-XINPUT_VERSION=19' 'resourceproto' 'scrnsaverproto')
 conflicts=('xorg-server<1.14.0' 'X-ABI-XINPUT_VERSION<19' 'X-ABI-XINPUT_VERSION>=20')
-options=('!libtool')
 groups=('xorg-drivers' 'xorg')
 source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
 sha256sums=('5d601e4bae53d5e9ead4ecd700f1beb5aeaf78b79e634c4aa381a9ce00276488')
diff --git a/extra/xf86-input-synaptics/PKGBUILD b/extra/xf86-input-synaptics/PKGBUILD
index 842037d8b..b235d50a3 100644
--- a/extra/xf86-input-synaptics/PKGBUILD
+++ b/extra/xf86-input-synaptics/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 185760 2013-05-18 11:02:57Z andyrtr $
+# $Id: PKGBUILD 198505 2013-10-30 15:16:55Z allan $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: Tobias Powalowski  <tpowa@archlinux.org>
 # Contributor: Thomas Bächler <thomas@archlinux.org>
@@ -18,7 +18,6 @@ replaces=('synaptics')
 provides=('synaptics')
 conflicts=('synaptics')
 groups=('xorg-drivers' 'xorg')
-options=(!libtool)
 backup=('etc/X11/xorg.conf.d/50-synaptics.conf')
 source=(http://xorg.freedesktop.org/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2
         add_tapbuttons.diff)
diff --git a/extra/xf86-input-vmmouse/PKGBUILD b/extra/xf86-input-vmmouse/PKGBUILD
index 15fb2db7f..7a6f43226 100644
--- a/extra/xf86-input-vmmouse/PKGBUILD
+++ b/extra/xf86-input-vmmouse/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 180187 2013-03-18 16:08:57Z andyrtr $
+# $Id: PKGBUILD 198506 2013-10-30 15:17:17Z allan $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=xf86-input-vmmouse
@@ -13,7 +13,6 @@ makedepends=('xorg-server-devel' 'X-ABI-XINPUT_VERSION=19' 'resourceproto' 'scrn
 conflicts=('xorg-server<1.14.0' 'X-ABI-XINPUT_VERSION<19' 'X-ABI-XINPUT_VERSION>=20')
 groups=('xorg-drivers' 'xorg')
 backup=('etc/X11/xorg.conf.d/50-vmmouse.conf')
-options=('!libtool')
 source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
 sha256sums=('04cfb60366008d4db815c550d8fb8d0a4270c75fa7a20fa3bddc9ecbd355612c')
 
diff --git a/extra/xf86-input-void/PKGBUILD b/extra/xf86-input-void/PKGBUILD
index 2bcb3ce0e..20f2669c9 100644
--- a/extra/xf86-input-void/PKGBUILD
+++ b/extra/xf86-input-void/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 180188 2013-03-18 16:08:57Z andyrtr $
+# $Id: PKGBUILD 198507 2013-10-30 15:17:39Z allan $
 #Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=xf86-input-void
@@ -12,7 +12,6 @@ depends=('glibc')
 makedepends=('xorg-server-devel' 'X-ABI-XINPUT_VERSION=19' 'resourceproto' 'scrnsaverproto')
 conflicts=('xorg-server<1.14.0' 'X-ABI-XINPUT_VERSION<19' 'X-ABI-XINPUT_VERSION>=20')
 groups=('xorg-drivers' 'xorg')
-options=('!libtool')
 source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
 sha1sums=('49b462d3acb16337eaf78202d4074f19d5e20b29')
 
diff --git a/extra/xf86-input-wacom/PKGBUILD b/extra/xf86-input-wacom/PKGBUILD
index dcd177f12..290d197b1 100644
--- a/extra/xf86-input-wacom/PKGBUILD
+++ b/extra/xf86-input-wacom/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 195224 2013-09-28 05:24:38Z heftig $
+# $Id: PKGBUILD 198508 2013-10-30 15:17:59Z allan $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Contributor: Jan de Groot <jgc@archlinux.org>
 # Contributor: M Rawash <mrawash@gmail.com>
@@ -15,7 +15,6 @@ depends=(libxi libxinerama libxrandr)
 makedepends=('xorg-server-devel' 'X-ABI-XINPUT_VERSION=19' 'resourceproto' 'scrnsaverproto')
 conflicts=('xorg-server<1.14.0' 'X-ABI-XINPUT_VERSION<19' 'X-ABI-XINPUT_VERSION>=20')
 optdepends=('inputattach: support for serial tablets')
-options=(!libtool)
 source=(http://downloads.sourceforge.net/project/linuxwacom/$pkgname/$pkgname-$pkgver.tar.bz2
         70-wacom.rules)
 md5sums=('353642b8a3f2dde089e913be32955aae'
diff --git a/extra/xf86-video-apm/PKGBUILD b/extra/xf86-video-apm/PKGBUILD
index b1a17aebf..3f553fa2a 100644
--- a/extra/xf86-video-apm/PKGBUILD
+++ b/extra/xf86-video-apm/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 180190 2013-03-18 16:09:00Z andyrtr $
+# $Id: PKGBUILD 198509 2013-10-30 15:18:20Z allan $
 # Maintainer: AndyRTR <andyrtr@archlinux.org>
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
@@ -12,7 +12,6 @@ license=('custom')
 depends=('glibc')
 makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=14' 'resourceproto' 'scrnsaverproto')
 conflicts=('xorg-server<1.14.0' 'X-ABI-VIDEODRV_VERSION<14' 'X-ABI-VIDEODRV_VERSION>=15')
-options=('!libtool')
 source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2 git-fix.diff)
 sha256sums=('953b04320117b14c5b7efb37de45cef45592409f639c2aa87b7e2d77dc8d3d0f'
             'be06cce5eb0b8eb070321e293f5cd9b7aa947d920d23cc962f7121191ba4180b')
diff --git a/extra/xf86-video-ark/PKGBUILD b/extra/xf86-video-ark/PKGBUILD
index ed351f636..47ae1f445 100644
--- a/extra/xf86-video-ark/PKGBUILD
+++ b/extra/xf86-video-ark/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 180191 2013-03-18 16:09:00Z andyrtr $
+# $Id: PKGBUILD 198510 2013-10-30 15:18:43Z allan $
 # Maintainer: AndyRTR <andyrtr@archlinux.org>
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
@@ -12,7 +12,6 @@ license=('custom')
 depends=('glibc')
 makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=14' 'resourceproto' 'scrnsaverproto')
 conflicts=('xorg-server<1.14.0' 'X-ABI-VIDEODRV_VERSION<14' 'X-ABI-VIDEODRV_VERSION>=15')
-options=('!libtool')
 groups=('xorg-drivers' 'xorg')
 source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2 build-fix.diff)
 sha256sums=('c690e046f34a393aac1c8d9616b4790e93cda60a460b00b9597d322175dbe51e'
diff --git a/extra/xf86-video-ast/PKGBUILD b/extra/xf86-video-ast/PKGBUILD
index ef642098d..51e117d75 100644
--- a/extra/xf86-video-ast/PKGBUILD
+++ b/extra/xf86-video-ast/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 180192 2013-03-18 16:09:01Z andyrtr $
+# $Id: PKGBUILD 198511 2013-10-30 15:19:03Z allan $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=xf86-video-ast
@@ -11,7 +11,6 @@ license=('custom')
 depends=('glibc')
 makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=14' 'resourceproto' 'scrnsaverproto')
 conflicts=('xorg-server<1.14.0' 'X-ABI-VIDEODRV_VERSION<14' 'X-ABI-VIDEODRV_VERSION>=15')
-options=('!libtool')
 groups=('xorg-drivers' 'xorg')
 source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2 git-fix.diff)
 sha256sums=('28fcd4781676485293f6dcd46e0797866f6219e22e1851c9796b037589998e76'
diff --git a/extra/xf86-video-ati/PKGBUILD b/extra/xf86-video-ati/PKGBUILD
index 3eaefab5d..764ae0ad1 100644
--- a/extra/xf86-video-ati/PKGBUILD
+++ b/extra/xf86-video-ati/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 192205 2013-08-07 15:15:12Z lcarlier $
+# $Id: PKGBUILD 198512 2013-10-30 15:19:24Z allan $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: Alexander Baldeck <alexander@archlinux.org>
 
@@ -14,7 +14,6 @@ depends=('libdrm>=2.4.41' 'systemd-tools' 'ati-dri' 'glamor-egl')
 makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=14' 'resourceproto' 'scrnsaverproto')
 conflicts=('xorg-server<1.14.0' 'X-ABI-VIDEODRV_VERSION<14' 'X-ABI-VIDEODRV_VERSION>=15')
 groups=('xorg-drivers' 'xorg')
-options=('!libtool')
 source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
 sha256sums=('f30f5efdc8d7d18d06eda7ef2f91a8b7290f1cfbf6ff26362cd47ab8969daec4')
 
diff --git a/extra/xf86-video-chips/PKGBUILD b/extra/xf86-video-chips/PKGBUILD
index 265180ab4..2c328df5e 100644
--- a/extra/xf86-video-chips/PKGBUILD
+++ b/extra/xf86-video-chips/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 180194 2013-03-18 16:09:03Z andyrtr $
+# $Id: PKGBUILD 198513 2013-10-30 15:19:45Z allan $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: Alexander Baldeck <alexander@archlinux.org>
 
@@ -12,7 +12,6 @@ license=('custom')
 depends=(glibc)
 makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=14' 'resourceproto' 'scrnsaverproto')
 conflicts=('xorg-server<1.14.0' 'X-ABI-VIDEODRV_VERSION<14' 'X-ABI-VIDEODRV_VERSION>=15')
-options=('!libtool')
 source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2 iopl.h git-fix.diff)
 sha256sums=('8d3c744d035b3d769049647bb8022ec24500d31b1b224cd0ea4efe61f86bfed2'
             'd04607e51f9064fb128beceda9660feadb7775b585466a5b9fb04f942effc670'
diff --git a/extra/xf86-video-cirrus/PKGBUILD b/extra/xf86-video-cirrus/PKGBUILD
index b1b470008..824faf92c 100644
--- a/extra/xf86-video-cirrus/PKGBUILD
+++ b/extra/xf86-video-cirrus/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 180195 2013-03-18 16:09:03Z andyrtr $
+# $Id: PKGBUILD 198514 2013-10-30 15:20:05Z allan $
 #Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=xf86-video-cirrus
@@ -12,7 +12,6 @@ depends=('glibc')
 makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=14' 'resourceproto' 'scrnsaverproto')
 conflicts=('xorg-server<1.14.0' 'X-ABI-VIDEODRV_VERSION<14' 'X-ABI-VIDEODRV_VERSION>=15')
 groups=('xorg-drivers' 'xorg')
-options=('!libtool')
 source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
 sha256sums=('3361e1a65d9b84c464752fd612bdf6087622c6dd204121715366a170e5c3ccd7')
 
diff --git a/extra/xf86-video-dummy/PKGBUILD b/extra/xf86-video-dummy/PKGBUILD
index d9c0c3344..d06834211 100644
--- a/extra/xf86-video-dummy/PKGBUILD
+++ b/extra/xf86-video-dummy/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 194314 2013-09-13 08:12:58Z andyrtr $
+# $Id: PKGBUILD 198515 2013-10-30 15:20:26Z allan $
 #Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=xf86-video-dummy
@@ -12,7 +12,6 @@ depends=('glibc')
 makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=14' 'xf86dgaproto' 'resourceproto' 'scrnsaverproto')
 conflicts=('xorg-server<1.14.0' 'X-ABI-VIDEODRV_VERSION<14' 'X-ABI-VIDEODRV_VERSION>=15')
 groups=('xorg-drivers' 'xorg')
-options=('!libtool')
 source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
 sha256sums=('56f84fcbc515685529ad8e10bca1072731d9c096b97c5d35ddc95cd589b98680')
 
diff --git a/extra/xf86-video-fbdev/PKGBUILD b/extra/xf86-video-fbdev/PKGBUILD
index 66af2ff48..91400da95 100644
--- a/extra/xf86-video-fbdev/PKGBUILD
+++ b/extra/xf86-video-fbdev/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 195144 2013-09-25 17:08:11Z andyrtr $
+# $Id: PKGBUILD 198516 2013-10-30 15:20:49Z allan $
 #Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=xf86-video-fbdev
@@ -12,7 +12,6 @@ depends=('glibc')
 makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=14' 'resourceproto' 'scrnsaverproto')
 conflicts=('xorg-server<1.14.0' 'X-ABI-VIDEODRV_VERSION<14' 'X-ABI-VIDEODRV_VERSION>=15')
 groups=('xorg-drivers' 'xorg')
-options=('!libtool')
 source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
 sha256sums=('9dd4b326498223abbfdf786089a46ea3db4fa6bbd341308eb48a9e00bc3fd51b')
 
diff --git a/extra/xf86-video-glint/PKGBUILD b/extra/xf86-video-glint/PKGBUILD
index df917019d..8ef44fc40 100644
--- a/extra/xf86-video-glint/PKGBUILD
+++ b/extra/xf86-video-glint/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 180198 2013-03-18 16:09:07Z andyrtr $
+# $Id: PKGBUILD 198517 2013-10-30 15:21:10Z allan $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=xf86-video-glint
@@ -11,7 +11,6 @@ license=('custom')
 depends=('glibc')
 makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=14' 'xf86dgaproto' 'resourceproto' 'scrnsaverproto')
 conflicts=('xorg-server<1.14.0' 'X-ABI-VIDEODRV_VERSION<14' 'X-ABI-VIDEODRV_VERSION>=15')
-options=('!libtool')
 groups=('xorg-drivers' 'xorg')
 source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2 git-fix.diff)
 sha256sums=('657f883bb3a4e4278399eba73840862c3642706ae8b0a4798ec97a31b3524221'
diff --git a/extra/xf86-video-i128/PKGBUILD b/extra/xf86-video-i128/PKGBUILD
index 3b54ba963..cc8528765 100644
--- a/extra/xf86-video-i128/PKGBUILD
+++ b/extra/xf86-video-i128/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 180199 2013-03-18 16:09:08Z andyrtr $
+# $Id: PKGBUILD 198518 2013-10-30 15:21:31Z allan $
 # Maintainer:Jan de Groot <jgc@archlinux.org>
 
 pkgname=xf86-video-i128
@@ -12,7 +12,6 @@ depends=('glibc')
 makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=14' 'resourceproto' 'scrnsaverproto')
 conflicts=('xorg-server<1.14.0' 'X-ABI-VIDEODRV_VERSION<14' 'X-ABI-VIDEODRV_VERSION>=15')
 groups=('xorg-drivers' 'xorg')
-options=('!libtool')
 source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2 git-fix.diff)
 sha256sums=('f8827e4c988f90cf5a677554b30d61f0a07eb86d872478751cdc94dc17452b9c'
             '3805461dd71ff6675fd08afd5c21a230e7f36d6cda6830adac38ceee36d96f4b')
diff --git a/extra/xf86-video-i740/PKGBUILD b/extra/xf86-video-i740/PKGBUILD
index 2d94138ca..35161e5ba 100644
--- a/extra/xf86-video-i740/PKGBUILD
+++ b/extra/xf86-video-i740/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 180200 2013-03-18 16:09:08Z andyrtr $
+# $Id: PKGBUILD 198519 2013-10-30 15:21:53Z allan $
 #Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=xf86-video-i740
@@ -11,7 +11,6 @@ license=('custom')
 depends=('glibc')
 makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=14' 'resourceproto' 'scrnsaverproto')
 conflicts=('xorg-server<1.14.0' 'X-ABI-VIDEODRV_VERSION<14' 'X-ABI-VIDEODRV_VERSION>=15')
-options=('!libtool')
 source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2 git-fix.diff)
 sha256sums=('1a24009bb2223b722fb41e1a2737a6e74bfecb0829e5583e270d267ee4ecca78'
             '2b004773fe8090dea727590a7fc0389c53a16d068537fd1968ae320b0f1e36ca')
diff --git a/extra/xf86-video-intel/PKGBUILD b/extra/xf86-video-intel/PKGBUILD
index f7f2d4f4b..d813d28dc 100644
--- a/extra/xf86-video-intel/PKGBUILD
+++ b/extra/xf86-video-intel/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 193567 2013-08-24 08:12:29Z andyrtr $
+# $Id: PKGBUILD 198520 2013-10-30 15:22:14Z allan $
 # Maintainer: AndyRTR <andyrtr@archlinux.org>
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
@@ -16,7 +16,6 @@ replaces=('xf86-video-intel-uxa' 'xf86-video-intel-sna')
 provides=('xf86-video-intel-uxa' 'xf86-video-intel-sna')
 conflicts=('xorg-server<1.14.0' 'X-ABI-VIDEODRV_VERSION<14' 'X-ABI-VIDEODRV_VERSION>=15'
            'xf86-video-intel-sna' 'xf86-video-intel-uxa' 'xf86-video-i810' 'xf86-video-intel-legacy')
-options=('!libtool')
 groups=('xorg-drivers' 'xorg')
 source=(${url}/archive/individual/driver/${pkgname}-${pkgver}.tar.bz2)
 sha256sums=('7d5a140f82a72fd1cbc8a664d66c3d4eca47ee240ca4927b8a98d7af6f65d6fc')
diff --git a/extra/xf86-video-mach64/PKGBUILD b/extra/xf86-video-mach64/PKGBUILD
index 991fe6400..cd6fe5e98 100644
--- a/extra/xf86-video-mach64/PKGBUILD
+++ b/extra/xf86-video-mach64/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 180202 2013-03-18 16:09:10Z andyrtr $
+# $Id: PKGBUILD 198521 2013-10-30 15:22:36Z allan $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=xf86-video-mach64
@@ -13,7 +13,7 @@ makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=14' 'resourceproto' 'sc
 conflicts=('xorg-server<1.14.0' 'X-ABI-VIDEODRV_VERSION<14' 'X-ABI-VIDEODRV_VERSION>=15')
 optdepends=('mach64-dri: DRI1 support from community repo')
 groups=('xorg-drivers' 'xorg')
-options=('!libtool' '!emptydirs')
+options=('!emptydirs')
 source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
 sha256sums=('97f108b8d7c0a8426bef9562683323ab6369956f18b0e220ee0d1a66b740855e')
 
diff --git a/extra/xf86-video-mga/PKGBUILD b/extra/xf86-video-mga/PKGBUILD
index a0db87db9..3da23a305 100644
--- a/extra/xf86-video-mga/PKGBUILD
+++ b/extra/xf86-video-mga/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 180203 2013-03-18 16:09:11Z andyrtr $
+# $Id: PKGBUILD 198523 2013-10-30 15:22:57Z allan $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=xf86-video-mga
@@ -12,7 +12,6 @@ depends=('glibc')
 makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=14' 'resourceproto' 'scrnsaverproto')
 conflicts=('xorg-server<1.14.0' 'X-ABI-VIDEODRV_VERSION<14' 'X-ABI-VIDEODRV_VERSION>=15')
 optdepends=('mga-dri: DRI1 support from community repo')
-options=('!libtool')
 groups=('xorg-drivers' 'xorg')
 source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
 sha256sums=('3f89ce250eea93f0de890954687790e06c0bab9e3e303df393e8759a187eca6c')
diff --git a/extra/xf86-video-modesetting/PKGBUILD b/extra/xf86-video-modesetting/PKGBUILD
index 51ac07260..fa9b0e673 100644
--- a/extra/xf86-video-modesetting/PKGBUILD
+++ b/extra/xf86-video-modesetting/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 188204 2013-06-12 19:08:23Z lcarlier $
+# $Id: PKGBUILD 198524 2013-10-30 15:23:19Z allan $
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 # Contributor: Gerardo Exequiel Pozzi <vmlinuz386@yahoo.com.ar>
 
@@ -14,7 +14,6 @@ makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=14' 'resourceproto' 'sc
 conflicts=('xorg-server<1.14.0' 'X-ABI-VIDEODRV_VERSION<14' 'X-ABI-VIDEODRV_VERSION>=15')
 groups=('xorg-drivers' 'xorg')
 groups=('xorg-drivers' 'xorg')
-options=('!libtool')
 source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
 sha256sums=('13dc349e9aa50987ab2479d27d6879cda2c1f9ad8c8d3a1422a2f53c36f047f8')
 
diff --git a/extra/xf86-video-neomagic/PKGBUILD b/extra/xf86-video-neomagic/PKGBUILD
index 5f4efc999..44e2a8489 100644
--- a/extra/xf86-video-neomagic/PKGBUILD
+++ b/extra/xf86-video-neomagic/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 193167 2013-08-17 14:06:22Z lcarlier $
+# $Id: PKGBUILD 198526 2013-10-30 15:23:40Z allan $
 #Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=xf86-video-neomagic
@@ -12,7 +12,6 @@ depends=('glibc')
 makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=14' 'resourceproto' 'scrnsaverproto')
 conflicts=('xorg-server<1.14.0' 'X-ABI-VIDEODRV_VERSION<14' 'X-ABI-VIDEODRV_VERSION>=15')
 groups=('xorg-drivers' 'xorg')
-options=('!libtool')
 source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
 sha256sums=('50abf6ac02547900edeaa5073c5f6d2f153f12dd47067cc7e4758e1b74d78874')
 
diff --git a/extra/xf86-video-nouveau/PKGBUILD b/extra/xf86-video-nouveau/PKGBUILD
index 558680093..09b5d3c4d 100644
--- a/extra/xf86-video-nouveau/PKGBUILD
+++ b/extra/xf86-video-nouveau/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 191802 2013-07-30 21:14:54Z lcarlier $
+# $Id: PKGBUILD 198527 2013-10-30 15:24:00Z allan $
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 # Contributor: buddabrod <buddabrod@gmail.com>
 
@@ -13,7 +13,6 @@ depends=('libdrm' 'udev' 'nouveau-dri')
 makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=14' 'resourceproto' 'scrnsaverproto')
 conflicts=('xorg-server<1.14.0' 'X-ABI-VIDEODRV_VERSION<14' 'X-ABI-VIDEODRV_VERSION>=15')
 groups=('xorg-drivers' 'xorg')
-options=('!libtool')
 install=$pkgname.install
 source=(http://xorg.freedesktop.org/archive/individual/driver/$pkgname-$pkgver.tar.bz2)
 sha256sums=('b247c800e532fad1c80a5666d8ca0d4e5712064b6d7a3b030b32206a8de04482')
diff --git a/extra/xf86-video-nv/PKGBUILD b/extra/xf86-video-nv/PKGBUILD
index 2a7ab0367..b2f2330d7 100644
--- a/extra/xf86-video-nv/PKGBUILD
+++ b/extra/xf86-video-nv/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 180207 2013-03-18 16:09:14Z andyrtr $
+# $Id: PKGBUILD 198528 2013-10-30 15:24:23Z allan $
 # Maintainer: AndyRTR <andyrtr@archlinux.org>
 # Maintainer:Jan de Groot <jgc@archlinux.org>
 
@@ -12,7 +12,6 @@ url="http://xorg.freedesktop.org/"
 depends=('glibc')
 makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=14' 'resourceproto' 'scrnsaverproto')
 conflicts=('xorg-server<1.14.0' 'X-ABI-VIDEODRV_VERSION<14' 'X-ABI-VIDEODRV_VERSION>=15')
-options=('!libtool')
 groups=('xorg-drivers' 'xorg')
 source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2 git-fixes.patch)
 sha256sums=('8395f65501f16f9cbaae8f598b02c6f18e78f4d3d30a08cb8d547dc2e00c10bf'
diff --git a/extra/xf86-video-openchrome/PKGBUILD b/extra/xf86-video-openchrome/PKGBUILD
index a287258bd..c24949122 100644
--- a/extra/xf86-video-openchrome/PKGBUILD
+++ b/extra/xf86-video-openchrome/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 192461 2013-08-12 09:17:15Z lcarlier $
+# $Id: PKGBUILD 198529 2013-10-30 15:24:51Z allan $
 # Contributor: Paul Mattal <paul@mattal.com>
 # Maintainer: Juergen Hoetzel <juergen@hoetzel.info>
 
@@ -15,7 +15,7 @@ makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=14' 'resourceproto' 'sc
 conflicts=('xorg-server<1.14.0' 'X-ABI-VIDEODRV_VERSION<14' 'X-ABI-VIDEODRV_VERSION>=15' 'xf86-video-via' 'xf86-video-unichrome' 'openchrome')
 replaces=('openchrome' 'xf86-video-via')
 groups=('xorg-drivers' 'xorg')
-options=('!libtool' '!emptydirs' '!makeflags')
+options=('!emptydirs' '!makeflags')
 source=(http://xorg.freedesktop.org/archive/individual/driver/${pkgname}-${pkgver}.tar.bz2)
 sha1sums=('1f7b23d4ed53417eda5c6730486b36812f469295')
 
diff --git a/extra/xf86-video-r128/PKGBUILD b/extra/xf86-video-r128/PKGBUILD
index 5e1198c8c..447554869 100644
--- a/extra/xf86-video-r128/PKGBUILD
+++ b/extra/xf86-video-r128/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 195864 2013-10-02 19:32:45Z andyrtr $
+# $Id: PKGBUILD 198530 2013-10-30 15:25:14Z allan $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=xf86-video-r128
@@ -13,7 +13,6 @@ makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=14' 'resourceproto' 'sc
 conflicts=('xorg-server<1.14.0' 'X-ABI-VIDEODRV_VERSION<14' 'X-ABI-VIDEODRV_VERSION>=15')
 optdepends=('r128-dri: DRI1 support from community repo')
 groups=('xorg-drivers' 'xorg')
-options=('!libtool')
 source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
 sha256sums=('8b2d295f1842d07304a75da1cfb9bf139b320a6539970eaf8d5ecc010cd36ee0')
 
diff --git a/extra/xf86-video-rendition/PKGBUILD b/extra/xf86-video-rendition/PKGBUILD
index 4caf52ecf..b4de759cc 100644
--- a/extra/xf86-video-rendition/PKGBUILD
+++ b/extra/xf86-video-rendition/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 180210 2013-03-18 16:09:16Z andyrtr $
+# $Id: PKGBUILD 198531 2013-10-30 15:25:34Z allan $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=xf86-video-rendition
@@ -11,7 +11,7 @@ license=('custom')
 depends=('glibc')
 makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=14' 'resourceproto' 'scrnsaverproto')
 conflicts=('xorg-server<1.14.0' 'X-ABI-VIDEODRV_VERSION<14' 'X-ABI-VIDEODRV_VERSION>=15')
-options=('!libtool' '!strip')
+options=('!strip')
 source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2 git-fixes.patch)
 sha256sums=('39b5569338237de6e17b2a2c6be73ac6c405ee596079c41a7028cfd6e54134cb'
             '93a59e9deed98af201c8bb231fdf3214fcd02dae8ef2f880b044b4fd100cdb4c')
diff --git a/extra/xf86-video-s3/PKGBUILD b/extra/xf86-video-s3/PKGBUILD
index 238c7721a..1229b54e0 100644
--- a/extra/xf86-video-s3/PKGBUILD
+++ b/extra/xf86-video-s3/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 180211 2013-03-18 16:09:17Z andyrtr $
+# $Id: PKGBUILD 198532 2013-10-30 15:25:58Z allan $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=xf86-video-s3
@@ -11,7 +11,6 @@ license=('custom')
 depends=('glibc')
 makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=14' 'resourceproto' 'scrnsaverproto')
 conflicts=('xorg-server<1.14.0' 'X-ABI-VIDEODRV_VERSION<14' 'X-ABI-VIDEODRV_VERSION>=15')
-options=('!libtool')
 source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2 build-fix.diff)
 sha256sums=('4778cd4f1d61490c3562f9be03664576f065fa3acf22fe0d0689212d7ea3ad39'
             'ad5ce4569c16f28801f4f89d8271fccc5706ef8508a6051ca094854d92a19d1a')
diff --git a/extra/xf86-video-s3virge/PKGBUILD b/extra/xf86-video-s3virge/PKGBUILD
index db233becc..08dfbc589 100644
--- a/extra/xf86-video-s3virge/PKGBUILD
+++ b/extra/xf86-video-s3virge/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 180212 2013-03-18 16:09:18Z andyrtr $
+# $Id: PKGBUILD 198533 2013-10-30 15:26:27Z allan $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: Alexander Baldeck <alexander@archlinux.org>
 
@@ -12,7 +12,6 @@ license=('custom')
 depends=('glibc')
 makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=14' 'resourceproto' 'scrnsaverproto')
 conflicts=('xorg-server<1.14.0' 'X-ABI-VIDEODRV_VERSION<14' 'X-ABI-VIDEODRV_VERSION>=15')
-options=(!libtool)
 source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
 sha256sums=('85e1f6bdd3f39d0348c53602f481b974c13fc752c94931882817751c8ec8363e')
 
diff --git a/extra/xf86-video-savage/PKGBUILD b/extra/xf86-video-savage/PKGBUILD
index 08158f8fc..5071a89a4 100644
--- a/extra/xf86-video-savage/PKGBUILD
+++ b/extra/xf86-video-savage/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 195146 2013-09-25 17:11:53Z andyrtr $
+# $Id: PKGBUILD 198534 2013-10-30 15:26:51Z allan $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=xf86-video-savage
@@ -12,7 +12,6 @@ depends=('glibc')
 makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=14' 'resourceproto' 'scrnsaverproto')
 conflicts=('xorg-server<1.14.0' 'X-ABI-VIDEODRV_VERSION<14' 'X-ABI-VIDEODRV_VERSION>=15')
 optdepends=('savage-dri: DRI1 support from community repo')
-options=(!libtool)
 groups=('xorg-drivers' 'xorg')
 source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
 sha256sums=('041d4205c9222c1780fba6e0e397a559aed393b7a7991b58fa79ba8cccc54a44')
diff --git a/extra/xf86-video-siliconmotion/PKGBUILD b/extra/xf86-video-siliconmotion/PKGBUILD
index 12228ae0f..48420a138 100644
--- a/extra/xf86-video-siliconmotion/PKGBUILD
+++ b/extra/xf86-video-siliconmotion/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 180214 2013-03-18 16:09:20Z andyrtr $
+# $Id: PKGBUILD 198535 2013-10-30 15:27:11Z allan $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: Alexander Baldeck <alexander@archlinux.org>
 
@@ -12,7 +12,6 @@ license=('custom')
 depends=('glibc')
 makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=14' 'resourceproto' 'scrnsaverproto')
 conflicts=('xorg-server<1.14.0' 'X-ABI-VIDEODRV_VERSION<14' 'X-ABI-VIDEODRV_VERSION>=15')
-options=('!libtool')
 groups=('xorg-drivers' 'xorg')
 source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2
 	98_sm712_CRT_enable.diff
diff --git a/extra/xf86-video-sis/PKGBUILD b/extra/xf86-video-sis/PKGBUILD
index e123c4a03..1339a4111 100644
--- a/extra/xf86-video-sis/PKGBUILD
+++ b/extra/xf86-video-sis/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 180222 2013-03-18 16:10:35Z andyrtr $
+# $Id: PKGBUILD 198536 2013-10-30 15:27:33Z allan $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=xf86-video-sis
@@ -12,7 +12,6 @@ depends=('glibc')
 makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=14' 'xf86dgaproto' 'resourceproto' 'scrnsaverproto')
 conflicts=('xorg-server<1.14.0' 'X-ABI-VIDEODRV_VERSION<14' 'X-ABI-VIDEODRV_VERSION>=15')
 optdepends=('sis-dri: DRI1 support from community repo')
-options=('!libtool')
 groups=('xorg-drivers' 'xorg')
 source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2
 	0001-Disable-UploadToScreen-and-DownloadFromScreen.patch
diff --git a/extra/xf86-video-sisimedia/PKGBUILD b/extra/xf86-video-sisimedia/PKGBUILD
index add01b89b..5522e7faa 100644
--- a/extra/xf86-video-sisimedia/PKGBUILD
+++ b/extra/xf86-video-sisimedia/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 180223 2013-03-18 16:10:37Z andyrtr $
+# $Id: PKGBUILD 198537 2013-10-30 15:27:58Z allan $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=xf86-video-sisimedia
@@ -11,7 +11,6 @@ license=('custom')
 depends=('glibc')
 makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=14' 'xf86dgaproto')
 conflicts=('xorg-server<1.14.0' 'X-ABI-VIDEODRV_VERSION<14' 'X-ABI-VIDEODRV_VERSION>=15')
-options=('!libtool')
 source=(ftp://ftp.archlinux.org/other/xf86-video-sisimedia/xf86-video-sisimedia-0.9.1_20091203.tar.bz2
         xf86-video-sis-0.9.1-20102701.patch
         0002-Remove-XFree86-Misc-PassMessage-support.patch
diff --git a/extra/xf86-video-sisusb/PKGBUILD b/extra/xf86-video-sisusb/PKGBUILD
index 14617168c..7676aa996 100644
--- a/extra/xf86-video-sisusb/PKGBUILD
+++ b/extra/xf86-video-sisusb/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 180224 2013-03-18 16:10:38Z andyrtr $
+# $Id: PKGBUILD 198538 2013-10-30 15:28:21Z allan $
 #Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=xf86-video-sisusb
@@ -11,7 +11,6 @@ license=('custom')
 depends=('glibc')
 makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=14' 'resourceproto' 'scrnsaverproto')
 conflicts=('xorg-server<1.14.0' 'X-ABI-VIDEODRV_VERSION<14' 'X-ABI-VIDEODRV_VERSION>=15')
-options=('!libtool')
 source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2 git-fixes.patch)
 sha256sums=('73dbef43c56a4ce1445c27ebac2ddc062c643c32ca6e2a4d095aea2185b9e046'
             '9b64f4a9160c1055d3e01e1b603840986163a7880dbbb5c12f3a7d4c66739134')
diff --git a/extra/xf86-video-tdfx/PKGBUILD b/extra/xf86-video-tdfx/PKGBUILD
index 997c74f8c..4c7b0abe1 100644
--- a/extra/xf86-video-tdfx/PKGBUILD
+++ b/extra/xf86-video-tdfx/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 180215 2013-03-18 16:09:21Z andyrtr $
+# $Id: PKGBUILD 198539 2013-10-30 15:28:43Z allan $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=xf86-video-tdfx
@@ -12,7 +12,6 @@ depends=('glibc')
 makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=14' 'resourceproto' 'scrnsaverproto')
 conflicts=('xorg-server<1.14.0' 'X-ABI-VIDEODRV_VERSION<14' 'X-ABI-VIDEODRV_VERSION>=15')
 optdepends=('tdfx-dri: DRI1 support from community repo')
-options=(!libtool)
 groups=('xorg-drivers' 'xorg')
 source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2 git-fixes.patch)
 sha256sums=('70d5fbadfb60fc25e4f90f2a1aad258f64fa3953efbc1059103a8d845870d859'
diff --git a/extra/xf86-video-trident/PKGBUILD b/extra/xf86-video-trident/PKGBUILD
index d33c4d24d..bc2df6862 100644
--- a/extra/xf86-video-trident/PKGBUILD
+++ b/extra/xf86-video-trident/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 180216 2013-03-18 16:09:22Z andyrtr $
+# $Id: PKGBUILD 198540 2013-10-30 15:29:05Z allan $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=xf86-video-trident
@@ -12,7 +12,6 @@ depends=('glibc')
 makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=14' 'xf86dgaproto' 'resourceproto' 'scrnsaverproto')
 conflicts=('xorg-server<1.14.0' 'X-ABI-VIDEODRV_VERSION<14' 'X-ABI-VIDEODRV_VERSION>=15')
 groups=('xorg-drivers' 'xorg')
-options=(!libtool)
 source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2 git_fixes.diff)
 sha256sums=('6a58e3f3034abd8803af8a5c7dd5a6a4a28ed4fdac742ffb05518caaddc28104'
             'e51d7a9c5a3d7d2df7f56e482f5fbeac1babc2b30cdf4655052b11c9d4ec2c1c')
diff --git a/extra/xf86-video-tseng/PKGBUILD b/extra/xf86-video-tseng/PKGBUILD
index 701c2dcae..c9f87a796 100644
--- a/extra/xf86-video-tseng/PKGBUILD
+++ b/extra/xf86-video-tseng/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 180217 2013-03-18 16:09:23Z andyrtr $
+# $Id: PKGBUILD 198541 2013-10-30 15:29:25Z allan $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=xf86-video-tseng
@@ -11,7 +11,6 @@ license=('custom')
 depends=('glibc')
 makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=14' 'resourceproto' 'scrnsaverproto')
 conflicts=('xorg-server<1.14.0' 'X-ABI-VIDEODRV_VERSION<14' 'X-ABI-VIDEODRV_VERSION>=15')
-options=('!libtool')
 source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2 git-fixes.patch)
 sha256sums=('c06dc5205f627e5afc795ecfa75e18d2d1db4e1f1f195fd017dad60854407819'
             '8a337e2bab9a5ee7ba15dde6665abcfa9559d769074873cb2a85cc86716bd5da')
diff --git a/extra/xf86-video-v4l/PKGBUILD b/extra/xf86-video-v4l/PKGBUILD
index d81537960..39ff92cd1 100644
--- a/extra/xf86-video-v4l/PKGBUILD
+++ b/extra/xf86-video-v4l/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 180218 2013-03-18 16:09:23Z andyrtr $
+# $Id: PKGBUILD 198542 2013-10-30 15:29:50Z allan $
 #Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=xf86-video-v4l
@@ -12,7 +12,6 @@ depends=('glibc')
 makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=14' 'resourceproto' 'scrnsaverproto')
 conflicts=('xorg-server<1.14.0' 'X-ABI-VIDEODRV_VERSION<14' 'X-ABI-VIDEODRV_VERSION>=15')
 groups=('xorg-drivers' 'xorg')
-options=('!libtool')
 source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2
         git-fixes.patch
         LICENSE)
diff --git a/extra/xf86-video-vesa/PKGBUILD b/extra/xf86-video-vesa/PKGBUILD
index b05999c60..45a3ddf95 100644
--- a/extra/xf86-video-vesa/PKGBUILD
+++ b/extra/xf86-video-vesa/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 180219 2013-03-18 16:09:24Z andyrtr $
+# $Id: PKGBUILD 198543 2013-10-30 15:30:23Z allan $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=xf86-video-vesa
@@ -12,7 +12,6 @@ depends=('glibc')
 makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=14' 'resourceproto' 'scrnsaverproto')
 conflicts=('xorg-server<1.14.0' 'X-ABI-VIDEODRV_VERSION<14' 'X-ABI-VIDEODRV_VERSION>=15')
 groups=('xorg-drivers' 'xorg')
-options=('!libtool')
 source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2
         revert-kernelcheck.patch
         git-fixes.patch)
diff --git a/extra/xf86-video-vmware/PKGBUILD b/extra/xf86-video-vmware/PKGBUILD
index 2ce3dc6ab..a9b857ec0 100644
--- a/extra/xf86-video-vmware/PKGBUILD
+++ b/extra/xf86-video-vmware/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 183093 2013-04-17 14:08:02Z jgc $
+# $Id: PKGBUILD 198544 2013-10-30 15:30:51Z allan $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=xf86-video-vmware
@@ -12,7 +12,7 @@ depends=('libdrm' 'svga-dri' 'mesa')
 makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=14' 'resourceproto' 'scrnsaverproto')
 conflicts=('xorg-server<1.14.0' 'X-ABI-VIDEODRV_VERSION<14' 'X-ABI-VIDEODRV_VERSION>=15')
 groups=('xorg-drivers' 'xorg')
-options=('!libtool' '!emptydirs')
+options=('!emptydirs')
 source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
 sha256sums=('802dda415c22412edad6c3df44fe18a06e91d0f8456d9a58bac0d340fdf8fe3d')
 
diff --git a/extra/xf86-video-voodoo/PKGBUILD b/extra/xf86-video-voodoo/PKGBUILD
index a624a2694..2d14fbb51 100644
--- a/extra/xf86-video-voodoo/PKGBUILD
+++ b/extra/xf86-video-voodoo/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 180221 2013-03-18 16:09:27Z andyrtr $
+# $Id: PKGBUILD 198545 2013-10-30 15:31:13Z allan $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=xf86-video-voodoo
@@ -12,7 +12,6 @@ depends=('glibc')
 makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=14' 'xf86dgaproto' 'resourceproto' 'scrnsaverproto')
 conflicts=('xorg-server<1.14.0' 'X-ABI-VIDEODRV_VERSION<14' 'X-ABI-VIDEODRV_VERSION>=15')
 groups=('xorg-drivers' 'xorg')
-options=('!libtool')
 source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
 sha256sums=('9e3eb8a3fdcc60ce4f7c37649188cfa67dcf25cda3a85d8027588458bb3fd7e8')
 
diff --git a/extra/xfce4-battery-plugin/PKGBUILD b/extra/xfce4-battery-plugin/PKGBUILD
index 4287cd8a6..e3cbca473 100644
--- a/extra/xfce4-battery-plugin/PKGBUILD
+++ b/extra/xfce4-battery-plugin/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 162942 2012-07-04 01:13:14Z eric $
+# $Id: PKGBUILD 198546 2013-10-30 15:31:35Z allan $
 # Maintainer: aurelien <aurelien@archlinux.org>
 # Contributor: Aurelien Foret <orelien@chez.com>
 
@@ -12,7 +12,6 @@ url="http://xfce-goodies.berlios.de/"
 groups=('xfce4-goodies')
 depends=('xfce4-panel')
 makedepends=('intltool')
-options=('!libtool')
 install=$pkgname.install
 source=(http://archive.xfce.org/src/panel-plugins/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.bz2)
 sha256sums=('f659b1af40ab72c93448affaa693ab551827a5600ce9b97a799b7c2419bdeb11')
diff --git a/extra/xfce4-clipman-plugin/PKGBUILD b/extra/xfce4-clipman-plugin/PKGBUILD
index d8c2b3dd5..fbebd7d55 100644
--- a/extra/xfce4-clipman-plugin/PKGBUILD
+++ b/extra/xfce4-clipman-plugin/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 157841 2012-04-30 04:20:05Z foutrelis $
+# $Id: PKGBUILD 198547 2013-10-30 15:31:55Z allan $
 # Maintainer: tobias <tobias at archlinux.org>
 # Contributor: Aurelien Foret <orelien@chez.com>
 
@@ -12,7 +12,6 @@ url="http://goodies.xfce.org/projects/panel-plugins/xfce4-clipman-plugin"
 groups=('xfce4-goodies')
 depends=('xfce4-panel' 'libunique' 'libxtst')
 makedepends=('intltool')
-options=('!libtool')
 install=${pkgname}.install
 source=(http://archive.xfce.org/src/panel-plugins/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2)
 md5sums=('61f3be97efa379cb358980c94e14692a')
diff --git a/extra/xfce4-cpufreq-plugin/PKGBUILD b/extra/xfce4-cpufreq-plugin/PKGBUILD
index d85412935..1c1e8eff1 100644
--- a/extra/xfce4-cpufreq-plugin/PKGBUILD
+++ b/extra/xfce4-cpufreq-plugin/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 193891 2013-09-04 01:10:34Z eric $
+# $Id: PKGBUILD 198548 2013-10-30 15:32:16Z allan $
 # Maintainer: AndyRTR <andyrtr@archlinux.org>
 # Contributor: tobias <tobias funnychar archlinux.org>
 
@@ -12,7 +12,6 @@ url="http://goodies.xfce.org/projects/panel-plugins/xfce4-cpufreq-plugin"
 groups=('xfce4-goodies')
 depends=('xfce4-panel')
 makedepends=('intltool')
-options=('!libtool')
 install=${pkgname}.install
 source=(http://archive.xfce.org/src/panel-plugins/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2)
 md5sums=('dcc56af0e19266956c297d124ba551f4')
diff --git a/extra/xfce4-cpugraph-plugin/PKGBUILD b/extra/xfce4-cpugraph-plugin/PKGBUILD
index 64ffa6bae..6a67b57ac 100644
--- a/extra/xfce4-cpugraph-plugin/PKGBUILD
+++ b/extra/xfce4-cpugraph-plugin/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 162991 2012-07-04 19:29:47Z eric $
+# $Id: PKGBUILD 198549 2013-10-30 15:32:39Z allan $
 # Maintainer: AndyRTR <andyrtr@archlinux.org>
 # Contributor: Aurelien Foret <orelien@chez.com>
 
@@ -12,7 +12,6 @@ url="http://goodies.xfce.org/projects/panel-plugins/xfce4-cpugraph-plugin"
 groups=('xfce4-goodies')
 depends=('xfce4-panel')
 makedepends=('intltool')
-options=('!libtool')
 install=$pkgname.install
 source=(http://archive.xfce.org/src/panel-plugins/$pkgname/1.0/$pkgname-$pkgver.tar.bz2)
 sha256sums=('85da0ec89aacfd31e0bbafcefea37cdca618d62e681c1c9da8bdd492f028f4c7')
diff --git a/extra/xfce4-datetime-plugin/PKGBUILD b/extra/xfce4-datetime-plugin/PKGBUILD
index 3e4402f6c..bd17435d4 100644
--- a/extra/xfce4-datetime-plugin/PKGBUILD
+++ b/extra/xfce4-datetime-plugin/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 178154 2013-02-17 09:09:09Z foutrelis $
+# $Id: PKGBUILD 198550 2013-10-30 15:32:59Z allan $
 # Maintainer:
 # Contributor: Andreas Radke <andyrtr@archlinux.org>
 # Contributor: Aurelien Foret <orelien@chez.com>
@@ -13,7 +13,6 @@ url="http://xfce-goodies.berlios.de/"
 groups=('xfce4-goodies')
 depends=('xfce4-panel')
 makedepends=('intltool')
-options=('!libtool')
 source=(http://archive.xfce.org/src/panel-plugins/${pkgname}/0.6/${pkgname}-${pkgver}.tar.bz2)
 md5sums=('fe604a251eadbc5b0f2b4737b85d92c8')
 
diff --git a/extra/xfce4-dev-tools/PKGBUILD b/extra/xfce4-dev-tools/PKGBUILD
index 6a76c4d1e..8408d9bbd 100644
--- a/extra/xfce4-dev-tools/PKGBUILD
+++ b/extra/xfce4-dev-tools/PKGBUILD
@@ -1,19 +1,26 @@
-# $Id: PKGBUILD 157849 2012-04-30 04:20:15Z foutrelis $
+# $Id: PKGBUILD 197077 2013-10-21 15:48:24Z foutrelis $
 # Maintainer: Evangelos Foutras <evangelos@foutrelis.com>
 # Contributor: Andreas Radke <andyrtr@archlinux.org>
 # Contributor: Tobias Kieslich <tobias funnychar archlinux.org>
 
 pkgname=xfce4-dev-tools
 pkgver=4.10.0
-pkgrel=1
+pkgrel=2
 pkgdesc="Xfce developer tools"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.xfce.org/"
 license=('GPL2')
 depends=('gtk-doc' 'automake' 'make' 'intltool' 'pkg-config')
-options=('!libtool')
-source=(http://archive.xfce.org/src/xfce/xfce4-dev-tools/${pkgver%.*}/$pkgname-$pkgver.tar.bz2)
-sha256sums=('f79649bbfbbf16881494ee9f67035063765aec12e23ab9bac31de2c8a4f32bf8')
+source=(http://archive.xfce.org/src/xfce/xfce4-dev-tools/${pkgver%.*}/$pkgname-$pkgver.tar.bz2
+        xfce4-dev-tools-4.10.0-remove-FORTIFY_SOURCE-2.patch)
+sha256sums=('f79649bbfbbf16881494ee9f67035063765aec12e23ab9bac31de2c8a4f32bf8'
+            '4ecfdf8cdb0940ce1044349bdb6646192dffd2b7f4e890f0ef5f00bfdfad7676')
+
+prepare() {
+  cd "$srcdir/$pkgname-$pkgver"
+
+  patch -Np1 -i "$srcdir/xfce4-dev-tools-4.10.0-remove-FORTIFY_SOURCE-2.patch"
+}
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
diff --git a/extra/xfce4-dev-tools/xfce4-dev-tools-4.10.0-remove-FORTIFY_SOURCE-2.patch b/extra/xfce4-dev-tools/xfce4-dev-tools-4.10.0-remove-FORTIFY_SOURCE-2.patch
new file mode 100644
index 000000000..1c9fb4e2f
--- /dev/null
+++ b/extra/xfce4-dev-tools/xfce4-dev-tools-4.10.0-remove-FORTIFY_SOURCE-2.patch
@@ -0,0 +1,22 @@
+From 236a0c578369bfc726f7d9a830975cbeaefbfee5 Mon Sep 17 00:00:00 2001
+From: Nick Schermer <nick@xfce.org>
+Date: Mon, 23 Jul 2012 15:31:48 +0000
+Subject: Remove FORTIFY_SOURCE=2.
+
+This gives warnings with full debug builds on recent gcc versions.
+---
+diff --git a/m4macros/xdt-features.m4 b/m4macros/xdt-features.m4
+index c5f5583..f258822 100644
+--- a/m4macros/xdt-features.m4
++++ b/m4macros/xdt-features.m4
+@@ -79,7 +79,7 @@ AC_HELP_STRING([--disable-debug], [Include no debugging support]),
+                               -Wcast-align -Wformat-security \
+                               -Winit-self -Wmissing-include-dirs -Wundef \
+                               -Wmissing-format-attribute -Wnested-externs"
+-    CPPFLAGS="$CPPFLAGS -D_FORTIFY_SOURCE=2"
++    CPPFLAGS="$CPPFLAGS"
+ 
+     if test x`uname` = x"Linux"; then
+       xdt_cv_additional_CFLAGS="$xdt_cv_additional_CFLAGS -fstack-protector"
+--
+cgit v0.9.2
diff --git a/extra/xfce4-dict/PKGBUILD b/extra/xfce4-dict/PKGBUILD
index 5d68de766..b2e800264 100644
--- a/extra/xfce4-dict/PKGBUILD
+++ b/extra/xfce4-dict/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 186157 2013-05-21 10:21:01Z foutrelis $
+# $Id: PKGBUILD 198551 2013-10-30 15:33:20Z allan $
 # Maintainer: AndyRTR <andyrtr@archlinux.org>
 # Contributor: Aurelien Foret <orelien@chez.com>
 
@@ -15,7 +15,6 @@ makedepends=('intltool')
 provides=('xfce4-dict-plugin')
 conflicts=('xfce4-dict-plugin')
 replaces=('xfce4-dict-plugin')
-options=('!libtool')
 install=$pkgname.install
 source=(http://archive.xfce.org/src/apps/$pkgname/0.7/$pkgname-$pkgver.tar.bz2)
 sha256sums=('407fc0f02adf6ea85dec6993db1e222b548afcdd63a9e35ed2d70a42c9738e58')
diff --git a/extra/xfce4-diskperf-plugin/PKGBUILD b/extra/xfce4-diskperf-plugin/PKGBUILD
index 6a47af76a..ab2a70e3d 100644
--- a/extra/xfce4-diskperf-plugin/PKGBUILD
+++ b/extra/xfce4-diskperf-plugin/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 162949 2012-07-04 02:32:01Z eric $
+# $Id: PKGBUILD 198552 2013-10-30 15:33:40Z allan $
 # Maintainer:
 # Contributor: Aurelien Foret <orelien@chez.com>
 
@@ -12,7 +12,6 @@ url="http://goodies.xfce.org/projects/panel-plugins/xfce4-diskperf-plugin"
 groups=('xfce4-goodies')
 depends=('xfce4-panel')
 makedepends=('intltool')
-options=('!libtool')
 source=(http://archive.xfce.org/src/panel-plugins/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.bz2)
 sha256sums=('aab6b9c4e2f78620920efac6874c4edf426f05b63b94cfda0da8c99a91110a0b')
 
diff --git a/extra/xfce4-eyes-plugin/PKGBUILD b/extra/xfce4-eyes-plugin/PKGBUILD
index 21e672c64..b9847e98f 100644
--- a/extra/xfce4-eyes-plugin/PKGBUILD
+++ b/extra/xfce4-eyes-plugin/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 179295 2013-03-04 21:35:04Z foutrelis $
+# $Id: PKGBUILD 198553 2013-10-30 15:34:02Z allan $
 # Maintainer:
 # Contributor: AndyRTR <andyrtr@archlinux.org>
 # Contributor: Aurelien Foret <orelien@chez.com>
@@ -13,7 +13,6 @@ license=('GPL2')
 groups=('xfce4-goodies')
 depends=('xfce4-panel' 'hicolor-icon-theme')
 makedepends=('intltool' 'perlxml')
-options=('!libtool')
 install=$pkgname.install
 source=(http://archive.xfce.org/src/panel-plugins/$pkgname/4.4/$pkgname-$pkgver.tar.bz2)
 sha256sums=('dad102fedd0d9e6df45338a018387b2aacaf24b05eb798275be0dfc05ffa3021')
diff --git a/extra/xfce4-fsguard-plugin/PKGBUILD b/extra/xfce4-fsguard-plugin/PKGBUILD
index c69f1814c..f3ed1f12b 100644
--- a/extra/xfce4-fsguard-plugin/PKGBUILD
+++ b/extra/xfce4-fsguard-plugin/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 162953 2012-07-04 03:10:03Z eric $
+# $Id: PKGBUILD 198554 2013-10-30 15:34:22Z allan $
 # Maintainer: AndyRTR <andyrtr@archlinux.org>
 # Contributor: Ben <ben@benmazer.net>
 
@@ -12,7 +12,6 @@ url="http://xfce-goodies.berlios.de/"
 groups=('xfce4-goodies')
 depends=('xfce4-panel')
 makedepends=('intltool')
-options=(!libtool)
 install=${pkgname}.install
 source=(http://archive.xfce.org/src/panel-plugins/${pkgname}/1.0/${pkgname}-${pkgver}.tar.bz2)
 md5sums=('9c179371475e2837004cc208026e30c1')
diff --git a/extra/xfce4-genmon-plugin/PKGBUILD b/extra/xfce4-genmon-plugin/PKGBUILD
index a67ddcbd3..249baa0b6 100644
--- a/extra/xfce4-genmon-plugin/PKGBUILD
+++ b/extra/xfce4-genmon-plugin/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 158882 2012-05-12 17:34:09Z foutrelis $
+# $Id: PKGBUILD 198555 2013-10-30 15:34:47Z allan $
 # Maintainer:
 # Contributor: AndyRTR <andyrtr@archlinux.org>
 # Contributor: Tobias Kieslich <tobias (at) archlinux.org>
@@ -13,7 +13,6 @@ url="http://goodies.xfce.org/projects/panel-plugins/xfce4-genmon-plugin"
 groups=('xfce4-goodies')
 depends=('xfce4-panel')
 makedepends=('intltool')
-options=('!libtool')
 source=(http://archive.xfce.org/src/panel-plugins/$pkgname/3.4/$pkgname-$pkgver.tar.bz2)
 sha256sums=('b0a5337b49c85623dc89f3c9e47c7374b1d466af2418033d2d6dfc57a9790387')
 
diff --git a/extra/xfce4-mailwatch-plugin/PKGBUILD b/extra/xfce4-mailwatch-plugin/PKGBUILD
index aba363f1d..0b3751ac9 100644
--- a/extra/xfce4-mailwatch-plugin/PKGBUILD
+++ b/extra/xfce4-mailwatch-plugin/PKGBUILD
@@ -1,42 +1,32 @@
-# $Id: PKGBUILD 157861 2012-04-30 04:20:30Z foutrelis $
+# $Id: PKGBUILD 197445 2013-10-26 02:49:51Z eric $
 # Maintainer: AndyRTR <andyrtr@archlinux.org>
 # Contributor: Suzy Williams <suzanne.williams3@verizon.net>
 
 pkgname=xfce4-mailwatch-plugin
-pkgver=1.1.0
-pkgrel=5
+pkgver=1.2.0
+pkgrel=1
 pkgdesc="A mailbox watch/check plugin for the Xfce4 panel"
-arch=(i686 x86_64 'mips64el')
+arch=('i686' 'x86_64' 'mips64el')
+url="http://goodies.xfce.org/projects/panel-plugins/xfce4-mailwatch-plugin"
 license=('GPL2')
-url="http://spurint.org/projects/xfce4-mailwatch-plugin/"
 groups=('xfce4-goodies')
-depends=('xfce4-panel' 'libxfcegui4' 'gnutls' 'libgcrypt' 'hicolor-icon-theme')
-makedepends=('intltool' 'xfce4-dev-tools')
-options=('!libtool')
+depends=('xfce4-panel')
+makedepends=('intltool')
 install=${pkgname}.install
-source=(http://spuriousinterrupt.org/files/mailwatch/${pkgname}-${pkgver}.tar.bz2
-	xfce4-mailwatch-plugin-1.1.0-underlink.patch
-	only-call-gnutls-transport_set_lowat-with-gnutls-2.12.patch)
-md5sums=('f84dce86be1d7f25f169f262aaacee4e'
-         '47fe8588e3bb642e1b507a854927e6db'
-         'd91ca2b9534e9e2d8dcbd94306b91ade')
+source=(http://archive.xfce.org/src/panel-plugins/xfce4-mailwatch-plugin/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2)
+md5sums=('7263114ec0f2987a3aff15afeeb45577')
 
 build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  patch -Np0 -i ${srcdir}/only-call-gnutls-transport_set_lowat-with-gnutls-2.12.patch
-  # fix for panel4.8 from Fedora
-  patch -Np1 -i ${srcdir}/xfce4-mailwatch-plugin-1.1.0-underlink.patch
-  xdt-autogen
+  cd ${pkgname}-${pkgver}
   ./configure --prefix=/usr \
 	--sysconfdir=/etc \
 	--libexecdir=/usr/lib \
 	--localstatedir=/var \
-	--disable-static \
 	--disable-debug
   make
 }
 
 package() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  make DESTDIR=${pkgdir} install
+  cd ${pkgname}-${pkgver}
+  make DESTDIR="${pkgdir}" install
 }
diff --git a/extra/xfce4-mailwatch-plugin/only-call-gnutls-transport_set_lowat-with-gnutls-2.12.patch b/extra/xfce4-mailwatch-plugin/only-call-gnutls-transport_set_lowat-with-gnutls-2.12.patch
deleted file mode 100644
index 349e78555..000000000
--- a/extra/xfce4-mailwatch-plugin/only-call-gnutls-transport_set_lowat-with-gnutls-2.12.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- libmailwatch-core/mailwatch-net-conn.c.orig	2012-04-29 05:38:20.015564589 +0300
-+++ libmailwatch-core/mailwatch-net-conn.c	2012-04-29 05:39:01.943290639 +0300
-@@ -621,8 +621,10 @@ xfce_mailwatch_net_conn_make_secure(Xfce
-                            net_conn->gt_creds);
-     gnutls_transport_set_ptr(net_conn->gt_session,
-                              (gnutls_transport_ptr_t)net_conn->fd);
-+#if GNUTLS_VERSION_NUMBER < 0x020c00
-     if(fcntl(net_conn->fd, F_GETFL) & O_NONBLOCK)
-         gnutls_transport_set_lowat(net_conn->gt_session, 0);
-+#endif
-     
-     if(!xfce_mailwatch_net_conn_tls_handshake(net_conn, error)) {
- #if 0
diff --git a/extra/xfce4-mailwatch-plugin/xfce4-mailwatch-plugin-1.1.0-underlink.patch b/extra/xfce4-mailwatch-plugin/xfce4-mailwatch-plugin-1.1.0-underlink.patch
deleted file mode 100644
index ada0df041..000000000
--- a/extra/xfce4-mailwatch-plugin/xfce4-mailwatch-plugin-1.1.0-underlink.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- xfce4-mailwatch-plugin-1.1.0/panel-plugin/Makefile.am	2008-08-26 03:42:36.000000000 +0100
-+++ xfce4-mailwatch-plugin-1.1.0/panel-plugin/Makefile.am.new	2011-01-14 17:27:44.116199383 +0000
-@@ -50,6 +50,7 @@
- 	-I$(top_srcdir)/libmailwatch-core \
- 	@GTHREAD_CFLAGS@ \
- 	@LIBXFCE4PANEL_CFLAGS@ \
-+	@LIBXFCEGUI4_CFLAGS@ \
- 	-DDATADIR=\"$(datadir)\" \
- 	-DLOCALEDIR=\"$(localedir)\"
- 
-@@ -60,7 +61,9 @@
- 	$(top_builddir)/libmailwatch-core/libmailwatch-core.la \
- 	@GTHREAD_LIBS@ \
- 	@LIBXFCE4PANEL_LIBS@ \
--	@GNUTLS_LIBS@
-+	@LIBXFCEGUI4_LIBS@ \
-+	@GNUTLS_LIBS@ \
-+	-lgcrypt
- 
- if HAVE_CYGWIN
-   xfce4_mailwatch_plugin_LDFLAGS += \
diff --git a/extra/xfce4-mixer/PKGBUILD b/extra/xfce4-mixer/PKGBUILD
index 1f14b08c1..48dd4b3f8 100644
--- a/extra/xfce4-mixer/PKGBUILD
+++ b/extra/xfce4-mixer/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 184824 2013-05-09 08:12:58Z foutrelis $
+# $Id: PKGBUILD 198556 2013-10-30 15:35:11Z allan $
 # Maintainer: Tobias Kieslich <tobias funnychar archlinux.org>
 
 pkgname=xfce4-mixer
@@ -12,7 +12,6 @@ groups=('xfce4')
 depends=('xfce4-panel' 'gstreamer0.10-base-plugins' 'libunique')
 optdepends=('gstreamer0.10-good-plugins: for OSS and PulseAudio support')
 makedepends=('intltool')
-options=('!libtool')
 install=$pkgname.install
 source=(http://archive.xfce.org/src/apps/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.bz2)
 sha256sums=('a8c589001b438171ea5a6b46ce9895c3ffbc5081ab67805ab9870e540068dade')
diff --git a/extra/xfce4-mount-plugin/PKGBUILD b/extra/xfce4-mount-plugin/PKGBUILD
index 048eca5cf..661998909 100644
--- a/extra/xfce4-mount-plugin/PKGBUILD
+++ b/extra/xfce4-mount-plugin/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 158994 2012-05-14 14:53:48Z foutrelis $
+# $Id: PKGBUILD 198557 2013-10-30 15:35:32Z allan $
 # Maintainer: AndyRTR <andyrtr@archlinux.org>
 # Contributor: Tobias Kieslich <tobias (at) archlinux.org>
 
@@ -12,7 +12,6 @@ license=('GPL')
 groups=('xfce4-goodies')
 depends=('xfce4-panel')
 makedepends=('intltool')
-options=('!libtool')
 install=$pkgname.install
 source=(http://archive.xfce.org/src/panel-plugins/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.bz2)
 sha256sums=('541d7af84d7d0b00ae547aa1f438e2fac51ee4195c4d0a17173c4f72accb227d')
diff --git a/extra/xfce4-mpc-plugin/PKGBUILD b/extra/xfce4-mpc-plugin/PKGBUILD
index 5e6d373df..66408b2f2 100644
--- a/extra/xfce4-mpc-plugin/PKGBUILD
+++ b/extra/xfce4-mpc-plugin/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 162957 2012-07-04 03:39:14Z eric $
+# $Id: PKGBUILD 198558 2013-10-30 15:35:52Z allan $
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 # Contributor: aurelien <aurelien@archlinux.org>
 # Contributor: Tobias Kieslich <tobias (at) archlinux.org>
@@ -13,7 +13,6 @@ license=('BSD')
 groups=('xfce4-goodies')
 depends=('xfce4-panel' 'libmpd>=0.16.1')
 makedepends=('intltool')
-options=('!libtool')
 source=(http://archive.xfce.org/src/panel-plugins/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.bz2)
 sha256sums=('4f0ce6146aa2680a4c1ca7bad1be30187a8a179e8c4355a8fe13d1fc38dac5c5')
 
diff --git a/extra/xfce4-netload-plugin/PKGBUILD b/extra/xfce4-netload-plugin/PKGBUILD
index dba09e52e..818bd8692 100644
--- a/extra/xfce4-netload-plugin/PKGBUILD
+++ b/extra/xfce4-netload-plugin/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 163558 2012-07-15 17:45:02Z foutrelis $
+# $Id: PKGBUILD 198559 2013-10-30 15:36:13Z allan $
 # Maintainer:
 # Contributor: Aurelien Foret <orelien@chez.com>
 
@@ -12,7 +12,6 @@ license=('GPL')
 groups=('xfce4-goodies')
 depends=('xfce4-panel')
 makedepends=('intltool')
-options=('!libtool')
 install=xfce4-netload-plugin.install
 source=(http://archive.xfce.org/src/panel-plugins/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.bz2)
 sha256sums=('c824f09e2d3860011b44d8272d661c458237786828027f3d9ad6a1d4f0096845')
diff --git a/extra/xfce4-notes-plugin/PKGBUILD b/extra/xfce4-notes-plugin/PKGBUILD
index a6e5b52f8..5f9c5216f 100644
--- a/extra/xfce4-notes-plugin/PKGBUILD
+++ b/extra/xfce4-notes-plugin/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 157871 2012-04-30 04:20:45Z foutrelis $
+# $Id: PKGBUILD 198560 2013-10-30 15:36:41Z allan $
 # Maintainer: Andreas Radke <andyrtr at archlinux.org>
 # Contributor: Ben Mazer <contrasutra@myrealbox.com>
 
@@ -12,7 +12,6 @@ url="http://xfce-goodies.berlios.de/"
 groups=('xfce4-goodies')
 depends=('xfce4-panel>=4.7.0' 'libxfcegui4' 'libunique' 'hicolor-icon-theme')
 makedepends=('intltool')
-options=('!libtool')
 install=${pkgname}.install
 source=(http://archive.xfce.org/src/panel-plugins/${pkgname}/1.7/${pkgname}-${pkgver}.tar.bz2)
 md5sums=('42b924b23f2fec6a1099e9b7a87db4a3')
diff --git a/extra/xfce4-notifyd/PKGBUILD b/extra/xfce4-notifyd/PKGBUILD
index 1119b7cef..aff533b1b 100644
--- a/extra/xfce4-notifyd/PKGBUILD
+++ b/extra/xfce4-notifyd/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 184796 2013-05-08 16:11:31Z foutrelis $
+# $Id: PKGBUILD 198561 2013-10-30 15:37:01Z allan $
 # Maintainer: Evangelos Foutras <evangelos@foutrelis.com>
 # Contributor: tobias <tobias funnychar archlinux.org>
 
@@ -13,7 +13,6 @@ groups=('xfce4-goodies')
 depends=('libxfce4ui' 'libnotify' 'hicolor-icon-theme')
 makedepends=('intltool')
 provides=('notification-daemon')
-options=('!libtool')
 install=$pkgname.install
 source=(http://archive.xfce.org/src/apps/$pkgname/0.2/$pkgname-$pkgver.tar.bz2)
 sha256sums=('8c7ed62f9496816d1391281f77d1b32216f9bf6fd22fbe4f6f3f4e07a6bbced0')
diff --git a/extra/xfce4-panel/PKGBUILD b/extra/xfce4-panel/PKGBUILD
index a4abe0b2a..f0e9babd1 100644
--- a/extra/xfce4-panel/PKGBUILD
+++ b/extra/xfce4-panel/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 184288 2013-05-05 17:46:17Z foutrelis $
+# $Id: PKGBUILD 198562 2013-10-30 15:37:22Z allan $
 # Maintainer: Evangelos Foutras <evangelos@foutrelis.com>
 # Contributor: tobias <tobias funnychar archlinux.org>
 
@@ -13,7 +13,6 @@ groups=('xfce4')
 depends=('exo' 'garcon' 'libxfce4ui' 'libwnck' 'hicolor-icon-theme'
          'desktop-file-utils')
 makedepends=('intltool' 'gtk-doc')
-options=('!libtool')
 install=$pkgname.install
 source=(http://archive.xfce.org/src/xfce/$pkgname/4.10/$pkgname-$pkgver.tar.bz2)
 sha256sums=('573052ed1b65e247415f92df120c8a78f9e4152c2636d38c923f82e32b8475d6')
diff --git a/extra/xfce4-power-manager/PKGBUILD b/extra/xfce4-power-manager/PKGBUILD
index e57801bbe..bbb6e306e 100644
--- a/extra/xfce4-power-manager/PKGBUILD
+++ b/extra/xfce4-power-manager/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 195950 2013-10-06 07:26:31Z foutrelis $
+# $Id: PKGBUILD 198563 2013-10-30 15:37:43Z allan $
 # Maintainer: Evangelos Foutras <evangelos@foutrelis.com>
 # Contributor: Tobias Kieslich <tobias funnychar archlinux.org>
 
@@ -12,7 +12,6 @@ license=('GPL2')
 groups=('xfce4')
 depends=('xfce4-panel' 'upower' 'udisks' 'libnotify' 'hicolor-icon-theme')
 makedepends=('pkgconfig' 'intltool')
-options=('!libtool')
 install=$pkgname.install
 source=(http://archive.xfce.org/src/apps/$pkgname/1.2/$pkgname-$pkgver.tar.bz2
         xfce4-power-manager-1.2.0-logind-support-for-suspend-hibernate.patch
diff --git a/extra/xfce4-quicklauncher-plugin/PKGBUILD b/extra/xfce4-quicklauncher-plugin/PKGBUILD
index 2f51019b0..e98881e47 100644
--- a/extra/xfce4-quicklauncher-plugin/PKGBUILD
+++ b/extra/xfce4-quicklauncher-plugin/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 157879 2012-04-30 04:21:07Z foutrelis $
+# $Id: PKGBUILD 198564 2013-10-30 15:38:04Z allan $
 # Maintainer: 
 # Contributor: Tobias Kieslich <tobias (at) archlinux.org>
 
@@ -12,7 +12,6 @@ url="http://xfce-goodies.berlios.de/"
 groups=('xfce4-goodies')
 depends=('xfce4-panel>=4.7.4' 'libxfcegui4')
 makedepends=('intltool')
-options=('!libtool')
 source=(http://archive.xfce.org/src/panel-plugins/${pkgname}/1.9/${pkgname}-${pkgver}.tar.bz2
 	xfce4-quicklauncher-plugin-1.9.4-desktop-file.patch
 	xfce4-quicklauncher-plugin-1.9.4-fix-missing-english-translation.patch
diff --git a/extra/xfce4-screenshooter/PKGBUILD b/extra/xfce4-screenshooter/PKGBUILD
index 3e78fd0d4..474ab6961 100644
--- a/extra/xfce4-screenshooter/PKGBUILD
+++ b/extra/xfce4-screenshooter/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 158096 2012-05-02 22:02:34Z foutrelis $
+# $Id: PKGBUILD 198565 2013-10-30 15:38:27Z allan $
 # Maintainer: Evangelos Foutras <evangelos@foutrelis.com>
 # Contributor: Tobias Kieslich <tobias (at) archlinux.org>
 
@@ -13,7 +13,6 @@ groups=('xfce4-goodies')
 depends=('xfce4-panel' 'libsoup' 'hicolor-icon-theme')
 makedepends=('intltool')
 install=$pkgname.install
-options=('!libtool')
 source=(http://archive.xfce.org/src/apps/$pkgname/1.8/$pkgname-$pkgver.tar.bz2)
 conflicts=('xfce4-screenshooter-plugin')
 replaces=('xfce4-screenshooter-plugin')
diff --git a/extra/xfce4-sensors-plugin/PKGBUILD b/extra/xfce4-sensors-plugin/PKGBUILD
index 8471cc584..a518b18a2 100644
--- a/extra/xfce4-sensors-plugin/PKGBUILD
+++ b/extra/xfce4-sensors-plugin/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 159140 2012-05-16 19:30:19Z foutrelis $
+# $Id: PKGBUILD 198566 2013-10-30 15:38:50Z allan $
 # Maintainer:
 # Contributor: Andreas Radke <andyrtr@archlinux.org>
 # Contributor: Merk Matthias <macem@chello.at>
@@ -14,7 +14,6 @@ groups=('xfce4-goodies')
 depends=('xfce4-panel' 'lm_sensors' 'libnotify' 'hicolor-icon-theme')
 makedepends=('intltool' 'hddtemp' 'gnu-netcat')
 optdepends=('hddtemp: for monitoring the temperature of hard drives')
-options=('!libtool')
 install=$pkgname.install
 source=(http://archive.xfce.org/src/panel-plugins/$pkgname/1.2/$pkgname-$pkgver.tar.bz2)
 sha256sums=('6b3c12917116c0610c0ca0824357afcc4ab4553301241e27aa9665159b834c1e')
diff --git a/extra/xfce4-session/PKGBUILD b/extra/xfce4-session/PKGBUILD
index 5297fc185..4349f993e 100644
--- a/extra/xfce4-session/PKGBUILD
+++ b/extra/xfce4-session/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 194429 2013-09-16 10:38:03Z foutrelis $
+# $Id: PKGBUILD 198567 2013-10-30 15:39:23Z allan $
 # Maintainer: Evangelos Foutras <evangelos@foutrelis.com>
 # Contributor: tobias <tobias funnychar archlinux.org>
 
@@ -18,7 +18,6 @@ optdepends=('gnome-keyring: for keyring support when GNOME compatibility is enab
             'gnome-screensaver: for locking screen with xflock4'
             'xlockmore: for locking screen with xflock4')
 replaces=('xfce-utils')
-options=('!libtool')
 install=$pkgname.install
 source=(http://archive.xfce.org/src/xfce/$pkgname/4.10/$pkgname-$pkgver.tar.bz2
         xfce4-session-4.10.1-logind-support-for-suspend-hibernate.patch)
diff --git a/extra/xfce4-smartbookmark-plugin/PKGBUILD b/extra/xfce4-smartbookmark-plugin/PKGBUILD
index 97b4c6da9..dac718bf9 100644
--- a/extra/xfce4-smartbookmark-plugin/PKGBUILD
+++ b/extra/xfce4-smartbookmark-plugin/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 175945 2013-01-25 08:43:59Z foutrelis $
+# $Id: PKGBUILD 198568 2013-10-30 15:39:44Z allan $
 # Maintainer:
 # Contributor: AndyRTR <andyrtr@archlinux.org>
 # Contributor: Tobias Kieslich <tobias (at) archlinux.org>
@@ -13,7 +13,6 @@ license=('GPL2')
 groups=('xfce4-goodies')
 depends=('xfce4-panel')
 makedepends=('intltool' 'libxt')
-options=('!libtool')
 source=(http://archive.xfce.org/src/panel-plugins/$pkgname/0.4/$pkgname-$pkgver.tar.bz2
         xfce4-smartbookmark-plugin-archlinux.patch)
 sha256sums=('6aa4269a5f4b7a3332d3c491efbbbd0a9ff0031a0005fee780346863bcf4f886'
diff --git a/extra/xfce4-systemload-plugin/PKGBUILD b/extra/xfce4-systemload-plugin/PKGBUILD
index a334bbed4..dd2d680f4 100644
--- a/extra/xfce4-systemload-plugin/PKGBUILD
+++ b/extra/xfce4-systemload-plugin/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 162960 2012-07-04 03:50:50Z eric $
+# $Id: PKGBUILD 198569 2013-10-30 15:40:10Z allan $
 # Maintainer: AndyRTR <andyrtr@archlinux.org>
 # Contributor: Aurelien Foret <orelien@chez.com>
 
@@ -12,7 +12,6 @@ url="http://goodies.xfce.org/projects/panel-plugins/xfce4-systemload-plugin"
 groups=('xfce4-goodies')
 depends=('xfce4-panel')
 makedepends=('intltool')
-options=('!libtool')
 source=(http://archive.xfce.org/src/panel-plugins/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2)
 md5sums=('22d48c0883f9d598bce24e81d93e692e')
 
diff --git a/extra/xfce4-taskmanager/PKGBUILD b/extra/xfce4-taskmanager/PKGBUILD
index 188f3250a..8dbc2d150 100644
--- a/extra/xfce4-taskmanager/PKGBUILD
+++ b/extra/xfce4-taskmanager/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 149254 2012-02-06 16:35:11Z foutrelis $
+# $Id: PKGBUILD 198570 2013-10-30 15:40:42Z allan $
 # Maintainer: 
 
 pkgname=xfce4-taskmanager
@@ -11,7 +11,6 @@ url="http://goodies.xfce.org/projects/applications/xfce4-taskmanager"
 groups=('xfce4-goodies')
 depends=('libwnck')
 makedepends=('pkgconfig' 'intltool')
-options=('!libtool')
 source=(http://archive.xfce.org/src/apps/${pkgname}/1.0/${pkgname}-${pkgver}.tar.bz2)
 md5sums=('cd205366ae771d2cbe72b5ca7b1257b0')
 
diff --git a/extra/xfce4-terminal/PKGBUILD b/extra/xfce4-terminal/PKGBUILD
index 9c9f197f2..413d20ee9 100644
--- a/extra/xfce4-terminal/PKGBUILD
+++ b/extra/xfce4-terminal/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 184303 2013-05-05 19:21:38Z foutrelis $
+# $Id: PKGBUILD 198571 2013-10-30 15:41:02Z allan $
 # Maintainer: Evangelos Foutras <evangelos@foutrelis.com>
 # Contributor: tobias <tobias funnychar archlinux.org>
 # Contributor: Aurelien Foret <orelien@chez.com>
@@ -15,7 +15,6 @@ depends=('libxfce4ui' 'vte' 'hicolor-icon-theme')
 makedepends=('intltool')
 conflicts=('terminal')
 replaces=('terminal')
-options=('!libtool')
 install=$pkgname.install
 source=(http://archive.xfce.org/src/apps/$pkgname/0.6/$pkgname-$pkgver.tar.bz2)
 sha256sums=('3d92422288d26311880af694bb4e02c9235997ca307a5e85001bf6bef65c3b35')
diff --git a/extra/xfce4-time-out-plugin/PKGBUILD b/extra/xfce4-time-out-plugin/PKGBUILD
index ac4d78b3a..9e8333f10 100755
--- a/extra/xfce4-time-out-plugin/PKGBUILD
+++ b/extra/xfce4-time-out-plugin/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 157893 2012-04-30 04:21:28Z foutrelis $
+# $Id: PKGBUILD 198572 2013-10-30 15:41:22Z allan $
 # Maintainer: AndyRTR <andyrtr@archlinux.org>
 # Contributor: Abhishek Dasgupta <abhidg@gmail.com>
 
@@ -12,7 +12,6 @@ groups=('xfce4-goodies')
 license=('GPL')
 depends=('xfce4-panel>=4.7.0')
 makedepends=('intltool')
-options=('!libtool')
 install=${pkgname}.install
 source=(http://archive.xfce.org/src/panel-plugins/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.bz2)
 md5sums=('b6e4a3145d31c341e2506fb17b014587')
diff --git a/extra/xfce4-timer-plugin/PKGBUILD b/extra/xfce4-timer-plugin/PKGBUILD
index 5bb0eb654..35f7f1de1 100644
--- a/extra/xfce4-timer-plugin/PKGBUILD
+++ b/extra/xfce4-timer-plugin/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 178519 2013-02-24 22:42:03Z eric $
+# $Id: PKGBUILD 198573 2013-10-30 15:41:44Z allan $
 # Maintainer: AndyRTR <andyrtr@archlinux.org>
 # Contributor: Tobias Kieslich <tobias (at) archlinux.org>
 
@@ -12,7 +12,6 @@ url="http://goodies.xfce.org/projects/panel-plugins/xfce4-timer-plugin"
 groups=('xfce4-goodies')
 depends=('xfce4-panel' 'libxfcegui4')
 makedepends=('intltool')
-options=('!libtool')
 install=xfce4-timer-plugin.install
 source=(http://archive.xfce.org/src/panel-plugins/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2)
 sha1sums=('5bd0e450b4c9b3f37a289fc1723b1a3d984ffd5d')
diff --git a/extra/xfce4-wavelan-plugin/PKGBUILD b/extra/xfce4-wavelan-plugin/PKGBUILD
index 49a04558d..4d66341e8 100644
--- a/extra/xfce4-wavelan-plugin/PKGBUILD
+++ b/extra/xfce4-wavelan-plugin/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 162963 2012-07-04 04:01:30Z eric $
+# $Id: PKGBUILD 198574 2013-10-30 15:42:05Z allan $
 # Maintainer: AndyRTR <andyrtr@archlinux.org>
 # Contributor: Tobias Kieslich <tobias (at) archlinux.org>
 
@@ -12,7 +12,6 @@ url="http://goodies.xfce.org/projects/panel-plugins/xfce4-wavelan-plugin/"
 groups=('xfce4-goodies')
 depends=('xfce4-panel' 'net-tools')
 makedepends=('intltool')
-options=('!libtool')
 source=(http://archive.xfce.org/src/panel-plugins/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2)
 md5sums=('50514bb286f1ed6761a1b36832bb7fe3')
 
diff --git a/extra/xfce4-weather-plugin/PKGBUILD b/extra/xfce4-weather-plugin/PKGBUILD
index f094c4cfd..68588600b 100644
--- a/extra/xfce4-weather-plugin/PKGBUILD
+++ b/extra/xfce4-weather-plugin/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 181854 2013-04-04 14:49:51Z foutrelis $
+# $Id: PKGBUILD 198575 2013-10-30 15:42:25Z allan $
 # Maintainer: Evangelos Foutras <evangelos@foutrelis.com>
 # Contributor: Suzy Williams <suzanne.williams3@verizon.net>
 
@@ -12,7 +12,6 @@ license=('GPL2')
 groups=('xfce4-goodies')
 depends=('xfce4-panel' 'libxml2' 'libsoup' 'hicolor-icon-theme')
 makedepends=('intltool')
-options=('!libtool')
 install=$pkgname.install
 source=(http://archive.xfce.org/src/panel-plugins/$pkgname/0.8/$pkgname-$pkgver.tar.bz2
         fix-color-parsing-when-reading-config-file.patch)
diff --git a/extra/xfce4-xkb-plugin/PKGBUILD b/extra/xfce4-xkb-plugin/PKGBUILD
index cadb3d7c1..cdea7988f 100644
--- a/extra/xfce4-xkb-plugin/PKGBUILD
+++ b/extra/xfce4-xkb-plugin/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 188774 2013-06-20 03:52:24Z foutrelis $
+# $Id: PKGBUILD 198576 2013-10-30 15:42:50Z allan $
 # Maintainer: Evangelos Foutras <evangelos@foutrelis.com>
 # Contributor: AndyRTR <andyrtr@archlinux.org>
 # Contributor: Tobias Kieslich <tobias (at) archlinux.org>
@@ -13,7 +13,6 @@ license=('custom')
 groups=('xfce4-goodies')
 depends=('xfce4-panel' 'libxklavier' 'librsvg')
 makedepends=('intltool')
-options=('!libtool')
 source=(http://archive.xfce.org/src/panel-plugins/$pkgname/0.5/$pkgname-$pkgver.tar.bz2)
 sha256sums=('09e4623033987ce7b711252609a17291b306cdf60863ee39677a4995a93318a5')
 
diff --git a/extra/xfconf/PKGBUILD b/extra/xfconf/PKGBUILD
index ad711b53a..49a73f2ad 100644
--- a/extra/xfconf/PKGBUILD
+++ b/extra/xfconf/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 186431 2013-05-26 09:26:17Z bluewind $
+# $Id: PKGBUILD 198577 2013-10-30 15:43:11Z allan $
 # Maintainer: Evangelos Foutras <evangelos@foutrelis.com>
 # Contributor: tobias <tobias funnychar archlinux.org>
 
@@ -15,7 +15,7 @@ groups=('xfce4')
 depends=('libxfce4util' 'dbus-glib' 'dbus')
 makedepends=('perl-extutils-depends' 'perl-extutils-pkgconfig' 'glib-perl'
              'intltool' 'gtk-doc' 'chrpath')
-options=('!libtool' '!emptydirs')
+options=('!emptydirs')
 source=(http://archive.xfce.org/src/xfce/$pkgname/4.10/$pkgname-$pkgver.tar.bz2)
 sha256sums=('175219a441cc7d0f210bbd1a3b0abba41598627cd9db27235811400c3e100576')
 
diff --git a/extra/xfdesktop/PKGBUILD b/extra/xfdesktop/PKGBUILD
index 7b2ec2f80..56edc76ab 100644
--- a/extra/xfdesktop/PKGBUILD
+++ b/extra/xfdesktop/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 179856 2013-03-10 16:22:07Z foutrelis $
+# $Id: PKGBUILD 198578 2013-10-30 15:43:32Z allan $
 # Maintainer: Evangelos Foutras <evangelos@foutrelis.com>
 # Contributor: tobias <tobias funnychar archlinux.org>
 
@@ -14,7 +14,6 @@ depends=('libxfce4ui' 'thunar' 'garcon' 'hicolor-icon-theme' 'libwnck')
 makedepends=('intltool')
 conflicts=('xfce4-menueditor')
 replaces=('xfce4-menueditor')
-options=('!libtool')
 install=xfdesktop.install
 source=(http://archive.xfce.org/src/xfce/$pkgname/4.10/$pkgname-$pkgver.tar.bz2)
 sha256sums=('49a6e0be513e307e896f7e5929825babec9bbcd4b2e73552f9d27647a4db797d')
diff --git a/extra/xfwm4/PKGBUILD b/extra/xfwm4/PKGBUILD
index 6791aed95..7ea8529b1 100644
--- a/extra/xfwm4/PKGBUILD
+++ b/extra/xfwm4/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 184290 2013-05-05 17:47:29Z foutrelis $
+# $Id: PKGBUILD 198579 2013-10-30 15:43:53Z allan $
 # Maintainer: Evangelos Foutras <evangelos@foutrelis.com>
 # Contributor: tobias <tobias funnychar archlinux.org>
 
@@ -12,7 +12,6 @@ license=('GPL2')
 groups=('xfce4')
 depends=('libxfce4ui' 'libwnck' 'hicolor-icon-theme')
 makedepends=('intltool')
-options=('!libtool')
 install=$pkgname.install
 source=(http://archive.xfce.org/src/xfce/$pkgname/4.10/$pkgname-$pkgver.tar.bz2)
 sha256sums=('380c44fba6eb779e34be0fe94f3726cfa131803014d6073c45aec8a1257fa740')
diff --git a/extra/xine-lib/PKGBUILD b/extra/xine-lib/PKGBUILD
index 06d6f5e50..1d6ddbd3a 100644
--- a/extra/xine-lib/PKGBUILD
+++ b/extra/xine-lib/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 195056 2013-09-24 20:09:11Z eric $
+# $Id: PKGBUILD 198581 2013-10-30 15:44:36Z allan $
 # Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgname=xine-lib
@@ -31,7 +31,6 @@ optdepends+=('wavpack: for using the wavpack plugin' \
             'gnome-vfs: for using the gnome-vfs plugin'
             'smbclient: for using the samba plugin')
 [ "$CARCH" = "mips64el" ] || optdepends+=('libvdpau: for using the VDPAU plugin')
-options=('!libtool')
 source=(http://downloads.sourceforge.net/sourceforge/xine/${pkgname}-${pkgver}.tar.xz)
 sha1sums=('32267c5fcaa1439a5fbf7606d27dc4fafba9e504')
 
diff --git a/extra/xmlsec/PKGBUILD b/extra/xmlsec/PKGBUILD
index 12ada7f9f..331860bfe 100644
--- a/extra/xmlsec/PKGBUILD
+++ b/extra/xmlsec/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 189642 2013-07-03 19:47:13Z andyrtr $
+# $Id: PKGBUILD 198582 2013-10-30 15:44:58Z allan $
 # Maintainer: AndyRTR <andyrtr@archlinux.org>
 # Contributor: Jan de Groot <jgc@archlinux.org>
 # Contributor: Hussam Al-Tayeb <ht990332@gmail.com>
@@ -11,7 +11,6 @@ license=('custom')
 arch=(i686 x86_64 'mips64el')
 url="http://www.aleksey.com/xmlsec/index.html"
 depends=('libxslt' 'openssl' 'gnutls' 'nss' 'libltdl')
-options=('!libtool')
 source=(http://www.aleksey.com/xmlsec/download/${pkgname}1-${pkgver}.tar.gz)
 md5sums=('fe664ba5f01ebfaeb0ab5deeb0b2249e')
 
diff --git a/extra/xmms/PKGBUILD b/extra/xmms/PKGBUILD
index 5555821d4..e5ba1f51f 100644
--- a/extra/xmms/PKGBUILD
+++ b/extra/xmms/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 171126 2012-11-16 19:24:09Z eric $
+# $Id: PKGBUILD 197428 2013-10-25 19:50:15Z eric $
 # Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgname=xmms
 pkgver=1.2.11
-pkgrel=6.1
+pkgrel=7
 pkgdesc="The X MultiMedia System - a multimedia player"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://legacy.xmms2.org/"
@@ -14,7 +14,6 @@ optdepends=('libmikmod: for the MikMod input plugin' \
             'libvorbis: for the Ogg Vorbis input plugin' \
             'alsa-lib: for the alsa output plugin' \
             'libgl: for the OpenGL Spectrum analyser visualization plugin')
-options=('!libtool' '!makeflags')
 install=xmms.install
 source=(http://legacy.xmms2.org/${pkgname}-${pkgver}.tar.bz2 \
 	xmms-menu.patch xmms-1.2.10-crossfade-0.3.9.patch xmms-fix.diff \
@@ -35,9 +34,8 @@ sha1sums=('9d1eae4baab25fd35c9ddfb49321ca60222f672d'
           'f24071ae484d9b55e61dba076801fa8e7976ff2f'
           '485c67cb8c8d4678bb3b0b280d2e233b14153b22')
 
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
+prepare() {
+  cd ${pkgname}-${pkgver}
 # Fix xmms.desktop
   patch -p0 < ../xmms-menu.patch
 # Patch for hang with xmms-crossfade 
@@ -51,7 +49,10 @@ build() {
   patch -p1 < ../xmms-1.2.10-fonts.patch
   patch -p1 < ../xmms-1.2.11-CVE-2007-0653.0654.patch
   patch -p1 < ../xmms-1.2.11-fix-mikmod-driver.patch
+}
 
+build() {
+  cd ${pkgname}-${pkgver}
   if [ "$CARCH" == "i686" ]; then
     SIMDOPT="--enable-simd"
   else
@@ -62,7 +63,7 @@ build() {
 }
 
 package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+  cd ${pkgname}-${pkgver}
   make DESTDIR="${pkgdir}" install
 
   install -D -m644 xmms/xmms.desktop "${pkgdir}/usr/share/applications/xmms.desktop"
diff --git a/extra/xorg-server/0001-Avoid-use-after-free-in-dix-dixfonts.c-doImageText-C.patch b/extra/xorg-server/0001-Avoid-use-after-free-in-dix-dixfonts.c-doImageText-C.patch
deleted file mode 100644
index b550bcedd..000000000
--- a/extra/xorg-server/0001-Avoid-use-after-free-in-dix-dixfonts.c-doImageText-C.patch
+++ /dev/null
@@ -1,76 +0,0 @@
-From 7bddc2ba16a2a15773c2ea8947059afa27727764 Mon Sep 17 00:00:00 2001
-From: Alan Coopersmith <alan.coopersmith@oracle.com>
-Date: Mon, 16 Sep 2013 21:47:16 -0700
-Subject: [PATCH] Avoid use-after-free in dix/dixfonts.c: doImageText()
- [CVE-2013-4396]
-
-Save a pointer to the passed in closure structure before copying it
-and overwriting the *c pointer to point to our copy instead of the
-original.  If we hit an error, once we free(c), reset c to point to
-the original structure before jumping to the cleanup code that
-references *c.
-
-Since one of the errors being checked for is whether the server was
-able to malloc(c->nChars * itemSize), the client can potentially pass
-a number of characters chosen to cause the malloc to fail and the
-error path to be taken, resulting in the read from freed memory.
-
-Since the memory is accessed almost immediately afterwards, and the
-X server is mostly single threaded, the odds of the free memory having
-invalid contents are low with most malloc implementations when not using
-memory debugging features, but some allocators will definitely overwrite
-the memory there, leading to a likely crash.
-
-Reported-by: Pedro Ribeiro <pedrib@gmail.com>
-Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
-Reviewed-by: Julien Cristau <jcristau@debian.org>
----
- dix/dixfonts.c |    5 +++++
- 1 file changed, 5 insertions(+)
-
-diff --git a/dix/dixfonts.c b/dix/dixfonts.c
-index feb765d..2e34d37 100644
---- a/dix/dixfonts.c
-+++ b/dix/dixfonts.c
-@@ -1425,6 +1425,7 @@ doImageText(ClientPtr client, ITclosurePtr c)
-             GC *pGC;
-             unsigned char *data;
-             ITclosurePtr new_closure;
-+            ITclosurePtr old_closure;
- 
-             /* We're putting the client to sleep.  We need to
-                save some state.  Similar problem to that handled
-@@ -1436,12 +1437,14 @@ doImageText(ClientPtr client, ITclosurePtr c)
-                 err = BadAlloc;
-                 goto bail;
-             }
-+            old_closure = c;
-             *new_closure = *c;
-             c = new_closure;
- 
-             data = malloc(c->nChars * itemSize);
-             if (!data) {
-                 free(c);
-+                c = old_closure;
-                 err = BadAlloc;
-                 goto bail;
-             }
-@@ -1452,6 +1455,7 @@ doImageText(ClientPtr client, ITclosurePtr c)
-             if (!pGC) {
-                 free(c->data);
-                 free(c);
-+                c = old_closure;
-                 err = BadAlloc;
-                 goto bail;
-             }
-@@ -1464,6 +1468,7 @@ doImageText(ClientPtr client, ITclosurePtr c)
-                 FreeScratchGC(pGC);
-                 free(c->data);
-                 free(c);
-+                c = old_closure;
-                 err = BadAlloc;
-                 goto bail;
-             }
--- 
-1.7.9.2
-
diff --git a/extra/xorg-server/PKGBUILD b/extra/xorg-server/PKGBUILD
index 452ebc859..ff5a25796 100644
--- a/extra/xorg-server/PKGBUILD
+++ b/extra/xorg-server/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 196227 2013-10-08 22:59:23Z lcarlier $
+# $Id: PKGBUILD 198667 2013-11-01 16:16:16Z andyrtr $
 # Maintainer: AndyRTR <andyrtr@archlinux.org>
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgbase=xorg-server
 pkgname=('xorg-server' 'xorg-server-xephyr' 'xorg-server-xdmx' 'xorg-server-xvfb' 'xorg-server-xnest' 'xorg-server-common' 'xorg-server-devel')
-pkgver=1.14.3
-pkgrel=2
+pkgver=1.14.4
+pkgrel=1
 arch=('i686' 'x86_64' 'mips64el')
 license=('custom')
 url="http://xorg.freedesktop.org"
@@ -13,7 +13,6 @@ makedepends=('pixman' 'libx11' 'mesa' 'mesa-libgl' 'xf86driproto' 'xcmiscproto'
              'compositeproto' 'recordproto' 'scrnsaverproto' 'resourceproto' 'xineramaproto' 'libxkbfile' 'libxfont' 'renderproto' 'libpciaccess'
              'libxv' 'xf86dgaproto' 'libxmu' 'libxrender' 'libxi' 'dmxproto' 'libxaw' 'libdmx' 'libxtst' 'libxres' 'xorg-xkbcomp' 'xorg-util-macros'
              'xorg-font-util' 'glproto' 'dri2proto' 'libgcrypt') 
-options=('!libtool')
 source=(${url}/releases/individual/xserver/${pkgbase}-${pkgver}.tar.bz2
         autoconfig-nvidia.patch
         autoconfig-sis.patch
@@ -24,9 +23,8 @@ source=(${url}/releases/individual/xserver/${pkgbase}-${pkgver}.tar.bz2
         xvfb-run.1
         10-quirks.conf
         loongson.patch
-        fb-rename-wfbDestroyGlyphCache.patch
-	0001-Avoid-use-after-free-in-dix-dixfonts.c-doImageText-C.patch)
-sha256sums=('02125ae13a443dcbb55f964d5c37f1da2f58ad54c2102356037bec23c1b84f5e'
+        fb-rename-wfbDestroyGlyphCache.patch)
+sha256sums=('608ccfaafb845f6e559884a30f946d365209172416710d687b190e9e1ff65dc3'
             '66e25f76a7496c429e0aff4b0670f168719bb0ceaeb88c6f2272f2bf3ed21162'
             'd027776fac1f7675b0a9ee817502290b1c45f9c09b0f0a6bb058c35f92361e84'
             'e033f9bcc21980f7f0428e6ed6c362a3d55ad293b05fd6e6c6c1933b86f9e63a'
@@ -60,10 +58,6 @@ prepare() {
 
   # http://cgit.freedesktop.org/xorg/xserver/commit/fb/wfbrename.h?id=5047810a4c20fab444b8c6eb146c55dcdb0d4219
   patch -Np1 -i ../fb-rename-wfbDestroyGlyphCache.patch
-
-  # CVE-2013-4396: Use after free in Xserver handling of ImageText requests
-  # (to be included in xorg-server 1.15.0 and 1.14.4)
-  patch -Np1 -i ../0001-Avoid-use-after-free-in-dix-dixfonts.c-doImageText-C.patch
 }
 
 build() {
@@ -229,14 +223,3 @@ package_xorg-server-devel() {
   install -m755 -d "${pkgdir}/usr/share/licenses/xorg-server-devel"
   ln -sf ../xorg-server-common/COPYING "${pkgdir}/usr/share/licenses/xorg-server-devel/COPYING"
 }
-sha256sums=('02125ae13a443dcbb55f964d5c37f1da2f58ad54c2102356037bec23c1b84f5e'
-            '66e25f76a7496c429e0aff4b0670f168719bb0ceaeb88c6f2272f2bf3ed21162'
-            'd027776fac1f7675b0a9ee817502290b1c45f9c09b0f0a6bb058c35f92361e84'
-            'e033f9bcc21980f7f0428e6ed6c362a3d55ad293b05fd6e6c6c1933b86f9e63a'
-            '26ee6ff255a60d7c1e136c612925eb63c86e85a4a3a55d531852ad9275526588'
-            'bb63658d250c21bbfaf94c5417f2920ce5963ee1f7db6cac2b163a54f2e9b619'
-            'ff0156309470fc1d378fd2e104338020a884295e285972cc88e250e031cc35b9'
-            '2460adccd3362fefd4cdc5f1c70f332d7b578091fb9167bf88b5f91265bbd776'
-            '94612f5c0d34a3b7152915c2e285c7b462e9d8e38d3539bd551a339498eac166'
-            'd0832cc16b5e6c1dee2959055a4b327f5c87e2a67b5f427d654663057207b2c1'
-            '2b90ce92a900b6d4edda9ef33acdd3d2c2708fec2344175c2d8dfd4265f56d32')
diff --git a/extra/xorg-xdm/PKGBUILD b/extra/xorg-xdm/PKGBUILD
index e89df667a..686d749f2 100644
--- a/extra/xorg-xdm/PKGBUILD
+++ b/extra/xorg-xdm/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 169967 2012-10-30 22:59:08Z heftig $
+# $Id: PKGBUILD 198584 2013-10-30 15:46:50Z allan $
 # Maintainer: Alexander Baldeck <alexander@archlinux.org>
 # Contributor: Jan de Groot <jgc@archlinux.org>
 pkgname=xorg-xdm
@@ -11,7 +11,6 @@ license=('custom')
 depends=('pam' 'libxaw' 'libxinerama' 'xorg-xrdb' 'xorg-sessreg' 'libxft' 'systemd')
 makedepends=('pkgconfig' 'xorg-util-macros' 'xtrans')
 backup=(etc/X11/xdm/Xaccess etc/X11/xdm/Xresources etc/X11/xdm/Xservers etc/X11/xdm/xdm-config etc/pam.d/xdm etc/X11/xdm/Xsetup_0 etc/X11/xdm/Xsession)
-options=('!libtool')
 source=(${url}/releases/individual/app/xdm-${pkgver}.tar.bz2
         Xsession-loginshell.patch
         Xsession-xsm.patch
diff --git a/extra/xorg-xinit/PKGBUILD b/extra/xorg-xinit/PKGBUILD
index d3874cfe0..38ccfeb49 100644
--- a/extra/xorg-xinit/PKGBUILD
+++ b/extra/xorg-xinit/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 194377 2013-09-15 08:07:59Z andyrtr $
+# $Id: PKGBUILD 197640 2013-10-27 15:15:12Z andyrtr $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: Alexander Baldeck <alexander@archlinux.org>
 
 pkgname=xorg-xinit
 pkgver=1.3.3
-pkgrel=1
+pkgrel=2
 pkgdesc="X.Org initialisation program "
 arch=('i686' 'x86_64' 'mips64el')
 license=('custom')
@@ -30,11 +30,15 @@ sha256sums=('74b2878de6e3d5b5948f1562a77e7f53b4e10621e505ddb278050c7f3cae00af'
             '2b94a42f2521cb5662fb9a5765a7507456dc0352ac9d0f44c56b359dcdb38898'
             '5e87bff928c143d9db9966048f6530e83e9e9a1cac09ce4c25f8aabc08611b6f')
 
-build() {
+prepare() {
   cd xinit-${pkgver}
   patch -Np1 -i "${srcdir}/06_move_serverauthfile_into_tmp.diff"
   patch -Np1 -i "${srcdir}/fs25361.patch"
   sed -i -e 's/XSLASHGLOB.sh/XSLASHGLOB/' xinitrc.cpp
+}
+
+build() {
+  cd xinit-${pkgver}
   ./configure --prefix=/usr --with-xinitdir=/etc/X11/xinit
   make
 }
@@ -49,4 +53,9 @@ package() {
   install -m644 "${srcdir}/xserverrc" "${pkgdir}/etc/X11/xinit/xserverrc"
   install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
   install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"
+  
+  # a workaround for https://bugs.archlinux.org/task/36959
+  sed -i '/^\s*$/d' $pkgdir/usr/bin/startx
+  sed -i '/^\s*$/d' $pkgdir/etc/X11/xinit/xinitrc
+
 }
diff --git a/extra/xvidcore/PKGBUILD b/extra/xvidcore/PKGBUILD
index 94144ae37..ab93903d9 100644
--- a/extra/xvidcore/PKGBUILD
+++ b/extra/xvidcore/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 194593 2013-09-19 00:27:32Z dan $
+# $Id: PKGBUILD 197326 2013-10-25 02:31:05Z bisson $
 # Maintainer: tobias <tobias@archlinux.org>
 # Contributor: Sarah Hay <sarah@archlinux.org>
 
 pkgname=xvidcore
 pkgver=1.3.2
-pkgrel=2
+pkgrel=3
 pkgdesc="XviD is an open source MPEG-4 video codec"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.xvid.org/"
diff --git a/extra/yajl/PKGBUILD b/extra/yajl/PKGBUILD
index 36ecb9538..317f51f61 100644
--- a/extra/yajl/PKGBUILD
+++ b/extra/yajl/PKGBUILD
@@ -5,8 +5,8 @@
 
 pkgname=yajl
 pkgver=2.0.4
-pkgrel=1
-pkgdesc='Yet Another JSON Library.'
+pkgrel=2
+pkgdesc='Yet Another JSON Library'
 arch=('i686' 'x86_64' 'mips64el')
 url='http://lloyd.github.com/yajl/'
 license=('ISC')
diff --git a/extra/yasm/PKGBUILD b/extra/yasm/PKGBUILD
index c1883cb20..82d89ac53 100644
--- a/extra/yasm/PKGBUILD
+++ b/extra/yasm/PKGBUILD
@@ -1,33 +1,32 @@
-# $Id: PKGBUILD 157779 2012-04-29 10:55:02Z allan $
-# Maintainer: Роман Кирилич (Roman Kyrylych) <roman@archlinux.org>
-# Contributor: Aaron Griffin <aaron@archlinux.org>
-# Contributor: Vinay S Shastry <vinayshastry@gmail.com>
+# $Id: PKGBUILD 197451 2013-10-26 06:45:33Z eric $
+# Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgname=yasm
 pkgver=1.2.0
-pkgrel=2
+pkgrel=3
 pkgdesc="A rewrite of NASM to allow for multiple syntax supported (NASM, TASM, GAS, etc.)"
 arch=('i686' 'x86_64' 'mips64el')
-license=('custom')
 url="http://www.tortall.net/projects/yasm/"
+license=('BSD' 'GPL2' 'LGPL2.1' 'PerlArtistic')
 depends=('glibc')
+options=('staticlibs')
 source=(http://www.tortall.net/projects/yasm/releases/${pkgname}-${pkgver}.tar.gz)
-options=('!libtool')
-md5sums=('4cfc0686cf5350dd1305c4d905eb55a6')
+sha1sums=('773d28f27f83c44ac35079add0d3167ca6c1def8')
 
 build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
+  cd ${pkgname}-${pkgver}
   ./configure --prefix=/usr
   make
 }
 
 check() {
-  cd ${srcdir}/${pkgname}-${pkgver}
+  cd ${pkgname}-${pkgver}
   make check
 }
 
 package() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  make DESTDIR=${pkgdir} install
-  install -Dm644 COPYING ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
+  cd ${pkgname}-${pkgver}
+  make DESTDIR="${pkgdir}" install
+  install -Dm644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+  install -Dm644 BSD.txt "${pkgdir}/usr/share/licenses/${pkgname}/BSD.txt"
 }
diff --git a/extra/yelp/PKGBUILD b/extra/yelp/PKGBUILD
index 35d79a715..80bfe578d 100644
--- a/extra/yelp/PKGBUILD
+++ b/extra/yelp/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 196147 2013-10-07 11:53:44Z jgc $
+# $Id: PKGBUILD 198585 2013-10-30 15:47:13Z allan $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Contributor: Jan de Groot <jgc@archlinux.org>
 
 pkgname=yelp
-pkgver=3.10.0
+pkgver=3.10.1
 pkgrel=1
 pkgdesc="A help browser for GNOME"
 arch=('i686' 'x86_64' 'mips64el')
@@ -12,11 +12,11 @@ depends=('webkitgtk' 'yelp-xsl' 'libxslt' 'hicolor-icon-theme' 'xz' 'bzip2'
 makedepends=('intltool' 'gtk-doc' 'itstool')
 groups=('gnome')
 license=('GPL')
-options=('!emptydirs' '!libtool')
+options=('!emptydirs')
 url="http://www.gnome.org"
 install=yelp.install
 source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('146f64a9b69409bedc5a0af9376ff2a38e5a4adcfa93c52c95d4ea4dc868cbd2')
+sha256sums=('17736479b7d0b1128c7d6cb3073f2b09e4bbc82670731b2a0d3a3219a520f816')
 
 build() {
   cd $pkgname-$pkgver
diff --git a/extra/zeitgeist/PKGBUILD b/extra/zeitgeist/PKGBUILD
index d1b42a8e8..81b6b13cf 100644
--- a/extra/zeitgeist/PKGBUILD
+++ b/extra/zeitgeist/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 191639 2013-07-28 19:42:13Z eric $
+# $Id: PKGBUILD 198587 2013-10-30 15:47:57Z allan $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Contributor: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: György Balló <ballogy@freestart.hu>
@@ -15,7 +15,6 @@ makedepends=(intltool gobject-introspection vala raptor python2-rdflib)
 provides=(zeitgeist-datahub)
 conflicts=(zeitgeist-datahub)
 replaces=(zeitgeist-datahub)
-options=('!libtool')
 source=("https://launchpad.net/$pkgname/${pkgver%.*}/$pkgver/+download/$pkgname-$pkgver.tar.xz")
 sha256sums=('769b5abfe67ef632414efa1d35a1462c5cd86c8792bb4635b4c3d93a5f15f061')
 
diff --git a/extra/zenity/PKGBUILD b/extra/zenity/PKGBUILD
index 15ac03b05..442193471 100644
--- a/extra/zenity/PKGBUILD
+++ b/extra/zenity/PKGBUILD
@@ -1,26 +1,31 @@
-# $Id: PKGBUILD 183472 2013-04-21 22:12:29Z heftig $
+# $Id: PKGBUILD 197413 2013-10-25 15:49:33Z heftig $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=zenity
-pkgver=3.8.0
+pkgver=3.10.0
 pkgrel=1
 pkgdesc="Display graphical dialog boxes from shell scripts"
-arch=(i686 x86_64 'mips64el')
-license=('LGPL')
-depends=('gtk3' 'libnotify')
-makedepends=('intltool' 'gtk-doc' 'itstool' 'docbook-xsl')
+arch=(i686 x86_64 mips64el)
+license=(LGPL)
+depends=(gtk3 libnotify)
+makedepends=(intltool gtk-doc itstool docbook-xsl git gnome-common yelp-tools)
 url="http://www.gnome.org"
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz)
-sha256sums=('94fbf0b71592f26dce0e2c49b82b4401139c8434084ad24c2c6a61ace1e6563f')
+source=(git://git.gnome.org/zenity#tag=ZENITY_3_10_0)
+sha256sums=('SKIP')
+
+prepare() {
+  cd $pkgname
+  git cherry-pick -n 80bc8ce643979fec201c4ebd5cd6405b6310357f
+}
 
 build() {
-  cd $pkgname-$pkgver
-  ./configure --prefix=/usr --sysconfdir=/etc \
+  cd $pkgname
+  ./autogen.sh --prefix=/usr --sysconfdir=/etc \
       --localstatedir=/var
   make
 }
 
 package() {
-  cd $pkgname-$pkgver
+  cd $pkgname
   make DESTDIR="${pkgdir}" install
 }
diff --git a/extra/zvbi/PKGBUILD b/extra/zvbi/PKGBUILD
index 7c87dc2b9..447b93a97 100644
--- a/extra/zvbi/PKGBUILD
+++ b/extra/zvbi/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 187081 2013-06-03 11:17:17Z allan $
+# $Id: PKGBUILD 198588 2013-10-30 15:48:19Z allan $
 # Maintainer: 
 # Contributor: Alexander Baldeck <alexander@archlinux.org>
 # Contributor: dorphell <dorphell@archlinux.org>
@@ -11,7 +11,6 @@ url="http://zapping.sourceforge.net/cgi-bin/view/ZVBI/WebHome"
 arch=('i686' 'x86_64' 'mips64el')
 depends=('libpng' 'libx11')
 license=('GPL')
-options=('!libtool')
 source=("http://downloads.sourceforge.net/sourceforge/zapping/${pkgname}-${pkgver}.tar.bz2"
         'fix-includes.patch'
         'zvbi-0.2.33-libpng15.patch')
diff --git a/extra/zziplib/PKGBUILD b/extra/zziplib/PKGBUILD
index 69736ea64..f5376730e 100644
--- a/extra/zziplib/PKGBUILD
+++ b/extra/zziplib/PKGBUILD
@@ -1,30 +1,29 @@
-# $Id: PKGBUILD 153578 2012-03-16 06:20:51Z eric $
+# $Id: PKGBUILD 197447 2013-10-26 06:24:44Z eric $
 # Maintainer: Rémy Oudompheng <remy@archlinux.org>
 # Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
 # Contributor: Roman Kyrylych <Roman.Kyrylych@gmail.com>
 
 pkgname=zziplib
 pkgver=0.13.62
-pkgrel=1.1
+pkgrel=2
 pkgdesc="A lightweight library that offers the ability to easily extract data from files archived in a single zip file"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://zziplib.sourceforge.net"
 license=('LGPL' 'MPL')
 depends=('zlib')
 makedepends=('python2')
-options=('!libtool')
 source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2)
 md5sums=('5fe874946390f939ee8f4abe9624b96c')
 
 build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+  cd ${pkgname}-${pkgver}
   export PYTHON=/usr/bin/python2
   ./configure --prefix=/usr
   make
 }
 
 package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+  cd ${pkgname}-${pkgver}
   make DESTDIR="${pkgdir}" install
 
 #fix permission
diff --git a/kernels/linux-libre-pae/PKGBUILD b/kernels/linux-libre-pae/PKGBUILD
index d65ba80f7..2ddd1ad62 100644
--- a/kernels/linux-libre-pae/PKGBUILD
+++ b/kernels/linux-libre-pae/PKGBUILD
@@ -1,12 +1,12 @@
-# $Id: PKGBUILD 195930 2013-10-05 19:44:24Z tpowa $
+# $Id: PKGBUILD 196455 2013-10-14 06:53:31Z tpowa $
 # Contributor: Tobias Powalowski <tpowa@archlinux.org>
 # Contributor: Thomas Baechler <thomas@archlinux.org>
-# Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
+# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
 
 pkgbase=linux-libre-pae     # Build stock -LIBRE-PAE kernel
 #pkgbase=linux-libre-custom # Build kernel with a different name
 _basekernel=3.11
-pkgver=${_basekernel}.4
+pkgver=${_basekernel}.5
 pkgrel=1
 arch=('i686')
 url="http://linux-libre.fsfla.org/"
@@ -24,8 +24,8 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn
         'criu-no-expert.patch'
         '3.11-haswell-intel_pstate.patch')
 md5sums=('7ec84223c7adcf01a5287eb7af96b7e7'
-         'd09e8017d22370b873628942f3ece3b0'
-         'bef7b3ced683c4dc9361f8739ec9f566'
+         'bcd700aa1ae7f13107a14885923358eb'
+         '3c6c0273ea8624e94cf960091c7809e7'
          'f302c931bd85309da9d9792b4cc96467'
          '36e90334b12b2e9d53fd92129ee98f5b'
          '98beb36f9b8cf16e58de2483ea9985e3'
@@ -306,7 +306,24 @@ _package-headers() {
   rm -rf "${pkgdir}"/usr/src/linux-${_kernver}/arch/{alpha,arc,arm,arm26,arm64,avr32,blackfin,c6x,cris,frv,h8300,hexagon,ia64,m32r,m68k,m68knommu,metag,mips,microblaze,mn10300,openrisc,parisc,powerpc,ppc,s390,score,sh,sh64,sparc,sparc64,tile,unicore32,um,v850,xtensa}
 }
 
-pkgname=("${pkgbase}" "${pkgbase}-headers")
+_package-docs() {
+  pkgdesc="Kernel hackers manual - HTML documentation that comes with the ${pkgbase^} kernel"
+  provides=("kernel26${_kernelname}-docs=${pkgver}" "linux${_kernelname}-docs=${pkgver}")
+  conflicts=("kernel26${_kernelname}-docs" "kernel26-libre${_kernelname}-docs" "linux${_kernelname}-docs")
+  replaces=("kernel26${_kernelname}-docs" "kernel26-libre${_kernelname}-docs" "linux${_kernelname}-docs")
+
+  cd "${srcdir}/linux-${_basekernel}"
+
+  mkdir -p "${pkgdir}/usr/src/linux-${_kernver}"
+  cp -al Documentation "${pkgdir}/usr/src/linux-${_kernver}"
+  find "${pkgdir}" -type f -exec chmod 444 {} \;
+  find "${pkgdir}" -type d -exec chmod 755 {} \;
+
+  # remove a file already in linux package
+  rm -f "${pkgdir}/usr/src/linux-${_kernver}/Documentation/DocBook/Makefile"
+}
+
+pkgname=("${pkgbase}" "${pkgbase}-headers" "${pkgbase}-docs")
 for _p in ${pkgname[@]}; do
   eval "package_${_p}() {
     _package${_p#${pkgbase}}
diff --git a/kernels/linux-libre-pae/config b/kernels/linux-libre-pae/config
index e001d16eb..cc77645ce 100644
--- a/kernels/linux-libre-pae/config
+++ b/kernels/linux-libre-pae/config
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86 3.11.0-1 Kernel Configuration
+# Linux/x86 3.11.4-1 Kernel Configuration
 #
 # CONFIG_64BIT is not set
 CONFIG_X86_32=y
@@ -1561,24 +1561,7 @@ CONFIG_MTD_BLOCK2MTD=m
 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
-# CONFIG_MTD_NAND_ECC_BCH is not set
-CONFIG_MTD_SM_COMMON=m
-# CONFIG_MTD_NAND_DENALI is not set
-CONFIG_MTD_NAND_IDS=m
-CONFIG_MTD_NAND_RICOH=m
-CONFIG_MTD_NAND_DISKONCHIP=m
-# CONFIG_MTD_NAND_DISKONCHIP_PROBE_ADVANCED is not set
-CONFIG_MTD_NAND_DISKONCHIP_PROBE_ADDRESS=0
-# CONFIG_MTD_NAND_DISKONCHIP_BBTWRITE is not set
-CONFIG_MTD_NAND_DOCG4=m
-# CONFIG_MTD_NAND_CAFE is not set
-CONFIG_MTD_NAND_CS553X=m
-CONFIG_MTD_NAND_NANDSIM=m
-# CONFIG_MTD_NAND_PLATFORM is not set
-CONFIG_MTD_ALAUDA=m
+# CONFIG_MTD_NAND is not set
 # CONFIG_MTD_ONENAND is not set
 
 #
@@ -1753,7 +1736,7 @@ CONFIG_SCSI_ENCLOSURE=m
 CONFIG_SCSI_MULTI_LUN=y
 # CONFIG_SCSI_CONSTANTS is not set
 # CONFIG_SCSI_LOGGING is not set
-# CONFIG_SCSI_SCAN_ASYNC is not set
+CONFIG_SCSI_SCAN_ASYNC=y 
 
 #
 # SCSI Transports
@@ -4845,9 +4828,7 @@ CONFIG_USB_STORAGE_ENE_UB6250=m
 CONFIG_USB_MDC800=m
 CONFIG_USB_MICROTEK=m
 # CONFIG_USB_DWC3 is not set
-CONFIG_USB_CHIPIDEA=m
-CONFIG_USB_CHIPIDEA_UDC=y
-# CONFIG_USB_CHIPIDEA_DEBUG is not set
+# CONFIG_USB_CHIPIDEA is not set
 
 #
 # USB port drivers
@@ -6404,7 +6385,6 @@ CONFIG_GENERIC_ALLOCATOR=y
 CONFIG_REED_SOLOMON=m
 CONFIG_REED_SOLOMON_ENC8=y
 CONFIG_REED_SOLOMON_DEC8=y
-CONFIG_REED_SOLOMON_DEC16=y
 CONFIG_BCH=m
 CONFIG_BCH_CONST_PARAMS=y
 CONFIG_TEXTSEARCH=y
diff --git a/kernels/linux-libre-rt/PKGBUILD b/kernels/linux-libre-rt/PKGBUILD
index 5f310ddc0..cd9ddeb34 100644
--- a/kernels/linux-libre-rt/PKGBUILD
+++ b/kernels/linux-libre-rt/PKGBUILD
@@ -1,21 +1,20 @@
-# $Id: PKGBUILD 193761 2013-08-30 11:11:43Z tpowa $
 # Maintainer:  Joakim Hernberg <jbh@alchemy.lu>
 # Contributor: Ray Rashif <schiv@archlinux.org>
 # Contributor: timbosa <tinny_tim@dodo.com.au>
 # Contributor: Tobias Powalowski <tpowa@archlinux.org>
 # Contributor: Thomas Baechler <thomas@archlinux.org>
-# Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
+# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
 # Contributor (Parabola): Márcio Silva <coadde@lavabit.com>
 
 pkgbase=linux-libre-rt      # Build stock -LIBRE-RT kernel
 #pkgbase=linux-libre-custom # Build kernel with a different name
 _basekernel=3.10
-_releasever=14
-_rtpatchver=rt9
+_releasever=15
+_rtpatchver=rt11
 _pkgver=${_basekernel}.${_releasever}
 pkgver=${_basekernel}.${_releasever}_${_rtpatchver}
 pkgrel=1
-_lxopkgver=${_basekernel}.14 # nearly always the same as pkgver
+_lxopkgver=${_basekernel}.15 # nearly always the same as pkgver
 arch=('i686' 'x86_64' 'mips64el')
 url="http://linux-libre.fsfla.org/"
 license=('GPL2')
@@ -36,8 +35,8 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn
         '3.10.6-logitech-dj.patch'
         "http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/debuginfo/linux-patches-${_lxopkgver}-gnu_0loongsonlibre_mipsel.tar.bz2")
 md5sums=('d562fd52580a3b6b18b6eeb5921d1d5c'
-         '33e33cc6a9f3f3fc0a760e9920bedc8b'
-         '303d1fbf2f5144628d67b65509325c52'
+         '9d85508aaa75442ec6e480a248102c5a'
+         'b3aafcfa4c1613460b2bd29a2c1c3421'
          'aee046ea7320dce066bb180facd7262a'
          'c21fb94a198752879b059a08d73cd3a6'
          '82496e68851d1960543a07ba51cdb44a'
@@ -47,7 +46,7 @@ md5sums=('d562fd52580a3b6b18b6eeb5921d1d5c'
          'f3def2cefdcbb954c21d8505d23cc83c'
          'd50c1ac47394e9aec637002ef3392bd1'
          '3ff40ca684cfe719723e627e2cef7cea'
-         '832d858c373a180f5e1ac407049ce652')
+         '8aab6ab727f49dffcae5fd1c3c7c5bdb')
 if [ "$CARCH" != "mips64el" ]; then
     # don't use the Loongson-specific patches on non-mips64el arches.
     unset source[${#source[@]}-1]
@@ -401,7 +400,24 @@ _package-headers() {
   fi
 }
 
-pkgname=("${pkgbase}" "${pkgbase}-headers")
+_package-docs() {
+  pkgdesc="Kernel hackers manual - HTML documentation that comes with the ${pkgbase^} kernel"
+  provides=("kernel26${_kernelname}-docs=${pkgver}" "linux${_kernelname}-docs=${pkgver}")
+  conflicts=("kernel26${_kernelname}-docs" "kernel26-libre${_kernelname}-docs" "linux${_kernelname}-docs")
+  replaces=("kernel26${_kernelname}-docs" "kernel26-libre${_kernelname}-docs" "linux${_kernelname}-docs")
+
+  cd "${srcdir}/linux-${_basekernel}"
+
+  mkdir -p "${pkgdir}/usr/src/linux-${_kernver}"
+  cp -al Documentation "${pkgdir}/usr/src/linux-${_kernver}"
+  find "${pkgdir}" -type f -exec chmod 444 {} \;
+  find "${pkgdir}" -type d -exec chmod 755 {} \;
+
+  # remove a file already in linux package
+  rm -f "${pkgdir}/usr/src/linux-${_kernver}/Documentation/DocBook/Makefile"
+}
+
+pkgname=("${pkgbase}" "${pkgbase}-headers" "${pkgbase}-docs")
 for _p in ${pkgname[@]}; do
   eval "package_${_p}() {
     _package${_p#${pkgbase}}
diff --git a/kernels/linux-libre-xen/PKGBUILD b/kernels/linux-libre-xen/PKGBUILD
index 1c0ae88de..8c3d6c88d 100644
--- a/kernels/linux-libre-xen/PKGBUILD
+++ b/kernels/linux-libre-xen/PKGBUILD
@@ -1,12 +1,12 @@
-# $Id: PKGBUILD 195930 2013-10-05 19:44:24Z tpowa $
+# $Id: PKGBUILD 196455 2013-10-14 06:53:31Z tpowa $
 # Contributor: Tobias Powalowski <tpowa@archlinux.org>
 # Contributor: Thomas Baechler <thomas@archlinux.org>
-# Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
+# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
 
 pkgbase=linux-libre-xen     # Build stock -LIBRE-XEN kernel
 #pkgbase=linux-libre-custom # Build kernel with a different name
 _basekernel=3.11
-pkgver=${_basekernel}.4
+pkgver=${_basekernel}.5
 pkgrel=1
 arch=('i686')
 url="http://linux-libre.fsfla.org/"
@@ -24,8 +24,8 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn
         'criu-no-expert.patch'
         '3.11-haswell-intel_pstate.patch')
 md5sums=('7ec84223c7adcf01a5287eb7af96b7e7'
-         'd09e8017d22370b873628942f3ece3b0'
-         '212338fa662436f9590026c9a71d82f7'
+         'bcd700aa1ae7f13107a14885923358eb'
+         'e97b1c54a6ebeb8647b49a4abda64072'
          'b7c2805bb287a644c0a303bf7721e534'
          '36e90334b12b2e9d53fd92129ee98f5b'
          '98beb36f9b8cf16e58de2483ea9985e3'
@@ -306,7 +306,24 @@ _package-headers() {
   rm -rf "${pkgdir}"/usr/src/linux-${_kernver}/arch/{alpha,arc,arm,arm26,arm64,avr32,blackfin,c6x,cris,frv,h8300,hexagon,ia64,m32r,m68k,m68knommu,metag,mips,microblaze,mn10300,openrisc,parisc,powerpc,ppc,s390,score,sh,sh64,sparc,sparc64,tile,unicore32,um,v850,xtensa}
 }
 
-pkgname=("${pkgbase}" "${pkgbase}-headers")
+_package-docs() {
+  pkgdesc="Kernel hackers manual - HTML documentation that comes with the ${pkgbase^} kernel"
+  provides=("kernel26${_kernelname}-docs=${pkgver}" "linux${_kernelname}-docs=${pkgver}")
+  conflicts=("kernel26${_kernelname}-docs" "kernel26-libre${_kernelname}-docs" "linux${_kernelname}-docs")
+  replaces=("kernel26${_kernelname}-docs" "kernel26-libre${_kernelname}-docs" "linux${_kernelname}-docs")
+
+  cd "${srcdir}/linux-${_basekernel}"
+
+  mkdir -p "${pkgdir}/usr/src/linux-${_kernver}"
+  cp -al Documentation "${pkgdir}/usr/src/linux-${_kernver}"
+  find "${pkgdir}" -type f -exec chmod 444 {} \;
+  find "${pkgdir}" -type d -exec chmod 755 {} \;
+
+  # remove a file already in linux package
+  rm -f "${pkgdir}/usr/src/linux-${_kernver}/Documentation/DocBook/Makefile"
+}
+
+pkgname=("${pkgbase}" "${pkgbase}-headers" "${pkgbase}-docs")
 for _p in ${pkgname[@]}; do
   eval "package_${_p}() {
     _package${_p#${pkgbase}}
diff --git a/kernels/linux-libre-xen/config b/kernels/linux-libre-xen/config
index 52c3c2112..7160191c1 100644
--- a/kernels/linux-libre-xen/config
+++ b/kernels/linux-libre-xen/config
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86 3.11.0-1 Kernel Configuration
+# Linux/x86 3.11.4-1 Kernel Configuration
 #
 # CONFIG_64BIT is not set
 CONFIG_X86_32=y
@@ -1568,24 +1568,7 @@ CONFIG_MTD_BLOCK2MTD=m
 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
-# CONFIG_MTD_NAND_ECC_BCH is not set
-CONFIG_MTD_SM_COMMON=m
-# CONFIG_MTD_NAND_DENALI is not set
-CONFIG_MTD_NAND_IDS=m
-CONFIG_MTD_NAND_RICOH=m
-CONFIG_MTD_NAND_DISKONCHIP=m
-# CONFIG_MTD_NAND_DISKONCHIP_PROBE_ADVANCED is not set
-CONFIG_MTD_NAND_DISKONCHIP_PROBE_ADDRESS=0
-# CONFIG_MTD_NAND_DISKONCHIP_BBTWRITE is not set
-CONFIG_MTD_NAND_DOCG4=m
-# CONFIG_MTD_NAND_CAFE is not set
-CONFIG_MTD_NAND_CS553X=m
-CONFIG_MTD_NAND_NANDSIM=m
-# CONFIG_MTD_NAND_PLATFORM is not set
-CONFIG_MTD_ALAUDA=m
+# CONFIG_MTD_NAND is not set
 # CONFIG_MTD_ONENAND is not set
 
 #
@@ -1762,7 +1745,7 @@ CONFIG_SCSI_ENCLOSURE=m
 CONFIG_SCSI_MULTI_LUN=y
 # CONFIG_SCSI_CONSTANTS is not set
 # CONFIG_SCSI_LOGGING is not set
-# CONFIG_SCSI_SCAN_ASYNC is not set
+CONFIG_SCSI_SCAN_ASYNC=y 
 
 #
 # SCSI Transports
@@ -4859,9 +4842,7 @@ CONFIG_USB_STORAGE_ENE_UB6250=m
 CONFIG_USB_MDC800=m
 CONFIG_USB_MICROTEK=m
 # CONFIG_USB_DWC3 is not set
-CONFIG_USB_CHIPIDEA=m
-CONFIG_USB_CHIPIDEA_UDC=y
-# CONFIG_USB_CHIPIDEA_DEBUG is not set
+# CONFIG_USB_CHIPIDEA is not set
 
 #
 # USB port drivers
@@ -6441,7 +6422,6 @@ CONFIG_GENERIC_ALLOCATOR=y
 CONFIG_REED_SOLOMON=m
 CONFIG_REED_SOLOMON_ENC8=y
 CONFIG_REED_SOLOMON_DEC8=y
-CONFIG_REED_SOLOMON_DEC16=y
 CONFIG_BCH=m
 CONFIG_BCH_CONST_PARAMS=y
 CONFIG_TEXTSEARCH=y
diff --git a/kernels/xen/PKGBUILD b/kernels/xen/PKGBUILD
index df4b2dbe8..a6718a6ae 100644
--- a/kernels/xen/PKGBUILD
+++ b/kernels/xen/PKGBUILD
@@ -2,7 +2,7 @@
 # Contributor: Limao Luo
 # Contributor: Luceo
 # Contributor: Revellion
-# Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
+# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
 
 pkgname=xen
 pkgver=4.2.1
diff --git a/libre-testing/ath9k-htc-firmware-git/PKGBUILD b/libre-testing/ath9k-htc-firmware-git/PKGBUILD
index d04643491..ceee17e13 100644
--- a/libre-testing/ath9k-htc-firmware-git/PKGBUILD
+++ b/libre-testing/ath9k-htc-firmware-git/PKGBUILD
@@ -1,4 +1,4 @@
-# Maintainer: André Silva <emulatorman@lavabit.com>
+# Maintainer: André Silva <emulatorman@parabola.nu>
 # Maintainer: Márcio Silva <coadde@lavabit.com>
 
 pkgname=ath9k-htc-firmware-git
diff --git a/libre-testing/icecat/PKGBUILD b/libre-testing/icecat/PKGBUILD
index d60144bde..b153ad518 100644
--- a/libre-testing/icecat/PKGBUILD
+++ b/libre-testing/icecat/PKGBUILD
@@ -2,7 +2,7 @@
 # Contributor (Parabola): Luke Shumaker <lukeshu@sbcglobal.net>
 # Contributor (Parabola): fauno <fauno@kiwwwi.com.ar>
 # Contributor (Parabola): vando <facundo@esdebian.org>
-# Contributor (Parabola): André Silva <emulatorman@lavabit.com>
+# Contributor (Parabola): André Silva <emulatorman@parabola.nu>
 
 # Maintainer (ConnochaetOS): Henry Jensen <hjensen@connochaetos.org>
 
diff --git a/libre-testing/linux-libre-firmware/PKGBUILD b/libre-testing/linux-libre-firmware/PKGBUILD
deleted file mode 100644
index 23ab691aa..000000000
--- a/libre-testing/linux-libre-firmware/PKGBUILD
+++ /dev/null
@@ -1,59 +0,0 @@
-# Maintainer: André Silva <emulatorman@lavabit.com>
-# Contributor: Márcio Silva <coadde@lavabit.com>
-
-pkgname=linux-libre-firmware
-pkgver=3.11
-pkgrel=1
-pkgdesc='Free firmware files for Linux-libre'
-arch=('any')
-url=('http://linux-libre.fsfla.org/')
-license=('GPL2')
-depends=('ath9k-htc-firmware')
-provides=('linux-firmware'
-          'kernel26-firmware=2.6.34.99')
-conflicts=('linux-firmware'
-           'linux-firmware-git'
-           'kernel26-firmware'
-           'ar9170-fw'
-           'iwlwifi-1000-ucode'
-           'iwlwifi-3945-ucode'
-           'iwlwifi-4965-ucode'
-           'iwlwifi-5000-ucode'
-           'iwlwifi-5150-ucode'
-           'iwlwifi-6000-ucode'
-           'rt2870usb-fw'
-           'rt2x00-rt61-fw'
-           'rt2x00-rt71w-fw')
-replaces=('linux-firmware'
-          'kernel26-firmware'
-          'ar9170-fw'
-          'iwlwifi-1000-ucode'
-          'iwlwifi-3945-ucode'
-          'iwlwifi-4965-ucode'
-          'iwlwifi-5000-ucode'
-          'iwlwifi-5150-ucode'
-          'iwlwifi-6000-ucode'
-          'rt2870usb-fw'
-          'rt2x00-rt61-fw'
-          'rt2x00-rt71w-fw')
-source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/$pkgver-gnu/linux-libre-$pkgver-gnu.tar.xz")
-md5sums=('7ec84223c7adcf01a5287eb7af96b7e7')
-
-package() {
-
-  # create firmware folder to put the free firmware files there
-  install -d -m755 $pkgdir/usr/lib/firmware
-
-  cd $srcdir/linux-$pkgver
-
-  # compile free firmware files  
-  make INSTALL_FW_PATH=$pkgdir/usr/lib/firmware firmware_install
-
-  # create licenses folder to put the licenses files there
-  install -d -m755 $pkgdir/usr/share/licenses/$pkgname
-
-  # move WHENCE file to linux-firmware license folder
-  cd $srcdir/linux-$pkgver
-  install -m644 firmware/WHENCE $pkgdir/usr/share/licenses/$pkgname
-
-}
diff --git a/libre-testing/syslinux/PKGBUILD b/libre-testing/syslinux/PKGBUILD
deleted file mode 100644
index 8a8845f0b..000000000
--- a/libre-testing/syslinux/PKGBUILD
+++ /dev/null
@@ -1,169 +0,0 @@
-# Maintainer: Tobias Powalowski <tpowa@archlinux.org>
-# Maintainer: Thomas Bächler <thomas@archlinux.org>
-# Contributor: Keshav Padram (the.ridikulus.rat) (aatt) (gemmaeiil) (ddoott) (ccoomm)>
-# Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
-
-pkgname="syslinux"
-pkgver="6.01"
-pkgrel="4.1"
-arch=('x86_64' 'i686')
-pkgdesc="Collection of boot loaders that boot from FAT, ext2/3/4 and btrfs filesystems, from CDs and via PXE (Parabola rebranded)"
-url="http://syslinux.zytor.com/"
-license=('GPL2')
-options=('!makeflags' '!emptydirs')
-backup=('boot/syslinux/syslinux.cfg'
-        'boot/syslinux/splash.png')
-makedepends=('python2' 'nasm' 'gnu-efi-libs')
-depends=('perl' 'glibc')
-optdepends=('perl-passwd-md5:  For md5pass'
-            'perl-digest-sha1: For sha1pass'
-            'mtools:           For mkdiskimage and syslinux support'
-            'gptfdisk:         For GPT support'
-            'util-linux:       For isohybrid'
-            'efibootmgr:       For EFI support'
-            'dosfstools:       For EFI support')
-md5sums=('5fe8959b92255143a334167ca1c395a6'
-         'f048880b57e2c5a7017ff8804bfda327'
-         '0e7d47e1f791f0c5e7bd40ed5c6d80cc'
-         'cb46ca47c6b6323127d908440057d98f')
-
-install="${pkgname}.install"
-
-source=("https://www.kernel.org/pub/linux/utils/boot/syslinux/${pkgname}-${pkgver}.tar.xz"
-        'syslinux.cfg'
-        'syslinux-install_update'
-        'splash.png')
-
-_build_syslinux_bios() {
-    
-    rm -rf "${srcdir}/${pkgname}-${pkgver}-bios/" || true
-    cp -r "${srcdir}/${pkgname}-${pkgver}" "${srcdir}/${pkgname}-${pkgver}-bios"
-    cd "${srcdir}/${pkgname}-${pkgver}-bios/"
-    
-    ## Do not try to build syslinux with our default LDFLAGS, it will fail
-    unset LDFLAGS
-    
-    make PYTHON="python2" bios
-    make PYTHON="python2" bios installer
-    
-}
-
-_build_syslinux_efi64() {
-    
-    rm -rf "${srcdir}/${pkgname}-${pkgver}-efi64/" || true
-    cp -r "${srcdir}/${pkgname}-${pkgver}" "${srcdir}/${pkgname}-${pkgver}-efi64"
-    cd "${srcdir}/${pkgname}-${pkgver}-efi64/"
-    
-    ## Unset all compiler FLAGS for efi64 build
-    unset CFLAGS
-    unset CPPFLAGS
-    unset CXXFLAGS
-    unset LDFLAGS
-    unset MAKEFLAGS
-    
-    make PYTHON="python2" efi64
-    make PYTHON="python2" efi64 installer
-    
-}
-
-_build_syslinux_efi32() {
-    
-    rm -rf "${srcdir}/${pkgname}-${pkgver}-efi32/" || true
-    cp -r "${srcdir}/${pkgname}-${pkgver}" "${srcdir}/${pkgname}-${pkgver}-efi32"
-    cd "${srcdir}/${pkgname}-${pkgver}-efi32/"
-    
-    ## Unset all compiler FLAGS for efi32 build
-    unset CFLAGS
-    unset CPPFLAGS
-    unset CXXFLAGS
-    unset LDFLAGS
-    unset MAKEFLAGS
-    
-    make PYTHON="python2" efi32
-    make PYTHON="python2" efi32 installer
-    
-}
-
-build() {
-    
-    cd "${srcdir}/${pkgname}-${pkgver}/"
-    
-    ## Do not try to build the Windows or DOS installers and DIAG files
-    sed 's|diag libinstaller dos win32 win64 dosutil txt|libinstaller txt|g' -i "${srcdir}/${pkgname}-${pkgver}/Makefile" || true
-    sed 's|win32/syslinux.exe win64/syslinux64.exe||g' -i "${srcdir}/${pkgname}-${pkgver}/Makefile" || true
-    sed 's|dosutil/*.com dosutil/*.sys||g' -i "${srcdir}/${pkgname}-${pkgver}/Makefile" || true
-    sed 's|dos/syslinux.com||g' -i "${srcdir}/${pkgname}-${pkgver}/Makefile" || true
-    sed 's|INSTALLSUBDIRS = com32 utils dosutil|INSTALLSUBDIRS = com32 utils|g' -i "${srcdir}/${pkgname}-${pkgver}/Makefile" || true
-    sed 's|install -m 644 -c $(INSTALL_DIAG) $(INSTALLROOT)$(DIAGDIR)|# install -m 644 -c $(INSTALL_DIAG) $(INSTALLROOT)$(DIAGDIR)|g' -i "${srcdir}/${pkgname}-${pkgver}/Makefile" || true
-    
-    ## Fix FHS manpage path
-    sed 's|/usr/man|/usr/share/man|g' -i "${srcdir}/${pkgname}-${pkgver}/mk/syslinux.mk" || true
-    
-    ## Build syslinux-efi
-    if [[ "${CARCH}" == "x86_64" ]]; then
-        _build_syslinux_efi64
-    fi
-    
-    if [[ "${CARCH}" == "i686" ]]; then
-        _build_syslinux_efi32
-    fi
-    
-    ## Build syslinux-bios
-    _build_syslinux_bios
-    
-}
-
-_package_syslinux_bios() {
-    
-    cd "${srcdir}/${pkgname}-${pkgver}-bios/"
-    
-    ## Install Syslinux bios
-    make INSTALLROOT="${pkgdir}/" AUXDIR="/usr/lib/syslinux/bios/" bios install
-    
-    ## Remove syslinux.exe,syslinux64.exe,syslinux.com and dosutil dir
-    rm "${pkgdir}/usr/lib/syslinux/bios"/syslinux.{com,exe} || true
-    rm "${pkgdir}/usr/lib/syslinux/bios/syslinux64.exe" || true
-    rm -rf "${pkgdir}/usr/lib/syslinux/bios/dosutil/" || true
-    
-    ## Remove com32 and diag dirs
-    rm -rf "${pkgdir}/usr/lib/syslinux/bios/diag/" || true
-    rm -rf "${pkgdir}/usr/lib/syslinux/bios/com32/" || true
-    
-    ## Move extlinux binary to /usr/bin
-    install -d "${pkgdir}/usr/bin"
-    mv "${pkgdir}/sbin/extlinux" "${pkgdir}/usr/bin/extlinux"
-    rm -rf "${pkgdir}/sbin/"
-    
-    ## Install docs
-    install -d "${pkgdir}/usr/share/doc"
-    cp -ar "${srcdir}/${pkgname}-${pkgver}/doc" "${pkgdir}/usr/share/doc/syslinux"
-    
-    ## Install the default configuration
-    install -D -m0644 "${srcdir}/syslinux.cfg" "${pkgdir}/boot/syslinux/syslinux.cfg"
-    
-    ## Install the installation and update script
-    ## This script is maintained at git://gist.github.com/772138.git
-    ## Script not yet updated for syslinux-efi
-    install -D -m0755 "${srcdir}/syslinux-install_update" "${pkgdir}/usr/bin/syslinux-install_update"
-    
-    # Install Parabola splash
-    install -D -m644 "${srcdir}/splash.png" "${pkgdir}/boot/syslinux/splash.png"
-}
-
-package() {
-    
-    cd "${srcdir}/${pkgname}-${pkgver}/"
-    
-    if [[ "${CARCH}" == "x86_64" ]]; then
-        cd "${srcdir}/${pkgname}-${pkgver}-efi64/"
-        make INSTALLROOT="${pkgdir}/" AUXDIR="/usr/lib/syslinux/" efi64 install
-    fi
-    
-    if [[ "${CARCH}" == "i686" ]]; then
-        cd "${srcdir}/${pkgname}-${pkgver}-efi32/"
-        make INSTALLROOT="${pkgdir}/" AUXDIR="/usr/lib/syslinux/" efi32 install
-    fi
-    
-    _package_syslinux_bios
-    
-}
diff --git a/libre-testing/syslinux/splash.png b/libre-testing/syslinux/splash.png
deleted file mode 100644
index eac14536b..000000000
--- a/libre-testing/syslinux/splash.png
+++ /dev/null
diff --git a/libre-testing/syslinux/splash.xcf b/libre-testing/syslinux/splash.xcf
deleted file mode 100644
index c27d04445..000000000
--- a/libre-testing/syslinux/splash.xcf
+++ /dev/null
diff --git a/libre-testing/syslinux/syslinux-dont-build-dos-windows-targets.patch b/libre-testing/syslinux/syslinux-dont-build-dos-windows-targets.patch
deleted file mode 100644
index 54151ab87..000000000
--- a/libre-testing/syslinux/syslinux-dont-build-dos-windows-targets.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Nur syslinux-4.02.orig//Makefile syslinux-4.02//Makefile
---- syslinux-4.02.orig//Makefile	2010-07-21 21:33:13.000000000 +0200
-+++ syslinux-4.02//Makefile	2010-07-22 11:14:03.325522937 +0200
-@@ -54,7 +54,7 @@
- # files that depend only on the B phase, but may have to be regenerated
- # for "make installer".
- BSUBDIRS = codepage com32 lzo core memdisk mbr memdump gpxe sample \
--	   diag libinstaller dos win32 win64 dosutil txt
-+	   libinstaller txt
- ITARGET  =
- IOBJECTS = $(ITARGET) \
- 	utils/gethostip utils/isohybrid utils/mkdiskimage \
diff --git a/libre-testing/syslinux/syslinux-install_update b/libre-testing/syslinux/syslinux-install_update
deleted file mode 100644
index 4dc09696a..000000000
--- a/libre-testing/syslinux/syslinux-install_update
+++ /dev/null
@@ -1,461 +0,0 @@
-#!/usr/bin/env bash
-#
-# Syslinux Installer / Updater Script (for BIOS only)
-# Copyright (C) 2013  Matthew Gyurgyik <pyther@pyther.net>
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
-#
-# This program 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 General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-#
-#-----------------
-# Exit Codes:
-#   1 - get_boot_device or other function failed
-#   2 - install/update failed
-#   3 - set_active failed
-#   4 - install_mbr failed
-#
-shopt -s nullglob
-
-bios_libpath="/usr/lib/syslinux/bios/"
-bios_bootpath="/boot/syslinux/"
-EXTLINUX="/usr/bin/extlinux"
-
-bios_core_modules=(config.c32 chain.c32 ldlinux.c32 libcom32.c32 libgpl.c32 liblua.c32 libmenu.c32 libutil.c32 linux.c32 menu.c32 vesamenu.c32)
-bios_autoupdate_file="/boot/syslinux/SYSLINUX_AUTOUPDATE"
-pciids_file="/usr/share/hwdata/pci.ids"
-
-## Helper functions ##
-# Taken from libui-sh
-# $1 needle
-# $2 set (array) haystack
-check_is_in() {
-    local needle="$1" element
-    shift
-    for element; do
-        [[ $element = $needle ]] && return 0
-    done
-    return 1
-}
-
-# return true when blockdevice is an md raid, otherwise return a unset value
-# get all devices that are part of raid device $1
-device_is_raid() {
-    [[ $1 && -f /proc/mdstat ]] || return 1
-    local devmajor=$(stat -c %t "$1")
-    (( devmajor == 9 ))
-}
-
-mdraid_all_slaves() {
-    local slave slaves
-    for slave in /sys/class/block/${1##*/}/slaves/*; do
-        source "$slave/uevent"
-        slaves="$slaves/dev/$DEVNAME "
-        unset DEVNAME
-    done
-    echo $slaves
-}
-
-# Check /sys/block to see if device is partitioned
-# If we have a partitioned block device (sda1) /sys/block/sda1/dev will not exist
-# However, if we have an unpartitioned block device (sda) /sys/block/sda/dev will exist
-dev_is_part() {
-    # $1 - blockdevice
-    local dev=$1
-
-    # If block device uevent file should be found
-    # If a partition is passed in path shouldn't exist
-    if [[ $dev = *cciss* ]]; then
-        [[ -f /sys/block/cciss\!${dev##*/}/dev ]] && return 1
-    elif [[ $dev = *ida* ]]; then
-        [[ -f /sys/block/ida\!${dev##*/}/dev ]] && return 1
-    else
-        [[ -f /sys/block/${dev##*/}/dev ]] && return 1
-    fi
-
-    return 0
-}
-
-# If EFI PART is present in the first 8 bytes then it must be a GPT disk
-device_is_gpt() {
-    local partsig=$(dd if="$1" skip=64 bs=8 count=1 2>/dev/null)
-    [[ $partsig = "EFI PART" ]]
-}
-
-clear_gpt_attr2() {
-    # $1 - Block Device, no partitions
-    local disk=$1
-
-    # Special Exception for cciss controllers
-    if [[ $disk = *cciss* ]]; then
-        for part in /dev/cciss/${disk##*/}*p*; do
-            local partnum="${part##*[[:alpha:]]}"
-            sgdisk "$disk" --attributes="$partnum":clear:2 &>/dev/null
-        done
-    # Smart 2 Controllers
-    elif [[ $disk = *ida* ]]; then
-        for part in /dev/ida/${disk##*/}*p*; do
-            local partnum="${part##*[[:alpha:]]}"
-            sgdisk "$disk" --attributes="$partnum":clear:2 &>/dev/null
-        done
-    else
-        for part in  /sys/block/${disk##*/}/${disk##*/}*; do
-            local partnum="${part##*[[:alpha:]]}"
-            sgdisk "$disk" --attributes="$partnum":clear:2 &>/dev/null
-        done
-    fi
-    return 0
-}
-
-usage() {
-cat << EOF
-usage: $0 options
-
-This script will install or upgrade Syslinux (for BIOS only)
-
-OPTIONS:
-  -h    Show this message
-  -i    Install Syslinux
-  -u    Update Syslinux
-  -a    Set Boot flag on boot partiton
-  -m    Install Syslinux MBR
-  -s    Updates Syslinux if /boot/syslinux/SYSLINUX_AUTOUPDATE exists
-
- Arguments Required:
-  -c    Chroot install (ex: -c /mnt)
-
-Example Usage: $0 -i -a -m     # (install, set boot flag, install mbr)
-               $0 -u           # (update)
-EOF
-}
-
-# Trys to find the partition that /boot resides on
-# This will either be on /boot or / (root)
-getBoot() {
-    if [[ ! -d "$bios_bootpath" ]]; then
-        echo "Could not find $bios_bootpath"
-        echo "Is boot mounted? Is Syslinux installed?"
-        exit 1
-    fi
-
-    syslinux_fs=(ext2 ext3 ext4 btrfs vfat)
-
-    # Use DATA from findmnt see rc.sysint for more info
-    if [[ -f /proc/self/mountinfo ]]; then
-        read rootdev rootfs < <(findmnt -run -t noautofs -o SOURCE,FSTYPE "$CHROOT/")
-        read bootdev bootfs < <(findmnt -run -t noautofs -o SOURCE,FSTYPE "$CHROOT/boot")
-    else
-        echo "Could not find /proc/self/mountinfo"
-        echo "Are you running a kernel greater than 2.6.24?"
-        exit 1
-    fi
-
-    if [[ $bootfs ]]; then
-        if ! check_is_in "$bootfs" "${syslinux_fs[@]}"; then
-            echo "/boot file system is not supported by Syslinux"
-            exit 1
-        fi
-        boot="boot"
-        bootpart="$bootdev"
-    elif [[ $rootfs ]]; then
-        if ! check_is_in "$rootfs" "${syslinux_fs[@]}"; then
-            echo "/ (root) file system is not supported by Syslinux"
-            exit 1
-        fi
-        boot="root"
-        bootpart="$rootdev"
-    else
-        echo "Could not find filesystem on / (root) or /boot."
-        exit 1
-    fi
-}
-
-# We store the partition table type either gpt or mbr in var ptb
-# In rare cases a user could have one raid disk using mbr and another using gpt
-# In such cases we accept that the output may be incomplete
-
-# Calls get_ptb() for $bootpart or for all device in RAID
-declare -A bootdevs
-get_boot_devices() {
-    if device_is_raid "$bootpart"; then
-        slaves=$(mdraid_all_slaves "$bootpart")
-
-        for slave in ${slaves[@]}; do
-            local disk="${slave%%[[:digit:]]*}"
-            device_is_gpt "$disk" && local ptb="GPT" || local ptb="MBR"
-            bootdevs[$slave]="$ptb"
-        done
-    else
-        local disk="${bootpart%%[[:digit:]]*}"
-        device_is_gpt "$disk" && local ptb="GPT" || local ptb="MBR"
-        bootdevs[$bootpart]="$ptb"
-    fi
-}
-
-# Function Assumes the boot partition should be marked as active
-# All other partitions should not have the boot flag set
-set_active() {
-    # If any bootdev is a block device without partitions bail
-    # we want to set the boot flag on partitioned disk
-    for dev in "${!bootdevs[@]}"; do
-        dev_is_part $dev || { echo "$dev - is a block device. Aborting set_active!"; return 1; }
-    done
-
-    # Clear BIOS Bootable Legacy Attribute for GPT drives
-    # In rare cases where a RAID device has slaves on the same block device
-    # Attribute 2 will be cleared for each partition multiple times
-    for dev in "${!bootdevs[@]}"; do
-        local ptb="${bootdevs[$dev]}"
-        if [[ "$ptb" = GPT ]]; then
-            local disk="${dev%%[[:digit:]]*}" #ex: /dev/sda
-            clear_gpt_attr2 "$disk"
-        fi
-    done
-
-    # Set the boot flag on bootdevs (generated from get_boot_devices)
-    for part in "${!bootdevs[@]}"; do
-        local ptb="${bootdevs[$part]}"
-        local partnum="${part##*[[:alpha:]]}"
-        case "$part" in
-            *[[:digit:]]p[[:digit:]]*)
-                local disk="${part%%p$partnum}" # get everything before p1
-                ;;
-            *)
-                local disk="${part%%[[:digit:]]*}"
-                ;;
-        esac
-
-        if [[ "$ptb" = MBR ]]; then
-            if sfdisk "$disk" -A "$partnum" &>/dev/null; then
-                echo "Boot Flag Set - $part"
-            else
-                echo "FAILED to Set the boot flag on $part"
-                exit 3
-            fi
-        elif [[ "$ptb" = GPT ]]; then
-            if sgdisk "$disk" --attributes="$partnum":set:2 &>/dev/null; then
-                echo "Attribute Legacy Bios Bootable Set - $part"
-            else
-                echo "FAILED to set attribute Legacy BIOS Bootable on $part"
-                exit 3
-            fi
-        fi
-    done
-    return 0
-}
-
-install_mbr() {
-    # If any bootdev is a block device without partitions bail
-    # we want to install the mbr to a partitioned disk
-    for dev in "${!bootdevs[@]}"; do
-        dev_is_part "$dev" || { echo "$dev - is a block device. Aborting MBR install"; return 1; }
-    done
-
-    for part in "${!bootdevs[@]}"; do
-        local partnum="${part##*[[:alpha:]]}"
-        case "$part" in
-            *[[:digit:]]p[[:digit:]]*)
-                local disk="${part%%p$partnum}" # get everything before p1
-                ;;
-            *)
-                local disk="${part%%[[:digit:]]*}"
-                ;;
-        esac
-        local ptb="${bootdevs[$part]}"
-
-        # We want to install to the root of the block device
-        # If the device is a partition - ABORT!
-        dev_is_part "$disk" && \
-        { echo "ABORT! MBR installation to partition ($disk)!"; exit 4;}
-
-        if [[ "$ptb" = MBR ]]; then
-            mbrfile="$bios_libpath/mbr.bin"
-        elif [[ "$ptb" = GPT ]]; then
-            mbrfile="$bios_libpath/gptmbr.bin"
-        fi
-
-        if dd bs=440 count=1 conv=notrunc if="$mbrfile" of="$disk" &> /dev/null; then
-            echo "Installed MBR ($mbrfile) to $disk"
-        else
-            echo "Error Installing MBR ($mbrfile) to $disk"
-            exit 4
-        fi
-    done
-    return 0
-}
-
-install_modules() {
-    # Copy all com32 files to /boot
-    for file in "${bios_libpath}"/*.c32; do
-        file=${file##*/}
-        rm "$bios_bootpath/$file" &> /dev/null
-        if [[ "$boot" = root ]]; then
-            # Symlink files if /boot resides on the same partition as root
-            ln -sf "${bios_libpath#$CHROOT}/$file" "$bios_bootpath/$file" &> /dev/null
-        elif [[ "$boot" = boot ]]; then
-            cp "$bios_libpath/$file" "$bios_bootpath/$file"
-        fi
-    done
-
-    # Copy / Symlink pci.ids if pci.ids exists on the FS
-    if [[ -f $pciids_file ]]; then
-        rm "$bios_bootpath/pci.ids" &> /dev/null
-        if [[ "$boot" = root ]]; then
-            ln -sf "$pciids_file" "$bios_bootpath/pci.ids" &> /dev/null
-        elif [[ "$boot" = boot ]]; then
-            cp "$pciids_file" "$bios_bootpath/pci.ids" &> /dev/null
-        fi
-    fi
-}
-
-_install() {
-    install_modules
-
-    if device_is_raid "$bootpart"; then
-        echo "Detected RAID on /boot"
-        "$EXTLINUX" --install "$bios_bootpath" --raid &> /dev/null
-    else
-        "$EXTLINUX" --install "$bios_bootpath" &> /dev/null
-    fi
-
-    if (( $? )); then
-        echo "Syslinux BIOS install failed"
-        exit 2
-    else
-        echo "Syslinux BIOS install successful"
-    fi
-
-    touch "$CHROOT/$bios_autoupdate_file"
-}
-
-update() {
-    install_modules
-
-    if device_is_raid $bootpart; then
-        echo "Detected RAID on /boot"
-        "$EXTLINUX" --update "$bios_bootpath" --raid &> /dev/null
-    else
-        "$EXTLINUX" --update "$bios_bootpath" &> /dev/null
-    fi
-
-    if (($?)); then
-        echo "Syslinux BIOS update failed"
-        exit 2
-    else
-        echo "Syslinux BIOS update successful"
-    fi
-}
-
-if (( $# == 0 )); then
-    usage
-    exit 1
-fi
-
-while getopts "c:uihmas" opt; do
-    case $opt in
-        c)
-            CHROOT=$(readlink -e "$OPTARG")
-            if [[ -z $CHROOT ]]; then
-                echo "error: chroot path ``$OPTARG does not exist";
-                exit 1
-            fi
-            ;;
-        h)
-            USAGE="True"
-            ;;
-        i)
-            INSTALL="True"
-            ;;
-        u)
-            UPDATE="True"
-            ;;
-        m)
-            MBR="True"
-            ;;
-        a)
-            SET_ACTIVE="True"
-            ;;
-        s)
-            # If AUTOUPDATE_FILE does not exist exit the script
-            if [[ -f $bios_autoupdate_file ]]; then
-                UPDATE="True"
-            else
-                exit 0
-            fi
-            ;;
-        *)
-            usage
-            exit 1
-            ;;
-    esac
-done
-
-if [[ $USAGE ]]; then
-    usage
-    exit 0
-fi
-
-# Make sure only root can run our script
-if (( $(id -u) != 0 )); then
-    echo "This script must be run as root" 1>&2
-    exit 1
-fi
-
-# Display Usage Information if both Install and Update are passed
-if [[ $INSTALL && $UPDATE ]]; then
-    usage
-    exit 1
-fi
-
-# If a chroot dir is path set variables to reflect chroot
-if [[ "$CHROOT" ]]; then
-    bios_libpath="$CHROOT$bios_libpath"
-    bios_bootpath="$CHROOT$bios_bootpath"
-    EXTLINUX="$CHROOT$EXTLINUX"
-fi
-
-# Exit if no /boot path exists
-if ( f=("$bios_bootpath"/*); (( ! ${#f[@]} )) ); then
-    echo "Error: $bios_bootpath is empty!"
-    echo "Is /boot mounted?"
-    exit 1
-fi
-
-# Get the boot device if any of these options are passed
-if [[ $INSTALL || $UPDATE || $SET_ACTIVE || $MBR ]]; then
-    getBoot
-fi
-
-# Install or Update
-if [[ $INSTALL ]]; then
-    _install || exit
-elif [[ $UPDATE ]]; then
-    update || exit
-fi
-
-
-# SET_ACTIVE and MBR
-if [[ $SET_ACTIVE ]] || [[ $MBR ]]; then
-    get_boot_devices
-
-    if [[ $SET_ACTIVE ]]; then
-        set_active || exit
-    fi
-
-    if [[ $MBR ]]; then
-        install_mbr || exit
-    fi
-fi
-
-exit 0
-
-# vim: set et sw=4:
diff --git a/libre-testing/syslinux/syslinux.cfg b/libre-testing/syslinux/syslinux.cfg
deleted file mode 100644
index 0c0c6339a..000000000
--- a/libre-testing/syslinux/syslinux.cfg
+++ /dev/null
@@ -1,78 +0,0 @@
-# Config file for Syslinux -
-# /boot/syslinux/syslinux.cfg
-#
-# Comboot modules:
-#   * menu.c32 - provides a text menu
-#   * vesamenu.c32 - provides a graphical menu
-#   * chain.c32 - chainload MBRs, partition boot sectors, Windows bootloaders
-#   * hdt.c32 - hardware detection tool
-#   * reboot.c32 - reboots the system
-#
-# To Use: Copy the respective files from /usr/lib/syslinux to /boot/syslinux.
-# If /usr and /boot are on the same file system, symlink the files instead
-# of copying them.
-#
-# If you do not use a menu, a 'boot:' prompt will be shown and the system
-# will boot automatically after 5 seconds.
-#
-# Please review the wiki: https://wiki.archlinux.org/index.php/Syslinux
-# The wiki provides further configuration examples
-
-DEFAULT parabola
-PROMPT 0        # Set to 1 if you always want to display the boot: prompt
-TIMEOUT 50
-# You can create syslinux keymaps with the keytab-lilo tool
-#KBDMAP de.ktl
-
-# Menu Configuration
-# Either menu.c32 or vesamenu32.c32 must be copied to /boot/syslinux 
-#UI menu.c32
-UI vesamenu.c32
-
-# Refer to http://syslinux.zytor.com/wiki/index.php/Doc/menu
-MENU TITLE Parabola GNU/Linux-libre
-MENU BACKGROUND splash.png
-MENU COLOR border       35;40   #ff777caa #a0000000 std
-MENU COLOR title        1;35;40 #ff777caa #a0000000 std
-MENU COLOR sel          7;35;47 #e0ffffff #20777caa all
-MENU COLOR unsel        35;40   #ff777caa #a0000000 std
-MENU COLOR help         35;40   #c0b2b2b2 #a0000000 std
-MENU COLOR timeout_msg  35;40   #ff777caa #00000000 std
-MENU COLOR timeout      1;35;40 #ff777caa #00000000 std
-MENU COLOR msg07        35;40   #ff777caa #a0000000 std
-MENU COLOR tabmsg       35;40   #ff777caa #00000000 std
-
-# boot sections follow
-#
-# TIP: If you want a 1024x768 framebuffer, add "vga=773" to your kernel line.
-#
-#-*
-
-LABEL parabola
-    MENU LABEL Parabola GNU/Linux-libre
-    LINUX ../vmlinuz-linux-libre
-    APPEND root=/dev/sda3 rw
-    INITRD ../initramfs-linux-libre.img
-
-LABEL parabolafallback
-    MENU LABEL Parabola GNU/Linux-libre Fallback
-    LINUX ../vmlinuz-linux-libre
-    APPEND root=/dev/sda3 rw
-    INITRD ../initramfs-linux-libre-fallback.img
-
-# If you want Memtest on syslinux, use this LABEL section to launch it (install the memtest86+ package)
-#    LABEL memtest
-#    MENU LABEL Memtest86+
-#    LINUX ../memtest86+/memtest.bin
-
-LABEL hdt
-        MENU LABEL HDT (Hardware Detection Tool)
-        COM32 hdt.c32
-
-LABEL reboot
-        MENU LABEL Reboot
-        COM32 reboot.c32
-
-LABEL poweroff
-        MENU LABEL Poweroff
-        COM32 poweroff.c32
diff --git a/libre-testing/syslinux/syslinux.install b/libre-testing/syslinux/syslinux.install
deleted file mode 100644
index ac8553a97..000000000
--- a/libre-testing/syslinux/syslinux.install
+++ /dev/null
@@ -1,36 +0,0 @@
-post_install() {
-  echo "==> If you want to use syslinux as your BIOS bootloader"
-  echo "==> edit /boot/syslinux/syslinux.cfg and run"
-  echo "==>   # /usr/bin/syslinux-install_update -i -a -m"
-  echo "==> to install it."
-  
-  cat << EOF
-Syslinux efi64 and efi32 files have been installed at
-/usr/lib/syslinux/{efi64,efi32}/ respectively.
-
-To install, copy /usr/lib/syslinux/efi64 to (ESP)/EFI/syslinux and
-syslinux.cfg to (ESP)/EFI/syslinux/syslinux.cfg and add a boot entry
-using efibootmgr for (ESP)/EFI/syslinux/syslinux.efi
-EOF
-
-}
-
-post_upgrade() {
-  # auto-update syslinux if /boot/syslinux/SYSLINUX_AUTOUPDATE exists
-  /usr/bin/syslinux-install_update -s
-  # update to 5.01 message
-  if [ "$(vercmp $2 5.01)" -lt 0 ]; then
-      echo "If you used syslinux-install_update to install syslinux:"
-      echo "==> If you want to use syslinux with menu and all modules please rerun" 
-      echo "==>   # /usr/bin/syslinux-install_update -i -a -m"
-      echo ""
-      echo "If you manually installed syslinux:"
-      echo "==> Please copy or symlink all .c32 modules to your /boot/syslinux directory."
-      echo "==> If (/ and /boot on seperate fs):"
-      echo "==>   # cp /usr/lib/syslinux/bios/*.c32 /boot/syslinux"
-      echo "==> If (/ and /boot on same fs):"
-      echo "==>   # ln -s /usr/lib/syslinux/bios/*.c32 /boot/syslinux"
-  fi
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/libre-testing/systemd/rePKGBUILD b/libre-testing/systemd/rePKGBUILD
index 8b9e59932..bd7d396db 100644
--- a/libre-testing/systemd/rePKGBUILD
+++ b/libre-testing/systemd/rePKGBUILD
@@ -4,7 +4,7 @@
 # then please put 'unknown'.
 
 # Maintainer: Nicolas Reynolds <fauno@kiwwwi.com.ar>
-# Maintainer: André Silva <emulatorman@lavabit.com>
+# Maintainer: André Silva <emulatorman@parabola.nu>
 source PKGBUILD
 unset build package md5sums source check
 _repo=testing
diff --git a/libre/abiword-libre/PKGBUILD b/libre/abiword-libre/PKGBUILD
index 30ef5cec2..e8f1e00d8 100644
--- a/libre/abiword-libre/PKGBUILD
+++ b/libre/abiword-libre/PKGBUILD
@@ -1,7 +1,7 @@
 # $Id: PKGBUILD 183900 2013-04-29 15:40:28Z bpiotrowski $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Maël Lavault <moimael@neuf.fr>
-# Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
+# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
 
 _pkgbase=abiword
 pkgbase=abiword-libre
diff --git a/libre/abuse-libre/PKGBUILD b/libre/abuse-libre/PKGBUILD
index 533ce1e06..e1b44b7f9 100644
--- a/libre/abuse-libre/PKGBUILD
+++ b/libre/abuse-libre/PKGBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de>
 # Contributor: jlvsimoes <jlvsimoes@oninet.pt>
 # Contributor: kevin <kevin@archlinux.org>
-# Contributor (Parabola): André Silva <emulatorman@lavabit.com>
+# Contributor (Parabola): André Silva <emulatorman@parabola.nu>
 
 _pkgname=abuse
 pkgname=abuse-libre
diff --git a/libre/ath9k-htc-firmware/PKGBUILD b/libre/ath9k-htc-firmware/PKGBUILD
index 6aec27967..172cb97b3 100644
--- a/libre/ath9k-htc-firmware/PKGBUILD
+++ b/libre/ath9k-htc-firmware/PKGBUILD
@@ -1,4 +1,4 @@
-# Maintainer: André Silva <emulatorman@lavabit.com>
+# Maintainer: André Silva <emulatorman@parabola.nu>
 # Maintainer: Márcio Silva <coadde@lavabit.com>
 
 pkgname=ath9k-htc-firmware
diff --git a/libre/atool-libre/PKGBUILD b/libre/atool-libre/PKGBUILD
index b2b3097b9..4ac426440 100644
--- a/libre/atool-libre/PKGBUILD
+++ b/libre/atool-libre/PKGBUILD
@@ -4,7 +4,7 @@
 # Contributor: tranquility <trankas@gmail.com>
 # Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
 # Maintainer (Parabola): Márcio Silva <coadde@lavabit.com>
-# Contributor (Parabola): André Silva <emulatorman@lavabit.com>
+# Contributor (Parabola): André Silva <emulatorman@parabola.nu>
 
 _pkgname=atool
 pkgname=atool-libre
diff --git a/libre/audacious-plugins-libre/PKGBUILD b/libre/audacious-plugins-libre/PKGBUILD
index 0924dc371..d1fb5b9a4 100644
--- a/libre/audacious-plugins-libre/PKGBUILD
+++ b/libre/audacious-plugins-libre/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 195219 2013-09-28 02:25:20Z bisson $
+# $Id: PKGBUILD 198672 2013-11-01 21:09:24Z bisson $
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
 # Contributor: Alexander Fehr <pizzapunk gmail com>
 # Contributor: William Rea <sillywilly@gmail.com>
@@ -8,8 +8,8 @@
 
 _pkgname=audacious-plugins
 pkgname=audacious-plugins-libre
-pkgver=3.4.1
-pkgrel=2
+pkgver=3.4.2
+pkgrel=1
 pkgdesc='Plugins for Audacious, without nonfree plugins'
 url='http://audacious-media-player.org/'
 license=('GPL' 'GPL3' 'LGPL' 'custom:BSD')
@@ -62,7 +62,7 @@ optdepends=('alsa-lib: Advanced Linux Sound Arch. output'
             'libcue: CUE playlist format')
 
 source=("http://distfiles.audacious-media-player.org/${_pkgname}-${pkgver}.tar.bz2")
-sha1sums=('81c36186d1fef7247b6ea890db7c77061965629b')
+sha1sums=('a9e831f4fd4d4c4a1dab11b819fa5ac96ce9fad0')
 
 prepare() {
 	# Retrieve upstream & remove plugin 'psf' due to issues mentioned above.
diff --git a/libre/audacity-libre/PKGBUILD b/libre/audacity-libre/PKGBUILD
index e9e18ba48..9fd861764 100644
--- a/libre/audacity-libre/PKGBUILD
+++ b/libre/audacity-libre/PKGBUILD
@@ -1,6 +1,6 @@
 # $Id: PKGBUILD 153455 2012-03-14 17:15:15Z eric $
 # Maintainer: Eric Bélanger <eric@archlinux.org>
-# Contributor (Parabola): André Silva <emulatorman@lavabit.com>
+# Contributor (Parabola): André Silva <emulatorman@parabola.nu>
 
 _pkgname=audacity
 pkgname=audacity-libre
diff --git a/libre/audex-libre/PKGBUILD b/libre/audex-libre/PKGBUILD
index 22ded032f..06b130f2a 100644
--- a/libre/audex-libre/PKGBUILD
+++ b/libre/audex-libre/PKGBUILD
@@ -3,7 +3,7 @@
 # Contributor: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: mightyjaym <jmambrosino@gmail.com>
 # Contributor: moostik <mooostik_at_gmail.com>
-# Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
+# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
 
 _pkgname=audex
 pkgname=audex-libre
diff --git a/libre/audio-convert-libre/ChangeLog b/libre/audio-convert-libre/ChangeLog
index c309d74a0..0d8720f38 100644
--- a/libre/audio-convert-libre/ChangeLog
+++ b/libre/audio-convert-libre/ChangeLog
@@ -1,4 +1,4 @@
-2013-03-13 André Silva <emulatorman@lavabit.com>
+2013-03-13 André Silva <emulatorman@parabola.nu>
 	* Remove nonfree faac recommendation
 
 2009-10-17 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
diff --git a/libre/audio-convert-libre/PKGBUILD b/libre/audio-convert-libre/PKGBUILD
index 81db4af67..0824a036c 100644
--- a/libre/audio-convert-libre/PKGBUILD
+++ b/libre/audio-convert-libre/PKGBUILD
@@ -1,7 +1,7 @@
 # $Id: PKGBUILD 91081 2013-05-18 21:26:27Z jlichtblau $
 # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
 # Contributor: Igor Galic <i.galic@gmail.com>
-# Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
+# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
 
 _pkgname=audio-convert
 pkgname=audio-convert-libre
diff --git a/libre/avidemux-libre/PKGBUILD b/libre/avidemux-libre/PKGBUILD
index 3cdb513cb..cbfdf1135 100644
--- a/libre/avidemux-libre/PKGBUILD
+++ b/libre/avidemux-libre/PKGBUILD
@@ -1,6 +1,6 @@
 # $Id: PKGBUILD 189962 2013-07-11 23:40:28Z eric $
 # Maintainer: Eric Bélanger <eric@archlinux.org>
-# Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
+# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
 
 _pkgbase=avidemux
 pkgbase=avidemux-libre
diff --git a/libre/avidemux-libre/PKGBUILD.WIP b/libre/avidemux-libre/PKGBUILD.WIP
index 65499e1ef..a6dea6acb 100644
--- a/libre/avidemux-libre/PKGBUILD.WIP
+++ b/libre/avidemux-libre/PKGBUILD.WIP
@@ -1,6 +1,6 @@
 # $Id: PKGBUILD 160693 2012-06-03 22:00:17Z eric $
 # Maintainer: Eric Bélanger <eric@archlinux.org>
-# Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
+# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
 
 _pkgbase=avidemux
 pkgbase=avidemux-libre
diff --git a/libre/bbswitch-libre/PKGBUILD b/libre/bbswitch-libre/PKGBUILD
index 6e88bce94..60009bbe6 100644
--- a/libre/bbswitch-libre/PKGBUILD
+++ b/libre/bbswitch-libre/PKGBUILD
@@ -1,13 +1,13 @@
 # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
 # Contributor: M0Rf30
 # Contributor: Samsagax <samsagax@gmail.com>
-# Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
+# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
 
 _pkgname=bbswitch
 pkgname=bbswitch-libre
 pkgver=0.7
 _extramodules=extramodules-3.11-LIBRE # Don't forget to update bbswitch.install
-pkgrel=16
+pkgrel=17
 pkgdesc="Kernel module allowing to switch dedicated graphics card on Optimus laptops (built for the linux-libre kernel package)"
 arch=('i686' 'x86_64' 'mips64el')
 url=("http://github.com/Bumblebee-Project/bbswitch")
diff --git a/libre/bfgminer-libre/PKGBUILD b/libre/bfgminer-libre/PKGBUILD
index 80e3d75e0..3559adcf4 100644
--- a/libre/bfgminer-libre/PKGBUILD
+++ b/libre/bfgminer-libre/PKGBUILD
@@ -1,14 +1,14 @@
-# $Id: PKGBUILD 97509 2013-09-23 12:27:29Z tredaelli $
+# $Id: PKGBUILD 99405 2013-10-28 11:43:52Z tredaelli $
 # Maintainer: Timothy Redaelli <timothy.redaelli@gmail.com>
 # Contributor: Andy Weidenbaum <archbaum@gmail.com>
 
 _pkgname=bfgminer
 pkgname=bfgminer-libre
-pkgver=3.2.1
+pkgver=3.4.0
 pkgrel=1
 pkgdesc="Bitcoin miner featuring overclocking, monitoring, fan speed control and remote management. For FPGA/GPU/CPU Bitcoin mining, without nonfree OpenCL recommendation."
 arch=('i686' 'x86_64' 'mips64el')
-depends=('curl' 'jansson' 'libusbx' 'lm_sensors')
+depends=('curl' 'jansson' 'libevent' 'libmicrohttpd' 'libusbx' 'lm_sensors')
 makedepends=('uthash' 'yasm')
 replaces=$_pkgname
 conflicts=$_pkgname
@@ -18,7 +18,7 @@ license=('GPL3')
 options=(!libtool)
 source=(http://luke.dashjr.org/programs/bitcoin/files/$_pkgname/$pkgver/$_pkgname-$pkgver.tbz2
         remove-dangerous-rpath.patch)
-sha256sums=('db8cdc4272950e12804961d21365ed96f3ef5262549cc0dfd6ebd2004e5d57d8'
+sha256sums=('5367802f303917810236be092a09400c6e105efc348eadcf27bdcea526728d67'
             'd26d07ca23ae25798c4db37cfda1a6a76f22d06e73efab1ddf62b3e1a7eef04c')
 
 prepare() {
@@ -31,7 +31,12 @@ prepare() {
 build() {
   cd "$srcdir"/$_pkgname-$pkgver
 
-  ./configure --prefix=/usr --enable-cpumining --enable-scrypt
+  ./configure	--prefix=/usr \
+	  	--enable-cpumining \
+		--enable-bfsb \
+		--enable-metabank \
+  		--enable-scrypt
+  # --enable-knc (FS#33640)
   make
 }
 
diff --git a/libre/blackbox-libre/PKGBUILD b/libre/blackbox-libre/PKGBUILD
index 980f35851..ef504f68e 100644
--- a/libre/blackbox-libre/PKGBUILD
+++ b/libre/blackbox-libre/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id$
+# $Id: PKGBUILD 100133 2013-11-01 20:20:45Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: durbatuluk <dvdscripter@gmail.org>
 # Contributor: Steve Ponsford <sp4d@lavabit.com>
@@ -7,17 +7,17 @@
 _pkgname=blackbox
 pkgname=${_pkgname}-libre
 pkgver=0.70.1
-pkgrel=10.1
-pkgdesc="A window manager for X11 without non-free programs on menu"
-url="http://${_pkgname}wm.sourceforge.net/"
+======
+pkgrel=11
+pkgdesc="A window manager for X11, without nonfree programs on the menu"
+url="http://blackboxwm.sourceforge.net/"
 arch=('i686' 'x86_64' 'mips64el')
 depends=('gcc-libs' 'libxft' 'libxext' 'libx11' 'libxt')
-replaces=("${_pkgname}")
-conflicts=("${_pkgname}")
-provides=("${_pkgname}=${pkgver}")
+replaces=$_pkgname
+conflicts=$_pkgname
+provides=$_pkgname=$pkgver
 license=('MIT')
-options=('!libtool')
-source=(http://downloads.sourceforge.net/${_pkgname}wm/${_pkgname}-${pkgver}.tar.gz
+source=(http://downloads.sourceforge.net/blackboxwm/$_pkgname-$pkgver.tar.gz
 	gcc4.3.patch
 	bbdock.patch
 	bsetbg-feh.patch
@@ -31,7 +31,7 @@ md5sums=('2d173b95ca5e64ef478c6a5d2deee9df'
          'f4fefa5f25c65c5d9a601e9c14646757')
 
 build() {
-  cd ${srcdir}/${_pkgname}-${pkgver}
+  cd $srcdir/$_pkgname-$pkgver
 
   patch -Np1 -i ../gcc4.3.patch
   patch -Np0 -i ../bbdock.patch
@@ -40,8 +40,11 @@ build() {
 
   ./configure --prefix=/usr --mandir=/usr/share/man
   make
-  make DESTDIR=${pkgdir} install
+}
 
-  install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${_pkgname}/LICENSE
-  install -D -m644 ${srcdir}/menu ${pkgdir}/usr/share/${_pkgname}/menu
+package() {
+  cd $srcdir/$_pkgname-$pkgver
+  make DESTDIR=$pkgdir install
+  install -D -m644 LICENSE $pkgdir/usr/share/licenses/$_pkgname/LICENSE
+  install -D -m644 $srcdir/menu $pkgdir/usr/share/$_pkgname/menu
 }
diff --git a/libre/blender-addon-luxrender/PKGBUILD b/libre/blender-addon-luxrender/PKGBUILD
index d3c891067..337cabcda 100644
--- a/libre/blender-addon-luxrender/PKGBUILD
+++ b/libre/blender-addon-luxrender/PKGBUILD
@@ -1,16 +1,16 @@
 # Maintainer: Márcio Silva <coadde@lavabit.com>
 
 _srcname=luxrender
-_pkgver=1.2.1
+_pkgver=1.3
 _bldname=blender
-_bldver=2.68
-_bldep=9
+_bldver=2.69
+_bldep=10
 _pkgname=${_srcname::3}${_bldname::5}25
 _srcver=c9deae0646d0
 
 pkgname=$_bldname-addon-$_srcname
 pkgver=$_pkgver.v$_bldver
-pkgrel=3
+pkgrel=1
 pkgdesc="$_pkgname: A addon for the ${_bldname^} which allows render and export with LuxRender (built for the $_bldname-libre package)"
 arch=any
 url=http://www.$_srcname.net/
diff --git a/libre/blender-libre/PKGBUILD b/libre/blender-libre/PKGBUILD
index 90df03528..359f2a6cf 100644
--- a/libre/blender-libre/PKGBUILD
+++ b/libre/blender-libre/PKGBUILD
@@ -2,8 +2,8 @@
 
 _pkgname=blender
 epoch=10
-_pkgver=2.68a
-pkgrel=3
+_pkgver=2.69
+pkgrel=1
 _jpgver=1.5
 _pyver=3.3
 
@@ -36,7 +36,7 @@ depends=(
   openal
   openexr-libre
   openimageio
-  'opencollada=20130413'
+  'opencollada=20131031'
   opencolorio
   openshadinglanguage
   shared-mime-info
@@ -57,9 +57,10 @@ provides=($_pkgname)
 conflicts=($_pkgname)
 [[ $_spn == true ]] && conflicts+=($_pkgname-libre)
 replaces=$_pkgname
+options=(!strip)
 install=$_pkgname.install
 source=http://download.$_pkgname.org/source/$_pkgname-$pkgver.tar.gz
-sha512sums=ce93779c5cbadf361f08ad0f9d5370d52878f94edc0b113d73711b842169d0e000e1500ece8e534439d94c5983e6ff3f15ca4ccd74db5f21447274c475090019
+sha512sums=f4de1f5a0a7868ee509b57ef65962a6c2af4c2bc7328db6ebe7b8e05f771c06efea92977f7a64433e8383382a33dbd73cb42b2bf872e63410e55c19ddd133142
 
 prepare() {
   cd $srcdir/$_pkgname-$pkgver
@@ -67,16 +68,17 @@ prepare() {
   msg 'renaming wrong OS name'
   _OS=$(uname -o)
   [[ $_OS == GNU ]] && sed -i 's|BUILD_PLATFORM;|"GNU";|' source/creator/buildinfo.c
-  [[ $_OS == GNU/Linux ]] && sed -i 's|BUILD_PLATFORM;|"GNU/Linux-libre";|' source/creator/buildinfo.c
-  sed -i 's|Linux, Mac OS X, Windows and FreeBSD|GNU and GNU/Linux-libre|
-          s|Linux, FreeBSD|GNU, GNU/Linux-libre|
+  [[ $_OS == GNU/Linux ]] && sed -i 's|BUILD_PLATFORM;|"GNU/Linux";|' source/creator/buildinfo.c
+  [[ $_OS == GNU/kFreeBSD ]] && sed -i 's|BUILD_PLATFORM;|"GNU/kFreeBSD";|' source/creator/buildinfo.c
+  sed -i 's|Linux, Mac OS X, Windows and FreeBSD|GNU and BSD|
+          s|Linux, FreeBSD|GNU and BSD|
           s|Unpack the archive, Then run the Blender executable.|Intall from Parabola repo (pacman -S '"$pkgname"'), Then run blender.|
           \|Windows|d;\|Mac OS X|d
           s|The downloaded Blender package includes|The '"${pkgname^}"' package includes|
          ' release/text/readme.html
-  sed -i 's|Linux|GNU/Linux-libre|
+  sed -i 's|Linux|GNU|
          ' release/scripts/{addons/game_engine_save_as_runtime,modules/bl_i18n_utils/utils_rtl}.py
-  sed -i 's| (.so under Linux, .dll under windows...)||
+  sed -i 's| (.so under Linux, .dll under windows...)| (.so under GNU or BSD, .dll under Wine or ReactOS...)|
          ' release/scripts/{addons/ui_translate,modules/bl_i18n_utils}/settings.py
 
   msg 'removing Open Source term'
@@ -135,5 +137,3 @@ package() {
   make DESTDIR=$pkgdir install
   python -m compileall $pkgdir/usr/share/$_pkgname
 }
-
-# vim:set ts=2 sw=2 et:
diff --git a/libre/bogofilter-libre/PKGBUILD b/libre/bogofilter-libre/PKGBUILD
index ef25ff8ff..ff674ed58 100644
--- a/libre/bogofilter-libre/PKGBUILD
+++ b/libre/bogofilter-libre/PKGBUILD
@@ -1,10 +1,11 @@
-# $Id: PKGBUILD 183193 2013-04-18 17:14:00Z andyrtr $
-# Maintainer: tobias <tobias@archlinux.org>
+# $Id: PKGBUILD 196818 2013-10-20 08:27:26Z andyrtr $
+# Maintainer: AndyRTR <andyrtr@archlinux.org>
+# Contributor: tobias <tobias@archlinux.org>
 # Contributor: Low Kian Seong <fastmail_low@speedymail.org>
 
 _pkgname=bogofilter
 pkgname=bogofilter-libre
-pkgver=1.2.3
+pkgver=1.2.4
 pkgrel=1
 pkgdesc="A fast Bayesian spam filtering tool, without noncommercial files"
 arch=('i686' 'x86_64' 'mips64el')
@@ -13,13 +14,13 @@ url="http://bogofilter.sourceforge.net"
 depends=('db' 'perl' 'gsl')
 backup=('etc/bogofilter/bogofilter.cf')
 source=(http://sourceforge.net/projects/${_pkgname}/files/${_pkgname}-current/${_pkgname}-${pkgver}/${_pkgname}-${pkgver}.tar.bz2)
-md5sums=('c3ed7f483b83abcbf6d8c797084bd06e')
+md5sums=('d0a5eebb3274b23ceabe766a6443a1c5')
 provides=("${_pkgname}=${pkgver}")
 replaces=("${_pkgname}")
 conflicts=("${_pkgname}")
 
 build() {
-  cd "${srcdir}/${_pkgname}-${pkgver}"
+  cd ${_pkgname}-${pkgver}
 
   # Remove noncommercial files.
   rm doc/bogofilter-SA-{2005-0{1,2},2010-01}
@@ -32,7 +33,7 @@ build() {
 }
 
 package() {
-  cd "${srcdir}/${_pkgname}-${pkgver}"
+  cd ${_pkgname}-${pkgver}
   make DESTDIR="${pkgdir}" install
 
   mv "${pkgdir}/etc/bogofilter/bogofilter.cf.example" "${pkgdir}/etc/bogofilter/bogofilter.cf"
diff --git a/libre/bumblebee-libre/PKGBUILD b/libre/bumblebee-libre/PKGBUILD
index c52f3e673..c01ed93b6 100644
--- a/libre/bumblebee-libre/PKGBUILD
+++ b/libre/bumblebee-libre/PKGBUILD
@@ -1,5 +1,5 @@
 # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
-# Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
+# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
 
 _pkgname=bumblebee
 pkgname=bumblebee-libre
diff --git a/libre/calibre-libre/PKGBUILD b/libre/calibre-libre/PKGBUILD
index ce9cfa040..52fd8b73d 100644
--- a/libre/calibre-libre/PKGBUILD
+++ b/libre/calibre-libre/PKGBUILD
@@ -1,15 +1,15 @@
-# $Id: PKGBUILD 98485 2013-10-11 18:19:46Z jelle $
+# $Id: PKGBUILD 100069 2013-11-01 09:01:32Z jelle $
 # Maintainer: jelle van der Waa <jelle@vdwaa.nl>
 # Maintainer: Daniel Wallace <danielwallace at gtmanfred dot com>
 # Contributor: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Petrov Roman <nwhisper@gmail.com>
 # Contributor: Andrea Fagiani <andfagiani _at_ gmail dot com>
 # Contributor: Larry Hajali <larryhaja@gmail.com>
-# Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
+# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
 
 _pkgname=calibre
 pkgname=calibre-libre
-pkgver=1.6
+pkgver=1.9.0
 pkgrel=1
 pkgdesc="Ebook management application, with unar support"
 arch=('i686' 'x86_64' 'mips64el') 
@@ -27,14 +27,13 @@ replaces=$_pkgname
 conflicts=$_pkgname
 provides=$_pkgname=$pkgver
 install=calibre.install
-source=('http://download.calibre-ebook.com/1.6.0/calibre-1.6.0.tar.xz'
+source=("http://download.calibre-ebook.com/${pkgver}/calibre-${pkgver}.tar.xz"
         'desktop_integration.patch'
         'calibre-mount-helper')
-md5sums=('d4fc03a2bec211324897cbb916c6eb89'
+md5sums=('69e0262f0e06b7d6384c3a183a44d02f'
          '8353d1878c5a498b3e49eddef473605f'
          '675cd87d41342119827ef706055491e7')
 
-
 prepare(){
   cd "${srcdir}/${_pkgname}"
   #rm -rf src/{cherrypy,pyPdf}
diff --git a/libre/cdfs-libre/PKGBUILD b/libre/cdfs-libre/PKGBUILD
index 518e25312..1d1fdac79 100644
--- a/libre/cdfs-libre/PKGBUILD
+++ b/libre/cdfs-libre/PKGBUILD
@@ -1,7 +1,7 @@
 # $Id: PKGBUILD 93210 2013-06-28 18:33:45Z foutrelis $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: J. Santiago Hirschfeld <jsantiagoh@yahoo.com.ar>
-# Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
+# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
 
 _pkgname=cdfs
 pkgname=cdfs-libre
diff --git a/libre/cgminer-libre/PKGBUILD b/libre/cgminer-libre/PKGBUILD
index 52019ab59..09608d1fa 100644
--- a/libre/cgminer-libre/PKGBUILD
+++ b/libre/cgminer-libre/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 98455 2013-10-11 07:59:42Z fyan $
+# $Id: PKGBUILD 100525 2013-11-05 13:41:39Z fyan $
 # Maintainer: Felix Yan <felixonmars@gmail.com>
 # Contributor: monson <holymonson@gmail.com>
 # Contributor: Thomas Dziedzic < gostrc at gmail >
@@ -7,44 +7,63 @@
 
 _pkgname=cgminer
 pkgname=cgminer-libre
-pkgver=3.5.1
+pkgver=3.7.2
+#_pkgver=3.6.6
+_pkgver=$pkgver
 pkgrel=1
 pkgdesc="Multi-threaded multi-pool GPU, FPGA and ASIC miner for bitcoin and derivative coins, without nonfree OpenCL recommendation"
 url='http://forum.bitcoin.org/index.php?topic=28402.0'
 license=('GPL3')
 arch=('i686' 'x86_64' 'mips64el')
+depends=('curl' 'mesa-libcl' 'libusbx' 'jansson')
+makedepends=('opencl-headers' 'git')
 replaces=$_pkgname
 conflicts=$_pkgname
 provides=$_pkgname=$pkgver
-depends=('curl' 'mesa-libcl' 'libusbx' 'jansson')
-makedepends=('opencl-headers')
-source=("http://ck.kolivas.org/apps/$_pkgname/$_pkgname-${pkgver}.tar.bz2"
+source=("git+https://github.com/ckolivas/${_pkgname}.git#tag=v$_pkgver"
         "$_pkgname.conf.d"
         "$_pkgname.service")
 backup=("etc/conf.d/$_pkgname" "etc/$_pkgname.conf")
 
 [ "$CARCH" == "x86_64" ] && makedepends+=('yasm')
 
-build() {
-  cd "$srcdir/$_pkgname-$pkgver"
-
+prepare() {
+  cd $_pkgname
   # We have latest jansson and libusb - just use them
-  sed "s|ac_subdirs_all='compat/libusb\-1.0'||" -i ./configure
-  sed 's|subdirs="$subdirs compat/libusb\-1.0"||' -i ./configure
-  sed 's|LIBUSB_LIBS="compat/libusb-1.0/libusb/.libs/libusb-1.0.a"|LIBUSB_LIBS=-lusb-1.0|' -i ./configure
-  sed 's|JANSSON_LIBS="compat/jansson/libjansson.a"|JANSSON_LIBS=-ljansson|' -i ./configure
-  sed 's|compat/Makefile compat/jansson/Makefile||' -i ./configure
 
-  sed 's|JANSSON_INCLUDES = -I$(top_srcdir)/compat/jansson||' -i ./Makefile.in
-  sed 's|USBUTILS_INCLUDES = -I$(top_srcdir)/compat/libusb\-1.0/libusb|USBUTILS_INCLUDES = -I/usr/include/libusb-1.0|' -i ./Makefile.in
-  sed 's|SUBDIRS = lib compat ccan|SUBDIRS = lib ccan|' -i ./Makefile.in
+  sed -e 's|^AC_CONFIG_SUBDIRS.*compat/jansson-2\.5.*||' \
+      -e 's|JANSSON_LIBS="compat/jansson-2\.5/src/\.libs/libjansson\.a"|JANSSON_LIBS=-ljansson|' \
+      -e 's|compat/Makefile||' \
+      -i ./configure.ac
+
+  sed -e 's|^JANSSON_INCLUDES= .*||' \
+      -e 's|^USBUTILS_INCLUDES = .*|USBUTILS_INCLUDES = -I/usr/include/libusb-1.0|' \
+      -e 's|^SUBDIRS.*|SUBDIRS = lib ccan|' \
+      -i ./Makefile.am
+
+  #sed "s|ac_subdirs_all='compat/libusb\-1.0\ncompat/jansson-2.5'||" -i ./configure
+  #sed 's|subdirs="$subdirs compat/libusb\-1.0"||' -i ./configure
+  #sed 's|subdirs="$subdirs compat/jansson\-2.5"||' -i ./configure
+  #sed 's|LIBUSB_LIBS="compat/libusb-1.0/libusb/.libs/libusb-1.0.a"|LIBUSB_LIBS=-lusb-1.0|' -i ./configure
+  #sed 's|JANSSON_LIBS="compat/jansson-2.5/src/.libs/libjansson.a"|JANSSON_LIBS=-ljansson|' -i ./configure
+  #sed 's|compat/Makefile ||' -i ./configure
+
+  #sed 's|JANSSON_INCLUDES = .*||' -i ./Makefile.in
+  #sed 's|USBUTILS_INCLUDES = .*|USBUTILS_INCLUDES = -I/usr/include/libusb-1.0|' -i ./Makefile.in
+  #sed 's|SUBDIRS = lib compat ccan|SUBDIRS = lib ccan|' -i ./Makefile.in
 
   rm -r compat
+}
 
+build() {
+  cd $_pkgname
+  
   # Here you may want to use custom CFLAGS
   #export CFLAGS="-O2 -march=native -mtune=native -msse2"
   
-  ./configure \
+  # ./configure \
+
+  ./autogen.sh \
     --prefix=/usr \
     --enable-scrypt \
     --enable-opencl \
@@ -52,17 +71,19 @@ build() {
     --enable-bitforce \
     --enable-icarus \
     --enable-modminer \
-    --enable-ztex \
     --enable-avalon \
     --enable-klondike \
     --enable-bitfury \
+    --enable-hashfast \
+    --enable-knc \
+    --with-system-libusb \
     --disable-adl # For license issues
   
   make
 }
 
 package() {
-  cd "$srcdir/$_pkgname-$pkgver"
+  cd $_pkgname
 
   make DESTDIR="$pkgdir" install
 
@@ -75,6 +96,6 @@ package() {
   install -Dm644 $_pkgname.conf "$pkgdir"/etc/$_pkgname.conf
 }
 
-sha512sums=('c8fe532b1086e3f2beb69b7f5e75e8ad9aab137c0db1a920de8e222ea2a4bf62ef608bec4b85cdf0f76162c53e5999677e326bb0b567abe26dd14eca52e28bdf'
+sha512sums=('SKIP'
             '99c38bc395848f9712ce172343d31f5c60f5d8ac1cfe2f48df8f3ec6c488fc275763a79c5ef36b99f32faa465b5a65284b38e8a63ef9b144075ee13971313b41'
             '3317b60c6b1f14c47d8ee636113ef40a4023ab14054129de80a37947b381fd2b647a7053f4e1bb639efa225a514e862fa531908714c34040dda2d6221dde7f5f')
diff --git a/libre/clementine-libre/PKGBUILD b/libre/clementine-libre/PKGBUILD
index 4cc986be1..22a92003d 100644
--- a/libre/clementine-libre/PKGBUILD
+++ b/libre/clementine-libre/PKGBUILD
@@ -1,21 +1,21 @@
-# $Id: PKGBUILD 94971 2013-08-01 22:31:55Z alucryd $
+# $Id: PKGBUILD 98608 2013-10-15 14:50:08Z alucryd $
 # Maintainer: Maxime Gauduin <alucryd@gmail.com>
 # Contributor: Stéphane Gaudreault <stephane@archlinux.org>
 # Contributor: BlackEagle <ike.devolder@gmail.com>
 # Contributor: Dany Martineau <dany.luc.martineau@gmail.com>
-# Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
+# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
 # Contributor (Parabola): Kete <kete@ninthfloor.org>
 # Contributor (Parabola): Márcio Silva <coadde@lavabit.com>
 
 _pkgname=clementine
 pkgname=clementine-libre
-pkgver=1.1.1
-pkgrel=9
+pkgver=1.2.0
+pkgrel=1
 pkgdesc="A music player and library organizer, without nonfree artwork and spotify support"
 url="http://www.clementine-player.org/"
 license=('GPL')
 arch=('i686' 'x86_64')
-depends=('chromaprint' 'gstreamer0.10-base' 'libcdio' 'libgpod' 'liblastfm' 'libmtp' 'projectm' 'protobuf' 'qca-ossl' 'qjson' 'taglib')
+depends=('chromaprint' 'glew' 'gstreamer0.10-base' 'libcdio' 'libgpod' 'liblastfm' 'libmtp' 'libmygpo-qt' 'protobuf' 'qca-ossl' 'taglib')
 makedepends=('cmake' 'boost' 'mesa' 'sparsehash')
 optdepends=('gstreamer0.10-base-plugins: "Base" plugin libraries'
             'gstreamer0.10-good-plugins: "Good" plugin libraries'
@@ -27,19 +27,15 @@ conflicts=('clementine')
 provides=("clementine=$pkgver")
 install=clementine.install
 source=("http://clementine-player.googlecode.com/files/${_pkgname}-${pkgver}.tar.gz"
-        'clementine-1.1.1-libimobiledevice-fix.patch'
         'remove-nonfree-artwork-and-spotify.patch'
         'moognu.png')
-md5sums=('28e4afb822388bd337a761db8f86febf'
-         '736df6cd828a3172701f63c8dc978cb9'
-         '9ccfe62f8784a1ccbe8c96f8cacad9d0'
-         '59a8c0d7659898c457b95f877718cf1c')
+sha256sums=('563d00da4e893f7b1966ed137bcab28042151e31ea561cb7076047d3cad96f72'
+            'e3b0ba3649d6c66ef002ce281949ab6febf2481893245b4e30c6f11ae6f5b463'
+            'c6918617769152f3617c61f721819e69d03f671b85760b11cfe45abd53955bc4')
 
 prepare() {
   cd ${_pkgname}-${pkgver}
 
-  patch -Np1 -i ../clementine-1.1.1-libimobiledevice-fix.patch
-
   # remove nonfree nonfree artwork and spotify references on files
   patch -Np1 -i ../remove-nonfree-artwork-and-spotify.patch
 
@@ -48,7 +44,7 @@ prepare() {
 
   # remove nonfree spotify files
   rm -v cmake/SpotifyVersion.cmake
-  rm -v data/spotify-core-logo-128x128.png
+  rm -v data/spotify-attribution.png
   rm -v data/icons/svg/spotify.svg
   rm -v data/schema/schema-30.sql
   rm -v src/{globalsearch/spotifysearchprovider.{cpp,h},internet/spotify{blobdownloader.{cpp,h},server.{cpp,h},service.{cpp,h},settingspage.{cpp,h,ui}}}
@@ -71,7 +67,7 @@ build() {
   fi
   mkdir build && cd build
 
-  cmake .. -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release -DUSE_SYSTEM_PROJECTM=1 -DBUILD_WERROR=0
+  cmake .. -DCMAKE_INSTALL_PREFIX='/usr' -DCMAKE_BUILD_TYPE='Release'
   make
 }
 
diff --git a/libre/clementine-libre/clementine-1.1.1-libimobiledevice-fix.patch b/libre/clementine-libre/clementine-1.1.1-libimobiledevice-fix.patch
deleted file mode 100644
index da7722fcb..000000000
--- a/libre/clementine-libre/clementine-1.1.1-libimobiledevice-fix.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -up clementine-1.1.1/src/devices/imobiledeviceconnection.h.fix clementine-1.1.1/src/devices/imobiledeviceconnection.h
---- clementine-1.1.1/src/devices/imobiledeviceconnection.h.fix	2013-04-23 14:44:56.932661018 -0400
-+++ clementine-1.1.1/src/devices/imobiledeviceconnection.h	2013-04-23 14:46:44.033657190 -0400
-@@ -51,7 +51,7 @@ private:
-   idevice_t device_;
-   afc_client_t afc_;
- 
--  uint16_t afc_port_;
-+  lockdownd_service_descriptor_t afc_port_;
- };
- 
- #endif // IMOBILEDEVICECONNECTION_H
diff --git a/libre/clementine-libre/remove-nonfree-artwork-and-spotify.patch b/libre/clementine-libre/remove-nonfree-artwork-and-spotify.patch
index 3a948bf96..957ddc7e7 100644
--- a/libre/clementine-libre/remove-nonfree-artwork-and-spotify.patch
+++ b/libre/clementine-libre/remove-nonfree-artwork-and-spotify.patch
@@ -1,7 +1,8 @@
-diff -rauN clementine-1.0.1/3rdparty/SPMediaKeyTap/SPMediaKeyTap.m clementine-libre-1.0.1/3rdparty/SPMediaKeyTap/SPMediaKeyTap.m 
---- clementine-1.0.1/3rdparty/SPMediaKeyTap/SPMediaKeyTap.m	2011-12-02 19:24:43.000000000 -0200
-+++ clementine-libre-1.0.1/3rdparty/SPMediaKeyTap/SPMediaKeyTap.m	2012-05-28 17:19:14.612750904 -0300
-@@ -98,7 +98,6 @@
+diff --git a/3rdparty/SPMediaKeyTap/SPMediaKeyTap.m b/3rdparty/SPMediaKeyTap/SPMediaKeyTap.m
+index a349f59..c418e0b 100644
+--- a/3rdparty/SPMediaKeyTap/SPMediaKeyTap.m
++++ b/3rdparty/SPMediaKeyTap/SPMediaKeyTap.m
+@@ -98,7 +98,6 @@ static CGEventRef tapEventCallback(CGEventTapProxy proxy, CGEventType type, CGEv
  {
  	return [NSArray arrayWithObjects:
  		[[NSBundle mainBundle] bundleIdentifier], // your app
@@ -9,10 +10,11 @@ diff -rauN clementine-1.0.1/3rdparty/SPMediaKeyTap/SPMediaKeyTap.m clementine-li
  		@"com.apple.iTunes",
  		@"com.apple.QuickTimePlayerX",
  		@"com.apple.quicktimeplayer",
-diff -rauN clementine-1.1.0/CMakeLists.txt clementine-libre-1.1.0/CMakeLists.txt
---- clementine-1.1.0/CMakeLists.txt	2012-10-22 04:24:28.000000000 -0200
-+++ clementine-libre-1.1.0/CMakeLists.txt	2012-10-26 01:58:08.725496264 -0200
-@@ -7,7 +7,6 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 8ba5a8a..986351b 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -7,7 +7,6 @@ include(cmake/Summary.cmake)
  include(cmake/Version.cmake)
  include(cmake/Deb.cmake)
  include(cmake/Rpm.cmake)
@@ -20,15 +22,15 @@ diff -rauN clementine-1.1.0/CMakeLists.txt clementine-libre-1.1.0/CMakeLists.txt
  include(cmake/OptionalSource.cmake)
  set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake)
  
-@@ -55,7 +54,6 @@
- pkg_check_modules(USBMUXD libusbmuxd)
- pkg_check_modules(LIBMTP libmtp>=1.0)
- pkg_check_modules(INDICATEQT indicate-qt)
--pkg_check_modules(SPOTIFY libspotify>=12.1.45)
- pkg_check_modules(CDIO libcdio)
+@@ -78,7 +77,6 @@ pkg_check_modules(LIBMYGPO_QT libmygpo-qt>=1.0.7)
+ pkg_check_modules(LIBXML libxml-2.0)
  pkg_check_modules(QCA qca2)
- pkg_check_modules(CHROMAPRINT libchromaprint)
-@@ -81,13 +79,6 @@
+ pkg_check_modules(QJSON REQUIRED QJson)
+-pkg_check_modules(SPOTIFY libspotify>=12.1.45)
+ pkg_check_modules(TAGLIB REQUIRED taglib>=1.6)
+ 
+ if (WIN32)
+@@ -124,13 +122,6 @@ if (APPLE)
    find_library(GROWL Growl)
    find_library(SPARKLE Sparkle)
  
@@ -41,44 +43,42 @@ diff -rauN clementine-1.1.0/CMakeLists.txt clementine-libre-1.1.0/CMakeLists.txt
 -
    add_subdirectory(3rdparty/SPMediaKeyTap)
    set(SPMEDIAKEYTAP_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/SPMediaKeyTap)
-   set(SPMEDIAKEYTAP_LIBRARIES SPMediaKeyTap)  
-@@ -224,26 +215,16 @@
+   set(SPMEDIAKEYTAP_LIBRARIES SPMediaKeyTap)
+@@ -254,7 +245,7 @@ optional_component(DEVICEKIT ON "Devices: DeviceKit backend"
    DEPENDS "D-Bus support" HAVE_DBUS
  )
  
--optional_component(SPOTIFY ON "Spotify support: core code"
-+optional_component(SPOTIFY OFF "Spotify support: core code"
-   DEPENDS "protobuf" PROTOBUF_FOUND PROTOBUF_PROTOC_EXECUTABLE
- )
- 
 -optional_component(SPOTIFY_BLOB ON "Spotify support: non-GPL binary helper"
 +optional_component(SPOTIFY_BLOB OFF "Spotify support: non-GPL binary helper"
    DEPENDS "protobuf" PROTOBUF_FOUND PROTOBUF_PROTOC_EXECUTABLE
    DEPENDS "libspotify" SPOTIFY_FOUND
-   DEPENDS "Spotify support: core code" HAVE_SPOTIFY
  )
+@@ -270,13 +261,6 @@ optional_component(SPARKLE ON "Sparkle integration"
  
--set(NEED_SPOTIFY_DOWNLOADER OFF)
--if(HAVE_SPOTIFY AND NOT HAVE_SPOTIFY_BLOB)
--  set(NEED_SPOTIFY_DOWNLOADER ON)
+ optional_component(VISUALISATIONS ON "Visualisations")
+ 
+-if(NOT HAVE_SPOTIFY_BLOB AND NOT QCA_FOUND)
+-  message(FATAL_ERROR "Either QCA must be available or the non-GPL Spotify "
+-          "code must be compiled in")
+-elif(QCA_FOUND)
+-  set(HAVE_SPOTIFY_DOWNLOADER ON)
 -endif()
 -
--optional_component(SPOTIFY_DOWNLOADER
--  ${NEED_SPOTIFY_DOWNLOADER} "Spotify support: blob downloader"
--  DEPENDS "qca2" QCA_FOUND
--)
--
- optional_component(MOODBAR ON "Moodbar support"
-   DEPENDS "fftw3" FFTW3_FOUND
- )
-@@ -411,14 +392,6 @@
+ # Find DBus if it's enabled
+ if (HAVE_DBUS)
+   find_package(Qt4 REQUIRED QtDbus)
+@@ -440,7 +424,6 @@ add_subdirectory(ext/libclementine-common)
+ add_subdirectory(ext/libclementine-tagreader)
+ add_subdirectory(ext/clementine-tagreader)
+ add_subdirectory(ext/libclementine-remote)
+-add_subdirectory(ext/libclementine-spotifyblob)
+ 
+ option(WITH_DEBIAN OFF)
+ if(WITH_DEBIAN)
+@@ -451,10 +434,6 @@ if(HAVE_BREAKPAD)
    add_subdirectory(3rdparty/google-breakpad)
  endif(HAVE_BREAKPAD)
  
--if(HAVE_SPOTIFY)
--  add_subdirectory(ext/libclementine-spotifyblob)
--endif(HAVE_SPOTIFY)
--
 -if(HAVE_SPOTIFY_BLOB)
 -  add_subdirectory(ext/clementine-spotifyblob)
 -endif(HAVE_SPOTIFY_BLOB)
@@ -86,18 +86,19 @@ diff -rauN clementine-1.1.0/CMakeLists.txt clementine-libre-1.1.0/CMakeLists.txt
  if(HAVE_MOODBAR)
    add_subdirectory(gst/moodbar)
  endif()
-diff -rauN clementine-1.1.1/data/data.qrc clementine-libre-1.1.1/data/data.qrc
---- clementine-1.1.1/data/data.qrc		2012-11-18 06:51:26.000000000 -0200
-+++ clementine-libre-1.1.1/data/data.qrc	2013-05-13 02:55:19.579440533 -0300
-@@ -1,7 +1,6 @@
- <RCC>
+diff --git a/data/data.qrc b/data/data.qrc
+index 4c5473f..bd5fe2d 100644
+--- a/data/data.qrc
++++ b/data/data.qrc
+@@ -2,7 +2,6 @@
      <qresource prefix="/">
          <file>blank.ttf</file>
+         <file>clementine_remote_qr.png</file>
 -        <file>clementine-spotify-public.pem</file>
          <file>currenttrack_bar_left.png</file>
          <file>currenttrack_bar_mid.png</file>
          <file>currenttrack_bar_right.png</file>
-@@ -76,7 +75,6 @@
+@@ -77,7 +76,6 @@
          <file>icons/22x22/phone-nokia-n900.png</file>
          <file>icons/22x22/phone-palm-pre.png</file>
          <file>icons/22x22/phone.png</file>
@@ -105,7 +106,7 @@ diff -rauN clementine-1.1.1/data/data.qrc clementine-libre-1.1.1/data/data.qrc
          <file>icons/22x22/user-away.png</file>
          <file>icons/22x22/view-choose.png</file>
          <file>icons/22x22/view-fullscreen.png</file>
-@@ -153,7 +151,6 @@
+@@ -154,7 +152,6 @@
          <file>icons/32x32/phone-palm-pre.png</file>
          <file>icons/32x32/phone.png</file>
          <file>icons/32x32/search.png</file>
@@ -113,7 +114,7 @@ diff -rauN clementine-1.1.1/data/data.qrc clementine-libre-1.1.1/data/data.qrc
          <file>icons/32x32/tools-wizard.png</file>
          <file>icons/32x32/view-choose.png</file>
          <file>icons/32x32/view-fullscreen.png</file>
-@@ -229,7 +226,6 @@
+@@ -230,7 +227,6 @@
          <file>icons/48x48/phone-nokia-n900.png</file>
          <file>icons/48x48/phone-palm-pre.png</file>
          <file>icons/48x48/phone.png</file>
@@ -121,7 +122,7 @@ diff -rauN clementine-1.1.1/data/data.qrc clementine-libre-1.1.1/data/data.qrc
          <file>icons/48x48/view-choose.png</file>
          <file>icons/48x48/view-fullscreen.png</file>
          <file>icons/48x48/view-media-equalizer.png</file>
-@@ -261,10 +257,10 @@
+@@ -262,10 +258,10 @@
          <file>lumberjacksong.txt</file>
          <file>lyrics/ultimate_providers.xml</file>
          <file>mainwindow.css</file>
@@ -130,35 +131,37 @@ diff -rauN clementine-1.1.1/data/data.qrc clementine-libre-1.1.1/data/data.qrc
          <file>nomusic.png</file>
          <file>now_playing_tooltip.txt</file>
 -        <file>nyancat.png</file>
+         <file>oauthsuccess.html</file>
          <file>osd_background.png</file>
          <file>osd_shadow_corner.png</file>
-         <file>osd_shadow_edge.png</file>
-@@ -339,7 +335,6 @@
+@@ -391,7 +387,6 @@
          <file>smartplaylistsearchterm.css</file>
          <file>songinfo.css</file>
          <file>spinner.gif</file>
--        <file>spotify-core-logo-128x128.png</file>
+-        <file>spotify-attribution.png</file>
          <file>star-off.png</file>
          <file>star-on.png</file>
          <file>tiny-pause.png</file>
-diff -rauN clementine-1.1.0/dist/macdeploy.py clementine-libre-1.1.0/dist/macdeploy.py
---- clementine-1.1.0/dist/macdeploy.py	2012-10-11 09:16:39.000000000 -0200
-+++ clementine-libre-1.1.0/dist/macdeploy.py	2012-10-26 02:06:12.781965350 -0200
-@@ -387,10 +387,7 @@
- FixPlugin(FindGioModule('libgiolibproxy.so'), 'gio-modules')
- 
- try:
--  FixPlugin('clementine-spotifyblob', '.')
-   FixPlugin('clementine-tagreader', '.')
--except:
--  print 'Failed to find blob: %s' % traceback.format_exc()
- 
- for plugin in QT_PLUGINS:
-   FixPlugin(FindQtPlugin(plugin), os.path.dirname(plugin))
-diff -rauN clementine-1.1.0/dist/windows/clementine.nsi clementine-libre-1.1.0/dist/windows/clementine.nsi
---- clementine-1.1.0/dist/windows/clementine.nsi	2012-10-22 04:27:00.000000000 -0200
-+++ clementine-libre-1.1.0/dist/windows/clementine.nsi	2012-10-26 02:07:20.551540003 -0200
-@@ -94,9 +94,6 @@
+diff --git a/dist/macdeploy.py b/dist/macdeploy.py
+index e054619..3568a6f 100755
+--- a/dist/macdeploy.py
++++ b/dist/macdeploy.py
+@@ -398,10 +398,7 @@ def main():
+   FixPlugin(FindGioModule('libgiolibproxy.so'), 'gio-modules')
+ 
+   try:
+-    FixPlugin('clementine-spotifyblob', '.')
+     FixPlugin('clementine-tagreader', '.')
+-  except:
+-    print 'Failed to find blob: %s' % traceback.format_exc()
+ 
+   for plugin in QT_PLUGINS:
+     FixPlugin(FindQtPlugin(plugin), os.path.dirname(plugin))
+diff --git a/dist/windows/clementine.nsi b/dist/windows/clementine.nsi
+index 82c0fc1..086bdc7 100644
+--- a/dist/windows/clementine.nsi
++++ b/dist/windows/clementine.nsi
+@@ -97,9 +97,6 @@ Section "Delete old files" oldfiles
    Delete "$INSTDIR\gstreamer-plugins\libgstqueue2.dll"
    Delete "$INSTDIR\gstreamer-plugins\libgstsoup.dll"
  
@@ -168,42 +171,43 @@ diff -rauN clementine-1.1.0/dist/windows/clementine.nsi clementine-libre-1.1.0/d
    ; 1.0
    Delete "$INSTDIR\libofa.dll"
    Delete "$INSTDIR\gstreamer-plugins\libgstofa.dll"
-@@ -110,7 +107,6 @@
-   File "avutil-50.dll"
+@@ -128,7 +125,6 @@ Section "Clementine" Clementine
+   File "avutil-51.dll"
    File "clementine.exe"
    File "clementine-tagreader.exe"
 -  File "clementine-spotifyblob.exe"
    File "clementine.ico"
    File "glew32.dll"
    File "intl.dll"
-@@ -164,7 +160,6 @@
+@@ -181,7 +177,6 @@ Section "Clementine" Clementine
    File "libqjson.dll"
    File "libsoup-2.4-1.dll"
    File "libspeex-1.dll"
 -  File "libspotify.dll"
+   File "libstdc++-6.dll"
    File "libtag.dll"
    File "libtasn1-3.dll"
-   File "libusbmuxd.dll"
-@@ -957,7 +952,6 @@
+@@ -939,7 +934,6 @@ Section "Uninstall"
    Delete "$INSTDIR\clementine.ico"
    Delete "$INSTDIR\clementine.exe"
    Delete "$INSTDIR\clementine-tagreader.exe"
 -  Delete "$INSTDIR\clementine-spotifyblob.exe"
    Delete "$INSTDIR\glew32.dll"
    Delete "$INSTDIR\intl.dll"
-   Delete "$INSTDIR\libcdio-12.dll"
-@@ -1010,7 +1004,6 @@
+   Delete "$INSTDIR\libcdio-14.dll"
+@@ -992,7 +986,6 @@ Section "Uninstall"
    Delete "$INSTDIR\libqjson.dll"
    Delete "$INSTDIR\libsoup-2.4-1.dll"
    Delete "$INSTDIR\libspeex-1.dll"
 -  Delete "$INSTDIR\libspotify.dll"
+   Delete "$INSTDIR\libstdc++-6.dll"
    Delete "$INSTDIR\libtag.dll"
    Delete "$INSTDIR\libtasn1-3.dll"
-   Delete "$INSTDIR\libusbmuxd.dll"
-diff -rauN clementine-1.1.0/dist/windows/clementine.nsi.in clementine-libre-1.1.0/dist/windows/clementine.nsi.in
---- clementine-1.1.0/dist/windows/clementine.nsi.in	2012-10-11 09:16:39.000000000 -0200
-+++ clementine-libre-1.1.0/dist/windows/clementine.nsi.in	2012-10-26 02:08:02.052572234 -0200
-@@ -94,9 +94,6 @@
+diff --git a/dist/windows/clementine.nsi.in b/dist/windows/clementine.nsi.in
+index 750b332..6bf47ff 100644
+--- a/dist/windows/clementine.nsi.in
++++ b/dist/windows/clementine.nsi.in
+@@ -97,9 +97,6 @@ Section "Delete old files" oldfiles
    Delete "$INSTDIR\gstreamer-plugins\libgstqueue2.dll"
    Delete "$INSTDIR\gstreamer-plugins\libgstsoup.dll"
  
@@ -213,70 +217,130 @@ diff -rauN clementine-1.1.0/dist/windows/clementine.nsi.in clementine-libre-1.1.
    ; 1.0
    Delete "$INSTDIR\libofa.dll"
    Delete "$INSTDIR\gstreamer-plugins\libgstofa.dll"
-@@ -110,7 +107,6 @@
-   File "avutil-50.dll"
+@@ -128,7 +125,6 @@ Section "Clementine" Clementine
+   File "avutil-51.dll"
    File "clementine.exe"
    File "clementine-tagreader.exe"
 -  File "clementine-spotifyblob.exe"
    File "clementine.ico"
    File "glew32.dll"
    File "intl.dll"
-@@ -164,7 +160,6 @@
+@@ -181,7 +177,6 @@ Section "Clementine" Clementine
    File "libqjson.dll"
    File "libsoup-2.4-1.dll"
    File "libspeex-1.dll"
 -  File "libspotify.dll"
+   File "libstdc++-6.dll"
    File "libtag.dll"
    File "libtasn1-3.dll"
-   File "libusbmuxd.dll"
-@@ -957,7 +952,6 @@
+@@ -939,7 +934,6 @@ Section "Uninstall"
    Delete "$INSTDIR\clementine.ico"
    Delete "$INSTDIR\clementine.exe"
    Delete "$INSTDIR\clementine-tagreader.exe"
 -  Delete "$INSTDIR\clementine-spotifyblob.exe"
    Delete "$INSTDIR\glew32.dll"
    Delete "$INSTDIR\intl.dll"
-   Delete "$INSTDIR\libcdio-12.dll"
-@@ -1010,7 +1004,6 @@
+   Delete "$INSTDIR\libcdio-14.dll"
+@@ -992,7 +986,6 @@ Section "Uninstall"
    Delete "$INSTDIR\libqjson.dll"
    Delete "$INSTDIR\libsoup-2.4-1.dll"
    Delete "$INSTDIR\libspeex-1.dll"
 -  Delete "$INSTDIR\libspotify.dll"
+   Delete "$INSTDIR\libstdc++-6.dll"
    Delete "$INSTDIR\libtag.dll"
    Delete "$INSTDIR\libtasn1-3.dll"
-   Delete "$INSTDIR\libusbmuxd.dll"
-diff -rauN clementine-1.1.0/src/CMakeLists.txt clementine-libre-1.1.0/src/CMakeLists.txt
---- clementine-1.1.0/src/CMakeLists.txt	2012-10-22 04:24:28.000000000 -0200
-+++ clementine-libre-1.1.0/src/CMakeLists.txt	2012-10-26 02:09:29.994361873 -0200
-@@ -630,7 +630,6 @@
+diff --git a/ext/libclementine-common/core/logging.cpp b/ext/libclementine-common/core/logging.cpp
+index 3c53d7a..49dd8cf 100644
+--- a/ext/libclementine-common/core/logging.cpp
++++ b/ext/libclementine-common/core/logging.cpp
+@@ -14,10 +14,6 @@
+    limitations under the License.
+ */
+ 
+-// Note: this file is licensed under the Apache License instead of GPL because
+-// it is used by the Spotify blob which links against libspotify and is not GPL
+-// compatible.
+-
+ #include <QtGlobal>
+ 
+ #include <cxxabi.h>
+diff --git a/ext/libclementine-common/core/logging.h b/ext/libclementine-common/core/logging.h
+index 3c582cf..4a3cea8 100644
+--- a/ext/libclementine-common/core/logging.h
++++ b/ext/libclementine-common/core/logging.h
+@@ -14,11 +14,6 @@
+    limitations under the License.
+ */
+ 
+-// Note: this file is licensed under the Apache License instead of GPL because
+-// it is used by the Spotify blob which links against libspotify and is not GPL
+-// compatible.
+-
+-
+ #ifndef LOGGING_H
+ #define LOGGING_H
+ 
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index 1104542..e7a8032 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -60,8 +60,6 @@ include_directories(${CMAKE_SOURCE_DIR}/ext/libclementine-tagreader)
+ include_directories(${CMAKE_BINARY_DIR}/ext/libclementine-tagreader)
+ include_directories(${CMAKE_SOURCE_DIR}/ext/libclementine-remote)
+ include_directories(${CMAKE_BINARY_DIR}/ext/libclementine-remote)
+-include_directories(${CMAKE_SOURCE_DIR}/ext/libclementine-spotifyblob)
+-include_directories(${CMAKE_BINARY_DIR}/ext/libclementine-spotifyblob)
+ 
+ cmake_policy(SET CMP0011 NEW)
+ include(../cmake/ParseArguments.cmake)
+@@ -157,7 +155,6 @@ set(SOURCES
+   globalsearch/simplesearchprovider.cpp
+   globalsearch/somafmsearchprovider.cpp
+   globalsearch/soundcloudsearchprovider.cpp
+-  globalsearch/spotifysearchprovider.cpp
+   globalsearch/suggestionwidget.cpp
+   globalsearch/urlsearchprovider.cpp
+ 
+@@ -195,9 +192,6 @@ set(SOURCES
+   internet/somafmservice.cpp
+   internet/somafmurlhandler.cpp
+   internet/soundcloudservice.cpp
+-  internet/spotifyserver.cpp
+-  internet/spotifyservice.cpp
+-  internet/spotifysettingspage.cpp
+   internet/subsonicservice.cpp
+   internet/subsonicsettingspage.cpp
+   internet/subsonicurlhandler.cpp
+@@ -461,7 +455,6 @@ set(HEADERS
+   globalsearch/searchprovider.h
+   globalsearch/simplesearchprovider.h
+   globalsearch/soundcloudsearchprovider.h
+-  globalsearch/spotifysearchprovider.h
+   globalsearch/suggestionwidget.h
+ 
+   internet/cloudfileservice.h
+@@ -494,9 +487,6 @@ set(HEADERS
+   internet/somafmservice.h
+   internet/somafmurlhandler.h
+   internet/soundcloudservice.h
+-  internet/spotifyserver.h
+-  internet/spotifyservice.h
+-  internet/spotifysettingspage.h
+   internet/subsonicservice.h
+   internet/subsonicsettingspage.h
+   internet/subsonicurlhandler.h
+@@ -685,7 +675,6 @@ set(UI
    internet/magnatunedownloaddialog.ui
    internet/magnatunesettingspage.ui
    internet/searchboxwidget.ui
 -  internet/spotifysettingspage.ui
+   internet/subsonicsettingspage.ui
  
    library/groupbydialog.ui
-   library/libraryfilterwidget.ui
-@@ -774,32 +773,6 @@
-     internet/lastfmstationdialog.ui
+@@ -836,15 +825,6 @@ optional_source(HAVE_LIBLASTFM
  )
  
--# Spotify
--optional_source(HAVE_SPOTIFY
--  SOURCES
--    globalsearch/spotifysearchprovider.cpp
--    internet/spotifyserver.cpp
--    internet/spotifyservice.cpp
--    internet/spotifysettingspage.cpp
--  HEADERS
--    globalsearch/spotifysearchprovider.h
--    internet/spotifyserver.h
--    internet/spotifyservice.h
--    internet/spotifysettingspage.h
--  INCLUDE_DIRECTORIES
--    ${CMAKE_SOURCE_DIR}/ext/libclementine-spotifyblob
--    ${CMAKE_BINARY_DIR}/ext/libclementine-spotifyblob
--)
--
+ 
 -optional_source(HAVE_SPOTIFY_DOWNLOADER
 -  SOURCES
 -    internet/spotifyblobdownloader.cpp
@@ -289,16 +353,18 @@ diff -rauN clementine-1.1.0/src/CMakeLists.txt clementine-libre-1.1.0/src/CMakeL
  # Platform specific - OS X
  optional_source(APPLE
    INCLUDE_DIRECTORIES
-@@ -1141,19 +1114,6 @@
+@@ -1171,7 +1151,6 @@ add_dependencies(clementine_lib pot)
+ 
+ 
+ target_link_libraries(clementine_lib
+-  clementine-spotifyblob-messages
+   libclementine-common
+   libclementine-tagreader
+   libclementine-remote
+@@ -1240,13 +1219,6 @@ if(HAVE_BREAKPAD)
    endif (LINUX)
  endif(HAVE_BREAKPAD)
  
--if(HAVE_SPOTIFY)
--  target_link_libraries(clementine_lib
--    clementine-spotifyblob-messages
--  )
--endif(HAVE_SPOTIFY)
--
 -if(HAVE_SPOTIFY_DOWNLOADER)
 -  target_link_libraries(clementine_lib
 -    ${QCA_LIBRARIES}
@@ -309,7 +375,7 @@ diff -rauN clementine-1.1.0/src/CMakeLists.txt clementine-libre-1.1.0/src/CMakeL
  if (APPLE)
    target_link_libraries(clementine_lib
      ${GROWL}
-@@ -1231,16 +1191,6 @@
+@@ -1328,16 +1300,6 @@ target_link_libraries(clementine
    clementine_lib
  )
  
@@ -326,22 +392,78 @@ diff -rauN clementine-1.1.0/src/CMakeLists.txt clementine-libre-1.1.0/src/CMakeL
  if (APPLE)
    install(FILES ../dist/clementine.icns
      DESTINATION "${CMAKE_BINARY_DIR}/clementine.app/Contents/Resources")
-diff -rauN clementine-1.1.0/src/config.h.in clementine-libre-1.1.0/src/config.h.in
---- clementine-1.1.0/src/config.h.in	2012-10-22 04:24:28.000000000 -0200
-+++ clementine-libre-1.1.0/src/config.h.in	2012-10-26 02:10:01.735935822 -0200
-@@ -38,8 +38,6 @@
+diff --git a/src/analyzers/nyancatanalyzer.cpp b/src/analyzers/nyancatanalyzer.cpp
+index 39ea101..ab19341 100644
+--- a/src/analyzers/nyancatanalyzer.cpp
++++ b/src/analyzers/nyancatanalyzer.cpp
+@@ -23,13 +23,13 @@
+ #include <QTimerEvent>
+ #include <QBrush>
+ 
+-const char* NyanCatAnalyzer::kName = "Nyanalyzer cat";
++const char* NyanCatAnalyzer::kName = "MooGNU";
+ const float NyanCatAnalyzer::kPixelScale = 0.02f;
+ 
+ 
+ NyanCatAnalyzer::NyanCatAnalyzer(QWidget* parent)
+   : Analyzer::Base(parent, 9),
+-    cat_(":/nyancat.png"),
++    cat_(":/moognu.png"),
+     timer_id_(startTimer(kFrameIntervalMs)),
+     frame_(0),
+     current_buffer_(0),
+diff --git a/src/config.h.in b/src/config.h.in
+index 6cac97e..90e4ee2 100644
+--- a/src/config.h.in
++++ b/src/config.h.in
+@@ -39,7 +39,6 @@
  #cmakedefine HAVE_QCA
- #cmakedefine HAVE_SAC
+ #cmakedefine HAVE_SKYDRIVE
  #cmakedefine HAVE_SPARKLE
--#cmakedefine HAVE_SPOTIFY
 -#cmakedefine HAVE_SPOTIFY_DOWNLOADER
  #cmakedefine HAVE_STATIC_SQLITE
+ #cmakedefine HAVE_UBUNTU_ONE
  #cmakedefine HAVE_WIIMOTEDEV
- #cmakedefine IMOBILEDEVICE_USES_UDIDS
-diff -rauN clementine-1.1.0/src/core/utilities.cpp clementine-libre-1.1.0/src/core/utilities.cpp
---- clementine-1.1.0/src/core/utilities.cpp	2012-10-11 09:16:39.000000000 -0200
-+++ clementine-libre-1.1.0/src/core/utilities.cpp	2012-10-26 02:10:38.303908540 -0200
-@@ -310,9 +310,6 @@
+diff --git a/src/core/backgroundstreams.cpp b/src/core/backgroundstreams.cpp
+index 347b959..b00cb87 100644
+--- a/src/core/backgroundstreams.cpp
++++ b/src/core/backgroundstreams.cpp
+@@ -9,7 +9,6 @@
+ 
+ const char* BackgroundStreams::kSettingsGroup = "BackgroundStreams";
+ const char* BackgroundStreams::kHypnotoadUrl = "hypnotoad:///";
+-const char* BackgroundStreams::kRainUrl = "http://data.clementine-player.org/rainymood";
+ const char* BackgroundStreams::kEnterpriseUrl = "enterprise:///";
+ 
+ BackgroundStreams::BackgroundStreams(EngineBase* engine, QObject* parent)
+@@ -28,7 +27,6 @@ void BackgroundStreams::LoadStreams() {
+   int version = s.value("version", 0).toInt();
+   if (version < 1) {
+     AddStream(QT_TR_NOOP("Hypnotoad"), QUrl(kHypnotoadUrl));
+-    AddStream(QT_TR_NOOP("Rain"), QUrl(kRainUrl));
+   }
+ 
+   if (version < kVersion) {
+diff --git a/src/core/timeconstants.h b/src/core/timeconstants.h
+index 96242d6..69196bd 100644
+--- a/src/core/timeconstants.h
++++ b/src/core/timeconstants.h
+@@ -14,10 +14,6 @@
+    limitations under the License.
+ */
+ 
+-// Note: this file is licensed under the Apache License instead of GPL because
+-// it is used by the Spotify blob which links against libspotify and is not GPL
+-// compatible.
+-
+ #ifndef TIMECONSTANTS_H
+ #define TIMECONSTANTS_H
+ 
+diff --git a/src/core/utilities.cpp b/src/core/utilities.cpp
+index 3fdc6be..e6a109f 100644
+--- a/src/core/utilities.cpp
++++ b/src/core/utilities.cpp
+@@ -340,9 +340,6 @@ QString GetConfigPath(ConfigPath config) {
          return QDir::homePath();
        #endif
  
@@ -351,30 +473,31 @@ diff -rauN clementine-1.1.0/src/core/utilities.cpp clementine-libre-1.1.0/src/co
      default:
        qFatal("%s", Q_FUNC_INFO);
        return QString::null;
-diff -rauN clementine-1.1.0/src/core/utilities.h clementine-libre-1.1.0/src/core/utilities.h
---- clementine-1.1.0/src/core/utilities.h	2012-10-11 09:16:39.000000000 -0200
-+++ clementine-libre-1.1.0/src/core/utilities.h	2012-10-26 02:11:04.965764358 -0200
-@@ -108,7 +108,6 @@
+diff --git a/src/core/utilities.h b/src/core/utilities.h
+index edaa545..ad2138c 100644
+--- a/src/core/utilities.h
++++ b/src/core/utilities.h
+@@ -111,7 +111,6 @@ namespace Utilities {
      Path_NetworkCache,
      Path_GstreamerRegistry,
      Path_DefaultMusicLibrary,
 -    Path_LocalSpotifyBlob,
      Path_MoodbarCache,
+     Path_CacheRoot,
    };
-   QString GetConfigPath(ConfigPath config);
-diff -rauN clementine-1.1.0/src/covers/albumcoverloader.cpp clementine-libre-1.1.0/src/covers/albumcoverloader.cpp
---- clementine-1.1.0/src/covers/albumcoverloader.cpp	2012-10-22 04:24:28.000000000 -0200
-+++ clementine-libre-1.1.0/src/covers/albumcoverloader.cpp	2012-10-26 03:59:14.488394050 -0200
-@@ -29,17 +29,12 @@
- #include <QUrl>
- #include <QNetworkReply>
- 
--#ifdef HAVE_SPOTIFY
--# include "internet/spotifyservice.h"
--#endif
--
+diff --git a/src/covers/albumcoverloader.cpp b/src/covers/albumcoverloader.cpp
+index a4c4241..39dd101 100644
+--- a/src/covers/albumcoverloader.cpp
++++ b/src/covers/albumcoverloader.cpp
+@@ -30,7 +30,6 @@
+ #include "core/tagreaderclient.h"
+ #include "core/utilities.h"
+ #include "internet/internetmodel.h"
+-#include "internet/spotifyservice.h"
+ 
  
- AlbumCoverLoader::AlbumCoverLoader(QObject* parent)
+ 
+@@ -38,8 +37,7 @@ AlbumCoverLoader::AlbumCoverLoader(QObject* parent)
    : QObject(parent),
      stop_requested_(false),
      next_id_(1),
@@ -384,38 +507,34 @@ diff -rauN clementine-1.1.0/src/covers/albumcoverloader.cpp clementine-libre-1.1
  {
  }
  
-@@ -167,30 +162,6 @@
+@@ -169,26 +167,6 @@ AlbumCoverLoader::TryLoadResult AlbumCoverLoader::TryLoadImage(
  
      remote_tasks_.insert(reply, task);
      return TryLoadResult(true, false, QImage());
 -  } else if (filename.toLower().startsWith("spotify://image/")) {
 -    // HACK: we should add generic image URL handlers
--    #ifdef HAVE_SPOTIFY
--      SpotifyService* spotify = InternetModel::Service<SpotifyService>();
--
--      if (!connected_spotify_) {
--        connect(spotify, SIGNAL(ImageLoaded(QString,QImage)),
--                SLOT(SpotifyImageLoaded(QString,QImage)));
--        connected_spotify_ = true;
--      }
--
--      QString id = QUrl(filename).path();
--      if (id.startsWith('/')) {
--        id.remove(0, 1);
--      }
--      remote_spotify_tasks_.insert(id, task);
--
--      // Need to schedule this in the spotify service's thread
--      QMetaObject::invokeMethod(spotify, "LoadImage", Qt::QueuedConnection,
--                                Q_ARG(QString, id));
--      return TryLoadResult(true, false, QImage());
--    #else
--      return TryLoadResult(false, false, QImage());
--    #endif
+-    SpotifyService* spotify = InternetModel::Service<SpotifyService>();
+-
+-    if (!connected_spotify_) {
+-      connect(spotify, SIGNAL(ImageLoaded(QString,QImage)),
+-              SLOT(SpotifyImageLoaded(QString,QImage)));
+-      connected_spotify_ = true;
+-    }
+-
+-    QString id = QUrl(filename).path();
+-    if (id.startsWith('/')) {
+-      id.remove(0, 1);
+-    }
+-    remote_spotify_tasks_.insert(id, task);
+-
+-    // Need to schedule this in the spotify service's thread
+-    QMetaObject::invokeMethod(spotify, "LoadImage", Qt::QueuedConnection,
+-                              Q_ARG(QString, id));
+-    return TryLoadResult(true, false, QImage());
    }
  
    QImage image(filename);
-@@ -198,16 +169,6 @@
+@@ -196,16 +174,6 @@ AlbumCoverLoader::TryLoadResult AlbumCoverLoader::TryLoadImage(
                         image.isNull() ? task.options.default_output_image_: image);
  }
  
@@ -429,21 +548,22 @@ diff -rauN clementine-1.1.0/src/covers/albumcoverloader.cpp clementine-libre-1.1
 -  emit ImageLoaded(task.id, scaled, image);
 -}
 -
- void AlbumCoverLoader::RemoteFetchFinished() {
-   QNetworkReply* reply = qobject_cast<QNetworkReply*>(sender());
-   if (!reply)
-diff -rauN clementine-1.1.0/src/covers/albumcoverloader.h clementine-libre-1.1.0/src/covers/albumcoverloader.h
---- clementine-1.1.0/src/covers/albumcoverloader.h	2012-10-22 04:24:28.000000000 -0200
-+++ clementine-libre-1.1.0/src/covers/albumcoverloader.h	2012-10-26 02:13:19.304984280 -0200
-@@ -62,7 +62,6 @@
+ void AlbumCoverLoader::RemoteFetchFinished(QNetworkReply* reply) {
+   reply->deleteLater();
+ 
+diff --git a/src/covers/albumcoverloader.h b/src/covers/albumcoverloader.h
+index 987be66..5214e14 100644
+--- a/src/covers/albumcoverloader.h
++++ b/src/covers/albumcoverloader.h
+@@ -62,7 +62,6 @@ class AlbumCoverLoader : public QObject {
   protected slots:
    void ProcessTasks();
-   void RemoteFetchFinished();
+   void RemoteFetchFinished(QNetworkReply* reply);
 -  void SpotifyImageLoaded(const QString& url, const QImage& image);
  
   protected:
    enum State {
-@@ -102,13 +101,10 @@
+@@ -102,13 +101,10 @@ class AlbumCoverLoader : public QObject {
    QMutex mutex_;
    QQueue<Task> tasks_;
    QMap<QNetworkReply*, Task> remote_tasks_;
@@ -457,54 +577,47 @@ diff -rauN clementine-1.1.0/src/covers/albumcoverloader.h clementine-libre-1.1.0
    static const int kMaxRedirects = 3;
  };
  
-diff -rauN clementine-1.1.0/src/engines/gstenginepipeline.cpp clementine-libre-1.1.0/src/engines/gstenginepipeline.cpp
---- clementine-1.1.0/src/engines/gstenginepipeline.cpp	2012-10-25 03:04:21.000000000 -0200
-+++ clementine-libre-1.1.0/src/engines/gstenginepipeline.cpp	2012-10-26 02:14:35.834075631 -0200
-@@ -30,11 +30,6 @@
+diff --git a/src/engines/gstenginepipeline.cpp b/src/engines/gstenginepipeline.cpp
+index 94f77a3..37c1cdf 100644
+--- a/src/engines/gstenginepipeline.cpp
++++ b/src/engines/gstenginepipeline.cpp
+@@ -29,8 +29,6 @@
+ #include "core/signalchecker.h"
  #include "core/utilities.h"
  #include "internet/internetmodel.h"
+-#include "internet/spotifyserver.h"
+-#include "internet/spotifyservice.h"
  
--#ifdef HAVE_SPOTIFY
--#  include "internet/spotifyserver.h"
--#  include "internet/spotifyservice.h"
--#endif
--
- const int GstEnginePipeline::kGstStateTimeoutNanosecs = 10000000;
- const int GstEnginePipeline::kFaderFudgeMsec = 2000;
  
-@@ -139,42 +134,11 @@
+ const int GstEnginePipeline::kGstStateTimeoutNanosecs = 10000000;
+@@ -141,37 +139,11 @@ bool GstEnginePipeline::ReplaceDecodeBin(GstElement* new_bin) {
  bool GstEnginePipeline::ReplaceDecodeBin(const QUrl& url) {
    GstElement* new_bin = NULL;
  
 -  if (url.scheme() == "spotify") {
--    #ifdef HAVE_SPOTIFY
--      new_bin = gst_bin_new("spotify_bin");
+-    new_bin = gst_bin_new("spotify_bin");
 -
--      // Create elements
--      GstElement* src = engine_->CreateElement("tcpserversrc", new_bin);
--      GstElement* gdp = engine_->CreateElement("gdpdepay", new_bin);
--      if (!src || !gdp)
--        return false;
+-    // Create elements
+-    GstElement* src = engine_->CreateElement("tcpserversrc", new_bin);
+-    GstElement* gdp = engine_->CreateElement("gdpdepay", new_bin);
+-    if (!src || !gdp)
+-      return false;
 -
--      // Pick a port number
--      const int port = Utilities::PickUnusedPort();
--      g_object_set(G_OBJECT(src), "host", "127.0.0.1", NULL);
--      g_object_set(G_OBJECT(src), "port", port, NULL);
+-    // Pick a port number
+-    const int port = Utilities::PickUnusedPort();
+-    g_object_set(G_OBJECT(src), "host", "127.0.0.1", NULL);
+-    g_object_set(G_OBJECT(src), "port", port, NULL);
 -
--      // Link the elements
--      gst_element_link(src, gdp);
+-    // Link the elements
+-    gst_element_link(src, gdp);
 -
--      // Add a ghost pad
--      GstPad* pad = gst_element_get_static_pad(gdp, "src");
--      gst_element_add_pad(GST_ELEMENT(new_bin), gst_ghost_pad_new("src", pad));
--      gst_object_unref(GST_OBJECT(pad));
+-    // Add a ghost pad
+-    GstPad* pad = gst_element_get_static_pad(gdp, "src");
+-    gst_element_add_pad(GST_ELEMENT(new_bin), gst_ghost_pad_new("src", pad));
+-    gst_object_unref(GST_OBJECT(pad));
 -
--      // Tell spotify to start sending data to us.
--      InternetModel::Service<SpotifyService>()->server()->StartPlaybackLater(url.toString(), port);
--    #else // HAVE_SPOTIFY
--      qLog(Error) << "Tried to play a spotify:// url, but spotify support is not compiled in";
--      return false;
--    #endif
+-    // Tell spotify to start sending data to us.
+-    InternetModel::Service<SpotifyService>()->server()->StartPlaybackLater(url.toString(), port);
 -  } else {
      new_bin = engine_->CreateElement("uridecodebin");
      g_object_set(G_OBJECT(new_bin), "uri", url.toEncoded().constData(), NULL);
@@ -515,33 +628,31 @@ diff -rauN clementine-1.1.0/src/engines/gstenginepipeline.cpp clementine-libre-1
  
    return ReplaceDecodeBin(new_bin);
  }
-diff -rauN clementine-1.1.0/src/internet/internetmodel.cpp clementine-libre-1.1.0/src/internet/internetmodel.cpp
---- clementine-1.1.0/src/internet/internetmodel.cpp	2012-10-22 04:24:28.000000000 -0200
-+++ clementine-libre-1.1.0/src/internet/internetmodel.cpp	2012-10-26 02:15:18.005072563 -0200
-@@ -34,9 +34,6 @@
- #ifdef HAVE_LIBLASTFM
-   #include "lastfmservice.h"
- #endif
--#ifdef HAVE_SPOTIFY
--  #include "spotifyservice.h"
--#endif
- #ifdef HAVE_GOOGLE_DRIVE
-   #include "googledriveservice.h"
- #endif
-@@ -79,9 +76,6 @@
+diff --git a/src/internet/internetmodel.cpp b/src/internet/internetmodel.cpp
+index 289f591..ac9e3e0 100644
+--- a/src/internet/internetmodel.cpp
++++ b/src/internet/internetmodel.cpp
+@@ -30,7 +30,6 @@
+ #include "savedradio.h"
+ #include "somafmservice.h"
+ #include "soundcloudservice.h"
+-#include "spotifyservice.h"
+ #include "subsonicservice.h"
+ #include "core/closure.h"
+ #include "core/logging.h"
+@@ -94,7 +93,6 @@ InternetModel::InternetModel(Application* app, QObject* parent)
    AddService(new SkyFmService(app, this));
    AddService(new SomaFMService(app, this));
    AddService(new SoundCloudService(app, this));
--#ifdef HAVE_SPOTIFY
 -  AddService(new SpotifyService(app, this));
--#endif
- }
- 
- void InternetModel::AddService(InternetService *service) {
-diff -rauN clementine-1.1.1/src/ui/about.cpp clementine-libre-1.1.1/src/ui/about.cpp
---- clementine-1.1.1/src/ui/about.cpp		2012-10-11 09:16:40.000000000 -0200
-+++ clementine-libre-1.1.1/src/ui/about.cpp	2013-05-13 02:19:40.262472593 -0300
-@@ -75,16 +75,9 @@
+   AddService(new SubsonicService(app, this));
+ #ifdef HAVE_UBUNTU_ONE
+   AddService(new UbuntuOneService(app, this));
+diff --git a/src/ui/about.cpp b/src/ui/about.cpp
+index 53e42bd..49e7714 100644
+--- a/src/ui/about.cpp
++++ b/src/ui/about.cpp
+@@ -76,14 +76,9 @@ QString About::MakeHtml() const {
  
    ret += QString("<br />%1</p>").arg(tr("...and all the Amarok contributors"));
    ret += QString("<p><b>%1</b>").arg(tr("And:"));
@@ -549,44 +660,38 @@ diff -rauN clementine-1.1.1/src/ui/about.cpp clementine-libre-1.1.1/src/ui/about
    ret += QString("<br /><a href=\"http://www.smitelli.com/?page=blog&p=54\">Scott Smitelli</a>");
    ret += QString("<br /><a href=\"http://hyperboleandahalf.blogspot.com\">Allie Brosh</a></p>");
  
--#ifdef HAVE_SPOTIFY
--  ret += "<p>This product uses SPOTIFY(R) CORE but is not endorsed, certified "
--         "or otherwise approved in any way by Spotify. Spotify is the "
--         "registered trade mark of the Spotify Group.</p>";
--#endif // HAVE_SPOTIFY
+-  ret += "<p>This product uses Music by Spotify but is not endorsed, certified "
+-         "or otherwise approved in any way by Spotify. Spotify is the registered "
+-         "trade mark of the Spotify Group.</p>";
 -
    return ret;
  }
  
-diff -rauN clementine-1.1.0/src/ui/settingsdialog.cpp clementine-libre-1.1.0/src/ui/settingsdialog.cpp
---- clementine-1.1.0/src/ui/settingsdialog.cpp	2012-10-11 09:16:40.000000000 -0200
-+++ clementine-libre-1.1.0/src/ui/settingsdialog.cpp	2012-10-26 02:16:32.400950434 -0200
-@@ -55,10 +55,6 @@
- # include "wiimotedev/wiimotesettingspage.h"
+diff --git a/src/ui/settingsdialog.cpp b/src/ui/settingsdialog.cpp
+index dc0d84f..4a9335d 100644
+--- a/src/ui/settingsdialog.cpp
++++ b/src/ui/settingsdialog.cpp
+@@ -38,7 +38,6 @@
+ #include "internet/digitallyimportedsettingspage.h"
+ #include "internet/groovesharksettingspage.h"
+ #include "internet/magnatunesettingspage.h"
+-#include "internet/spotifysettingspage.h"
+ #include "internet/subsonicsettingspage.h"
+ #include "internet/ubuntuonesettingspage.h"
+ #include "library/librarysettingspage.h"
+@@ -174,7 +173,6 @@ SettingsDialog::SettingsDialog(Application* app, BackgroundStreams* streams, QWi
+   AddPage(Page_Box, new BoxSettingsPage(this), providers);
  #endif
  
--#ifdef HAVE_SPOTIFY
--# include "internet/spotifysettingspage.h"
--#endif
--
- #ifdef HAVE_GOOGLE_DRIVE
- # include "internet/googledrivesettingspage.h"
- #endif
-@@ -147,10 +143,6 @@
-   AddPage(Page_GoogleDrive, new GoogleDriveSettingsPage(this), providers);
- #endif
- 
--#ifdef HAVE_SPOTIFY
 -  AddPage(Page_Spotify, new SpotifySettingsPage(this), providers);
--#endif
--
    AddPage(Page_Magnatune, new MagnatuneSettingsPage(this), providers);
    AddPage(Page_DigitallyImported, new DigitallyImportedSettingsPage(this), providers);
    AddPage(Page_BackgroundStreams, new BackgroundStreamsSettingsPage(this), providers);
-diff -rauN clementine-1.1.0/src/ui/settingsdialog.h clementine-libre-1.1.0/src/ui/settingsdialog.h
---- clementine-1.1.0/src/ui/settingsdialog.h	2012-10-11 09:16:40.000000000 -0200
-+++ clementine-libre-1.1.0/src/ui/settingsdialog.h	2012-10-26 02:16:56.596276994 -0200
-@@ -67,7 +67,6 @@
+diff --git a/src/ui/settingsdialog.h b/src/ui/settingsdialog.h
+index e9e709a..5485a37 100644
+--- a/src/ui/settingsdialog.h
++++ b/src/ui/settingsdialog.h
+@@ -69,7 +69,6 @@ public:
      Page_Library,
      Page_Lastfm,
      Page_Grooveshark,
@@ -594,84 +699,3 @@ diff -rauN clementine-1.1.0/src/ui/settingsdialog.h clementine-libre-1.1.0/src/u
      Page_Magnatune,
      Page_DigitallyImported,
      Page_BackgroundStreams,
-diff -rauN clementine-1.1.0/ext/libclementine-common/core/logging.cpp clementine-libre-1.1.0/ext/libclementine-common/core/logging.cpp
---- clementine-1.1.0/ext/libclementine-common/core/logging.cpp	2012-10-11 09:16:39.000000000 -0200
-+++ clementine-libre-1.1.0/ext/libclementine-common/core/logging.cpp	2012-10-26 02:20:08.682299778 -0200
-@@ -14,10 +14,6 @@
-    limitations under the License.
- */
- 
--// Note: this file is licensed under the Apache License instead of GPL because
--// it is used by the Spotify blob which links against libspotify and is not GPL
--// compatible.
--
- #include <QtGlobal>
- 
- #include <cxxabi.h>
-diff -rauN clementine-1.1.0/ext/libclementine-common/core/logging.h clementine-libre-1.1.0/ext/libclementine-common/core/logging.h
---- clementine-1.1.0/ext/libclementine-common/core/logging.h	2012-10-11 09:16:39.000000000 -0200
-+++ clementine-libre-1.1.0/ext/libclementine-common/core/logging.h	2012-10-26 02:20:34.937511945 -0200
-@@ -14,11 +14,6 @@
-    limitations under the License.
- */
- 
--// Note: this file is licensed under the Apache License instead of GPL because
--// it is used by the Spotify blob which links against libspotify and is not GPL
--// compatible.
--
--
- #ifndef LOGGING_H
- #define LOGGING_H
- 
-diff -rauN clementine-1.0.1/src/core/timeconstants.h clementine-libre-1.0.1/src/core/timeconstants.h
---- clementine-1.0.1/src/core/timeconstants.h	2011-12-02 19:24:44.000000000 -0200
-+++ clementine-libre-1.0.1/src/core/timeconstants.h	2012-05-30 03:10:10.338953893 -0300
-@@ -14,10 +14,6 @@
-    limitations under the License.
- */
- 
--// Note: this file is licensed under the Apache License instead of GPL because
--// it is used by the Spotify blob which links against libspotify and is not GPL
--// compatible.
--
- #ifndef TIMECONSTANTS_H
- #define TIMECONSTANTS_H
- 
-diff -rauN clementine-1.1.1/src/core/backgroundstreams.cpp clementine-libre-1.1.1/src/core/backgroundstreams.cpp
---- clementine-1.1.1/src/core/backgroundstreams.cpp		2012-10-11 09:16:39.000000000 -0200
-+++ clementine-libre-1.1.1/src/core/backgroundstreams.cpp	2013-05-13 02:20:21.506864034 -0300
-@@ -9,7 +9,6 @@
- 
- const char* BackgroundStreams::kSettingsGroup = "BackgroundStreams";
- const char* BackgroundStreams::kHypnotoadUrl = "hypnotoad:///";
--const char* BackgroundStreams::kRainUrl = "http://data.clementine-player.org/rainymood";
- const char* BackgroundStreams::kEnterpriseUrl = "enterprise:///";
- 
- BackgroundStreams::BackgroundStreams(EngineBase* engine, QObject* parent)
-@@ -28,7 +27,6 @@
-   int version = s.value("version", 0).toInt();
-   if (version < 1) {
-     AddStream(QT_TR_NOOP("Hypnotoad"), QUrl(kHypnotoadUrl));
--    AddStream(QT_TR_NOOP("Rain"), QUrl(kRainUrl));
-   }
- 
-   if (version < kVersion) {
-diff -rauN clementine-1.1.1/src/analyzers/nyancatanalyzer.cpp clementine-libre-1.1.1/src/analyzers/nyancatanalyzer.cpp
---- clementine-1.1.1/src/analyzers/nyancatanalyzer.cpp	2012-10-16 08:17:37.000000000 -0200
-+++ clementine-libre-1.1.1/src/analyzers/nyancatanalyzer.cpp	2013-08-02 00:16:25.974215711 -0300
-@@ -23,13 +23,13 @@
- #include <QTimerEvent>
- #include <QBrush>
- 
--const char* NyanCatAnalyzer::kName = "Nyanalyzer cat";
-+const char* NyanCatAnalyzer::kName = "MooGNU";
- const float NyanCatAnalyzer::kPixelScale = 0.02f;
- 
- 
- NyanCatAnalyzer::NyanCatAnalyzer(QWidget* parent)
-   : Analyzer::Base(parent, 9),
--    cat_(":/nyancat.png"),
-+    cat_(":/moognu.png"),
-     timer_id_(startTimer(kFrameIntervalMs)),
-     frame_(0),
-     current_buffer_(0),
diff --git a/libre/crosstool-ng/PKGBUILD b/libre/crosstool-ng/PKGBUILD
index 48ec51a10..0ed15649b 100644
--- a/libre/crosstool-ng/PKGBUILD
+++ b/libre/crosstool-ng/PKGBUILD
@@ -3,7 +3,7 @@
 # Contributor (Parabola): Márcio Silva <coadde@lavabit.com>
 
 pkgname=crosstool-ng
-pkgver=1.18.0
+pkgver=1.19.0
 pkgrel=1
 pkgdesc="A versatile cross toolchain generator (eglibc addons patch)"
 arch=('i686' 'x86_64' 'mips64el')
@@ -14,7 +14,6 @@ makedepends=('libtool')
 optdepends=('subversion: for retrieving eglibc sources')
 source=(http://crosstool-ng.org/download/${pkgname}/${pkgname}-${pkgver}.tar.bz2)
         #libc_ports_short_name.patch)
-md5sums=('3376d389c632baa77f0bce1db1a196a9')
 
 build() {
   cd $srcdir/$pkgname-$pkgver
@@ -30,3 +29,5 @@ package() {
 
   install -Dm644 ct-ng.comp ${pkgdir}/usr/share/bash-completion/completions/ct-ng
 }
+sha1sums=('b7ae3e90756b499ff5362064b7d80f8a45d09bfb')
+sha256sums=('cd54f20bb8190533b21c9cf7f93c9073c22d59541f52774c3f3053264ba53a93')
diff --git a/libre/cups-filters-libre/PKGBUILD b/libre/cups-filters-libre/PKGBUILD
index 20fcf5bf3..b95e820b7 100644
--- a/libre/cups-filters-libre/PKGBUILD
+++ b/libre/cups-filters-libre/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 196334 2013-10-11 15:48:49Z andyrtr $
+# $Id: PKGBUILD 198470 2013-10-30 15:04:07Z andyrtr $
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 
 pkgname=cups-filters-libre
 _pkgname=cups-filters
-pkgver=1.0.40
+pkgver=1.0.41
 pkgrel=1
 pkgdesc="OpenPrinting CUPS Filters, without foomatic-db-nonfree recommendation"
 arch=('i686' 'x86_64' 'mips64el')
@@ -16,9 +16,8 @@ optdepends=('ghostscript: for non-PostScript printers to print with CUPS to conv
 	    'foomatic-db-engine: drivers use Ghostscript to convert PostScript to a printable form directly')
 backup=(etc/fonts/conf.d/99pdftoopvp.conf
         etc/cups/cups-browsed.conf)
-options=(!libtool)
 source=(http://www.openprinting.org/download/cups-filters/$_pkgname-$pkgver.tar.gz)
-md5sums=('50936e556a2787a85cb14dd859e8f410')
+md5sums=('9065084c7601ce1721cd6f34ca0a4337')
 replaces=("${_pkgname}")
 conflicts=("${_pkgname}")
 provides=("${_pkgname}=${pkgver}")
@@ -44,8 +43,6 @@ check() {
 package() {
   cd $_pkgname-$pkgver
   make DESTDIR="$pkgdir/" install
-  # drop static lib
-  rm -f ${pkgdir}/usr/lib/*.a
   
   # add upstream systemd support file
   install -Dm644 utils/cups-browsed.service ${pkgdir}/usr/lib/systemd/system/cups-browsed.service
diff --git a/libre/dkms-libre/PKGBUILD b/libre/dkms-libre/PKGBUILD
index 99caab5fa..0f3f66c38 100644
--- a/libre/dkms-libre/PKGBUILD
+++ b/libre/dkms-libre/PKGBUILD
@@ -1,7 +1,7 @@
 # $Id: PKGBUILD 90494 2013-05-12 22:57:28Z seblu $
 # Maintainer: Sébastien Luttringer
 # Contributor: Balwinder S "bsd" Dheeman (bdheeman AT gmail.com)
-# Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
+# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
 
 _pkgname=dkms
 pkgname=dkms-libre
diff --git a/libre/doublecmd-libre/PKGBUILD b/libre/doublecmd-libre/PKGBUILD
index 8b8ec9477..522204000 100644
--- a/libre/doublecmd-libre/PKGBUILD
+++ b/libre/doublecmd-libre/PKGBUILD
@@ -1,5 +1,5 @@
 # vim:set ft=sh:
-# $Id: PKGBUILD 97498 2013-09-22 18:08:53Z idevolder $
+# $Id: PKGBUILD 99027 2013-10-22 19:14:23Z idevolder $
 # Maintainer: BlackIkeEagle <ike DOT devolder AT gmail DOT com>
 # Contributor: (sirocco AT ngs.ru)
 
@@ -8,7 +8,7 @@ pkgbase=doublecmd-libre
 pkgname=('doublecmd-libre-gtk2' 'doublecmd-libre-qt')
 pkgver=0.5.7
 _helpver=0.5.5
-pkgrel=1
+pkgrel=2
 url="http://doublecmd.sourceforge.net/"
 arch=('i686' 'x86_64')
 license=('GPL')
@@ -50,7 +50,7 @@ build() {
 package_doublecmd-libre-gtk2() {
 	pkgdesc="twin-panel (commander-style) file manager (GTK), with unar recommendation"
 	depends=('gtk2')
-	conflicts=('doublecmd-gtk2' 'doublecmd-gtk2-libre')
+	conflicts=('doublecmd-qt' 'doublecmd-gtk2' 'doublecmd-gtk2-libre')
 	replaces=('doublecmd-gtk2' 'doublecmd-gtk2-libre')
 	provides=("doublecmd-gtk2=${pkgver}")
 	cd "$srcdir/$_pkgbase-gtk"
@@ -65,7 +65,7 @@ package_doublecmd-libre-gtk2() {
 package_doublecmd-libre-qt() {
 	pkgdesc="twin-panel (commander-style) file manager (QT), with unar recommendation"
 	depends=('qt4pas')
-	conflicts=('doublecmd-qt' 'doublecmd-qt-libre')
+	conflicts=('doublecmd-gtk2' 'doublecmd-qt' 'doublecmd-qt-libre')
 	replaces=('doublecmd-qt' 'doublecmd-qt-libre')
 	provides=("doublecmd-qt=${pkgver}")
 	cd "$srcdir/$_pkgbase-qt"
diff --git a/libre/ecasound-libre/PKGBUILD b/libre/ecasound-libre/PKGBUILD
index 120eda3b2..51e87b705 100644
--- a/libre/ecasound-libre/PKGBUILD
+++ b/libre/ecasound-libre/PKGBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Ray Rashif <schiv@archlinux.org>
 # Contributor: Eric Belanger <eric@archlinux.org>
 # Contributor: Tom Newsom <Jeepster@gmx.co.uk>
-# Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
+# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
 
 _pkgname=ecasound
 pkgname=ecasound-libre
diff --git a/libre/epiphany-libre/PKGBUILD b/libre/epiphany-libre/PKGBUILD
index 0fcc1a491..b33bb486f 100644
--- a/libre/epiphany-libre/PKGBUILD
+++ b/libre/epiphany-libre/PKGBUILD
@@ -1,12 +1,12 @@
-# $Id: PKGBUILD 195129 2013-09-25 11:58:35Z jgc $
+# $Id: PKGBUILD 196579 2013-10-15 14:29:30Z jgc $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
-# Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
+# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
 # Contributor (Parabola): Márcio Silva <coadde@lavabit.com>
 
 _pkgname=epiphany
 pkgname=epiphany-libre
-pkgver=3.10.0
-pkgrel=2
+pkgver=3.10.1
+pkgrel=1
 install=epiphany.install
 pkgdesc="A GNOME web browser based on the WebKit rendering engine, with DuckDuckGo HTML support"
 arch=('i686' 'x86_64' 'mips64el')
@@ -20,11 +20,14 @@ options=('!libtool' '!emptydirs')
 groups=('gnome')
 url="http://www.gnome.org/projects/epiphany/"
 source=(http://ftp.gnome.org/pub/GNOME/sources/$_pkgname/${pkgver:0:4}/$_pkgname-$pkgver.tar.xz)
-sha256sums=('7bd2c3b21464a83909d75befe2f9501c1ab2f00e2371f26023f79818faec351e')
+sha256sums=('86c680b4b12432b18cbb8e7dec25b26586a536cb5842027db2e6986f416ddfad')
 
 prepare() {
   cd $_pkgname-$pkgver
 
+  # Replace DuckDuckGo to DuckDuckGo HTML
+  sed -i 's|duckduckgo[.]com|duckduckgo.com/html|g' $(grep -rlI 'duckduckgo[.]com')
+
   # Replace Google support to DuckDuckGo HTML
   sed -i 's|http://www[.]google[.]com/search?q=%s[&]ie=UTF-8[&]oe=UTF-8|https://duckduckgo.com/html/?q=search|g' $(grep -rlI 'http://www[.]google[.]com/search?q=%s&ie=UTF-8&oe=UTF-8')
   sed -i '\|a quoted string should be searched|d' $(grep -rlI 'a quoted string should be searched')
diff --git a/libre/file-roller-libre/PKGBUILD b/libre/file-roller-libre/PKGBUILD
index 8289eb471..893b75e02 100644
--- a/libre/file-roller-libre/PKGBUILD
+++ b/libre/file-roller-libre/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 195293 2013-09-30 08:01:47Z jgc $
+# $Id: PKGBUILD 196556 2013-10-15 13:44:19Z heftig $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Contributor: Jan de Groot <jgc@archlinux.org>
 
 _pkgname=file-roller
 pkgname=file-roller-libre
-pkgver=3.10.0
-pkgrel=2
+pkgver=3.10.1
+pkgrel=1
 pkgdesc="Create and modify archives, with unar support included and nonfree unace recommendation removed"
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
@@ -19,17 +19,11 @@ conflicts=("$_pkgname")
 options=('!libtool' '!emptydirs')
 install=file-roller.install
 url="http://www.gnome.org"
-source=(http://ftp.gnome.org/pub/gnome/sources/$_pkgname/${pkgver%.*}/$_pkgname-$pkgver.tar.xz
-        bug708854.patch
-        bug709035.patch)
-sha256sums=('d889bb9904146e5715c082aa9a6d96b0606a066ba2bf05fbfb7030f2bf274f13'
-            'a8f4e856924b6b78e47cc134c723d1d93119f90ec9ab69dd0b59ec8a934688ba'
-            '59f07968b720ccd9c70e6232b2bfcaa3cf9298d6ce48be4882154d69cbe7a909')
+source=(http://ftp.gnome.org/pub/gnome/sources/$_pkgname/${pkgver%.*}/$_pkgname-$pkgver.tar.xz)
+sha256sums=('7b180bcf98eaf19835926c694ec5262a421f3a0271f030ca338ccf7f6846a80f')
 
 prepare() {
   cd $_pkgname-$pkgver
-  patch -Np1 -i ../bug708854.patch
-  patch -Np1 -i ../bug709035.patch
 }
 
 build() {
diff --git a/libre/filesystem/PKGBUILD b/libre/filesystem/PKGBUILD
index 60fa5924b..00be19b0a 100644
--- a/libre/filesystem/PKGBUILD
+++ b/libre/filesystem/PKGBUILD
@@ -1,7 +1,7 @@
 # $Id: PKGBUILD 180021 2013-03-14 19:23:11Z dreisner $
 # Maintainer: Tom Gundersen <teg@jklm.no>
 # Maintainer (Parabola): Nicolás Reynolds <fauno@kiwwwi.com.ar>
-# Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
+# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
 
 pkgname=filesystem
 pkgver=2013.05
diff --git a/libre/foomatic-filters-libre/PKGBUILD b/libre/foomatic-filters-libre/PKGBUILD
index eeb26a639..c05a01e86 100644
--- a/libre/foomatic-filters-libre/PKGBUILD
+++ b/libre/foomatic-filters-libre/PKGBUILD
@@ -1,6 +1,6 @@
 # $Id: PKGBUILD 185778 2013-05-18 16:33:20Z andyrtr $
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
-# Contributor (Parabola): André Silva <emulatorman@lavabit.com>
+# Contributor (Parabola): André Silva <emulatorman@parabola.nu>
  
 pkgbase="foomatic"
 pkgname=('foomatic-filters-libre')
diff --git a/libre/ghostscript-libre/PKGBUILD b/libre/ghostscript-libre/PKGBUILD
index d339089af..4db0709fc 100644
--- a/libre/ghostscript-libre/PKGBUILD
+++ b/libre/ghostscript-libre/PKGBUILD
@@ -1,7 +1,7 @@
 # $Id: PKGBUILD 193812 2013-09-02 09:41:54Z andyrtr $
 # Maintainer: AndyRTR <andyrtr@archlinux.org>
 # Maintainer (Parabola): Joshua Haase <hahj87@gmail.com>
-# Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
+# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
 
 ### !!! rebuild groff from core that picks up hardcoding the GS versioned font path !!! ###
 
diff --git a/libre/gnormalize-libre/PKGBUILD b/libre/gnormalize-libre/PKGBUILD
index 6a07966b2..75edbfc1e 100644
--- a/libre/gnormalize-libre/PKGBUILD
+++ b/libre/gnormalize-libre/PKGBUILD
@@ -3,7 +3,7 @@
 # Contributor: Chris Brannon <cmbrannon79@gmail.com>
 # Contributor: Corrado Primier <bardo@aur.archlinux.org>
 # Contributor:JZsolt Varadi (karmaxxl) 
-# Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
+# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
 
 _pkgname=gnormalize
 pkgname=gnormalize-libre
diff --git a/libre/gnu-ghostscript/PKGBUILD b/libre/gnu-ghostscript/PKGBUILD
index 0c124d528..f23b29ec0 100644
--- a/libre/gnu-ghostscript/PKGBUILD
+++ b/libre/gnu-ghostscript/PKGBUILD
@@ -1,4 +1,4 @@
-# Maintainer: André Silva <emulatorman@lavabit.com>
+# Maintainer: André Silva <emulatorman@parabola.nu>
 
 _pkgname=ghostscript
 pkgname=gnu-ghostscript
diff --git a/libre/grub-legacy/PKGBUILD b/libre/grub-legacy/PKGBUILD
index 036540e79..57aaa2840 100644
--- a/libre/grub-legacy/PKGBUILD
+++ b/libre/grub-legacy/PKGBUILD
@@ -1,7 +1,7 @@
 # $Id: PKGBUILD 142375 2011-11-08 22:04:23Z ronald $
 # Maintainer: Ronald van Haren <ronald.archlinux.org>
 # Maintainer: ava1ar <mail(dot)avatar(at)gmail(dot)com>
-# Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
+# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
 # Contributor (Parabola): Jorge López <jorginho@lavabit.com>
 
 pkgname=grub-legacy
diff --git a/libre/grub/PKGBUILD b/libre/grub/PKGBUILD
index ea12eb9ad..de9ebb452 100644
--- a/libre/grub/PKGBUILD
+++ b/libre/grub/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer : Tobias Powalowski <tpowa@archlinux.org>
 # Maintainer : Ronald van Haren <ronald.archlinux.org>
 # Contributor: Keshav Padram (the.ridikulus.rat) (aatt) (gemmaeiil) (ddoott) (ccoomm)>
-# Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
+# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
 
 _GRUB_BZR_REV="5086"
 
diff --git a/libre/gst-plugins-bad-libre/PKGBUILD b/libre/gst-plugins-bad-libre/PKGBUILD
index 17d1105e3..465072d3a 100644
--- a/libre/gst-plugins-bad-libre/PKGBUILD
+++ b/libre/gst-plugins-bad-libre/PKGBUILD
@@ -1,17 +1,18 @@
-# $Id: PKGBUILD 195012 2013-09-24 14:12:15Z heftig $
+# $Id: PKGBUILD 197399 2013-10-25 12:22:28Z heftig $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Maintainer (Parabola): Márcio Silva <coadde@lavabit.com>
 
 _pkgname=gst-plugins-bad
 pkgname=$_pkgname-libre
 pkgver=1.2.0
-pkgrel=1
+pkgrel=2
 pkgdesc="GStreamer Multimedia Framework Bad Plugins, without nonfree faac support"
 arch=('i686' 'x86_64' 'mips64el')
 license=('LGPL')
 url="http://gstreamer.freedesktop.org/"
 depends=('mjpegtools' 'gst-plugins-base-libs' 'curl' 'chromaprint' 'libmms' 'faad2' 'mpg123' 'celt' 'libdca' 'soundtouch' 'spandsp' 'libdvdnav' 'libmodplug' 'libgme' 'opus' 'wayland' 'neon' 'libofa' 'fluidsynth' 'openjpeg' 'libwebp' 'libsrtp' 'gnutls')
-makedepends=('schroedinger' 'libexif' 'libdvdread' 'libvdpau' 'libmpeg2' 'python' 'valgrind' 'wildmidi')
+makedepends=('schroedinger' 'libexif' 'libdvdread' 'libvdpau' 'libmpeg2' 'python' 'valgrind' 'wildmidi'
+             'gobject-introspection')
 provides=($_pkgname=$pkgver)
 conflicts=$_pkgname
 replaces=$_pkgname
diff --git a/libre/gstreamer0.10-bad-libre/PKGBUILD b/libre/gstreamer0.10-bad-libre/PKGBUILD
index 686f41e06..593042e3e 100644
--- a/libre/gstreamer0.10-bad-libre/PKGBUILD
+++ b/libre/gstreamer0.10-bad-libre/PKGBUILD
@@ -1,12 +1,12 @@
-# $Id: PKGBUILD 183943 2013-04-29 17:33:53Z bpiotrowski $
+# $Id: PKGBUILD 197398 2013-10-25 12:22:00Z heftig $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Maintainer (Parabola): fauno <fauno@kiwwwi.com.ar>
-# Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
+# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
 
 pkgbase=gstreamer0.10-bad-libre
 pkgname=('gstreamer0.10-bad-libre' 'gstreamer0.10-bad-libre-plugins')
 pkgver=0.10.23
-pkgrel=4
+pkgrel=5
 arch=('i686' 'x86_64' 'mips64el')
 license=('LGPL' 'GPL')
 makedepends=('pkgconfig' 'gstreamer0.10-base>=0.10.36' 'xvidcore' 'libdca' 'bzip2' 'libdc1394' 'neon' 'musicbrainz' 'faad2' 'libmms' 'libcdaudio' 'libmpcdec' 'mjpegtools' 'libdvdnav' 'libmodplug' 'jasper' 'liblrdf' 'libofa' 'soundtouch' 'libvdpau' 'schroedinger' 'libass' 'libvpx' 'gsm' 'libgme' 'rtmpdump' 'libsndfile' 'librsvg' 'wildmidi' 'opus')
diff --git a/libre/gummiboot/PKGBUILD b/libre/gummiboot/PKGBUILD
index eebb9744c..9fbfa235b 100644
--- a/libre/gummiboot/PKGBUILD
+++ b/libre/gummiboot/PKGBUILD
@@ -3,7 +3,7 @@
 # Contributor: Tobias Powalowski <tpowa@archlinux.org>
 # Contributor: Keshav P R <(the.ridikulus.rat) (aatt) (gemmaeiil) (ddoott) (ccoomm)>
 # Contributor:  Mantas Mikulėnas <grawity@gmail.com>
-# Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
+# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
 
 pkgname="gummiboot"
 pkgver="38"
diff --git a/libre/hexchat-libre/PKGBUILD b/libre/hexchat-libre/PKGBUILD
index 161f78e82..b1c9228a6 100644
--- a/libre/hexchat-libre/PKGBUILD
+++ b/libre/hexchat-libre/PKGBUILD
@@ -1,7 +1,7 @@
 # $Id: PKGBUILD 97268 2013-09-15 22:44:23Z alucryd $
 # Maintainer: Maxime Gauduin <alucryd@gmail.com>
 # Contributor: TingPing <tingping@tingping.se>
-# Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
+# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
 
 _pkgname=hexchat
 pkgname=hexchat-libre
diff --git a/libre/hplip-libre/PKGBUILD b/libre/hplip-libre/PKGBUILD
index 7d2dceae8..e312adc11 100644
--- a/libre/hplip-libre/PKGBUILD
+++ b/libre/hplip-libre/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 194375 2013-09-15 08:00:33Z andyrtr $
+# $Id: PKGBUILD 196769 2013-10-18 13:50:49Z andyrtr $
 # Maintainer: Tom Gundersen <teg@jklm.no>
 # Contributor : Rémy Oudompheng <remy@archlinux.org>
 # Contributor: Morgan LEFIEUX <comete@archlinuxfr.org>
@@ -6,7 +6,7 @@
 
 _pkgname=hplip
 pkgname=hplip-libre
-pkgver=3.13.9
+pkgver=3.13.10
 pkgrel=2
 pkgdesc="Drivers for HP DeskJet, OfficeJet, Photosmart, Business Inkjet and some LaserJet, without hplip-plugin binary blobs recommendation"
 arch=('i686' 'x86_64' 'mips64el')
@@ -20,6 +20,7 @@ optdepends=('cups: for printing support'
             'sane: for scanner support'
             'python2-pillow: for commandline scanning support'
             'python2-notify: for Desktop notification support'
+            'python2-reportlab: for pdf output in hp-scan'
             'rpcbind: for network support'
             'python2-pyqt: for running hp-toolbox'
             'python2-gobject2: for running hp-toolbox'
@@ -29,17 +30,12 @@ conflicts=$_pkgname
 provides=$_pkgname=$pkgver
 options=('!libtool')
 install=hplip.install
-source=(http://downloads.sourceforge.net/${_pkgname}/$_pkgname-$pkgver.tar.gz{,.asc}
-        hp-mkuri.patch)
-md5sums=('8fcbbd0d3a0b76550f325bd6cf46d9d9'
-         'SKIP'
-         '0bd7779fdbc4d7a9386df04dce2cb8d4')
+source=(http://downloads.sourceforge.net/${_pkgname}/$_pkgname-$pkgver.tar.gz{,.asc})
+md5sums=('ba729c514a2dc95390b99e9a9d452999'
+         'SKIP')
 
-build() {
- cd "$srcdir/$_pkgname-$pkgver"
-
- # fix linking libnotify, FS#34283
- patch -Np0 -i ${srcdir}/hp-mkuri.patch
+prepare() {
+ cd $_pkgname-$pkgver
  
  export PYTHON=python2
  
@@ -65,7 +61,10 @@ build() {
    
  export AUTOMAKE='automake --foreign'
  autoreconf --force --install
+}
 
+build() {
+ cd $_pkgname-$pkgver
  ./configure --prefix=/usr \
              --enable-qt4 \
              --disable-foomatic-rip-hplip-install \
@@ -83,15 +82,16 @@ build() {
 }
 
 package() {
- #cd "$srcdir/$_pkgname-$pkgver"
- cd "$srcdir/$_pkgname-${pkgver/.a/a}"
+ #cd $_pkgname-$pkgver
+ cd $_pkgname-${pkgver/.a/a}
  make rulesdir=/usr/lib/udev/rules.d DESTDIR="$pkgdir/" install
+ 
  # remove config provided by sane and autostart of hp-daemon
  rm -rf "$pkgdir"/etc/{sane.d,xdg}
+ 
  # remove HAL .fdi file because HAL is no longer used
- rm -rf "$pkgdir"/usr/share/hal
- # log dir should not be world writeable
- chmod 775 "$pkgdir"/var/log/hp{,/tmp}
+ rm -vrf "$pkgdir"/usr/share/hal
+ 
  # remove rc script
- rm -rf "$pkgdir"/etc/init.d
+ rm -vrf "$pkgdir"/etc/init.d
 }
diff --git a/libre/hplip-libre/hplip-CVE-2013-4325.patch b/libre/hplip-libre/hplip-CVE-2013-4325.patch
new file mode 100644
index 000000000..85bff893b
--- /dev/null
+++ b/libre/hplip-libre/hplip-CVE-2013-4325.patch
@@ -0,0 +1,22 @@
+diff -up hplip-3.13.7/base/pkit.py.CVE-2013-4325 hplip-3.13.7/base/pkit.py
+--- hplip-3.13.7/base/pkit.py.CVE-2013-4325	2013-07-23 06:18:29.000000000 +0100
++++ hplip-3.13.7/base/pkit.py	2013-09-11 10:54:13.252419283 +0100
+@@ -176,15 +176,10 @@ class PolicyKitService(dbus.service.Obje
+                                     "/org/freedesktop/PolicyKit1/Authority",
+                                     "org.freedesktop.PolicyKit1.Authority")
+         policy_kit = dbus.Interface(obj, "org.freedesktop.PolicyKit1.Authority")
+-        info = dbus.Interface(connection.get_object("org.freedesktop.DBus",
+-                                                    "/org/freedesktop/DBus/Bus",
+-                                                    False),
+-                              "org.freedesktop.DBus")
+-        pid = info.GetConnectionUnixProcessID(sender)
+         
+         subject = (
+-            'unix-process',
+-            { 'pid' : dbus.UInt32(pid, variant_level = 1) }
++            'system-bus-name',
++            { 'name' : dbus.String(sender, variant_level = 1) }
+         )
+         details = { '' : '' }
+         flags = dbus.UInt32(1)         # AllowUserInteraction = 0x00000001
+
diff --git a/libre/iceape-l10n/PKGBUILD b/libre/iceape-l10n/PKGBUILD
index 5e088da07..00341af26 100644
--- a/libre/iceape-l10n/PKGBUILD
+++ b/libre/iceape-l10n/PKGBUILD
@@ -2,7 +2,7 @@
 # Contributor: fauno <fauno@kiwwwi.com.ar>
 # Contributor: Figue <ffigue@gmail.com>
 # Maintainer: Márcio Silva <coadde@lavabit.com>
-# Maintainer: André Silva <emulatorman@lavabit.com>
+# Maintainer: André Silva <emulatorman@parabola.nu>
 # Based on icecat-i18n package, which is in turn based on firefox-i18n
 
 # When updating to a newer upstream release:
diff --git a/libre/iceape-libre/PKGBUILD b/libre/iceape-libre/PKGBUILD
index 1ea0c56b0..601de26b9 100644
--- a/libre/iceape-libre/PKGBUILD
+++ b/libre/iceape-libre/PKGBUILD
@@ -1,5 +1,5 @@
 # Maintainer : Márcio Silva <coadde@lavabit.com>
-# Maintainer : André Silva <emulatorman@lavabit.com>
+# Maintainer : André Silva <emulatorman@parabola.nu>
 
 # We're getting this from Debian Sid
 _debname=iceape
diff --git a/libre/icecat-adblock-plus/PKGBUILD b/libre/icecat-adblock-plus/PKGBUILD
index 3c078997c..1837c0119 100644
--- a/libre/icecat-adblock-plus/PKGBUILD
+++ b/libre/icecat-adblock-plus/PKGBUILD
@@ -1,6 +1,6 @@
 # $Id: PKGBUILD 94536 2013-07-26 13:15:58Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
+# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
 
 _pkgname=firefox-adblock-plus
 pkgname=icecat-adblock-plus
diff --git a/libre/icecat-l10n/PKGBUILD b/libre/icecat-l10n/PKGBUILD
index 15e559623..939e07019 100644
--- a/libre/icecat-l10n/PKGBUILD
+++ b/libre/icecat-l10n/PKGBUILD
@@ -2,7 +2,7 @@
 # Contributor: fauno <fauno@kiwwwi.com.ar>
 # Contributor: Figue <ffigue@gmail.com>
 # Maintainer: Márcio Silva <coadde@lavabit.com>
-# Maintainer: André Silva <emulatorman@lavabit.com>
+# Maintainer: André Silva <emulatorman@parabola.nu>
 # Based on firefox-i18n package
 
 # When updating to a newer upstream release:
@@ -10,96 +10,7 @@
 # - (optionally) edit PKGBUILD.in
 # - Run 'make'. It will take care of everything else for you.
 
-_langpacks=(
-  ach
-  ak
-  ar
-  as
-  ast
-  be
-  bg
-  bn-BD
-  bn-IN
-  br
-  bs
-  ca
-  cs
-  csb
-  cy
-  da
-  de
-  el
-  en-GB
-  en-US
-  en-ZA
-  eo
-  es-AR
-  es-CL
-  es-ES
-  es-MX
-  et
-  eu
-  fa
-  ff
-  fi
-  fr
-  fy-NL
-  ga-IE
-  gd
-  gl
-  gu-IN
-  he
-  hi-IN
-  hr
-  hu
-  hy-AM
-  id
-  is
-  it
-  ja
-  kk
-  km
-  kn
-  ko
-  ku
-  lg
-  lij
-  lt
-  lv
-  mai
-  mk
-  ml
-  mr
-  nb-NO
-  nl
-  nn-NO
-  nso
-  or
-  pa-IN
-  pl
-  pt-BR
-  pt-PT
-  rm
-  ro
-  ru
-  si
-  sk
-  sl
-  son
-  sq
-  sr
-  sv-SE
-  ta-LK
-  ta
-  te
-  th
-  tr
-  uk
-  vi
-  zh-CN
-  zh-TW
-  zu
-)
+_langpacks=(ach af ak ar as ast be bg bn-BD bn-IN br bs ca cs csb cy da de el en-GB en-ZA eo es-AR es-CL es-ES es-MX et eu fa ff fi fr fy-NL ga-IE gd gl gu-IN he hi-IN hr hu hy-AM id is it ja kk km kn ko ku lg lij lt lv mai mk ml mr nb-NO nl nn-NO nso or pa-IN pl pt-BR pt-PT rm ro ru si sk sl son sq sr sv-SE ta ta-LK te th tr uk vi zh-CN zh-TW zu)
 
 pkgbase=icecat-l10n
 pkgname=(
@@ -107,8 +18,8 @@ pkgname=(
   do echo icecat-l10n-$lang | tr A-Z a-z
   done)
 )
-pkgver=17.0.1
-pkgrel=3
+pkgver=24.0
+pkgrel=1
 pkgdesc='Language packs for GNU IceCat.'
 arch=(
   any
@@ -125,9 +36,14 @@ makedepends=(
   zip
 )
 source=('region.properties')
+#  for lang in ${_langpacks[@]}
+#  do 
+#      source+=(http://ftp.gnu.org/gnu/gnuzilla/lang/${pkgver::2}/$lang.xpi)
+#  done
+
   for lang in ${_langpacks[@]}
   do 
-      source+=(http://ftp.gnu.org/gnu/gnuzilla/lang/${pkgver::4}/$lang.xpi)
+      source+=(http://mirror.lnx.im/icecat/langpacks/$pkgver/$lang.xpi)
   done
 
 noextract=(
@@ -137,7 +53,7 @@ noextract=(
 )
 
 
-_path=/usr/lib/${pkgbase%-l10n}/extensions/
+_path=/usr/lib/${pkgbase%-l10n}/browser/extensions/
 
 build() {
   cd $srcdir
@@ -146,7 +62,7 @@ build() {
   do
       cd $srcdir
       unzip -q $i.xpi -d $i
-      install -Dm644 $srcdir/region.properties $i/chrome/$i/locale/browser-region
+      install -Dm644 $srcdir/region.properties $i/browser/chrome/$i/locale/browser-region
       cd $i
       zip -q -r $srcdir/langpack-$i@firefox.mozilla.org.xpi .
   done
@@ -166,94 +82,92 @@ package_icecat-l10n-$(echo $lang | tr A-Z a-z) () {
 "
 done
 
-sha512sums=(
-  1ec2a61191cdcd98678cdc823cf7b03bfad1444c5e33b5f2e264863ee302639202680207fc36c9a0337d699dcc7d7cc99a3f02b9caa07dc64d907c0c42a51138
-  f3c627282fa78ef67335fa70671af848f2fff2252db1c4125838bcbfd92c61ae978b9a32885f4b33beac4eb4d8dc3fc034b18703686164a4903c4180de539439
-  d88793ed54794833ec6200d7a1957b68ebe8dd5c1dd6f4d030440919e5ca7f85f84fefd459603d29be57fd6b9d0961356c7760aedaca638bc3b58532ceae8441
-  6f3f6e026bc7d4ac6d6aa9e1ebb5995d663293f9b26190d33de8857cbfd5e6454bbda49bd13d6c6c1dab544ef0f2da0cdec50b1d9fbfb73aa5d66b0a6a67a87c
-  a0f8aec338bd7a36af983bab144fafdb9c9dc9081ceaf31aae443160e68758f3d46a385bc20d4a6767b81d09eeca92e08e0aa79250719e9e1f9d7bbab8137390
-  066d2540fcf97e87e778124d9bd8aa0d624d810d5b034423f43fc77f8579c2006c2a7a519b438a152272ed9db85a3e56ae770f221c7eabdc700368c4788e6108
-  12801164ecebf059c5615480785ce4ce95de5221d05e74bf85f747a62f8954decd372afb829b8d941316bc9115c3b6faf1da6da869d0ce5b09c622043936bf6f
-  aacf7f3713431a4dd5060d475145834c0b9aafb032bdceac9bfee4d3ea0ebe869c86bfec1fb65995b2a531962c40b9df69d4a427e81cf01164891f668c3000ee
-  ce022ddcb8c46d1ecc97187ad025707b33f763b1abed69a8cc33b1b512728267fe67ab45dd19e5f89463328950330db9ea5243df30e0f35acae48c4746211b79
-  560c43e6f684a726c10a547b6f95d511d63837521b6251ab3b5f141c4e9490c925eb049e3c6e29d1eb9bbe066fda9e5671a0aae8715f0946ee941ece77b5968a
-  5bd37933a9026c5af0facb34932a1cbb24b46d16fee9ee2b94313e3c7c6622d5ac0f1afe05b003a39cd9750cfa4f0d1f40455610b52d4c48f1e3ff108c2bdca8
-  37c5d9048f8ef0969a71bf422f9625fa768fac0174046f8cc5922534070eb38a89e467e78013c394702afe4af9045d3977d250bbe0dc26ce5059d5f4c8bce990
-  aaf2b4a0d7a8a9b9d29a212be5c7de43af47b80624e6f2ffc6fd1be80de3840acdb7dc91309bd59a0e1e8c8f510f2ce571d0be5587dcbb55caed32b0c400be5d
-  5db08621ddb5313c2e87e6f0922b66716cd1880eb479ca23ef6dbfcd52c86af2e6954dfb68569aef31061fe4ef0965111fab91f36caa12e01f76749bac0ae625
-  9acf3446c15e95f7f8bd553ce1860fc9d8181eb20472e3e435544ccea96d2305698cf89af4b4bce8a741c1c13f5b590f73912a3ff478fe976a7da02046877a6e
-  0f3cf93dc93f324b5caa4da8fba259164bb6bd58bdd1dc4152304a4000ef84b6191e827fa69a619a32c8edcdd3c66d2307100f6db5e934182862fd53e382ebc2
-  31b7185f3587e3f8cd660510908392e97cd664364fb4e1c538f30fc53012ae2703a4c2542b956099feccecc28d849953cc0259c76ea8b13cac8e2ae4a66091b6
-  5c195f9572eb9134d2616be85b4101ad3b5ca7f2314a061208238e8c22a3dfa4173da8aaae5923875776bc782b0e84c8ca1633e701b16a6a6f0847e99c28a1a6
-  b0825885c0dc76dd2aacf86bb662d6db400d76247c7071b2920f3c0543e6bea6c4d9752aa42abeb02b25195160eb727dce949be2dbd6493b5e4de6afb738f227
-  2e27aebb49e6c4ca3360dd53e240ac03e307442a26690c37e09e185a02531a13077181417bbf64580062820d67cbc5a8d87d297accb2410c85a00655bb74a359
-  e77b3060eddda40956dd6cebc56d2c754e9f9132afe346cbaba4b9f0df33b799c357a61d65cd8d469ae52df1419fbe31e35226c342a43ebbdd1ca09913d733fb
-  5deefc36b86a2bb20804a506df208d5ef87675dcc82b3f2faaa39ca08eb5ae2793a15aff61da7328234f75c67c3aff3c5a56e5cdabcc5e6b7c2225405b9967e1
-  7216d29fb344b7e1ad373cb41f3926a52e6fb7a3ba1313c3b9918ca7e8001d7b285d40d1ca0d06cf38cc29f8d16aabd28dbbdd7cb4270eff4a5357a60bcada11
-  ffbe8caf8b7c38dfe760d7007f9da9cff78c59814572a2bc3f3dbe41b00abae91d1aae54661e19ec5c836b13ae752bdbbda09691485e6f7546335435207f0c51
-  9213b4b91a1849bc1d659bfe97d78ac936204a7b68aaa4294840867950f59276a792b00f278ea2bf078b80ee187a26d1ad94be34beb609f0f321fa102b5c8902
-  4d4c267991aba194aef7fbcba6e4212e095aaf99b7b21255dc3faf770685effb7284eb75d6dec41be685f694736f101a15e7c6a09c877444c73b0c9ecf523a01
-  cf9e06f616d181894f6731587e917fa7b12f2dd89bd388dbfc3ee263595239908be36dc076b448932bd27a58f5fc95c5b8f39d53c0b487973976f036a660e9c3
-  504778df4dc2b19afe617ce506eefc6440931fcaa3f1637f1bbaa43fcc5b1f480d3e5223a3b0a3570dc73b08d6c2b77474b65b90ce9e706d4114431d53293a9e
-  92361116e3faaa39a93ca33e190a3ffb40eefe028ad30feaf2cd62517a4337af74bfebd00a7e0f8ee3dfc9e1b6d9fb69d26c360e4c80edc193c7bcbcbabd86f2
-  3a7ff8e5213d88727ea15fb63ebdbb6c1c53da18b203895f4ec4b4d42b8ce163eeba94c2cbe68407fabbd1290048c75ce8fac91d379d11e5357b0a0908e2da86
-  6db783b5581ebfddea5d3e27e0ac081f216252711a9ad1f0c88a78ca79bd7c0a76e21b28aec745052cd210e6282670824640b67016822cc312a508052347453b
-  d6cad457fbe801e0469dad7760f3dc434b09ae44f703d60e96dbe8882a9fce001d5ebfb5b86154eaddc898c57bd36ce540be5505f9dd67872ecdcf5a378bddbb
-  08a4893fb4cc059ddf4407e5989a21cd47efc4cbb49248b92638d39a5833f7a61c22d38a3c63a744417342f2a1cfe42615202bc19f4aa10c31e6efc3e757fa7c
-  610cca4845f8f7a8e4a5401a5247677d953d60ba9d936fde6d796f59ce545c103a229ff15c5511041fa7b6883ed622b5a0576f92bee9b668982bda191a748f12
-  5228910ca879655c32ccd6e87ebcaceaff34f370517f6f4dc02f9d34a724d0243a0a4512549bab3f6c9da296c527e73f30274f57fb35187aa76475166137e9f4
-  be389439dff009413c5bac5bc2a9b3ec98aafb9ed5be2c1429d8a528f9dcf9906f33f2f695d70f84e9940312a7e06c90bc9f8071ecb2bdd697bd7d6e7d69cc31
-  4d0fa955007c5ed6b3ab45da487bc569e0ee7e50d270ead3dea69e8e98b4f8fc105dc1e5876c2c1d35c1f5be97a48f013af3893214ecd1ac75f8c50d6db12446
-  4b2cb88b781c320b1230d65b41dcfbdb7120e2fc3acb30e679f7c143cacc293e07bf5d4e1c32910e9dd5952b17a8fb24d312a12553e7d7b99636c40d26d004ea
-  2ea6935fb9b9f24f901f34f6ad9982c8f523247992244b2f2cbc82a4558e73e9a401a6ceaa0b7d49b1b96c52ff145c1698d8e032bc5ecd81c313c7fc5d299224
-  d73c522a334c79ec68f5d3609d04585c0796d257435c9ae2ac19c5bca57c153b8fc45c045ab3fb3c26b2110eb9e1fd169edd6c67d6762a30b13b7bbe8bc00d79
-  709f86b5bae1a2d20ea78a35b84c4b60825090769bb0797c4958362d4c593e796a651801f3f52e2e8eb74f541945ad216f4f91ed633ed0d714fa4b13c88ab11f
-  0d6b27fcb5d9bf936215a4736877a605dd7279c9c3e4a30dd359acb373cc8413130855393e00e44f2465da980c5e18003f8b9c383e4fe24550234b06830e92e4
-  aec647729bff73a8f4a645d5a058ac65d106346023535197c13042e832f40f3e7c716b6c0f5ffc5071efe8a70138db5cf1edd36ab871d2b4d62729c151485d17
-  66fff3d844cf19dd606c87b21d61ca5b708693177e2e07b7496443b046c689db3670796f9979eb8e1705562f7912c9b0b55e588e5487184af88bbb4576db1dd6
-  02edefb82f8c80050bea8c34244b9475c56ee27331afa3660cb1c287b5e458bc497803fb0551f349490f8306a9484714d3e37202b65bae69b6193db3a338f39b
-  374015d62bd5e739438bd4d6946991448b545719be2b577e70efd1bae44d80ae05f164b234ba7dbc9908645d8d09882b51bd4576e2b787a1738e1da1c8da37c7
-  b7a9f867c1fa8d6867f23bdbc3cce2bc5de5524ed62197af58c64de79ada49daad7395c54795d588fdf48ea390c065c2648aa5f745072b58b16d8381e0c2c4fb
-  02113a07a1b326b961f3ffddbe8e5be7504d6d653ae5a9e1a0391c2f6f047cd59e783e257db717b6d31191b6c0516db61b3e729d9710b594d6cdd0a9cc396365
-  86840368f447eeb82ada6194ccab18cba8a293fa4803303041bff22d8639bba0099a1bdf93dd7b027ab91c675a42c02ccf6ba299986f1aa5f62b3fc5a6cc8745
-  16c08ab4088c44b3b09dd021c19669156da99e7a578bb91543ccd9a4d60a3a5d66d57b75f23b4c26c40924a2c52f9a73d02b61db1aae039701c3b881575265f3
-  e3c33cffe8e88bde6b6a1108de40809b2dc6ee8d9b861fed38d98389410d65856f84b8e225695283e8d53570147a2d12bfc9875a527b9e2f383249091712f5ea
-  29dfcc4f4eb455eab8eee90ee1fda258fb24b0679d73ac6b63085e48795c7218ac941e73c9dd691105e63907f8b5cd6aa067628d45b6d4a8c19e829f1ef28ca2
-  ced0dbdfd1f5685811c8984b8eaab67698eeec134d34852b8e64f62e426ddac5c0c2d6130ec14d4c0d374d5333b5376aefa256befc98bee77daff64fd7d0ecaf
-  c49242218db2c982182ead1ce91b72ad8e315a1dff8a327185cb2718eb27cd5381b9801e9bd287cf82a191d5618e434491246404a9801da95d37e0702730771e
-  44fdd428b0eaab6a6c879c940fd499d49a184b6e11fe73eb23534a7f6e069d7535c43b6364e17398e75b8fa420edb50efb2cd9e6321759171ad944d37c4297be
-  2f02da6626bb6f2b39c33ba761048a3219b11a7a1e0012e28e6b99eda194a12e467443716a5f3e3590d764cf96912d782fa2013f18c15df0694d58c380dfb665
-  9223386933582dbff20c40f84f6a7c60d86f3015de7a66f2119a616dc8a1ea1f148d7b726167dac72fed4742ff0d9ebe02660e99d22fceb59d557e718c35b3c9
-  1af17d2d25db68d4876f25e4d624d28f7ee83517fd3e8aa1e404b4eba82b8e6c9fe25ecf62593c737260ea969089c9be9ac111cdca45a8f32a10d88c4d76dd01
-  e8735e914db6707014a9e23cbde156862f113f9d6c83f1480b34235830e73dc1efddfba3c8eb692d3ec081de7c07bda6d467203498b4301a22c440a71094df4c
-  ac7ed3ecea34d585d1d66e00f84d946f676aadc5987596f324a51f72a55253c665577ff88f7d197640d33c721331e60b721c386018e87cdbc287461f74b5e3aa
-  ca8bf664228145b559e7032f225f585cc8cd606c53d81dee79f748e6197a42c58f0587a1d21ba282cccd4836b336d92efabfde8e523f4ef3298d40a0bb7c95cb
-  f40dcdbc6fd7bddac1a216af6796fae520a799863d559f57aecc2c6fae880ff8cdb6630ffc6672cd54c270b1a2e246d98b352437a752910199938b4a0ba38c0a
-  92e4a6140e0079dfd6f733a203e802174958829b40d46c5117c46fa9d278ae2acb5a51103486557b7ca09dcc3c432150b98963c8f4522d4cf75ecba7ae481eca
-  9a8f364eaa8fbaa241867bd85677b0258d39cefadbdce9bc09a34420392dfa7f1feceb56558a11666b7e9136dc420881c21705acc793bb98d2dc7858902c3e1c
-  edef438984bda3cfb48a5bb33e00613465c9eb51308eb2b77809d09d40fc9fd606e1f41fb5acb6381991e51d42d789efd278e3c7dfdeae03418700c4501af1b5
-  a21dc8a5c0bf621be61a612fad44d02bdda488e3eea528f54cf799430926d3ce3caff36b7a7ce5ae622ab4c8b5a1d93420ae01b646feeb41995dd0e6f6f1cda1
-  2f0d5222de35c08bc9197e8c89b1b0052164284207e390abaf436744badb77a3afa0832342649bcb4b94372a60f6deffae97fc486e4a84916e4a4630dd22b7e7
-  10b76868670c74b8a761189c410f1c174dd85b4f76b00aa7bdd497959dc4f584f2f6c5736cfb17f08ed8e6e27db6f82a206badc58653ecc7f765e2a27771651a
-  f4d1de91f617b2b72eb251b700bc54cf101d31a6b7c28cbf8f69f5f409e0e9b25b1aa1e1e349002a5af899edf28c6d36a16000de41f57f2a1fddd2d1ae45fb91
-  bf6a9f5e7360d9b79f03ce79734d9814167d96443c59eec479deba6fb7cb78beff323873c166ec99f1256d3768c1740b37d1cb5c531a2eadbe5eb9988925ad4e
-  e7157b16a6f5524ce1637d5f7e0136949f0cbcb4eec53264863a91388750a202548df27abf5b64a63697c12161e832fc3f1e8ffb4d06b05e22e131d06bb2c579
-  66fd746eb5e2b0ebd05d3d0c645498d149217927ef058da118e558a22bdc1f5e8e3edcbb0dba92dfc2a6443eea25a1ca35a41d1535172dd00d140de9f9976944
-  738a5529a9b6a386f8fa49f2a08b17d63589eee3d3384644988f384dfa758963afc93b019fe0811997464531b23f7351b22ff39b9087e5c173b324174c70f5c5
-  f3e1825879a37d561aa9c460b4b405225048f20b782a14ead6287eb62cd273ea72aee046d50e34c3af43e59bcf9449e801399a41fd8f42dde05c48c419971ff3
-  e26985e1443beb7f403a0cd68b1b751cfbfc66a4e467d50f69a1aaa39179b71291a421ae28d7e13c5d38a9606db63adcb256e1ff9529cdd53cb25d0bf2826384
-  27cc10d779d20d526b98bcb3cf6b7e355735f29ba2ab67579919989067a816e7aa6668f9f995f04e7da3f0e14f0e3a7f9bcb74e4e321cfddd83c947a7ba8c882
-  81462218ca3e24ad703435fbc762041dc3060719d4846d1264a678ef4bfb29dc88ba6fd80da6352942dd24a8c466f731b5fb42bea04b3a07af29f2bdd1e0a265
-  2e3a4b33fcdc65f6b9482ee0f8dd4baa7b3323634725df3414ab2273dcc71e0b004d0a5fd24019873d23af39687354f60d1cb2255dd74307eec4f356ed84ec91
-  187871334a815b1084ad3ff0ba328ded8573a987878cb22d8546e181fa9ebc683288a352389ce4c7fd715537c400f877488570e3c3a6e7232b77ca94aeec5546
-  cf33b1f63013d1fabba6868178f77075340fa946a03f0d936ec1fdfdfdfb58a4c59d21e2b8a8a0663306d05747220e951f17d5526ef6acd872e70c7c4084c18e
-  c18524862e76289187aa5e541ec11b3632ecf410c247d99aa6e29f73b5038b32e96ac8a6b8ac45671220ecff5c1d7837570dac4e65337e8e18b0e0938b6b8dfb
-  23ac9a28661a9befff8410b15cd1a1d935ab0325f0f7c96ac363e8561c0142d9fb912bcaf75b6983fb3c705160ec2eaa44c3f19bd950bcd25c4d9e94f3f707ba
-  bacabefa1703d0444087e86aff908ac4768a4c07ebdc51fc0f80b417850001bf90561473f316a1d2de6e4a68c92f59876218bf29fcacd84da793a90dcfeb5482
-  7edbfde7bd76cf23c68520b0fef9de128c5dee9a19d3adc291aea0695754470368dade75092a5d476a4ca18ce907efac0f3d567b62b1b65c6711f013c5ecb6de
-  04b2e1f09af6983905aaf8538333e4f42d4df856e2c9e6aa14c728ee2d6336f567734129e9a5aca1818f778d3ac81a2d5f0e0129024a77644f9a4318bc59e8a7
-  9d24a29788491eca45b893210e53eecb5eef326e8c9e9d0bc72a29dc2e9a9a369ee910759bf49f50d8d592a6bcf667ab325aa6523628e4358b1543cad5b81c5b
-  9f2c1975b5bfbad8348de2d64f453828b6e38747ecd172a902093cbad8846d96b0d43368b28437ec96516517e8091e60564dd9e264218a4e9e6add83672692b4
-  32d9b993a5453fcb2ee64d853fdde16ddcb1589a393e56dec3de03481bc19f67e2c73d76bcbfea26864d90dd127091aaa8e278f114b8a0026ee59662a3fce83d
-  fdf828e81d039bb35d497aff8a1770beafb91f3a9c53ecbbb6fda672b989648731640a876f7f134fb0956c65129b1923712d363d42f08a54288f0c75bfc57dff
-)
+sha512sums=('b6ddcf75c0ff8c542851be45147dfe22c1a73c5e4dd59ce6543d5a3e7bba70be3576bd280cbe53f479bfdf5c3839561484b0f9e93ca061bae9ff25990a7e899b'
+            'ccbc42363a5c0927404175d1d2abd1a039582789464e3533ea018055594522d25bb78cddb587c3d97f6747683e57a3f8ef387352756574f70aeef007bdb48e43'
+            '102c77a69adee2132e063a8d831cc0876b184100a36cd2a8a34be80cdbd4c9a5db2490d01b0329725fe4077b8be71c684f57fb71131bec35a1d2bc06570d09bd'
+            '0c6852c488ae71bf84b0cf09e605aaa6d465f67a81fbe6a0a608a63c413d2574b059e8596fbd3476b4c247246ef0600eaee9e5e514c5beea5306ed94d685111a'
+            '78eaed8c944ddf9ed2eed1165f2d55da4835aa31dd9e541017b528ee065f01907ac2538e7c2995ae7df9878c4395659431ac6ebcb63eec06f1dab0aa654b6f2c'
+            '56f5764051f9d2b1d6501d0c55953252359722fdef3364925275d890ac0eaec64c7d3f5ab674591217113f67041b6558dbec7448a172ee1a3d0e6728dc82e6dc'
+            '35c3c2bf8df1821fe7e88d3a25e1d05780c3376349c6d2ef5102016bc8f3dd5b474dbdff567f8eb81f01e9ead80ea251d8d0a97c1eaf378e8182d499e4163d1b'
+            '1ec2afe2877cd6237bec7edc9474d9f53410fe6bc401e5f22c8fe1545b3349ce2d273c8b926fe2e49d742a366d520d494b09a29b8103194ef43f255ab5c72cf1'
+            '16e7e18ed3a549767128e88edce8bc5510e609e61c016b7ae472cd292129f1a97a9bab6d71c85acb2a8999ae69ae00cdf74d7b0661062f843c693fcfb3c61cf3'
+            'f06e6d5a54ff1e02bb8ade7b52f229e1fc686b3e783f8409563698293bc97431b08c28fc33490617a6e97187f0bd25297ab41339cd55a6db5d419b912f110742'
+            '2132a6609004ae4362819d4a32c9db64edc94b5fad6902bf6c0a91e8c77828d028fd2444c7173ba5e35b2925e34d6914d788b9f2572f07c71605a21ed6f3e2d6'
+            'c6a43b119d720784d4757ff10e21d161689fd538869bdc28af161a244eee602aba9ed5089a8f3ccbdcd2339e756543f3f636adc235a0a1136edc144ddfccc045'
+            '73b332b86150b3acb163b7e438e4fd84fadddfa284619bd4664ce235d3979a2ad548f56b31a60af45b5005b6eef58d3177b9d343f829ff630dc7c892d73069c7'
+            '30ee0d37261826727003292434f94606d83f56933ff45a78e26160c32fb360752ca3a46a225b63e46f6091a7f4be7bc8ccce01e4af6d03e3d955e107df3dc192'
+            '36bf0085d7e1751a3845afffbc48bdfe97fee324ad373a24515e2278e9863f1fccead5cfd3dcc4257c68a6ee571f74b5d564496a7c859e8d2708db4f3dbc0e2c'
+            '79315feb9f32c6ef2b879902db479f9641ccace17f4aecc2d8e60d2758cddb739aecc1cedc168361ca5013afcbc65552227861c9890da6fefc52578bfa071f02'
+            'f092ce7de320fa4197039c727471b3485ecb58b21789e17d91f78c00eb294f5d59cc30d9c12dde56f1423517a2dd0d376ccdecd4a20f6ee429bc8d68abe6c58c'
+            'ac64bd3ef7d8bbc34a75d8769f7d167367913dcd48037344f4bd1664a20d0d957da5b4259f14c1bb1039e1700fcd911ebd363db51d77a058af97f319f3cf37af'
+            '762b19770395840066d7ed7a783737ae2b7441acda2b81a43ee660dc73f349016c5c0d76eedd7770179adc98855e9f8c4fc7c07f34aa226a6c0ac873bb2c9199'
+            '4eada162fd7356a75463d6a3f6e9a85348f578152be7ba8ebc7f720c89441be1c5cf1d1ecb87bac07fb5d58d144a62d89610f01e76fdac960e6452ad14b48640'
+            'd9004ddf736a599791516bda109641dc73f3c0cd75c57f4dc0f4eb38af7edd4c43cd679affdd787ce90c620eedeee4d4b57daf566ff45abe5296711bdbd361ef'
+            '28b64dcec6f5b80962c40e3ab24dd9e025292824e77421db415022619d1e93f59ef4e3bebf2d99aafffb7dded9d50b0a8828368dea1fd349cffac870293d547f'
+            'f9a0a0528f9e9eada477b9025b5ada3b331dccb9b813b8d6de8795888f8c2ba5ca83224b66c7bbc6b628bc5ddce412d02fdce13bb02cebd0368ed326fd985455'
+            '2eb64ec09e717c2bcff31972879cf5f4f38bedfd6c7e104c9f60c6112a0b66ca0b2a8bfb6e1fb8b0b917dd742e6a0294c7e63d950396938880fa2a08780028fe'
+            'de39689bcaaaad0d091cb629c8ffcc3d547e38cc18803a523e4dfd19261a73369d05dc516f9fd070416656f0b8525b2167a1a91e1f52dee566afbbde67546dad'
+            '5710bd570db458d7f380d1ef67f6916ae8b5aa168fef6148f8c9939eb0cf891d7c231baf7b82d3a929100ecdfb41f1697463493279d85782ae20ae8e1f723f27'
+            'dc81b95d5c0288b7b18f6b83385b5841f53be315d00283f7bbbda10546ddd1c6da8962cbcd17cdad596b80792430b9e370bd7504396148e9f3b7ecf6b67a3fb8'
+            'f99bf5afe15f8160c013aa61e117480962b41e3f07558479949e47a78deddd30e5edab92fbb95fe9fc5691cc758e4cd677db77438169db9b728ec859d0ea9be9'
+            '3876d605a77ba69a5c465b323af11bf465b5d3018a73d9abe3967d2efb581db44cdcfc1c3882b057f0341ff2c4a0f4a47644d621dbb82600d971b9fadc308c07'
+            'eb6a2f1c3cec49b87d3589d30e47fba7f5bb7988a9fea9c453c001a0b6b7efaab537eeb775beaf9340836a505141654f908880b2b87d017c3ea10df270e2bb08'
+            '15b55e38071b055b415a35ea6b01d62967e716f05a77d3cf0ca4579526705d8d95418517c62629a2c8bf2a4d4bd164bb562053bd062920327c7f46d6ecadb258'
+            'baf7e9d95af4a10460c2181b0e061477d19dcbd1f7ea07fcf57826663fd4bf289a44870f9f1e0b87491bbdf8c98e9c8cffc1166fbd85738e81fabca5ae2cbde1'
+            '63195a49b46a36281bcc8929bf60330bf71e0df573bcb84e88168785131f2a686d92a5d4cf0dbceeca8b98ad8b965614db519775ebb4201fb36d21aa63740acd'
+            '799c78a46d3e0f680530512296af06566c478b39036f5368db4f1dbafd03753e22b8db787fc8f10e0956406fb2af20d235e4a2db230231c7523bc10a9d0eb608'
+            '06ce49ad0b1ea766e5d9b4098977cb98d9b07501ead5288c943bd4aa394300f9d7c540000b8b6501dac70aa0f07a0f34c12ef405e98d193a8ccd4fdfddaf0c76'
+            'b4295f5c8018852ef99b704d976c72c0d6b1a1296a88ea8aa5a20afc2612ad5f6e7cafc78fef1b5efcc3a09a11a8f929fbdfa5f927fdfd1a237786ee23ea0890'
+            '41af25a045833fad8a2df8682466ea39278e71b560e356557ab8b5aace8cb7294e7e8eb868ba817b5027ce86badeb53caeab4ad615fc9d6836bdaa8ddacf589a'
+            '6b86ed5850f0af5a8ab3e982d8e568b49eec7b0ea636793d83fbbd2da49e66ff42be3a4ba03da79c04b091dfb966c366a73683bf7f12dd6a87875b0137c781a5'
+            '7e244e0b924a6ec524a4a8aa8f100785ba2e7a9a76d879b44ba7ad0cc21bd28669099203e81c68ad205bb9a62e384178a2008a8bc2b81133589fe103d924e4a8'
+            '55f1bb499e89c8668674534a0b5455d7035ecf190030cb244c3e7ed5fa30dda362bf162aa888d224fe8bfe6a2dac1bdb5fa37208b6613795bb0f6e1c7f328f9e'
+            '613fe8e67dff63acb99648b16c364df9ac9cd1000a694d4500dc3fa82ffa40a32664ec6af0ace72527358c54793819758f9db34864737dd24f568eecacc9d034'
+            'ef1f0f6c581a241d9641cfde319e3c827e6192b24848f32729b46d042d81c5d38b63c390dd9f6de07b022a2af44675699304426d223facec574310f49310f3fa'
+            'bf83bdbf27fa98b9b2bd6e1975c2c9ed978cccf20e30e0bebce7db9f0175ef7e64826ec04eb156d3608514b238e42a48c02094404c49b3cd8d6e225bb7ac9289'
+            '30590eb19cf6b3bc91211054bac3b59b211c4f24985643ec441a62346b56964b3f3509d8c814345be812ad424b47d5feca29e904fda54f1ac0f41f38781c7484'
+            '089eefd02e48b87912e4f7ca6f59f202a4f70809b6dcaffdd626e01454788a1190c89529e6952b3b53738f1c33c6888ca696b0039f0fd2bf041c78fb20864c52'
+            'f542e6664dd496c02c0ed31ffcae98961a0b5eb09fb6253c0342161753e35b2abaa1d63da30b7b46ad76d1daa75b234e6d960725cc105f9ad5aa4952f0848411'
+            'f8345f06193913910530709a7c2f0db346bbcd8d61ab284cb148f0d79957a02a63cba29255eb9c07f8b0b78b509bc182c2e6621926c6e1ba2bc7d22b689b8823'
+            '0138d8102177e49810a7c870f642f00d967f50b6c67fb19031ab738a345bf54cf6d4301156a1e3848e301105ec5a23a3e8a086660a56b947da5fe49c0482de9d'
+            'eb6b299e8d449d8ee9b55737e6c8544a047fb6fe3712ee7af5ab170ebd2511fd68783f26e053dcbfc6b3e5499d49d0e5e40751b3d666eddf2d522fea52515449'
+            '3f3affc89f9882c551458fe7a1d6ceb88c3d306e6ea33d374330bd68e797210fd57c58a144c150c22bc9ba5d4d0a072e3547720990a46d511dd39582d3144256'
+            'e74551b7a0b983556dc0d6abc1cba0249592db640c1ebc1ca85fe16581c9270be164e0f03b6597b2442ffb25debc5fb5c9cbe2cfd4b496ef7aaab3b392a90af4'
+            '296953b90b1b0e997d6f26261895c41124f3994a324639631757ad4f929b90484d339d7c39b2bd61162962aa711a8fc3106e39d894484bc2c1a9aaa19d1ca527'
+            '2953a1e268b6daa5c975ae474c699d5d666e4038bf9c9ac9bc43cbcba8595d6ae2b9d7ee276dd5e7b8e5aa28748266881ab08cab6b7b82f0300544d9db41fad0'
+            '4db9a7557de060401e983bcb941c82de24d28a52735060b0d0635f74fd03691d50917911a0d37361155e8d046b4f1276b4572aa5f5ab1d93b8e427562cf8c5c3'
+            'f741090c6ceb77dd32c3e2f7ed3bb333404aa1baa3403c9ed2555ae460af2a35aee8bf78bcf0df6ab2e62c7fbe8994c99b3701a7686201a6b0aeb8759480f0ce'
+            '14dc9e7baea0e6a69c1c2eb4fe40d6e73176240e5188966a8e71e9f443c4a1314785b83725bf95138751d21f0c5528af485dd91e82a70e3247e031796cc9f674'
+            '9339f2dd572e4856d83d58cf430fccdb7402726ce8aad598bdae4dea5c44fab85fcb8a6e4662ffb291aba5239fa897ae7b2175d43c3924d9b655ab4aa07a5c12'
+            'b6ecce0111f7f19f66dbb5272642a1cb49ca86ad66986d8068d6f7ec57daca37fb4bf21091eb571369a9c13b2ad362c9268fb57ed746a4965ed3f1c2ceee0b7f'
+            'ccac4efb9f646991ae8edbc629286a443ace2526505de8940f1c689aa03e774b95354710c5cfc4437b05061f33e196f99deea9b9a4097bffe659fc44e81905db'
+            '6bf2e0a8184dda096e4756010854abe678716da2e67f305a74ee781f2fa530f131b69cdc0ad028d73de74af47a0c63d8dccd150d7f5c62c0fda117898667e8fc'
+            '3447315c1301eb5cfaf9b5ff2182b8ec59028edee886dc0d746d38d9118a8bbb12496c4c7b8ed0105b825a305357d69378c9ed81c219146a5369426af51bc89d'
+            'b642f47cf12951b471eb88a827b446b93bd5be2e4f48f79f063c158330e571c364ed99e9db52aa46c3fa4bf05ddd4a453c170251e78ffefc0231df8226b54fab'
+            '52627d61d3fddb87bbc9bd0ff9285c7a9e02dce5b581900b81b67da3e29c5348d27c39e617955d67429c2463f390aa7e1517f1c169c99968e165b95c4c1cd788'
+            '2106e376a6489d8f3c7ac8de416629c358700b2211003ed62304b9c807abf2874ef0fc302a2ddc365b78eeaaf96e18efdb2638df53d0bb17cb25547754001315'
+            '94602a30a47096ad5b513db79e0ff6f9ae772ce1615fe7a96b59bf5167ae9f51b062939318b07fe4112f61d21ddadd63403c501f28e6b05972b57e7bd6d1fc3d'
+            '8f00a33b2e4e3ca4e3b8ef2bf570b235c1adb9bafcff72e57075ac23d7bfb3c4251b789ff297c1db26c67cae9b5450deefaa1e29be5f800fb83556757e739aee'
+            '20e960e0f63b47edc11ab3dc7821148e87ddbe2862dcce88d6683c2a029d898d37f222aec0f0a74437d722eaca969735268c361e6f3fd1ea0abb20b648216ac3'
+            '7120185e1bd4651a9ea04b6df44a38a06983673289fd730b0bb01cd5e5421157f000b6fbaace5108bf27f3f481abdb25ae37cce429a4903343b1d4d7d26fc89f'
+            'd019d132fbccd949e3c3d1431af404c91a70f2e1ab8453d2c4d181d296a6c1e04faf33c8a40817214b3942e49362c213ddc0ef27ca28abe0a5207cf38c8f0cae'
+            '6043baa68dd7416d58a05f79dff945d686e43ecbcc6887d095b726863fcecd82ca44c443eb7418271a94d2500a6a7be3986be0845004faa7019ce85c78fbdc46'
+            'eda161269a3d765e8f7c459c801a614b18a0cec532fdd6adf39b8dceef4ab300302e89ee124369416117e87aa5c2702828ccd629703477cc8b43695ea60d3a25'
+            '120a98b28b14c4c3ebb65686a0e80b1c9055bf0b800c09b7abfb7a55b69040ecd582e068eb0330509bdd7b50ae1c4a2cad1497a9948104185903145e849cafe4'
+            'a53fc721cdb2359b353e118ed063a4450b9bac414e50c75229f805eeefabf50ba56e6750f7d8785e1a44305c1cb65937ce4807fbdc9b39fa190ee76212fcf83c'
+            'f10d6cfbebdaaf03147584a87d0d5a08e77b0708528b4936f1dfdd5a3b0586fc011ed55e79d3c9f852c8812f64f4bef4b44b4732bbdac91657f1b929041b008a'
+            '382aa46e2063d13cf0def1dbf3d975b7e46e5aa752549ed2a705b445c77e8cb2788c1a457bb6eb498b2b5c712d0ef577b83970dd366e6a0301c1406bd3bd453c'
+            '4e827413807cd1a751bd60cbf4f77b289883e88a4c76414ba6467dbc9c7b34397f2c8b2468b6ded8f96328d8fb5e3db022e14957329cb345c17ac80eee446196'
+            '59df71086abd10f71a2a90bb4fbcca16bb7d397c437d1fa3d30f8b20aa79aa4ce7373e57b7c0985356069e196106398a9084a0261d13bfc2d7361a62653e7d78'
+            'efe0bd64ad3b65a9371b11c7c8f7fd49fd64cabfc4a8c920f49da620bb96f4f884c7ff608d45df8e02c59050e7305d8746f3293720a22ff9dd5d42768a2b7c65'
+            'b9c5bc90c92aa09ebdc9755111ac77f823b1f25f329d68549731d24ad04aa748fcb721bee88827f98b90f4337e934cfd01be7a8f1b61f8b2d7c5e8ee99b33ca2'
+            'b0a10a75106b1932d0c9bbbde06410951758685693dfafe761c3460976a702b26739ca954c09983b9d00e89aa93ded4f3d9894640d0706902c15f626211185b5'
+            '3a5ae6dd61c11076bd4306a2a46215eef72398d6408bdad2d1df5544ba221820ed761ab4e070f7a04283b38489e9b59432857b24c8ec6b3fd963658dfe7ca37f'
+            '162ea29214d4a08861fcf1ac01ac1b3502947f93d8b7b15f1b547ad966b7394089731224b5cdab0351a63165673b60ca3b66af7051ce4ac3e6851e146e1c1390'
+            '52239d8a7eb7af80401399510cbc4988131ad2aecf1fe0990498e5e0c6e1002e95b36fc8b94463661083348c2967548983ad47ce6cc4081a39394f27478433c4'
+            '965ed8801d5c857f90734837afe9d9d8f4931dc1eafe7bdbcf5c73d003d00e9d9175970cfdf62acc325bd93229dfae276b6b2481b48ab2198aca4a5d701bf5e6'
+            'cd49326639793d6fd115ddd61d38606575d11bab6c6a9c123800d924e5e720ce9a102ee0bd8d3d3e9ee1a0700da1b5c9058760dce9b9c752cf19bc93e5137a7a'
+            'f93bc631c340ea0211ad66cf270cc749a4b5f771d7b4445cf17544c0274cb75ddfe9529ac33f9e2d0103604e6102b88445c725d5753b5634fabb5cfb1a5be7b9'
+            'ed99a68bc4d59376c292cddacd7666de7e622e1a1737fa0d560d186e07f196139416f44c9ae8aca4823d9251d98327acfc2dd9f7e2ac88884f6ca517b86940fa'
+            '220fa866daa4a691d8f785be4744dd7efa0f1fd96456cd64d3958afaf7d201028d11dca313a7943cc11098606be6dfb1b202d5f0e453868f71e1e17d7fa68905'
+            '2ba9cd3a40ce4fba8cbb09ccd09ca0f1ec1170927c7c019349620c047a852ef1c9acba06894c81b177a150d4f2429d048a48c79a132c17b2a66a52dc44f0b876')
diff --git a/libre/icecat-l10n/region.properties b/libre/icecat-l10n/region.properties
index 551605dd7..fe7f265ce 100644
--- a/libre/icecat-l10n/region.properties
+++ b/libre/icecat-l10n/region.properties
@@ -10,12 +10,6 @@ browser.search.order.1=DuckDuckGo HTML
 browser.search.order.2=DuckDuckGo Lite
 browser.search.order.3=Seeks Search
 
-# URL for site-specific search engines
-# TRANSLATION NOTE: {moz:domain} and {searchTerms} are placeholders for the site
-# to be searched and the user's search query. Place them in the appropriate location
-# for your locale's URL but do not translate them.
-browser.search.siteSearchURL=https://duckduckgo.com/html/?q=site%3A{moz:domain}+{searchTerms}
-
 # increment this number when anything gets changed in the list below.  This will
 # cause Firefox to re-read these prefs and inject any new handlers into the 
 # profile database.  Note that "new" is defined as "has a different URL"; this
diff --git a/libre/icecat-noscript/PKGBUILD b/libre/icecat-noscript/PKGBUILD
index 60c4d2d5d..0ed0ed507 100644
--- a/libre/icecat-noscript/PKGBUILD
+++ b/libre/icecat-noscript/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 97930 2013-10-01 15:58:44Z spupykin $
+# $Id: PKGBUILD 99237 2013-10-26 10:36:31Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
+# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
 
 _pkgname=firefox-noscript
 pkgname=icecat-noscript
-pkgver=2.6.8.1
+pkgver=2.6.8.4
 pkgrel=1
 pkgdesc="plugin for icecat which disables script"
 arch=('any')
@@ -14,7 +14,7 @@ depends=()
 provides=$_pkgname=$pkgver
 makedepends=('unzip')
 source=(https://secure.informaction.com/download/releases/noscript-$pkgver.xpi)
-md5sums=('955e4c5706a73977c09d7b4d0bc6dd9f')
+md5sums=('3096cfcd43988c7a2f0caa031dc74d51')
 
 package() {
 #  _ffver=`pacman -Q icecat | cut -f2 -d\ | cut -f1 -d-`
@@ -23,7 +23,7 @@ package() {
 
   cd $srcdir
   local emid=$(sed -n -e '/<\?em:id>\?/!d; s/.*\([\"{].*[}\"]\).*/\1/; s/\"//g; p; q' install.rdf)
-  local dstdir=$pkgdir/usr/lib/icecat/extensions/${emid}
+  local dstdir=$pkgdir/usr/lib/icecat/browser/extensions/${emid}
   install -d $dstdir
 #  sed -i 's#<em:maxVersion>.*</em:maxVersion>#<em:maxVersion>7.*</em:maxVersion>#' install.rdf
   cp -R * $dstdir
diff --git a/libre/icecat/PKGBUILD b/libre/icecat/PKGBUILD
index 43126e355..0721a71f2 100644
--- a/libre/icecat/PKGBUILD
+++ b/libre/icecat/PKGBUILD
@@ -1,10 +1,10 @@
+# Contributor (Parabola): André Silva <emulatorman@parabola.nu>
+# Maintainer (Parabola): Márcio Silva <coadde@lavabit.com>
 # Contributor (ConnochaetOS): Henry Jensen <hjensen@connochaetos.org>
 # Contributor (Parabola): Luke Shumaker <lukeshu@sbcglobal.net>
 # Contributor: Figue <ffigue at gmail>
 # Contributor (Parabola): fauno <fauno@kiwwwi.com.ar>
 # Contributor (Parabola): vando <facundo@esdebian.org>
-# Contributor (Parabola): André Silva <emulatorman@lavabit.com>
-# Maintainer (Parabola): Márcio Silva <coadde@lavabit.com>
 # Contributor (Arch): Jakub Schmidtke <sjakub@gmail.com>
 # Thank you very much to the older contributors:
 # Contributor: evr <evanroman at gmail>
@@ -13,43 +13,49 @@
 _pgo=false
 
 pkgname=icecat
-pkgver=17.0.1
-pkgrel=10
+pkgver=24.0
+pkgrel=3
 pkgdesc='GNU IceCat, the standalone web browser based on Mozilla Firefox.'
 arch=(i686 x86_64 mips64el)
 license=(MPL GPL LGPL)
-depends=(alsa-lib dbus-glib desktop-file-utils gtk2 gstreamer0.10-base wireless_tools hicolor-icon-theme hunspell libevent libnotify libvpx libxt mime-types mozilla-common mozilla-searchplugins nss sqlite startup-notification)
-makedepends=(autoconf2.13 diffutils imagemagick libidl2 librsvg libxslt mesa pkg-config python2 unzip zip)
-options=(!emptydirs)
+depends=(alsa-lib dbus-glib desktop-file-utils gtk2 hicolor-icon-theme hunspell libevent libnotify libvpx libxt mime-types mozilla-common mozilla-searchplugins nss sqlite startup-notification)
+makedepends=(autoconf2.13 diffutils gstreamer0.10-base imagemagick imake inetutils libidl2 libpulse librsvg libxslt mesa pkg-config python2 unzip zip)
+options=(!emptydirs !makeflags)
 if $_pgo; then
   makedepends+=(xorg-server-xvfb)
   options+=(!ccache)
 fi
-optdepends=('networkmanager: Location detection via available WiFi networks')
+optdepends=('networkmanager: Location detection via available WiFi networks'
+            'gstreamer0.10-base-plugins: vorbis decoding, ogg demuxing'
+            'gstreamer0.10-bad-libre-plugins: aac, vp8 and opus decoding'
+            'gstreamer0.10-good-plugins: webm and mp4 demuxing'
+            'gstreamer0.10-ugly-plugins: h.264 decoding'
+            'libpulse: PulseAudio audio driver')
 url=http://www.gnu.org/software/gnuzilla/
 install=$pkgname.install
 source=(
-  ftp://ftp.gnu.org/gnu/gnuzilla/${pkgver::4}/$pkgname-$pkgver.tar.gz
+  ftp://ftp.gnu.org/gnu/gnuzilla/${pkgver::2}/$pkgname-$pkgver.tar.gz
   mozconfig
   mozconfig.pgo
-  xulrunner-copy-stub.patch
   libre.patch
   $pkgname.desktop
   $pkgname-safe.desktop
   $pkgname-install-dir.patch
   vendor.js
+  icecat-20.0.1-fixed-loading-icon.png
   #cairo.patch
 )
+
 md5sums=(
-  c88a29aa92fc41a07e777a0e63ac5f7e
-  5154141da7cf38102927e3addb49ccac
-  383e8e2a97a8b13fe56d153adb6878b6
-  3009b176cc5f9b1e416b1bf7c45b064b
-  0c358e8357e3629de6982246ace629ea
+  0d3fdcec3f5fde494dedb595387e8f21
+  71dce16848bc51503a154841ce99427b
+  df08eaa1ac3bc6c2356be4fbf8ec8932
+  b5198ac730fc09e3d0297523b28289c4
   b41f82994fa056ffa5f8e6d99570e27a
   b30ba2b5562558d510fdd09d626d0faa
   64826fcf48816b13090042eefddbaa58
-  2c48d9feffb909df35b552f9c5c555d5
+  1dfa11e781950a969205e83840e9741e
+  6e335a517c68488941340ee1c23f97b0
   #c8552d030494443218d88792f4dbbd0f
 )
 
@@ -64,7 +70,6 @@ prepare() {
   fi
 
   patch -Np1 -i $srcdir/$pkgname-install-dir.patch # install to /usr/lib/$pkgname
-  patch -Np1 -i $srcdir/xulrunner-copy-stub.patch # small fix
   patch -Np1 -i $srcdir/libre.patch # Remove Google+Mozilla stuff
   #patch -Np1 -i $srcdir/cairo.patch # fix cairo
 
@@ -100,9 +105,17 @@ prepare() {
   # WebRTC build tries to execute "python" and expects Python 2
   ln -s /usr/bin/python2 "$srcdir/path/python"
 
+  # Use gold, as Mozilla can use some of its features, such as safe ICF
+  #ln -s /usr/bin/ld.gold "$srcdir/path/ld"
+
   # configure script misdetects the preprocessor without an optimization level
   # https://bugs.archlinux.org/task/34644
   sed -i '/ac_cpp=/s/$CPPFLAGS/& -O2/' configure
+
+  # Fix tab loading icon (flickers with libpng 1.6)
+  # https://bugzilla.mozilla.org/show_bug.cgi?id=841734
+  cp "$srcdir/icecat-20.0.1-fixed-loading-icon.png" \
+    browser/themes/linux/tabbrowser/loading.png
 }
 
 build() {
@@ -111,19 +124,27 @@ build() {
   export PATH="$srcdir/path:$PATH"
   export LDFLAGS="$LDFLAGS -Wl,-rpath,/usr/lib/$pkgname"
   export PYTHON="/usr/bin/python2"
-  export MOZ_MAKE_FLAGS="$MAKEFLAGS"
-  unset MAKEFLAGS
 
-  if $_pgo; then
-    # Enable PGO
-    export DISPLAY=:99
-    Xvfb -nolisten tcp -extension GLX -screen 0 1280x1024x24 $DISPLAY &
-    _fail=0
-
-    make -f client.mk build MOZ_PGO=1 || _fail=1
+  if [[ $CARCH == i686 ]]; then
+    # Work around memory address space exhaustion during linking on i686
+    LDFLAGS+=' -Wl,--no-keep-memory'
+  fi
 
-    kill $! || true
-    return $_fail
+  if $_pgo; then
+    if [[ $CARCH != i686 ]]; then
+      # Set up PGO
+      export DISPLAY=:99
+      Xvfb -nolisten tcp -extension GLX -screen 0 1280x1024x24 $DISPLAY &
+
+      if ! make -f client.mk build MOZ_PGO=1; then
+        kill $!
+        return 1
+      fi
+
+      kill $! || true
+    else
+      make -f client.mk build
+    fi
   else
     make -f client.mk build
   fi
@@ -133,7 +154,7 @@ package() {
   cd $srcdir/gnuzilla-build
   make -j1 -f client.mk DESTDIR=$pkgdir install
 
-  install -Dm644 ../vendor.js "$pkgdir/usr/lib/$pkgname/defaults/preferences/vendor.js"
+  install -Dm644 ../vendor.js "$pkgdir/usr/lib/$pkgname/browser/defaults/preferences/vendor.js"
 
   brandingdir=browser/branding/unofficial
   icondir=$pkgdir/usr/share/icons/hicolor
@@ -145,11 +166,13 @@ package() {
     install -Dm644 $srcdir/$d.desktop $pkgdir/usr/share/applications/$d.desktop
   done
 
-  rm -rf $pkgdir/usr/lib/$pkgname/{dictionaries,hyphenation,searchplugins,plugins}
+  rm -rf $pkgdir/usr/lib/$pkgname/{dictionaries,hyphenation}
   ln -sf /usr/share/hunspell            $pkgdir/usr/lib/$pkgname/dictionaries
   ln -sf /usr/share/hyphen              $pkgdir/usr/lib/$pkgname/hyphenation
-  ln -sf /usr/lib/mozilla/plugins       $pkgdir/usr/lib/$pkgname/plugins
-  ln -sf /usr/lib/mozilla/searchplugins $pkgdir/usr/lib/$pkgname/searchplugins
+
+  rm -rf $pkgdir/usr/lib/$pkgname/browser/{searchplugins,plugins}
+  ln -sf /usr/lib/mozilla/plugins       $pkgdir/usr/lib/$pkgname/browser/plugins
+  ln -sf /usr/lib/mozilla/searchplugins $pkgdir/usr/lib/$pkgname/browser/searchplugins
 
   # We don't want the development stuff
   rm -rf $pkgdir/usr/{include,lib/$pkgname-devel,share/idl}
diff --git a/libre/icecat/icecat-20.0.1-fixed-loading-icon.png b/libre/icecat/icecat-20.0.1-fixed-loading-icon.png
new file mode 100644
index 000000000..55f25e591
--- /dev/null
+++ b/libre/icecat/icecat-20.0.1-fixed-loading-icon.png
diff --git a/libre/icecat/libre.patch b/libre/icecat/libre.patch
index c5c9a6ade..244592db8 100644
--- a/libre/icecat/libre.patch
+++ b/libre/icecat/libre.patch
@@ -1,23 +1,8 @@
-diff -urN a/browser/app/profile/firefox.js b/browser/app/profile/firefox.js
---- a/browser/app/profile/firefox.js
-+++ b/browser/app/profile/firefox.js
-@@ -1150,11 +1150,9 @@
- // (This is intentionally on the high side; see bug 746055.)
- pref("image.mem.max_decoded_image_kb", 256000);
- 
--// Example social provider
--pref("social.manifest.facebook", "{\"origin\":\"https://www.facebook.com\",\"name\":\"Facebook Messenger\",\"workerURL\":\"https://www.facebook.com/desktop/fbdesktop2/socialfox/fbworker.js.php\",\"iconURL\":\"data:image/x-icon;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8%2F9hAAAAX0lEQVQ4jWP4%2F%2F8%2FAyUYTFhHzjgDxP9JxGeQDSBVMxgTbUBCxer%2Fr999%2BQ8DJBuArJksA9A10s8AXIBoA0B%2BR%2FY%2FjD%2BEwoBoA1yT5v3PbdmCE8MAshhID%2FUMoDgzUYIBj0Cgi7ar4coAAAAASUVORK5CYII%3D\",\"sidebarURL\":\"https://www.facebook.com/desktop/fbdesktop2/?socialfox=true\"}");
- // Comma-separated list of nsIURI::prePaths that are allowed to activate
- // built-in social functionality.
--pref("social.activation.whitelist", "https://www.facebook.com");
-+pref("social.activation.whitelist", "");
- pref("social.sidebar.open", true);
- pref("social.sidebar.unload_timeout_ms", 10000);
- pref("social.active", false);
-diff -urN a/browser/locales/en-US/chrome/browser-region/region.properties b/browser/locales/en-US/chrome/browser-region/region.properties
+diff --git a/browser/locales/en-US/chrome/browser-region/region.properties b/browser/locales/en-US/chrome/browser-region/region.properties
+index f4adbdc..fe7f265 100644
 --- a/browser/locales/en-US/chrome/browser-region/region.properties
 +++ b/browser/locales/en-US/chrome/browser-region/region.properties
-@@ -3,30 +3,18 @@
+@@ -3,17 +3,12 @@
  # file, You can obtain one at http://mozilla.org/MPL/2.0/.
  
  # Default search engine
@@ -31,84 +16,61 @@ diff -urN a/browser/locales/en-US/chrome/browser-region/region.properties b/brow
 -
 -# This is the default set of web based feed handlers shown in the reader
 -# selection UI
--browser.contentHandlers.types.0.title=Bloglines
--browser.contentHandlers.types.0.uri=http://www.bloglines.com/login?r=/sub/%s
--browser.contentHandlers.types.1.title=My Yahoo
--browser.contentHandlers.types.1.uri=http://add.my.yahoo.com/rss?url=%s
--browser.contentHandlers.types.2.title=Google
--browser.contentHandlers.types.2.uri=http://fusion.google.com/add?feedurl=%s
--
--# Keyword URL (for location bar searches)
--keyword.URL=http://www.google.com/search?ie=UTF-8&oe=UTF-8&sourceid=navclient&gfns=1&q=
+-browser.contentHandlers.types.0.title=My Yahoo!
+-browser.contentHandlers.types.0.uri=http://add.my.yahoo.com/rss?url=%s
 +browser.search.order.1=DuckDuckGo HTML
 +browser.search.order.2=DuckDuckGo Lite
 +browser.search.order.3=Seeks Search
  
- # URL for site-specific search engines
- # TRANSLATION NOTE: {moz:domain} and {searchTerms} are placeholders for the site
- # to be searched and the user's search query. Place them in the appropriate location
- # for your locale's URL but do not translate them.
--browser.search.siteSearchURL=https://www.google.com/search?ie=UTF-8&oe=UTF-8&sourceid=navclient&q=site%3A{moz:domain}+{searchTerms}
-+browser.search.siteSearchURL=https://duckduckgo.com/html/?q=site%3A{moz:domain}+{searchTerms}
- 
  # increment this number when anything gets changed in the list below.  This will
  # cause Firefox to re-read these prefs and inject any new handlers into the 
-@@ -34,3 +22,11 @@
- # means that it's not possible to update the name of existing handler, so 
+@@ -22,20 +17,10 @@ browser.contentHandlers.types.0.uri=http://add.my.yahoo.com/rss?url=%s
  # don't make any spelling errors here.
  gecko.handlerService.defaultHandlersVersion=3
-+
-+# The default set of protocol handlers for irc:
+ 
+-# The default set of protocol handlers for webcal:
+-gecko.handlerService.schemes.webcal.0.name=30 Boxes
+-gecko.handlerService.schemes.webcal.0.uriTemplate=http://30boxes.com/external/widget?refer=ff&url=%s
+-
+-# The default set of protocol handlers for mailto:
+-gecko.handlerService.schemes.mailto.0.name=Yahoo! Mail
+-gecko.handlerService.schemes.mailto.0.uriTemplate=https://compose.mail.yahoo.com/?To=%s
+-gecko.handlerService.schemes.mailto.1.name=Gmail
+-gecko.handlerService.schemes.mailto.1.uriTemplate=https://mail.google.com/mail/?extsrc=mailto&url=%s
+-
+ # The default set of protocol handlers for irc:
+-gecko.handlerService.schemes.irc.0.name=Mibbit
+-gecko.handlerService.schemes.irc.0.uriTemplate=https://www.mibbit.com/?url=%s
 +gecko.handlerService.schemes.irc.0.name=Freenode Web IRC
 +gecko.handlerService.schemes.irc.0.uriTemplate=https://webchat.freenode.net
-+
-+# The default set of protocol handlers for ircs:
+ 
+ # The default set of protocol handlers for ircs:
+-gecko.handlerService.schemes.ircs.0.name=Mibbit
+-gecko.handlerService.schemes.ircs.0.uriTemplate=https://www.mibbit.com/?url=%s
 +gecko.handlerService.schemes.ircs.0.name=Freenode Web IRC
 +gecko.handlerService.schemes.ircs.0.uriTemplate=https://webchat.freenode.net
-diff -Nur a/dom/ipc/test.xul b/dom/ipc/test.xul
---- a/dom/ipc/test.xul
-+++ b/dom/ipc/test.xul
-@@ -294,6 +294,6 @@
-                oncommand="document.getElementById('page').QueryInterface(Components.interfaces.nsIFrameLoaderOwner).frameLoader.delayRemoteDialogs = this.checked;"/>
-   </toolbar>
- 
--  <browser type="content" src="http://www.google.com/" flex="1" id="page" remote="true"/>
-+  <browser type="content" src="https://duckduckgo.com/html" flex="1" id="page" remote="true"/>
-   <label id="messageLog" value="" crop="center"/>
- </window>
-diff -Nur a/layout/ipc/test-ipcbrowser.xul b/layout/ipc/test-ipcbrowser.xul
---- a/layout/ipc/test-ipcbrowser.xul
-+++ b/layout/ipc/test-ipcbrowser.xul
-@@ -69,6 +69,6 @@
-        label="setViewportScale"/>
-   </toolbar>
- 
--  <browser type="content" src="http://www.google.com/" flex="1" id="content"
-+  <browser type="content" src="https://duckduckgo.com/html" flex="1" id="content"
-            remote="true"/>
- </window>
-diff -Nur a/browser/locales/generic/profile/bookmarks.html.in b/browser/locales/generic/profile/bookmarks.html.in
+diff --git a/browser/locales/generic/profile/bookmarks.html.in b/browser/locales/generic/profile/bookmarks.html.in
+index e925c1e..5101035 100644
 --- a/browser/locales/generic/profile/bookmarks.html.in
 +++ b/browser/locales/generic/profile/bookmarks.html.in
-@@ -11,13 +11,21 @@
+@@ -15,13 +15,20 @@
      <DT><H3 PERSONAL_TOOLBAR_FOLDER="true" ID="rdf:#$FvPhC3">@bookmarks_toolbarfolder@</H3>
  <DD>@bookmarks_toolbarfolder_description@
      <DL><p>
--        <DT><A HREF="http://www.mozilla.com/@AB_CD@/firefox/central/" ID="rdf:#$GvPhC3">@getting_started@</A>
+-        <DT><A HREF="https://www.mozilla.org/@AB_CD@/firefox/central/" ID="rdf:#$GvPhC3">@getting_started@</A>
 +        <DT><A HREF="https://parabolagnulinux.org/" ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAABL0lEQVQ4jWNgoCcoq16VU1GzygnEBtEVDWuV8GooKFuhWVG3uiM3d5UokG4qr1szAaa5vGbVt4ralacwNDU0rGIrr10VBVG0+lxhwyqVsqqVtRW1q6eD5IvL19oB2V+B+D9QzQu4xtDQVZylVavygRKHqurWOlbUrknKK12qWlCwWLK8elUFA8N/xvLy5VYVtas+gzWDDVi9E2QjT1XdcufymjWpQJt1cXmnvHwVP1DzR7hmIC6vW+kOtpnYQKysW30arrlm9RVi9cFBRfXKJTADympWJZNsQFnN6rUQA1adAQU2SZqBXmUGBtozUDiU1qxQJtl2oCY3kO2l1avCSdYMAsBAWwyM2plkaS4p6eYGOv1YQ0MDB1kGlFWuDChuWKZBlmYQqK5eJU22ZkIAAEIlnQZQkzITAAAAAElFTkSuQmCC">Parabola GNU/Linux-libre</A>
      </DL><p>
 -    <DT><H3 ID="rdf:#$ZvPhC3">@firefox_heading@</H3>
 +    <DT><H3 ID="rdf:#$YvPhC3">Parabola GNU/Linux-libre</H3>
      <DL><p>
--        <DT><A HREF="http://www.mozilla.com/@AB_CD@/firefox/help/" ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAAK/INwWK6QAAABl0RVh0U29mdHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAHWSURBVHjaYvz//z8DJQAggJiQOe/fv2fv7Oz8rays/N+VkfG/iYnJfyD/1+rVq7ffu3dPFpsBAAHEAHIBCJ85c8bN2Nj4vwsDw/8zQLwKiO8CcRoQu0DxqlWrdsHUwzBAAIGJmTNnPgYa9j8UqhFElwPxf2MIDeIrKSn9FwSJoRkAEEAM0DD4DzMAyPi/G+QKY4hh5WAXGf8PDQ0FGwJ22d27CjADAAIIrLmjo+MXA9R2kAHvGBA2wwx6B8W7od6CeQcggKCmCEL8bgwxYCbUIGTDVkHDBia+CuotgACCueD3TDQN75D4xmAvCoK9ARMHBzAw0AECiBHkAlC0Mdy7x9ABNA3obAZXIAa6iKEcGlMVQHwWyjYuL2d4v2cPg8vZswx7gHyAAAK7AOif7SAbOqCmn4Ha3AHFsIDtgPq/vLz8P4MSkJ2W9h8ggBjevXvHDo4FQUQg/kdypqCg4H8lUIACnQ/SOBMYI8bAsAJFPcj1AAEEjwVQqLpAbXmH5BJjqI0gi9DTAAgDBBCcAVLkgmQ7yKCZxpCQxqUZhAECCJ4XgMl493ug21ZD+aDAXH0WLM4A9MZPXJkJIIAwTAR5pQMalaCABQUULttBGCCAGCnNzgABBgAMJ5THwGvJLAAAAABJRU5ErkJggg==" ID="rdf:#$22iCK1">@firefox_help@</A>
--        <DT><A HREF="http://www.mozilla.com/@AB_CD@/firefox/customize/" ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAAK/INwWK6QAAABl0RVh0U29mdHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAHWSURBVHjaYvz//z8DJQAggJiQOe/fv2fv7Oz8rays/N+VkfG/iYnJfyD/1+rVq7ffu3dPFpsBAAHEAHIBCJ85c8bN2Nj4vwsDw/8zQLwKiO8CcRoQu0DxqlWrdsHUwzBAAIGJmTNnPgYa9j8UqhFElwPxf2MIDeIrKSn9FwSJoRkAEEAM0DD4DzMAyPi/G+QKY4hh5WAXGf8PDQ0FGwJ22d27CjADAAIIrLmjo+MXA9R2kAHvGBA2wwx6B8W7od6CeQcggKCmCEL8bgwxYCbUIGTDVkHDBia+CuotgACCueD3TDQN75D4xmAvCoK9ARMHBzAw0AECiBHkAlC0Mdy7x9ABNA3obAZXIAa6iKEcGlMVQHwWyjYuL2d4v2cPg8vZswx7gHyAAAK7AOif7SAbOqCmn4Ha3AHFsIDtgPq/vLz8P4MSkJ2W9h8ggBjevXvHDo4FQUQg/kdypqCg4H8lUIACnQ/SOBMYI8bAsAJFPcj1AAEEjwVQqLpAbXmH5BJjqI0gi9DTAAgDBBCcAVLkgmQ7yKCZxpCQxqUZhAECCJ4XgMl493ug21ZD+aDAXH0WLM4A9MZPXJkJIIAwTAR5pQMalaCABQUULttBGCCAGCnNzgABBgAMJ5THwGvJLAAAAABJRU5ErkJggg==" ID="rdf:#$32iCK1">@firefox_customize@</A>
--        <DT><A HREF="http://www.mozilla.com/@AB_CD@/firefox/community/" ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAAK/INwWK6QAAABl0RVh0U29mdHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAHWSURBVHjaYvz//z8DJQAggJiQOe/fv2fv7Oz8rays/N+VkfG/iYnJfyD/1+rVq7ffu3dPFpsBAAHEAHIBCJ85c8bN2Nj4vwsDw/8zQLwKiO8CcRoQu0DxqlWrdsHUwzBAAIGJmTNnPgYa9j8UqhFElwPxf2MIDeIrKSn9FwSJoRkAEEAM0DD4DzMAyPi/G+QKY4hh5WAXGf8PDQ0FGwJ22d27CjADAAIIrLmjo+MXA9R2kAHvGBA2wwx6B8W7od6CeQcggKCmCEL8bgwxYCbUIGTDVkHDBia+CuotgACCueD3TDQN75D4xmAvCoK9ARMHBzAw0AECiBHkAlC0Mdy7x9ABNA3obAZXIAa6iKEcGlMVQHwWyjYuL2d4v2cPg8vZswx7gHyAAAK7AOif7SAbOqCmn4Ha3AHFsIDtgPq/vLz8P4MSkJ2W9h8ggBjevXvHDo4FQUQg/kdypqCg4H8lUIACnQ/SOBMYI8bAsAJFPcj1AAEEjwVQqLpAbXmH5BJjqI0gi9DTAAgDBBCcAVLkgmQ7yKCZxpCQxqUZhAECCJ4XgMl493ug21ZD+aDAXH0WLM4A9MZPXJkJIIAwTAR5pQMalaCABQUULttBGCCAGCnNzgABBgAMJ5THwGvJLAAAAABJRU5ErkJggg==" ID="rdf:#$42iCK1">@firefox_community@</A>
--        <DT><A HREF="http://www.mozilla.com/@AB_CD@/about/" ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAAK/INwWK6QAAABl0RVh0U29mdHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAHWSURBVHjaYvz//z8DJQAggJiQOe/fv2fv7Oz8rays/N+VkfG/iYnJfyD/1+rVq7ffu3dPFpsBAAHEAHIBCJ85c8bN2Nj4vwsDw/8zQLwKiO8CcRoQu0DxqlWrdsHUwzBAAIGJmTNnPgYa9j8UqhFElwPxf2MIDeIrKSn9FwSJoRkAEEAM0DD4DzMAyPi/G+QKY4hh5WAXGf8PDQ0FGwJ22d27CjADAAIIrLmjo+MXA9R2kAHvGBA2wwx6B8W7od6CeQcggKCmCEL8bgwxYCbUIGTDVkHDBia+CuotgACCueD3TDQN75D4xmAvCoK9ARMHBzAw0AECiBHkAlC0Mdy7x9ABNA3obAZXIAa6iKEcGlMVQHwWyjYuL2d4v2cPg8vZswx7gHyAAAK7AOif7SAbOqCmn4Ha3AHFsIDtgPq/vLz8P4MSkJ2W9h8ggBjevXvHDo4FQUQg/kdypqCg4H8lUIACnQ/SOBMYI8bAsAJFPcj1AAEEjwVQqLpAbXmH5BJjqI0gi9DTAAgDBBCcAVLkgmQ7yKCZxpCQxqUZhAECCJ4XgMl493ug21ZD+aDAXH0WLM4A9MZPXJkJIIAwTAR5pQMalaCABQUULttBGCCAGCnNzgABBgAMJ5THwGvJLAAAAABJRU5ErkJggg==" ID="rdf:#$52iCK1">@firefox_about@</A>
+-        <DT><A HREF="https://www.mozilla.org/@AB_CD@/firefox/help/" ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAAK/INwWK6QAAABl0RVh0U29mdHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAHWSURBVHjaYvz//z8DJQAggJiQOe/fv2fv7Oz8rays/N+VkfG/iYnJfyD/1+rVq7ffu3dPFpsBAAHEAHIBCJ85c8bN2Nj4vwsDw/8zQLwKiO8CcRoQu0DxqlWrdsHUwzBAAIGJmTNnPgYa9j8UqhFElwPxf2MIDeIrKSn9FwSJoRkAEEAM0DD4DzMAyPi/G+QKY4hh5WAXGf8PDQ0FGwJ22d27CjADAAIIrLmjo+MXA9R2kAHvGBA2wwx6B8W7od6CeQcggKCmCEL8bgwxYCbUIGTDVkHDBia+CuotgACCueD3TDQN75D4xmAvCoK9ARMHBzAw0AECiBHkAlC0Mdy7x9ABNA3obAZXIAa6iKEcGlMVQHwWyjYuL2d4v2cPg8vZswx7gHyAAAK7AOif7SAbOqCmn4Ha3AHFsIDtgPq/vLz8P4MSkJ2W9h8ggBjevXvHDo4FQUQg/kdypqCg4H8lUIACnQ/SOBMYI8bAsAJFPcj1AAEEjwVQqLpAbXmH5BJjqI0gi9DTAAgDBBCcAVLkgmQ7yKCZxpCQxqUZhAECCJ4XgMl493ug21ZD+aDAXH0WLM4A9MZPXJkJIIAwTAR5pQMalaCABQUULttBGCCAGCnNzgABBgAMJ5THwGvJLAAAAABJRU5ErkJggg==" ID="rdf:#$22iCK1">@firefox_help@</A>
+-        <DT><A HREF="https://www.mozilla.org/@AB_CD@/firefox/customize/" ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAAK/INwWK6QAAABl0RVh0U29mdHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAHWSURBVHjaYvz//z8DJQAggJiQOe/fv2fv7Oz8rays/N+VkfG/iYnJfyD/1+rVq7ffu3dPFpsBAAHEAHIBCJ85c8bN2Nj4vwsDw/8zQLwKiO8CcRoQu0DxqlWrdsHUwzBAAIGJmTNnPgYa9j8UqhFElwPxf2MIDeIrKSn9FwSJoRkAEEAM0DD4DzMAyPi/G+QKY4hh5WAXGf8PDQ0FGwJ22d27CjADAAIIrLmjo+MXA9R2kAHvGBA2wwx6B8W7od6CeQcggKCmCEL8bgwxYCbUIGTDVkHDBia+CuotgACCueD3TDQN75D4xmAvCoK9ARMHBzAw0AECiBHkAlC0Mdy7x9ABNA3obAZXIAa6iKEcGlMVQHwWyjYuL2d4v2cPg8vZswx7gHyAAAK7AOif7SAbOqCmn4Ha3AHFsIDtgPq/vLz8P4MSkJ2W9h8ggBjevXvHDo4FQUQg/kdypqCg4H8lUIACnQ/SOBMYI8bAsAJFPcj1AAEEjwVQqLpAbXmH5BJjqI0gi9DTAAgDBBCcAVLkgmQ7yKCZxpCQxqUZhAECCJ4XgMl493ug21ZD+aDAXH0WLM4A9MZPXJkJIIAwTAR5pQMalaCABQUULttBGCCAGCnNzgABBgAMJ5THwGvJLAAAAABJRU5ErkJggg==" ID="rdf:#$32iCK1">@firefox_customize@</A>
+-        <DT><A HREF="https://www.mozilla.org/@AB_CD@/contribute/" ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAAK/INwWK6QAAABl0RVh0U29mdHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAHWSURBVHjaYvz//z8DJQAggJiQOe/fv2fv7Oz8rays/N+VkfG/iYnJfyD/1+rVq7ffu3dPFpsBAAHEAHIBCJ85c8bN2Nj4vwsDw/8zQLwKiO8CcRoQu0DxqlWrdsHUwzBAAIGJmTNnPgYa9j8UqhFElwPxf2MIDeIrKSn9FwSJoRkAEEAM0DD4DzMAyPi/G+QKY4hh5WAXGf8PDQ0FGwJ22d27CjADAAIIrLmjo+MXA9R2kAHvGBA2wwx6B8W7od6CeQcggKCmCEL8bgwxYCbUIGTDVkHDBia+CuotgACCueD3TDQN75D4xmAvCoK9ARMHBzAw0AECiBHkAlC0Mdy7x9ABNA3obAZXIAa6iKEcGlMVQHwWyjYuL2d4v2cPg8vZswx7gHyAAAK7AOif7SAbOqCmn4Ha3AHFsIDtgPq/vLz8P4MSkJ2W9h8ggBjevXvHDo4FQUQg/kdypqCg4H8lUIACnQ/SOBMYI8bAsAJFPcj1AAEEjwVQqLpAbXmH5BJjqI0gi9DTAAgDBBCcAVLkgmQ7yKCZxpCQxqUZhAECCJ4XgMl493ug21ZD+aDAXH0WLM4A9MZPXJkJIIAwTAR5pQMalaCABQUULttBGCCAGCnNzgABBgAMJ5THwGvJLAAAAABJRU5ErkJggg==" ID="rdf:#$42iCK1">@firefox_community@</A>
+-        <DT><A HREF="https://www.mozilla.org/@AB_CD@/about/" ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAAK/INwWK6QAAABl0RVh0U29mdHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAHWSURBVHjaYvz//z8DJQAggJiQOe/fv2fv7Oz8rays/N+VkfG/iYnJfyD/1+rVq7ffu3dPFpsBAAHEAHIBCJ85c8bN2Nj4vwsDw/8zQLwKiO8CcRoQu0DxqlWrdsHUwzBAAIGJmTNnPgYa9j8UqhFElwPxf2MIDeIrKSn9FwSJoRkAEEAM0DD4DzMAyPi/G+QKY4hh5WAXGf8PDQ0FGwJ22d27CjADAAIIrLmjo+MXA9R2kAHvGBA2wwx6B8W7od6CeQcggKCmCEL8bgwxYCbUIGTDVkHDBia+CuotgACCueD3TDQN75D4xmAvCoK9ARMHBzAw0AECiBHkAlC0Mdy7x9ABNA3obAZXIAa6iKEcGlMVQHwWyjYuL2d4v2cPg8vZswx7gHyAAAK7AOif7SAbOqCmn4Ha3AHFsIDtgPq/vLz8P4MSkJ2W9h8ggBjevXvHDo4FQUQg/kdypqCg4H8lUIACnQ/SOBMYI8bAsAJFPcj1AAEEjwVQqLpAbXmH5BJjqI0gi9DTAAgDBBCcAVLkgmQ7yKCZxpCQxqUZhAECCJ4XgMl493ug21ZD+aDAXH0WLM4A9MZPXJkJIIAwTAR5pQMalaCABQUULttBGCCAGCnNzgABBgAMJ5THwGvJLAAAAABJRU5ErkJggg==" ID="rdf:#$52iCK1">@firefox_about@</A>
 +        <DT><A HREF="https://parabolagnulinux.org/" ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAABL0lEQVQ4jWNgoCcoq16VU1GzygnEBtEVDWuV8GooKFuhWVG3uiM3d5UokG4qr1szAaa5vGbVt4ralacwNDU0rGIrr10VBVG0+lxhwyqVsqqVtRW1q6eD5IvL19oB2V+B+D9QzQu4xtDQVZylVavygRKHqurWOlbUrknKK12qWlCwWLK8elUFA8N/xvLy5VYVtas+gzWDDVi9E2QjT1XdcufymjWpQJt1cXmnvHwVP1DzR7hmIC6vW+kOtpnYQKysW30arrlm9RVi9cFBRfXKJTADympWJZNsQFnN6rUQA1adAQU2SZqBXmUGBtozUDiU1qxQJtl2oCY3kO2l1avCSdYMAsBAWwyM2plkaS4p6eYGOv1YQ0MDB1kGlFWuDChuWKZBlmYQqK5eJU22ZkIAAEIlnQZQkzITAAAAAElFTkSuQmCC">Parabola GNU/Linux-libre</A>
 +        <DT><A HREF="https://parabolagnulinux.org/packages/" ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAABL0lEQVQ4jWNgoCcoq16VU1GzygnEBtEVDWuV8GooKFuhWVG3uiM3d5UokG4qr1szAaa5vGbVt4ralacwNDU0rGIrr10VBVG0+lxhwyqVsqqVtRW1q6eD5IvL19oB2V+B+D9QzQu4xtDQVZylVavygRKHqurWOlbUrknKK12qWlCwWLK8elUFA8N/xvLy5VYVtas+gzWDDVi9E2QjT1XdcufymjWpQJt1cXmnvHwVP1DzR7hmIC6vW+kOtpnYQKysW30arrlm9RVi9cFBRfXKJTADympWJZNsQFnN6rUQA1adAQU2SZqBXmUGBtozUDiU1qxQJtl2oCY3kO2l1avCSdYMAsBAWwyM2plkaS4p6eYGOv1YQ0MDB1kGlFWuDChuWKZBlmYQqK5eJU22ZkIAAEIlnQZQkzITAAAAAElFTkSuQmCC">Parabola GNU/Linux-libre Packages</A>
 +        <DT><A HREF="https://wiki.parabolagnulinux.org/" ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAABL0lEQVQ4jWNgoCcoq16VU1GzygnEBtEVDWuV8GooKFuhWVG3uiM3d5UokG4qr1szAaa5vGbVt4ralacwNDU0rGIrr10VBVG0+lxhwyqVsqqVtRW1q6eD5IvL19oB2V+B+D9QzQu4xtDQVZylVavygRKHqurWOlbUrknKK12qWlCwWLK8elUFA8N/xvLy5VYVtas+gzWDDVi9E2QjT1XdcufymjWpQJt1cXmnvHwVP1DzR7hmIC6vW+kOtpnYQKysW30arrlm9RVi9cFBRfXKJTADympWJZNsQFnN6rUQA1adAQU2SZqBXmUGBtozUDiU1qxQJtl2oCY3kO2l1avCSdYMAsBAWwyM2plkaS4p6eYGOv1YQ0MDB1kGlFWuDChuWKZBlmYQqK5eJU22ZkIAAEIlnQZQkzITAAAAAElFTkSuQmCC">Parabola GNU/Linux-libre Wiki</A>
 +        <DT><A HREF="https://labs.parabola.nu/" ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAA/klEQVQ4jWP4TyFgGAYGLN25iDID+pd0UGbAxMUTUQT+fP36/9+/f2A2jMZrwKyNEC/8+P71/6/ijP9/fv/+/23Hzv+fly/9/7m7+//XkuL/7yvL/j+PCf3/qrn+/+ed2/7/evocZPr/b3fu/Ge4cuf6/2/fPv5PnaD9f720wP9lyir/F0kI/V8myv9/jbjA/w3i/P+XC/H8n8Uv8H+6kOj/JZIS/2eqaP2/umPP/88/fv5nADnz+cuX/x0S9f8n6Kv/jxGQ+R8vJPu/x9D+/2wrz//9hnb/mzVM/5fKav4vMbL835OZ+//ty9dw7zFcuPuYKL/iDAOydY4aAAcA33O6tzziloYAAAAASUVORK5CYII=">Parabola GNU/Linux-libre Labs</A>
-+        <DT><A HREF="https://identi.ca/group/parabola" ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAHElEQVQ4jWNgGFTgVwLLf2LwqAGjBgxyA4YmAABB5QQG+m9VWQAAAABJRU5ErkJggg==" LAST_CHARSET="UTF-8">Parabola GNU/Linux-libre (parabola) group - Identi.ca</A>
 +    </DL><p>
 +    <DT><H3 ID="rdf:#$ZvPhC3">Free Software Foundation</H3>
 +    <DL><p>
@@ -118,3 +80,27 @@ diff -Nur a/browser/locales/generic/profile/bookmarks.html.in b/browser/locales/
 +        <DT><A HREF="http://www.h-node.org/" ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAABgElEQVQ4jaXRz2uSARzHcb0vlRGEzTVWISU1BVkFYTIyjNK1pKcxHA+yhWMWIamHYikFgpoLIi9jwegi3QbL9SzdLmMbM9J+DkJBgm5RDvEPeHeQHOyQz0OH9+V7ePGBr0pqpPmfVPsP8a0AR4MnMEwf48x9K0s/E8oAY9iEMOvD+8yP2qVjrhhRBnSN61n5sIpULqC+pGHh8wNlgEY8jPQXcGh4VXukDND5evYAl46odIuXtYdKAANSudAChO52/XeMZMohecCbcoGdH99Y+7LO72adT9+/4nh8nYOjBl7/SsoB8gBkpHk8T0S2K++pN3fRin3cfnFDHvCuWkI9rEMvHGEo5gbAHnXhnLF1BpZLeRaLOVT2A8Q3A5wMngXgWtKLxX9KPqC+rCWQvYkpeK4NWKcGOgO50ts2MJJ0cPreeQDciTHMchZYIhcwh2wcuqjn+ccwGm9v6wsTxxn0dVgQXZ7Ek3Agpq6QrcaQGmmebtxFSDkRU1fJVmL/BpT2ByV/3eDMhinRAAAAAElFTkSuQmCC">h-node</A>
      </DL><p>
  </DL><p>
+diff --git a/dom/ipc/test.xul b/dom/ipc/test.xul
+index 25efdb6..8162c73 100644
+--- a/dom/ipc/test.xul
++++ b/dom/ipc/test.xul
+@@ -299,6 +299,6 @@
+                oncommand="document.getElementById('page').QueryInterface(Components.interfaces.nsIFrameLoaderOwner).frameLoader.delayRemoteDialogs = this.checked;"/>
+   </toolbar>
+ 
+-  <browser type="content" src="http://www.google.com/" flex="1" id="page" remote="true"/>
++  <browser type="content" src="https://duckduckgo.com/html" flex="1" id="page" remote="true"/>
+   <label id="messageLog" value="" crop="center"/>
+ </window>
+diff --git a/layout/ipc/test-ipcbrowser.xul b/layout/ipc/test-ipcbrowser.xul
+index 237ba61..7603d7d 100644
+--- a/layout/ipc/test-ipcbrowser.xul
++++ b/layout/ipc/test-ipcbrowser.xul
+@@ -73,6 +73,6 @@
+        label="setViewportScale"/>
+   </toolbar>
+ 
+-  <browser type="content" src="http://www.google.com/" flex="1" id="content"
++  <browser type="content" src="https://duckduckgo.com/html" flex="1" id="content"
+            remote="true"/>
+ </window>
diff --git a/libre/icecat/mozconfig b/libre/icecat/mozconfig
index d1fd0e3f8..2f6d0757b 100644
--- a/libre/icecat/mozconfig
+++ b/libre/icecat/mozconfig
@@ -23,15 +23,13 @@ ac_add_options --enable-system-sqlite
 ac_add_options --enable-system-ffi
 #ac_add_options --enable-system-cairo
 ac_add_options --enable-system-pixman
-ac_add_options --with-pthreads
 
 # Features
 ac_add_options --enable-startup-notification
-ac_add_options --enable-gstreamer
+ac_add_options --enable-pulseaudio
 
 ac_add_options --disable-crashreporter
 ac_add_options --disable-updater
-ac_add_options --disable-tests
 ac_add_options --disable-installer
 
 # Parabola features
diff --git a/libre/icecat/mozconfig.pgo b/libre/icecat/mozconfig.pgo
index 2f4ebe32b..71ba205a4 100644
--- a/libre/icecat/mozconfig.pgo
+++ b/libre/icecat/mozconfig.pgo
@@ -1,3 +1,3 @@
 
 # PGO
-mk_add_options PROFILE_GEN_SCRIPT='$(PYTHON) $(MOZ_OBJDIR)/_profile/pgo/profileserver.py 10'
+mk_add_options PROFILE_GEN_SCRIPT='EXTRA_TEST_ARGS=10 $(MAKE) -C $(MOZ_OBJDIR) pgo-profile-run'
diff --git a/libre/icecat/vendor.js b/libre/icecat/vendor.js
index 151140b8f..3d93cec01 100644
--- a/libre/icecat/vendor.js
+++ b/libre/icecat/vendor.js
@@ -8,9 +8,5 @@ pref("browser.shell.checkDefaultBrowser", false);
 pref("extensions.autoDisableScopes", 11);
 pref("extensions.shownSelectionUI", true);
 
-// Make sure that safebrowsing is disabled
-pref("browser.safebrowsing.enabled", false);
-pref("browser.safebrowsing.malware.enabled", false);
-
-// Enable gstreamer support
-pref("media.gstreamer.enabled", true);
+// Disable Social API
+pref("social.remote-install.enabled", false);
diff --git a/libre/icedove-l10n/PKGBUILD b/libre/icedove-l10n/PKGBUILD
index 8ebc5657f..58645651d 100644
--- a/libre/icedove-l10n/PKGBUILD
+++ b/libre/icedove-l10n/PKGBUILD
@@ -1,10 +1,10 @@
 # Maintainer: Márcio Silva <coadde@lavabit.com>
-# Maintainer: André Silva <emulatorman@lavabit.com>
+# Maintainer: André Silva <emulatorman@parabola.nu>
 
 pkgbase=icedove-l10n
 epoch=1
-_pkgver=17.0.9esr
-pkgver=17.0.9.deb2
+_pkgver=24.0
+pkgver=24.0.deb1
 
 _langpacks=(ar ast be bg bn-BD br ca cs da de el en-GB en-US es-AR es-ES et eu fi fr fy-NL ga-IE gd gl he hr hu hy-AM id is it ja ko lt nb-NO nl nn-NO pa-IN pl pt-BR pt-PT rm ro ru si sk sl sq sr sv-SE ta-LK tr uk vi zh-CN zh-TW)
 
@@ -15,7 +15,7 @@ pkgname=($(for lang in ${_langpacks[@]}
 pkgrel=1
 pkgdesc="Language packs for Debian Icedove."
 arch=('any')
-url="http://packages.debian.org/sid/icedove"
+url="http://packages.debian.org/experimental/icedove"
 license=('MPL' 'GPL')
 depends=("icedove-libre>=$epoch:$pkgver")
 makedepends=('unzip' 'zip')
@@ -65,58 +65,58 @@ done
 
 md5sums=('d5b2567a8cc8f64591f313a6efdaaffc'
          'f3719964e893c1002b7a923e8f95f923'
-         'cc32b8aa30e0e54fcea11b76a9a030f4'
-         'a18431241d61f6f517c1b8c3d8ce884f'
-         '28b6143d9dea47b9bd89453fea455457'
-         'e1139e6b943a02af2be130f66db99390'
-         '6c446ab3cfc39b1b177f0b7c4558ffd6'
-         'f6a88413d68fff4451fb675586539705'
-         '8e77e2d1236ee08c690edd6617bc61ec'
-         '7a5748c07c863745540e4dc48773bdfe'
-         'fabe0a051dfedeee5b7301ae1f886aa2'
-         '171068c63cb0819a5c8769d92a713c6e'
-         '64d5d905bba39a9c857e16e2deed8d92'
-         '41a11fedd4f0721c7dfa7b4f294c4578'
-         '8a23d4d6616428292c9edf432e747543'
-         '41aa0520d62b7f257938bae83a3fc72b'
-         '2b1f30b215838a256a15eb87f93825a8'
-         '1c125ec400fa3d9de88cf6a775f5deae'
-         'd85151b34d12e265f3df28dfbc78dd1b'
-         '0ab58f3f0ee604e1af3dc5c16b0c2ea0'
-         'e7a3d71e609efcefe71c57b7890fb37c'
-         '166efd822691c91a722d53e8e9c6d7a8'
-         'f7837a358208e6720f18e9858478915a'
-         '58b38fd78be414cf4d10c2ac6dfd128c'
-         'aceb524b1e843668405b762ee7258756'
-         '2dfc7c8760aa197efe662a389614e284'
-         '5886ef068a1b73bfd7d8c3c2628d8674'
-         'ab535a80c409fd0b4b732fdb79f525ad'
-         '12dd37921eedcd2c9e5a4484315bed6d'
-         '0766135b41053a1b168b8a5d2b865025'
-         'fb61057edad48f619a4943d7033ea4ac'
-         'e7eb605e77a7dcf2093c78fee22432a8'
-         'ac3455b559e3be6bba9b801e54fba4a6'
-         '1ab817dd1e0b2a20c7b95b3821626e4b'
-         '239a2ce9ada5bee297a3abc5d382fbc0'
-         '5159ca357d344d48e4a1ed7f5d0c6148'
-         'b260be89e9ae689a2285995541055f06'
-         'fe3a462afcb4a9e0a4228f0f5a894790'
-         'e775993988b93497c062c0e0b5cf8c5e'
-         '67fec92b3bdaa8267467e96cde7145e1'
-         '36d0044c7e1808bc80fb7aa27c37f540'
-         'fcea0c7480719cf77b7d38a23114ac25'
-         '205bd5873fcb142b3c3828a8a6bbe4f9'
-         'e82f9a3ef19ec74d235c71d4162bef28'
-         'e38119f6bfc43aec4016120c970fa1eb'
-         '9e89b3c89bc8f6e4dd1c80e25591b634'
-         'af4688e2617a18410165da9474de7fdc'
-         '09f10be4a94a6eb9f91aa9be6fd65a65'
-         '864fe0fae10e437dd764454f87ad0cc1'
-         'b2e7cbfa68bcb2e7eac21e18d87a3d93'
-         '171a1064054f4fd185ce896738d50cbc'
-         '2f34b234825e28993eb244862cef607b'
-         'ad7814da5ccddfbba70fc9389b7b1368'
-         '41513e2cef7b5a311e8f3de988f2594b'
-         'a929204d41eba4631b97892f4a915591'
-         '6a36f76040d930fa8a448c1d7b6c7c22'
-         'be9c55a9994069fa8ebac022201cdaf3')
+         '00e5745138bd36a6dda6996ca82bb458'
+         '2681d2dd9cba526734ac85a07bd72dff'
+         'cd10d510639d2b4c524cd3a8fed30845'
+         'b5d4c6176cb3d9181bc4958a59955371'
+         'ec714abc51563df68c0e767499eb131b'
+         'b3958d9eb8ff1074524c913eea9d4531'
+         '6cd59396e969a9fe0c9c4494b05e0d70'
+         'a9cb42920b2dc0a07df802f9720e2976'
+         'ca88f9d29b53c5249e04007b27e6b6f1'
+         '7800c97656d7c969d7d99efaf5449547'
+         '52c26e8e74d054a9b0e8b785d05a1219'
+         'da4d4b0a905905a6befdacfc93ce11ec'
+         '7a1b3a80c2451cf388b1f394843d4d6e'
+         'c9e1bb783a81d0a2cebe1ddec3a29c2b'
+         'f586ca445a5e9cdb0cd8e5da5e301f75'
+         'cda87ee3de3712dd7d98a31205cd0d78'
+         '97dfd7b9bdd3ffc451874a7c918747a8'
+         '3cf977ccd8b1f4b5215c7bec4e795063'
+         'ce4b74e192d97b37b29bf725884bab77'
+         '0e131941c0cb0e7c2ecac70092c931a5'
+         '2140ad226acf709cbdf0a8323c704d97'
+         'e539e40b18fb35398e88eadda0751256'
+         'f7e0ff5bc085fa947d56677732ad40df'
+         'e031bcb2d0df57a79d39aa8555e918ba'
+         '87f1310bff7b978a8015362dc95dfeba'
+         '2d3e0e115d0b9b1cd061beeb7cfb1039'
+         'da16f65cb7095bf7ab50334d5310b46b'
+         'b0ef1e6b1289376c25dfad11fd3b5825'
+         'b33c0fc1a1b6d6f1b61e33e16a68c3aa'
+         '91d710244168d0c1c769435a60b64f3c'
+         '8debe2067c3ffdd910cfa0ad99ed62dd'
+         '7b639bf8009edb028538722812d29c1f'
+         '6ab044113bb056df256112716c4d7bc6'
+         '1f1cfc93ae9c04d6062d824fdf89ef0a'
+         'c13d3d3653cbb530aafd82ea3a455b31'
+         '4f0acf27aa26483e161ad74c0bde0a0d'
+         '0b19f435b174941580e423586330af30'
+         '2c377b2b3dcbe5869c2db0dda2de06ed'
+         'a7a04da21888fd15b755529b5bf2e36f'
+         '9309c021fc49d3a0aee8df25d41f525a'
+         '297f79f74a807063de05ed34159d7524'
+         '35d94ffaa43bd3dc451723b392b2bd2a'
+         '6028467f08ef13bd6b6a1de7348e06d3'
+         'b2903194003960ed7189ce6834abfb07'
+         '3841804189ed1a6bbf1a4845b5fdf53f'
+         '58245e37b544aa0dd0ce79e383a6aa23'
+         '5ee4beab35fd0adb3b250fb80a9b82a8'
+         '3d702ac32f8184038d38b2dbc7e7c886'
+         '27c5580bd0f7d45362e367c8b1675190'
+         'a70ab64d7bc529083bfe5ae4be9a4c0c'
+         'd7ca7f6c776958b22f97f59d7e28c647'
+         '4beb1c99e43c4ea2fea8d9d877bcfe06'
+         '67098d273f37d70f59f04b8be7a96595'
+         '69dd513b2ea4472b5b651faf278ba836'
+         'a62005875fba96de365a1432e6616842')
diff --git a/libre/icedove-libre/PKGBUILD b/libre/icedove-libre/PKGBUILD
index 8728e2e87..20dbea731 100644
--- a/libre/icedove-libre/PKGBUILD
+++ b/libre/icedove-libre/PKGBUILD
@@ -1,10 +1,10 @@
 # Maintainer : Márcio Silva <coadde@lavabit.com>
-# Maintainer : André Silva <emulatorman@lavabit.com>
+# Maintainer : André Silva <emulatorman@parabola.nu>
 
-# We're getting this from Debian Sid
+# We're getting this from Debian Experimental
 _debname=icedove
-_debver=17.0.9
-_debrel=deb2
+_debver=24.0
+_debrel=deb1
 _debrepo=http://ftp.debian.org/debian/pool/main/
 debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; }
 
@@ -16,30 +16,28 @@ pkgrel=1
 pkgdesc="A libre version of Debian Icedove, the standalone mail/news reader based on Mozilla Thunderbird."
 arch=('i686' 'x86_64' 'mips64el')
 license=('MPL' 'GPL' 'LGPL')
-url="http://packages.debian.org/sid/${_pkgname}"
+url="http://packages.debian.org/experimental/${_pkgname}"
 depends=('alsa-lib' 'dbus-glib' 'desktop-file-utils' 'gtk2' 'hicolor-icon-theme' 'hunspell' 'libevent' 'libnotify' 'libvpx' 'libxt' 'mime-types' 'mozilla-common' 'mozilla-searchplugins' 'nss' 'sqlite' 'startup-notification')
-makedepends=('unzip-libre' 'zip' 'pkg-config' 'python2' 'python2-virtualenv' 'wireless_tools' 'yasm' 'mesa' 'autoconf2.13' 'quilt')
+makedepends=('unzip-libre' 'zip' 'pkg-config' 'python2' 'wireless_tools' 'yasm' 'mesa' 'autoconf2.13' 'quilt')
 optdepends=('libcanberra: for sound support')
 replaces=('thunderbird')
 conflicts=('thunderbird')
 provides=('thunderbird')
 install=${_pkgname}.install
-source=("${_debrepo}/`debfile ${_debname}`_${_debver}.orig.tar.bz2"
+source=("${_debrepo}/`debfile ${_debname}`_${_debver}.orig.tar.xz"
         "${_debrepo}/`debfile ${_debname}`_${_debver}-${_debrel#deb}.debian.tar.gz"
         mozconfig
-        replace-urls.txt
         vendor.js
         ${_pkgname}.desktop)
 options=(!emptydirs)
-md5sums=('4c2aacece253be8f177a74d90d782f45'
-         'dd8ccad23583cc0d8c3b77066711f077'
-         '5cf95ea94f69cdd36604890cfbf7b954'
-         'a8fc4658d45b6bf9350023e5c3f34e56'
-         '4eecc4fc5aafaf0da651a09eadc90bee'
+md5sums=('c69b05c9a1c28d455964aed4927ef916'
+         'c67dc2f46f0e4d463ebe1ccdbfae6392'
+         'c46cf2a671c8fdefcabd4c87e38f3d40'
+         '5a53179d14ae9631b7afe5e4d0fc0b25'
          'e785e0c267f4435ae1a9aa0b03bcacfb')
 
 prepare() {
-  export DEBIAN_BUILD="comm-esr17"
+  export DEBIAN_BUILD="comm-esr24"
 
   export QUILT_PATCHES=debian/patches
   export QUILT_REFRESH_ARGS='-p ab --no-timestamps --no-index'
@@ -74,32 +72,30 @@ prepare() {
           s|include $(DEPTH)/config/rules.mk|include $(topsrcdir)/config/rules.mk|;
          ' mail/branding/icedove/locales/Makefile.in
 
+  # Fix package-manifest.in
+  sed -i '\|; Phishing Protection| s|$|\n#ifdef MOZ_SAFE_BROWSING|;
+          \|@BINPATH@/components/url-classifier[.]xpt| s|$|\n#endif|
+         ' mail/installer/package-manifest.in
+
   # Fix branding
   sed -i 's|Icedove Mail/News|Icedove|' mail/branding/icedove/locales/en-US/brand.{dtd,properties}
 
   # Replace common URLs
-  sed '/^#/d' ../replace-urls.txt | while read -r moz_url gnu_url; do
-    if [[ -n $moz_url ]]; then
-      printf 'liberating: %s -> %s\n' "$moz_url" "$gnu_url"
-      grep -Erl "${moz_url}" \
-        --exclude='*.'{patch,orig,rej} \
-        --exclude-dir={.pc,test,tests,testing} \
-        | xargs -d '\n' --no-run-if-empty sed -ri "s<${moz_url}<${gnu_url}<g"
-    fi
-  done
+  sed -i '\|extensions[.]getAddons[.]get[.]url| s|https://services[.]addons[.]mozilla[.]org.\+["][)][;]|http://directory.fsf.org/wiki/Icedove");|g;
+          \|extensions[.]getAddons[.]search[.]browseURL| s|https://addons[.]mozilla[.]org.\+["][)][;]|http://directory.fsf.org/wiki/Icedove");|g;
+          \|extensions[.]getAddons[.]search[.]url| s|https://services[.]addons[.]mozilla[.]org.\+["][)][;]|http://directory.fsf.org/wiki/Icedove");|g;
+          \|extensions[.]webservice[.]discoverURL| s|https://services[.]addons[.]mozilla[.]org.\+["][)][;]|http://directory.fsf.org/wiki/Icedove");|g;
+         ' mail/app/profile/all-thunderbird.js
 
   cp "${srcdir}/mozconfig" .mozconfig
 
   # configure script misdetects the preprocessor without an optimization level
   # https://bugs.archlinux.org/task/34644
-  sed -i '/ac_cpp=/s/$CPPFLAGS/& -O2/' configure
-
-  # Fix virtualenv path
-  sed -i 's|/usr/share/pyshared/virtualenv.py|/usr/lib/python2.7/site-packages/virtualenv.py|' mozilla/configure
+  sed -i '/ac_cpp=/s/$CPPFLAGS/& -O2/' mozilla/configure
 }
 
 build() {
-  export DEBIAN_BUILD="comm-esr17"
+  export DEBIAN_BUILD="comm-esr24"
 
   cd "${srcdir}/${DEBIAN_BUILD}"
 
@@ -110,7 +106,7 @@ build() {
 }
 
 package() {
-  export DEBIAN_BUILD="comm-esr17"
+  export DEBIAN_BUILD="comm-esr24"
 
   cd "${srcdir}/${DEBIAN_BUILD}"
 
diff --git a/libre/icedove-libre/mozconfig b/libre/icedove-libre/mozconfig
index 4f90cb58a..57c02368a 100644
--- a/libre/icedove-libre/mozconfig
+++ b/libre/icedove-libre/mozconfig
@@ -20,7 +20,7 @@ ac_add_options --with-system-libvpx
 ac_add_options --enable-system-hunspell
 ac_add_options --enable-system-sqlite
 ac_add_options --enable-system-ffi
-#ac_add_options --enable-system-cairo
+ac_add_options --enable-system-cairo
 ac_add_options --enable-system-pixman
 ac_add_options --with-pthreads
 
@@ -28,6 +28,7 @@ ac_add_options --with-pthreads
 ac_add_options --enable-startup-notification
 ac_add_options --enable-gio
 
+ac_add_options --disable-gstreamer
 ac_add_options --disable-gnomevfs
 ac_add_options --disable-crashreporter
 ac_add_options --disable-updater
diff --git a/libre/icedove-libre/replace-urls.txt b/libre/icedove-libre/replace-urls.txt
index fc13e32fb..9cc6d0933 100644
--- a/libre/icedove-libre/replace-urls.txt
+++ b/libre/icedove-libre/replace-urls.txt
@@ -2,24 +2,24 @@
 # These are whitespace-separated EREs, comments are lines starting with '#'
 
 https?://addons\.mozilla\.org/((%LOCALE%|@AB_CD@|en-US|ru)/)?([a-zA-Z%-]+)/dictionaries/?(\?[^"']*)?   https://parabolagnulinux.org/packages/\?repo=Extra\&q=hunspell-
-https?://addons\.mozilla\.org/((%LOCALE%|@AB_CD@|en-US|ru)/)?([a-zA-Z%-]+)/plugins/?(\?[^"']*)?        https://gnuzilla.gnu.org/plugins/
-https?://addons\.mozilla\.org/((%LOCALE%|@AB_CD@|en-US|ru)/)?([a-zA-Z%-]+)/personas/?(\?[^"']*)?       https://www.gnu.org/software/gnuzilla/addons.html
-https?://addons\.mozilla\.org/((%LOCALE%|@AB_CD@|en-US|ru)/)?([a-zA-Z%-]+)/recommended/?(\?[^"']*)?    https://www.gnu.org/software/gnuzilla/addons.html
-https?://addons\.mozilla\.org/((%LOCALE%|@AB_CD@|en-US|ru)/)?([a-zA-Z%-]+)/search-engines/?(\?[^"']*)? https://www.gnu.org/software/gnuzilla/addons.html#search%20engines
-https?://addons\.mozilla\.org/((%LOCALE%|@AB_CD@|en-US|ru)/)?([a-zA-Z%-]+)/search/?(\?[^"']*)?         https://www.gnu.org/software/gnuzilla/addons.html
-https?://addons\.mozilla\.org/((%LOCALE%|@AB_CD@|en-US|ru)/)?([a-zA-Z%-]+)/themes/?(\?[^"']*)?         https://www.gnu.org/software/gnuzilla/addons.html#themes
-https?://addons\.mozilla\.org/((%LOCALE%|@AB_CD@|en-US|ru)/)?([a-zA-Z%-]+)/?(\?[^"']*)?"               https://www.gnu.org/software/gnuzilla/addons.html"
-https?://addons\.mozilla\.org/((%LOCALE%|@AB_CD@|en-US|ru)/)?([a-zA-Z%-]+)/?(\?[^"']*)?$               https://www.gnu.org/software/gnuzilla/addons.html
+https?://addons\.mozilla\.org/((%LOCALE%|@AB_CD@|en-US|ru)/)?([a-zA-Z%-]+)/plugins/?(\?[^"']*)?        http://directory.fsf.org/wiki/Icedove
+https?://addons\.mozilla\.org/((%LOCALE%|@AB_CD@|en-US|ru)/)?([a-zA-Z%-]+)/personas/?(\?[^"']*)?       http://directory.fsf.org/wiki/Icedove
+https?://addons\.mozilla\.org/((%LOCALE%|@AB_CD@|en-US|ru)/)?([a-zA-Z%-]+)/recommended/?(\?[^"']*)?    http://directory.fsf.org/wiki/Icedove
+https?://addons\.mozilla\.org/((%LOCALE%|@AB_CD@|en-US|ru)/)?([a-zA-Z%-]+)/search-engines/?(\?[^"']*)? http://directory.fsf.org/wiki/Icedove
+https?://addons\.mozilla\.org/((%LOCALE%|@AB_CD@|en-US|ru)/)?([a-zA-Z%-]+)/search/?(\?[^"']*)?         http://directory.fsf.org/wiki/Icedove
+https?://addons\.mozilla\.org/((%LOCALE%|@AB_CD@|en-US|ru)/)?([a-zA-Z%-]+)/themes/?(\?[^"']*)?         http://directory.fsf.org/wiki/Icedove
+https?://addons\.mozilla\.org/((%LOCALE%|@AB_CD@|en-US|ru)/)?([a-zA-Z%-]+)/?(\?[^"']*)?"               http://directory.fsf.org/wiki/Icedove"
+https?://addons\.mozilla\.org/((%LOCALE%|@AB_CD@|en-US|ru)/)?([a-zA-Z%-]+)/?(\?[^"']*)?$               http://directory.fsf.org/wiki/Icedove
 
-https://addons.mozilla.org/firefox/collections/mozilla/webdeveloper/ https://www.gnu.org/software/gnuzilla/addons.html
+https://addons.mozilla.org/firefox/collections/mozilla/webdeveloper/ http://directory.fsf.org/wiki/Icedove
 
-https?://services\.addons\.mozilla\.org/(%LOCALE%|@AB_CD@|en-US|ru)/([a-zA-Z%-]+)/  https://www.gnu.org/software/gnuzilla/addons.html#bogus-services.\2/
+https?://services\.addons\.mozilla\.org/(%LOCALE%|@AB_CD@|en-US|ru)/([a-zA-Z%-]+)/  http://directory.fsf.org/wiki/Icedove.\2/
 
-https?://pfs\.mozilla\.org/plugins/PluginFinderService\.php             https://gnuzilla.gnu.org/plugins/PluginFinderService.php
+https?://pfs\.mozilla\.org/plugins/PluginFinderService\.php             http://directory.fsf.org/wiki/Icedove
 #https?://versioncheck\.addons\.mozilla\.org/update/VersionCheck\.php
 #https?://versioncheck-bg\.addons\.mozilla\.org/update/VersionCheck\.php
 
-"https?://addons\.mozilla\.org/" "https://www.gnu.org/software/gnuzilla/addons.html"
+"https?://addons\.mozilla\.org/" "http://directory.fsf.org/wiki/Icedove"
 
 # hack: these aren't URLs, per se
-(addonsBrowseAll\.description\s*=.*)addons\.mozilla\.org \1gnu.org/software/gnuzilla/addons.html
+(addonsBrowseAll\.description\s*=.*)addons\.mozilla\.org \1directory.fsf.org/wiki/Icedove
diff --git a/libre/icedove-libre/vendor.js b/libre/icedove-libre/vendor.js
index 279bdc158..170b505a8 100644
--- a/libre/icedove-libre/vendor.js
+++ b/libre/icedove-libre/vendor.js
@@ -1,6 +1,3 @@
-// Forbid application updates
-lockPref("app.update.enabled", false);
-
 // Use LANG environment variable to choose locale
 pref("intl.locale.matchOS", true);
 
diff --git a/libre/iceweasel-adblock-plus/PKGBUILD b/libre/iceweasel-adblock-plus/PKGBUILD
index 81648fbcd..b3c11d563 100644
--- a/libre/iceweasel-adblock-plus/PKGBUILD
+++ b/libre/iceweasel-adblock-plus/PKGBUILD
@@ -1,6 +1,6 @@
 # $Id: PKGBUILD 94536 2013-07-26 13:15:58Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
+# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
 
 _pkgname=firefox-adblock-plus
 pkgname=iceweasel-adblock-plus
diff --git a/libre/iceweasel-l10n/PKGBUILD b/libre/iceweasel-l10n/PKGBUILD
index a135d161e..c032a2b70 100644
--- a/libre/iceweasel-l10n/PKGBUILD
+++ b/libre/iceweasel-l10n/PKGBUILD
@@ -1,4 +1,4 @@
-# Maintainer: André Silva <emulatorman@lavabit.com>
+# Maintainer: André Silva <emulatorman@parabola.nu>
 # Maintainer: Márcio Silva <coadde@lavabit.com>
 # Contributor: Luke Shumaker <lukeshu@sbcglobal.net>
 # Contributor: fauno <fauno@kiwwwi.com.ar>
@@ -11,8 +11,8 @@
 # - Run 'make'. It will take care of everything else for you.
 
 _debname=iceweasel
-_debver=24.0
-_debrel=deb2
+_debver=25.0
+_debrel=deb1
 _debrepo=http://ftp.debian.org/debian/pool/main/
 debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; }
 
@@ -28,7 +28,7 @@ pkgrel=1
 
 pkgdesc="Language packs for Debian Iceweasel."
 arch=('any')
-url="http://packages.debian.org/sid/iceweasel"
+url="http://packages.debian.org/experimental/iceweasel"
 license=('MPL' 'GPL')
 depends=("iceweasel-libre>=$epoch:$pkgver")
 makedepends=('unzip' 'zip')
@@ -75,92 +75,92 @@ package_iceweasel-l10n-$(echo $lang | tr A-Z a-z)() {
 "
 done
 
-md5sums=('e88728730ecf9f0f145de5f70e362b15'
-         '8b54f8c36f8465987871145fd70956ce'
-         'ad3a11f1485a58a0ad59d861d37a08a5'
-         '9761805e9011c371bb443d8f74fede3c'
-         '87bb6a20535feb2692aa2a6a1afa11e5'
-         '656dca2918d356fbe368b18fb9eac7ec'
-         'e1c793ac7d7beed9d21631154c3dbe1c'
-         '862470f8d5ee8f8d2f68afc7f4a3d5c1'
-         '5d7d027fe8c821689a4fdb022fdf7b1f'
-         'ab298b1e9d86dfccb6797a8f2f28c8af'
-         '4c3dd02509c0f7a8506b7303a410692b'
-         'ebe4f9e91981bbe85d4f2024325d4cf2'
-         'c7e1dae44043c1236f96739ad1117fbe'
-         'b33da7699c2a2f5e0febd11e4489d382'
-         '63c8b3e4c079fbbd98e321035b5c6317'
-         'f14d3462af09d8094393ee16f679e5ab'
-         '0eac6ddbcce45fd8e9a202c93a3738cb'
-         'c837f374f56c0bd6efdde745dce89f8a'
-         '5f780c1b42835050c39db15493dff728'
-         '69303505295c74467a56aa2a43ea2b82'
-         '7c44dba21f5d03604b5dd120231a00ae'
-         'a401bc653b544ac4f259cca56b79d96d'
-         'abdac5ba27fc5cd2ec4d5bc514772670'
-         '0ddc4de7b3050ed2a49233fbe18eebb3'
-         '7d09b317736ba78bd6bcf86f5f6e1e11'
-         '14d1ceaaef00130134e017ae868db8ea'
-         '9ddedfef7ffea213ef4d4e1773b3ad15'
-         'ae89977182d5998204b8ebc1e2603e9f'
-         '642cdf237587093072412720fb36485a'
-         '113ef967c5c05ae9ceae093064fdc116'
-         '90425e1d17c39090a68014c6ce7fb17b'
-         '0d9e0fc7162eb0aca197866ef427f481'
-         '95cc1695aa5bffbdcbcb773fb0430319'
-         '1475a2ad88c8699a9c36e07baed988e0'
-         '26fd5bf6e4e0a6c634ca7632fb20d69d'
-         '1cfb6db8de12e0698f0663fffe651962'
-         '47cbb471101ed09e1d43f85a38cac91f'
-         'e8cb435f70c0d62b07cddf051b2e6a5b'
-         'bc58060bf3539ab408f1a331ec617949'
-         '01e8eedc1594c13db4f8a991fcf87f83'
-         '91179c0d3ee8f003a848eedd2435ea3c'
-         '0bac7e153488e965f164d61d81de87cb'
-         '4dabbdfa4fe6477e862eb381eb2c4fd0'
-         'a83a772712ae74ddb309cb4a7cb52f75'
-         'e16444075ca17e7b5961f7e1e0a828bf'
-         '4df54bf6c1b1cb35a130d34f9a981eec'
-         '27e8f49d9a73c79515aa75304758ae22'
-         '4ad85b335fd26d3474548433fd20d919'
-         '7f63adfe80832afc40cc3774b48fdefc'
-         'dbeac803ed5906af388d2130cdac5c32'
-         'f82ba92549541e2d89d5040d175a11d8'
-         'bd46bc7902cba8866ffedbb50c8ca2f8'
-         '203f1fcb9dd3de9396787fc9dab0312a'
-         'da685c4c4bd727b337bb720d83de8cf5'
-         '42fbbda5287dfbf11619e6046bd06f8b'
-         '65844655106abc5fba71a2cd9bec2d26'
-         '4ad3f9cbb469aeca27443e39a53e8c73'
-         '9225277738d7a0fb8b585314ecdb642f'
-         '292574470c2daeda3c005b12d8a66269'
-         '954554b04d7aee0c6662d2edf7b48c1b'
-         'f15824595b7aab31ce8cc91de781ea03'
-         'c5f2c9ddb5775179be5eea13b12f843f'
-         'def21db04a3b606c603412d7a0091041'
-         '686fcc1eefcce197c8b27363c5db6f34'
-         '9eb2657a7af95927274b0453056173b3'
-         '58e3dedcb8c0f85766aaaa0d35746b94'
-         '209670672c37d4befa4375528385ae4a'
-         'f3b09defe2dd33f94c5aa4f3c19d726e'
-         '3f05b588ddea099c873203267287e296'
-         '91180565b17731d4ff40e6612f499527'
-         'fac9050297be0dfe64473d3fe3bce03b'
-         'd72a455cd79e304627db71c0ad42e42c'
-         'f271b0a4b2d348edca352611da9fa79e'
-         '367a12e148e94885d5141a7b374523f7'
-         '18fb3c7bbfdf0b81a40ef5f0bd9d3c2c'
-         '4e5418b69f62e5d281aa98b0089149de'
-         'bfdf7ae55a0994fbe3ed2359dfd2d437'
-         'e7b4b504e518b16bb5d9cea8770b1b7a'
-         'a8719e1294071e9e0366f686b89a793f'
-         'c422789ab794748200b3d33f660b0076'
-         'ac040347a410692fea6b7fdda06802cf'
-         '97c066c4bd823d8f3157fbb390cbaaac'
-         '3167b085b038f6f1bde2530a167e7405'
-         'e969d0185a8c34341edba2ea2e70a476'
-         'aff3452e3b6663a2e2f8870924bfded6'
-         '44519549cf6b052b49519c9960f97481'
-         'fe67796800cb807148a39722d689a4c7'
-         'b947f013e632c6d262ebdbfac53e3958'
-         '677267c8284fca2b3749f53eba598121')
+md5sums=('a4593936bf1c7a9ec9368ff249f9cc56'
+         '72891c593c993c5474abff8b4e72d543'
+         '675ce7d5e3d7a2899db8be29a3f8482a'
+         'ed754b10fb8e687dab42ccb50f31649c'
+         'e3ca6f8116a0d9b2cada9fa88b66e237'
+         '3324458a1907de5c95ed6d02601e2753'
+         '5ea65765bb6fb9ba8aac3e36ed66c1b8'
+         'c22ae0fcc64c979cf87aec4b191353fb'
+         'c33058a022beb01abad48d543d4621bc'
+         'f7cb06c3847748fcd01aa6c7e07bab09'
+         'b2c9f2768a5f364c64e38d76323aa1b7'
+         'cf5a47e0ce43bcbe9601401e3adcf87b'
+         'c42200f23f5ced9395ae8a1dff2e824f'
+         '487dd4ace0ed32330b4dcbf1c6d39758'
+         '5ad617928cf23d8e97916cf16d417635'
+         '6dd585cf48ac920dfb2ba2966ccc1a7b'
+         '399e6f69ea89436c3cb2d6c17b9415f5'
+         '726eb9a1368f01b01cb11f78c1fe91b1'
+         '19152bb2705946c16f7f10140128635b'
+         '34a8fd695d3ac20bf733c4c5fd9c733e'
+         'e13963f59dbec91fa9318fcfb19570c5'
+         '9ef86e7b69f7de49e321ef7dc7dc0b75'
+         'bb74f5cb87e6218820e7c9a2bddc2021'
+         'fa34dfaed15fa16814ac2d629971141f'
+         'a124544d82417a7a1341c37c80b18f68'
+         '6936b981c79fbffbd514dcbd281c26b8'
+         '0b59289da31c29844db8c688770a474a'
+         '8bd21818ca2216e65f160eb7a9ca072b'
+         '20ad27abc7c254a9960682f7afda1e5f'
+         'e8bd8488274796668e5b7a4e4dba5949'
+         '991f8d1e1faae1a6a22113f4f3f6d90e'
+         'bb0f98dcd2b87510d09216d9a36ef686'
+         '87fa30b76eafab63b28ee53943435e43'
+         '3cbafc8cdff119b73fcbd2bac8ffadea'
+         '25b4ee89d58b2edf937515a1f8309768'
+         'ea5b9b47bd4a24a80058509ba2126041'
+         '97be59190157410b37a56cbec1d95c78'
+         '575a68f6bc5ace8fc212a9a7d759291b'
+         'f57bea11b0f49cf2e4023008ffcdc87d'
+         'c1130d88b73db6a474d1df5ed00d0427'
+         'd0fd4480ab9fd6d20e2ea3c23a94ae14'
+         '4b7f19fd35a68990d114e0f7c265b7b2'
+         '77ed20f961742c3b8eb7a8cfdc24df25'
+         '9c3ed09220442dc602be0fd130475349'
+         'c7b7cd5971d07052c983e6d2047a3154'
+         '6e7b9ac0906938a0ba4296e99a03779c'
+         '39b1121cb719123596c3b1ef48d82b94'
+         'ae71cd7232645c49b1d9f970a6f824e0'
+         '25b322a7fa03c620747d72587e594173'
+         '4b5fefdfdba63243507ac623644912ca'
+         'ae02bb179460d0a1ad2c88ed063c1222'
+         '2eb0dd6b6540f11b1e3ea7cfb6a8f414'
+         '1a04b8c9fddcdbc96e52d2a6b5ccaae9'
+         '8fa2584f770ca97eb7a46826f027aa63'
+         '083f0e2bdc94f668b0aa10a7ebe65e78'
+         '091c223464fb65ed7e771fa0abda5db6'
+         '53bc7c5f16a4c1e9d5315ae44bfbc1ab'
+         '5cfc5a27b72a432da7267fcc87fab40a'
+         'a4467ea38382fd2c0aa22fdf1aab41b1'
+         '2ae42108358fe38e2efbe70e26f82f3c'
+         'dcba6a97010bb9504e9778bfc5aee54b'
+         '4b8dd9e54b79d133884d29b6a6b78d1f'
+         '0c364c911b310d5656652faced437ec4'
+         '60856a5d67e13bc3ecb2edd6f90ce328'
+         '1685cea5a1094769a0a2f7fa3e248482'
+         '6d3218c1a6c45206c71477f3403b3bf9'
+         'a75749039cca538ba22bb7007b8358e9'
+         'c795a1eb2f467a1fe6c7821af6dd9d05'
+         'b1e16275ee6b874e4f39579126cb8c94'
+         '159145964d7c3e6faa1416a2ebc96e84'
+         'bf6efa5437f4dbd6549e27b00523e10e'
+         'ab9d9d2568d3be83038973c7b1077c6a'
+         'd6ad3b4a84ca1a35ef46a6a7053de37c'
+         '285f62d8782aa73860a2187b0a4027cf'
+         'd107b587a939124df3c8a233e75d3ca3'
+         '968bd91d21c52095f08f9a55d20ba6a4'
+         '0f29172e2aa3edf11a1c705ce945f036'
+         '78ce26aa5e6fedff75cae9aa24d8d8e9'
+         'a8d0606d5d79f1e4f08908f67b0336ab'
+         '21d6c6af9ae10aa4d392a1f949a76462'
+         'bf1fb5267204996373ff541558d7b286'
+         'c3561aa5796054b0377eaab17017b341'
+         '2a2c08f36efd1b4455194abd67268c34'
+         '4cfe3e0dca2d7e26effb3fdda7bb2af7'
+         'a1eb070b498fd9324a7c5c3563f7d29e'
+         '1fad104a69ed3150d3d8ca1b79181d03'
+         '2e099ca02f1269f25627616cb7df3d12'
+         '852e3415f008110d23ed1ed9bdba2d35'
+         'e8f40197b8026e641b4836de6864045a')
diff --git a/libre/iceweasel-l10n/region.properties b/libre/iceweasel-l10n/region.properties
index fe7f265ce..5654eb9ee 100644
--- a/libre/iceweasel-l10n/region.properties
+++ b/libre/iceweasel-l10n/region.properties
@@ -15,7 +15,7 @@ browser.search.order.3=Seeks Search
 # profile database.  Note that "new" is defined as "has a different URL"; this
 # means that it's not possible to update the name of existing handler, so 
 # don't make any spelling errors here.
-gecko.handlerService.defaultHandlersVersion=3
+gecko.handlerService.defaultHandlersVersion=4
 
 # The default set of protocol handlers for irc:
 gecko.handlerService.schemes.irc.0.name=Freenode Web IRC
diff --git a/libre/iceweasel-libre/Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch b/libre/iceweasel-libre/Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch
index 5d56ee23b..d2716aed3 100644
--- a/libre/iceweasel-libre/Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch
+++ b/libre/iceweasel-libre/Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch
@@ -67,10 +67,10 @@ index d7fec75..d531b83 100644
  component {3d2532e3-4932-4774-b7ba-968f5899d3a4} IEProfileMigrator.js

  contract @mozilla.org/profile/migrator;1?app=browser&type=ie {3d2532e3-4932-4774-b7ba-968f5899d3a4}

 diff --git a/browser/components/migration/src/FirefoxProfileMigrator.js b/browser/components/migration/src/FirefoxProfileMigrator.js

-index 23e021d..469e504 100644

+index 3db6720..a3b3dda 100644

 --- a/browser/components/migration/src/FirefoxProfileMigrator.js

 +++ b/browser/components/migration/src/FirefoxProfileMigrator.js

-@@ -89,7 +89,7 @@ Object.defineProperty(FirefoxProfileMigrator.prototype, "startupOnlyMigrator", {

+@@ -128,7 +128,7 @@ Object.defineProperty(FirefoxProfileMigrator.prototype, "startupOnlyMigrator", {

  

  

  FirefoxProfileMigrator.prototype.classDescription = "Firefox Profile Migrator";

@@ -80,10 +80,10 @@ index 23e021d..469e504 100644
  

  this.NSGetFactory = XPCOMUtils.generateNSGetFactory([FirefoxProfileMigrator]);

 diff --git a/browser/components/migration/src/MigrationUtils.jsm b/browser/components/migration/src/MigrationUtils.jsm

-index 3d23a98..4ce7a3e 100644

+index 2c91e9a..08962c4 100644

 --- a/browser/components/migration/src/MigrationUtils.jsm

 +++ b/browser/components/migration/src/MigrationUtils.jsm

-@@ -404,12 +404,6 @@ this.MigrationUtils = Object.freeze({

+@@ -405,12 +405,6 @@ this.MigrationUtils = Object.freeze({

     * @see nsIStringBundle

     */

    getLocalizedString: function MU_getLocalizedString(aKey, aReplacements) {

@@ -96,7 +96,7 @@ index 3d23a98..4ce7a3e 100644
      if (aReplacements === undefined)

        return getMigrationBundle().GetStringFromName(aKey);

      return getMigrationBundle().formatStringFromName(

-@@ -624,6 +618,17 @@ this.MigrationUtils = Object.freeze({

+@@ -625,6 +619,17 @@ this.MigrationUtils = Object.freeze({

    },

  

    /**

@@ -140,18 +140,10 @@ index 21cf405..f3c1a6b 100644
  <!ENTITY noMigrationSources.label       "No programs that contain bookmarks, history or password data could be found.">

  

 diff --git a/browser/locales/en-US/chrome/browser/migration/migration.properties b/browser/locales/en-US/chrome/browser/migration/migration.properties

-index b1cb03d..1755ae7 100644

+index 094a9dc..a620905 100644

 --- a/browser/locales/en-US/chrome/browser/migration/migration.properties

 +++ b/browser/locales/en-US/chrome/browser/migration/migration.properties

-@@ -8,7 +8,6 @@ profileName_format=%S %S

- sourceNameIE=Internet Explorer

- sourceNameSafari=Safari

- sourceNameChrome=Google Chrome

--sourceNameFirefox=Mozilla Firefox

- 

- importedBookmarksFolder=From %S

- 

-@@ -24,22 +23,22 @@ importedSafariReadingList=Reading List (From Safari)

+@@ -24,30 +24,30 @@ importedSafariReadingList=Reading List (From Safari)

  2_ie=Cookies

  2_safari=Cookies

  2_chrome=Cookies

@@ -176,69 +168,82 @@ index b1cb03d..1755ae7 100644
 -16_firefox=Saved Passwords

 +16_self=Saved Passwords

  

- 32_ie=Favorites

+-32_ie=Favorites

++32_ie=Favourites

  32_safari=Bookmarks

-@@ -48,4 +47,4 @@ importedSafariReadingList=Reading List (From Safari)

+ 32_chrome=Bookmarks

+ 

  64_ie=Other Data

  64_safari=Other Data

  64_chrome=Other Data

 -64_firefox_other=Other Data

 +64_self=Other Data

-diff --git a/toolkit/content/jar.mn b/toolkit/content/jar.mn

-index 5c23509..54b82bd 100644

---- a/toolkit/content/jar.mn

-+++ b/toolkit/content/jar.mn

-@@ -43,7 +43,7 @@ toolkit.jar:

- +  content/global/mozilla.xhtml               (mozilla.xhtml)

-    content/global/nsDragAndDrop.js            (nsDragAndDrop.js)

-    content/global/resetProfile.css            (resetProfile.css)

--*  content/global/resetProfile.js             (resetProfile.js)

-+   content/global/resetProfile.js             (resetProfile.js)

-    content/global/resetProfile.xul            (resetProfile.xul)

-    content/global/resetProfileProgress.xul    (resetProfileProgress.xul)

-    content/global/treeUtils.js                (treeUtils.js)

+ 

+-128_firefox=Windows and Tabs

++128_self=Windows and Tabs

 diff --git a/toolkit/content/resetProfile.js b/toolkit/content/resetProfile.js

-index dcb4065..09c1146 100644

+index d46b43b..2253994 100644

 --- a/toolkit/content/resetProfile.js

 +++ b/toolkit/content/resetProfile.js

-@@ -36,13 +36,13 @@ function resetSupported() {

-                        getService(Ci.nsIToolkitProfileService);

-   let currentProfileDir = Services.dirsvc.get("ProfD", Ci.nsIFile);

+@@ -28,6 +28,58 @@ function onResetProfileLoad() {

+   populateResetPane("migratedItems");

+ }

  

--#expand const MOZ_APP_NAME = "__MOZ_APP_NAME__";

--#expand const MOZ_BUILD_APP = "__MOZ_BUILD_APP__";

--

-   // Reset is only supported for the default profile if the self-migrator used for reset exists.

-   try {

--    return currentProfileDir.equals(profileService.selectedProfile.rootDir) &&

--             ("@mozilla.org/profile/migrator;1?app=" + MOZ_BUILD_APP + "&type=" + MOZ_APP_NAME in Cc);

++<<<<<<< HEAD

++=======

++/**

++ * Check if reset is supported for the currently running profile.

++ *

++ * @return boolean whether reset is supported.

++ */

++function resetSupported() {

++  let profileService = Cc["@mozilla.org/toolkit/profile-service;1"].

++                       getService(Ci.nsIToolkitProfileService);

++  let currentProfileDir = Services.dirsvc.get("ProfD", Ci.nsIFile);

++

++  // Reset is only supported for the default profile if the self-migrator used for reset exists.

++  try {

 +    if (currentProfileDir.equals(profileService.selectedProfile.rootDir) &&

 +        "@mozilla.org/toolkit/profile-migrator;1" in Cc) {

 +      let pm = Cc["@mozilla.org/toolkit/profile-migrator;1"].createInstance(Ci.nsIProfileMigrator);

 +      return ("canMigrate" in pm) && pm.canMigrate("self");

 +    }

-   } catch (e) {

-     // Catch exception when there is no selected profile.

-     Cu.reportError(e);

-@@ -53,9 +53,6 @@ function resetSupported() {

- function getMigratedData() {

-   Components.utils.import("resource:///modules/MigrationUtils.jsm");

- 

--#expand const MOZ_BUILD_APP = "__MOZ_BUILD_APP__";

--#expand const MOZ_APP_NAME = "__MOZ_APP_NAME__";

--

-   // From migration.properties

-   const MIGRATED_TYPES = [

-     4,  // History and Bookmarks

-@@ -68,7 +65,7 @@ function getMigratedData() {

-   let dataTypes = [];

-   for (let itemID of MIGRATED_TYPES) {

-     try {

--      let typeName = MigrationUtils.getLocalizedString(itemID + "_" + MOZ_APP_NAME);

++  } catch (e) {

++    // Catch exception when there is no selected profile.

++    Cu.reportError(e);

++  }

++  return false;

++}

++

++function getMigratedData() {

++  Components.utils.import("resource:///modules/MigrationUtils.jsm");

++

++  // From migration.properties

++  const MIGRATED_TYPES = [

++    4,  // History and Bookmarks

++    16, // Passwords

++    8,  // Form History

++    2,  // Cookies

++  ];

++

++  // Loop over possible data to migrate to give the user a list of what will be preserved.

++  let dataTypes = [];

++  for (let itemID of MIGRATED_TYPES) {

++    try {

 +      let typeName = MigrationUtils.getLocalizedString(itemID + "_self");

-       dataTypes.push(typeName);

-     } catch (x) {

-       // Catch exceptions when the string for a data type doesn't exist.

++      dataTypes.push(typeName);

++    } catch (x) {

++      // Catch exceptions when the string for a data type doesn't exist.

++      Components.utils.reportError(x);

++    }

++  }

++  return dataTypes;

++}

++

++>>>>>>> Bug 756390 - Make the "Reset Firefox" feature more generic

+ function onResetProfileAccepted() {

+   let retVals = window.arguments[0];

+   retVals.reset = true;

 diff --git a/toolkit/profile/nsIProfileMigrator.idl b/toolkit/profile/nsIProfileMigrator.idl

 index f35c227..7062886 100644

 --- a/toolkit/profile/nsIProfileMigrator.idl

@@ -268,10 +273,10 @@ index f35c227..7062886 100644
  

  %{C++

 diff --git a/toolkit/xre/nsAppRunner.cpp b/toolkit/xre/nsAppRunner.cpp

-index cc3f65e..cdd4305 100644

+index 5f989ea..e7e21bd 100644

 --- a/toolkit/xre/nsAppRunner.cpp

 +++ b/toolkit/xre/nsAppRunner.cpp

-@@ -3731,7 +3731,7 @@ XREMain::XRE_mainRun()

+@@ -3733,7 +3733,7 @@ XREMain::XRE_mainRun()

          if (gDoProfileReset) {

            // Automatically migrate from the current application if we just

            // reset the profile.

diff --git a/libre/iceweasel-libre/PKGBUILD b/libre/iceweasel-libre/PKGBUILD
index 069b2827d..9285849c3 100644
--- a/libre/iceweasel-libre/PKGBUILD
+++ b/libre/iceweasel-libre/PKGBUILD
@@ -1,4 +1,4 @@
-# Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
+# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
 # Maintainer (Parabola): Márcio Silva <coadde@lavabit.com>
 # Contributor (ConnochaetOS): Henry Jensen <hjensen@connochaetos.org>
 # Contributor (Parabola): Luke Shumaker <lukeshu@sbcglobal.net>
@@ -12,10 +12,10 @@
 
 _pgo=true
 
-# We're getting this from Debian Sid
+# We're getting this from Debian Experimental
 _debname=iceweasel
-_debver=24.0
-_debrel=deb2
+_debver=25.0
+_debrel=deb1
 _debrepo=http://ftp.debian.org/debian/pool/main/
 debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; }
 
@@ -42,7 +42,7 @@ optdepends=('networkmanager: Location detection via available WiFi networks'
             'gstreamer0.10-good-plugins: webm and mp4 demuxing'
             'gstreamer0.10-ugly-plugins: h.264 decoding'
             'libpulse: PulseAudio audio driver')
-url="http://packages.debian.org/sid/${_pkgname}"
+url="http://packages.debian.org/experimental/${_pkgname}"
 install=iceweasel.install
 replaces=('firefox')
 conflicts=('firefox')
@@ -55,18 +55,18 @@ source=("$_debrepo/`debfile $_debname`_$_debver.orig.tar.bz2"
         iceweasel.desktop
         iceweasel-install-dir.patch
         vendor.js
-        replace-urls.txt
+        iceweasel-20.0.1-fixed-loading-icon.png
         Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch)
-md5sums=('8f24807d67599516850a4bdca2b2fbd6'
-         '1f4f1347e05b15f5af137787d614ecdf'
+md5sums=('dd1462b582747210cc6c2ac1d01c4c17'
+         '4f4cde44b6e83cf78ff5d6e757d1913c'
          '350feec44d359c31679dbec3de6685df'
          'df08eaa1ac3bc6c2356be4fbf8ec8932'
-         '5b32b39c033a33f45e2cfc6c3e80f20c'
+         '8c11b80574b11e96c2ef44fa16f4b844'
          '7b9e5996dd9fe0b186a43a297db1c6b5'
          'abf5ecb74caa857abb42bcfbb3442d9c'
-         '121fefaa040936c3b96298da0c49f450'
-         'a8fc4658d45b6bf9350023e5c3f34e56'
-         'f1594fa3567e5b70202c3432d7c00202')
+         '816013881cfc9a1f4f0ede72b014f8b3'
+         '6e335a517c68488941340ee1c23f97b0'
+         'ee3279c706c3a69e6f8eda415c4d35b0')
 
 prepare() {
   export DEBIAN_BUILD="mozilla-release"
@@ -89,19 +89,18 @@ prepare() {
   patch -Np1 -i "$srcdir/Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch" # Adding fixed Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch
   patch -Np1 -i "$srcdir/iceweasel-install-dir.patch" # install to /usr/lib/$_pkgname
 
-  # Replace common URLs
-  sed '/^#/d' ../replace-urls.txt | while read -r moz_url gnu_url; do
-    if [[ -n $moz_url ]]; then
-      printf 'liberating: %s -> %s\n' "$moz_url" "$gnu_url"
-      grep -Erl "${moz_url}" \
-        --exclude='*.'{patch,orig,rej} \
-        --exclude-dir={.pc,test,tests,testing} \
-        | xargs -d '\n' --no-run-if-empty sed -ri "s<${moz_url}<${gnu_url}<g"
-    fi
-  done
-
-  # Patch anything that's left
+  # Patch and remove anything that's left
   patch -Np1 -i "$srcdir/libre.patch"
+  rm -v browser/base/content/abouthome/snippet*.png || true
+  sed -i "\|abouthome/snippet|d" browser/base/jar.mn
+
+  # Replace common URLs
+  sed -i '\|extensions[.]getAddons[.]get[.]url| s|https://services[.]addons[.]mozilla[.]org.\+["][)][;]|http://directory.fsf.org/wiki/GNU_IceCat");|g;
+          \|extensions[.]getAddons[.]search[.]browseURL| s|https://addons[.]mozilla[.]org.\+["][)][;]|http://directory.fsf.org/wiki/GNU_IceCat");|g;
+          \|extensions[.]getAddons[.]search[.]url| s|https://services[.]addons[.]mozilla[.]org.\+["][)][;]|http://directory.fsf.org/wiki/GNU_IceCat");|g;
+          \|extensions[.]webservice[.]discoverURL| s|https://services[.]addons[.]mozilla[.]org.\+["][)][;]|http://directory.fsf.org/wiki/GNU_IceCat");|g;
+          \|browser[.]search[.]searchEnginesURL| s|https://addons[.]mozilla[.]org.\+["][)][;]|http://directory.fsf.org/wiki/GNU_IceCat");|g;
+         ' browser/app/profile/firefox.js
 
   cp "$srcdir/mozconfig" .mozconfig # Load our build config, disable SafeSearch
 
@@ -149,6 +148,11 @@ prepare() {
   # configure script misdetects the preprocessor without an optimization level
   # https://bugs.archlinux.org/task/34644
   sed -i '/ac_cpp=/s/$CPPFLAGS/& -O2/' configure
+
+  # Fix tab loading icon (flickers with libpng 1.6)
+  # https://bugzilla.mozilla.org/show_bug.cgi?id=841734
+  cp "$srcdir/iceweasel-20.0.1-fixed-loading-icon.png" \
+    browser/themes/linux/tabbrowser/loading.png
 }
 
 build() {
diff --git a/libre/iceweasel-libre/iceweasel-20.0.1-fixed-loading-icon.png b/libre/iceweasel-libre/iceweasel-20.0.1-fixed-loading-icon.png
new file mode 100644
index 000000000..55f25e591
--- /dev/null
+++ b/libre/iceweasel-libre/iceweasel-20.0.1-fixed-loading-icon.png
diff --git a/libre/iceweasel-libre/libre.patch b/libre/iceweasel-libre/libre.patch
index 504ebca91..e5632c667 100644
--- a/libre/iceweasel-libre/libre.patch
+++ b/libre/iceweasel-libre/libre.patch
@@ -1,7 +1,7 @@
-diff -ruN mozilla-release.orig/browser/app/profile/firefox.js mozilla-release/browser/app/profile/firefox.js
---- mozilla-release.orig/browser/app/profile/firefox.js	2013-08-07 10:36:49.891513965 -0300
-+++ mozilla-release/browser/app/profile/firefox.js	2013-08-12 22:34:34.309460804 -0300
-@@ -1206,14 +1206,6 @@
+diff -Nur mozilla-release.orig/browser/app/profile/firefox.js mozilla-release/browser/app/profile/firefox.js
+--- mozilla-release.orig/browser/app/profile/firefox.js	2013-11-05 03:52:59.229583495 -0200
++++ mozilla-release/browser/app/profile/firefox.js	2013-11-05 03:57:12.955661016 -0200
+@@ -1269,14 +1269,6 @@
  // (This is intentionally on the high side; see bug 746055.)
  pref("image.mem.max_decoded_image_kb", 256000);
  
@@ -16,10 +16,105 @@ diff -ruN mozilla-release.orig/browser/app/profile/firefox.js mozilla-release/br
  // Turn on the CSP 1.0 parser for Content Security Policy headers
  pref("security.csp.speccompliant", true);
  
-diff -ruN mozilla-release.orig/browser/base/content/abouthome/aboutHome.js mozilla-release/browser/base/content/abouthome/aboutHome.js
---- mozilla-release.orig/browser/base/content/abouthome/aboutHome.js	2013-08-07 11:44:11.230486326 -0300
-+++ mozilla-release/browser/base/content/abouthome/aboutHome.js	2013-08-08 08:27:08.189418422 -0300
-@@ -3,132 +3,41 @@
+diff -Nur mozilla-release.orig/browser/base/content/abouthome/aboutHome.css mozilla-release/browser/base/content/abouthome/aboutHome.css
+--- mozilla-release.orig/browser/base/content/abouthome/aboutHome.css	2013-10-25 20:27:08.000000000 -0200
++++ mozilla-release/browser/base/content/abouthome/aboutHome.css	2013-11-05 03:57:12.958994121 -0200
+@@ -49,11 +49,6 @@
+   background-repeat: no-repeat;
+ }
+ 
+-#searchForm,
+-#snippets {
+-  width: 470px;
+-}
+-
+ #searchForm {
+   display: -moz-box;
+ }
+@@ -72,8 +67,7 @@
+ #searchEngineLogo {
+   display: inline-block;
+   height: 28px;
+-  width: 70px;
+-  min-width: 70px;
++  width: 47px;
+ }
+ 
+ #searchText {
+@@ -145,48 +139,6 @@
+   transition-duration: 0ms;
+ }
+ 
+-#defaultSnippet1,
+-#defaultSnippet2,
+-#rightsSnippet {
+-  display: block;
+-  min-height: 38px;
+-  background: 30px center no-repeat;
+-  padding: 6px 0;
+-  -moz-padding-start: 79px;
+-}
+-
+-#rightsSnippet[hidden] {
+-  display: none;
+-}
+-
+-#defaultSnippet1:-moz-dir(rtl),
+-#defaultSnippet2:-moz-dir(rtl),
+-#rightsSnippet:-moz-dir(rtl) {
+-  background-position: right 30px center;
+-}
+-
+-#defaultSnippet1 {
+-  background-image: url("chrome://browser/content/abouthome/snippet1.png");
+-}
+-
+-#defaultSnippet2 {
+-  background-image: url("chrome://browser/content/abouthome/snippet2.png");
+-}
+-
+-#snippets {
+-  display: inline-block;
+-  text-align: start;
+-  margin: 12px 0;
+-  color: #3c3c3c;
+-  font-size: 75%;
+-  /* 12px is the computed font size, 15px the computed line height of the snippets
+-     with Segoe UI on a default Windows 7 setup. The 15/12 multiplier approximately
+-     converts em from units of font-size to units of line-height. The goal is to
+-     preset the height of a three-line snippet to avoid visual moving/flickering as
+-     the snippets load. */
+-  min-height: calc(15/12 * 3em);
+-}
+-
+ #launcher {
+   display: -moz-box;
+   -moz-box-align: center;
+@@ -366,20 +318,6 @@
+     background-image: url("chrome://branding/content/about-logo@2x.png");
+   }
+ 
+-  #defaultSnippet1,
+-  #defaultSnippet2,
+-  #rightsSnippet {
+-    background-size: 40px;
+-  }
+-
+-  #defaultSnippet1 {
+-    background-image: url("chrome://browser/content/abouthome/snippet1@2x.png");
+-  }
+-
+-  #defaultSnippet2 {
+-    background-image: url("chrome://browser/content/abouthome/snippet2@2x.png");
+-  }
+-
+   .launchButton::before,
+   #aboutMozilla::before {
+     transform: scale(.5);
+diff -Nur mozilla-release.orig/browser/base/content/abouthome/aboutHome.js mozilla-release/browser/base/content/abouthome/aboutHome.js
+--- mozilla-release.orig/browser/base/content/abouthome/aboutHome.js	2013-10-25 20:27:08.000000000 -0200
++++ mozilla-release/browser/base/content/abouthome/aboutHome.js	2013-11-05 04:10:11.565757913 -0200
+@@ -3,152 +3,44 @@
   * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
  
  const SEARCH_ENGINES = {
@@ -186,31 +281,315 @@ diff -ruN mozilla-release.orig/browser/base/content/abouthome/aboutHome.js mozil
    }
  };
  
-@@ -138,7 +47,7 @@
- //   * add an entry here in the proper ordering (based on spans)
- // The <a/> part of the snippet will be linked to the corresponding url.
- const DEFAULT_SNIPPETS_URLS = [
+-// The process of adding a new default snippet involves:
+-//   * add a new entity to aboutHome.dtd
+-//   * add a <span/> for it in aboutHome.xhtml
+-//   * add an entry here in the proper ordering (based on spans)
+-// The <a/> part of the snippet will be linked to the corresponding url.
+-const DEFAULT_SNIPPETS_URLS = [
 -  "https://www.mozilla.org/firefox/features/?utm_source=snippet&utm_medium=snippet&utm_campaign=default+feature+snippet"
-+  "http://packages.debian.org/experimental/iceweasel"
- , "https://www.gnu.org/software/gnuzilla/addons.html"
- ];
+-, "https://addons.mozilla.org/firefox/?utm_source=snippet&utm_medium=snippet&utm_campaign=addons"
+-];
+-
+-const SNIPPETS_UPDATE_INTERVAL_MS = 86400000; // 1 Day.
+-
+-// IndexedDB storage constants.
+-const DATABASE_NAME = "abouthome";
+-const DATABASE_VERSION = 1;
+-const SNIPPETS_OBJECTSTORE_NAME = "snippets";
+-
+ // This global tracks if the page has been set up before, to prevent double inits
+ let gInitialized = false;
+ let gObserver = new MutationObserver(function (mutations) {
+@@ -156,7 +48,6 @@
+     if (mutation.attributeName == "searchEngineURL") {
+       setupSearchEngine();
+       if (!gInitialized) {
+-        ensureSnippetsMapThen(loadSnippets);
+         gInitialized = true;
+       }
+       return;
+@@ -177,117 +68,6 @@
+   window.removeEventListener("resize", fitToWidth);
+ });
+ 
+-// This object has the same interface as Map and is used to store and retrieve
+-// the snippets data.  It is lazily initialized by ensureSnippetsMapThen(), so
+-// be sure its callback returned before trying to use it.
+-let gSnippetsMap;
+-let gSnippetsMapCallbacks = [];
+-
+-/**
+- * Ensure the snippets map is properly initialized.
+- *
+- * @param aCallback
+- *        Invoked once the map has been initialized, gets the map as argument.
+- * @note Snippets should never directly manage the underlying storage, since
+- *       it may change inadvertently.
+- */
+-function ensureSnippetsMapThen(aCallback)
+-{
+-  if (gSnippetsMap) {
+-    aCallback(gSnippetsMap);
+-    return;
+-  }
+-
+-  // Handle multiple requests during the async initialization.
+-  gSnippetsMapCallbacks.push(aCallback);
+-  if (gSnippetsMapCallbacks.length > 1) {
+-    // We are already updating, the callbacks will be invoked when done.
+-    return;
+-  }
+-
+-  let invokeCallbacks = function () {
+-    if (!gSnippetsMap) {
+-      gSnippetsMap = Object.freeze(new Map());
+-    }
+-
+-    for (let callback of gSnippetsMapCallbacks) {
+-      callback(gSnippetsMap);
+-    }
+-    gSnippetsMapCallbacks.length = 0;
+-  }
+-
+-  let openRequest = indexedDB.open(DATABASE_NAME, DATABASE_VERSION);
+-
+-  openRequest.onerror = function (event) {
+-    // Try to delete the old database so that we can start this process over
+-    // next time.
+-    indexedDB.deleteDatabase(DATABASE_NAME);
+-    invokeCallbacks();
+-  };
+-
+-  openRequest.onupgradeneeded = function (event) {
+-    let db = event.target.result;
+-    if (!db.objectStoreNames.contains(SNIPPETS_OBJECTSTORE_NAME)) {
+-      db.createObjectStore(SNIPPETS_OBJECTSTORE_NAME);
+-    }
+-  }
+-
+-  openRequest.onsuccess = function (event) {
+-    let db = event.target.result;
+-
+-    db.onerror = function (event) {
+-      invokeCallbacks();
+-    }
+-
+-    db.onversionchange = function (event) {
+-      event.target.close();
+-      invokeCallbacks();
+-    }
+-
+-    let cache = new Map();
+-    let cursorRequest = db.transaction(SNIPPETS_OBJECTSTORE_NAME)
+-                          .objectStore(SNIPPETS_OBJECTSTORE_NAME).openCursor();
+-    cursorRequest.onerror = function (event) {
+-      invokeCallbacks();
+-    }
+-
+-    cursorRequest.onsuccess = function(event) {
+-      let cursor = event.target.result;
+-
+-      // Populate the cache from the persistent storage.
+-      if (cursor) {
+-        cache.set(cursor.key, cursor.value);
+-        cursor.continue();
+-        return;
+-      }
+-
+-      // The cache has been filled up, create the snippets map.
+-      gSnippetsMap = Object.freeze({
+-        get: function (aKey) cache.get(aKey),
+-        set: function (aKey, aValue) {
+-          db.transaction(SNIPPETS_OBJECTSTORE_NAME, "readwrite")
+-            .objectStore(SNIPPETS_OBJECTSTORE_NAME).put(aValue, aKey);
+-          return cache.set(aKey, aValue);
+-        },
+-        has: function (aKey) cache.has(aKey),
+-        delete: function (aKey) {
+-          db.transaction(SNIPPETS_OBJECTSTORE_NAME, "readwrite")
+-            .objectStore(SNIPPETS_OBJECTSTORE_NAME).delete(aKey);
+-          return cache.delete(aKey);
+-        },
+-        clear: function () {
+-          db.transaction(SNIPPETS_OBJECTSTORE_NAME, "readwrite")
+-            .objectStore(SNIPPETS_OBJECTSTORE_NAME).clear();
+-          return cache.clear();
+-        },
+-        get size() cache.size
+-      });
+-
+-      setTimeout(invokeCallbacks, 0);
+-    }
+-  }
+-}
+-
+ function onSearchSubmit(aEvent)
+ {
+   let searchTerms = document.getElementById("searchText").value;
+@@ -372,140 +152,6 @@
  
-diff -urN mozilla-release.orig/browser/base/content/abouthome/aboutHome.css mozilla-release/browser/base/content/abouthome/aboutHome.css
---- mozilla-release.orig/browser/base/content/abouthome/aboutHome.css	2013-01-04 21:44:27.000000000 -0200
-+++ mozilla-release/browser/base/content/abouthome/aboutHome.css		2013-01-10 01:35:44.497079456 -0200
-@@ -66,8 +66,7 @@
- #searchEngineLogo {
-   display: inline-block;
-   height: 28px;
--  width: 70px;
--  min-width: 70px;
-+  width: 47px;
  }
  
- #searchText {
-diff -urN mozilla-release.orig/browser/locales/en-US/chrome/browser-region/region.properties mozilla-release/browser/locales/en-US/chrome/browser-region/region.properties
---- mozilla-release.orig/browser/locales/en-US/chrome/browser-region/region.properties	2013-09-10 20:14:52.000000000 -0300
-+++ mozilla-release/browser/locales/en-US/chrome/browser-region/region.properties	2013-09-18 17:24:08.209539436 -0300
+-/**
+- * Update the local snippets from the remote storage, then show them through
+- * showSnippets.
+- */
+-function loadSnippets()
+-{
+-  if (!gSnippetsMap)
+-    throw new Error("Snippets map has not properly been initialized");
+-
+-  // Check cached snippets version.
+-  let cachedVersion = gSnippetsMap.get("snippets-cached-version") || 0;
+-  let currentVersion = document.documentElement.getAttribute("snippetsVersion");
+-  if (cachedVersion < currentVersion) {
+-    // The cached snippets are old and unsupported, restart from scratch.
+-    gSnippetsMap.clear();
+-  }
+-
+-  // Check last snippets update.
+-  let lastUpdate = gSnippetsMap.get("snippets-last-update");
+-  let updateURL = document.documentElement.getAttribute("snippetsURL");
+-  let shouldUpdate = !lastUpdate ||
+-                     Date.now() - lastUpdate > SNIPPETS_UPDATE_INTERVAL_MS;
+-  if (updateURL && shouldUpdate) {
+-    // Try to update from network.
+-    let xhr = new XMLHttpRequest();
+-    try {
+-      xhr.open("GET", updateURL, true);
+-    } catch (ex) {
+-      showSnippets();
+-      return;
+-    }
+-    // Even if fetching should fail we don't want to spam the server, thus
+-    // set the last update time regardless its results.  Will retry tomorrow.
+-    gSnippetsMap.set("snippets-last-update", Date.now());
+-    xhr.onerror = function (event) {
+-      showSnippets();
+-    };
+-    xhr.onload = function (event)
+-    {
+-      if (xhr.status == 200) {
+-        gSnippetsMap.set("snippets", xhr.responseText);
+-        gSnippetsMap.set("snippets-cached-version", currentVersion);
+-      }
+-      showSnippets();
+-    };
+-    xhr.send(null);
+-  } else {
+-    showSnippets();
+-  }
+-}
+-
+-/**
+- * Shows locally cached remote snippets, or default ones when not available.
+- *
+- * @note: snippets should never invoke showSnippets(), or they may cause
+- *        a "too much recursion" exception.
+- */
+-let _snippetsShown = false;
+-function showSnippets()
+-{
+-  let snippetsElt = document.getElementById("snippets");
+-
+-  // Show about:rights notification, if needed.
+-  let showRights = document.documentElement.getAttribute("showKnowYourRights");
+-  if (showRights) {
+-    let rightsElt = document.getElementById("rightsSnippet");
+-    let anchor = rightsElt.getElementsByTagName("a")[0];
+-    anchor.href = "about:rights";
+-    snippetsElt.appendChild(rightsElt);
+-    rightsElt.removeAttribute("hidden");
+-    return;
+-  }
+-
+-  if (!gSnippetsMap)
+-    throw new Error("Snippets map has not properly been initialized");
+-  if (_snippetsShown) {
+-    // There's something wrong with the remote snippets, just in case fall back
+-    // to the default snippets.
+-    showDefaultSnippets();
+-    throw new Error("showSnippets should never be invoked multiple times");
+-  }
+-  _snippetsShown = true;
+-
+-  let snippets = gSnippetsMap.get("snippets");
+-  // If there are remotely fetched snippets, try to to show them.
+-  if (snippets) {
+-    // Injecting snippets can throw if they're invalid XML.
+-    try {
+-      snippetsElt.innerHTML = snippets;
+-      // Scripts injected by innerHTML are inactive, so we have to relocate them
+-      // through DOM manipulation to activate their contents.
+-      Array.forEach(snippetsElt.getElementsByTagName("script"), function(elt) {
+-        let relocatedScript = document.createElement("script");
+-        relocatedScript.type = "text/javascript;version=1.8";
+-        relocatedScript.text = elt.text;
+-        elt.parentNode.replaceChild(relocatedScript, elt);
+-      });
+-      return;
+-    } catch (ex) {
+-      // Bad content, continue to show default snippets.
+-    }
+-  }
+-
+-  showDefaultSnippets();
+-}
+-
+-/**
+- * Clear snippets element contents and show default snippets.
+- */
+-function showDefaultSnippets()
+-{
+-  // Clear eventual contents...
+-  let snippetsElt = document.getElementById("snippets");
+-  snippetsElt.innerHTML = "";
+-
+-  // ...then show default snippets.
+-  let defaultSnippetsElt = document.getElementById("defaultSnippets");
+-  let entries = defaultSnippetsElt.querySelectorAll("span");
+-  // Choose a random snippet.  Assume there is always at least one.
+-  let randIndex = Math.floor(Math.random() * entries.length);
+-  let entry = entries[randIndex];
+-  // Inject url in the eventual link.
+-  if (DEFAULT_SNIPPETS_URLS[randIndex]) {
+-    let links = entry.getElementsByTagName("a");
+-    // Default snippets can have only one link, otherwise something is messed
+-    // up in the translation.
+-    if (links.length == 1) {
+-      links[0].href = DEFAULT_SNIPPETS_URLS[randIndex];
+-    }
+-  }
+-  // Move the default snippet to the snippets element.
+-  snippetsElt.appendChild(entry);
+-}
+-
+ function fitToWidth() {
+   if (window.scrollMaxX) {
+     document.body.setAttribute("narrow", "true");
+diff -Nur mozilla-release.orig/browser/base/content/abouthome/aboutHome.xhtml mozilla-release/browser/base/content/abouthome/aboutHome.xhtml
+--- mozilla-release.orig/browser/base/content/abouthome/aboutHome.xhtml	2013-10-25 20:27:08.000000000 -0200
++++ mozilla-release/browser/base/content/abouthome/aboutHome.xhtml	2013-11-05 03:57:12.962327229 -0200
+@@ -43,15 +43,6 @@
+           <input id="searchSubmit" type="submit" value="&abouthome.searchEngineButton.label;"/>
+         </form>
+       </div>
+-
+-      <div id="snippetContainer">
+-        <div id="defaultSnippets" hidden="true">
+-          <span id="defaultSnippet1">&abouthome.defaultSnippet1.v1;</span>
+-          <span id="defaultSnippet2">&abouthome.defaultSnippet2.v1;</span>
+-        </div>
+-        <span id="rightsSnippet" hidden="true">&abouthome.rightsSnippet;</span>
+-        <div id="snippets"/>
+-      </div>
+     </div>
+     <div class="spacer"/>
+ 
+diff -Nur mozilla-release.orig/browser/locales/en-US/chrome/browser-region/region.properties mozilla-release/browser/locales/en-US/chrome/browser-region/region.properties
+--- mozilla-release.orig/browser/locales/en-US/chrome/browser-region/region.properties	2013-10-25 20:27:09.000000000 -0200
++++ mozilla-release/browser/locales/en-US/chrome/browser-region/region.properties	2013-11-05 04:16:11.884325686 -0200
 @@ -3,17 +3,12 @@
  # file, You can obtain one at http://mozilla.org/MPL/2.0/.
  
@@ -235,11 +614,11 @@ diff -urN mozilla-release.orig/browser/locales/en-US/chrome/browser-region/regio
  # cause Firefox to re-read these prefs and inject any new handlers into the 
 @@ -22,20 +17,10 @@
  # don't make any spelling errors here.
- gecko.handlerService.defaultHandlersVersion=3
+ gecko.handlerService.defaultHandlersVersion=4
  
 -# The default set of protocol handlers for webcal:
 -gecko.handlerService.schemes.webcal.0.name=30 Boxes
--gecko.handlerService.schemes.webcal.0.uriTemplate=http://30boxes.com/external/widget?refer=ff&url=%s
+-gecko.handlerService.schemes.webcal.0.uriTemplate=https://30boxes.com/external/widget?refer=ff&url=%s
 -
 -# The default set of protocol handlers for mailto:
 -gecko.handlerService.schemes.mailto.0.name=Yahoo! Mail
@@ -258,31 +637,9 @@ diff -urN mozilla-release.orig/browser/locales/en-US/chrome/browser-region/regio
 -gecko.handlerService.schemes.ircs.0.uriTemplate=https://www.mibbit.com/?url=%s
 +gecko.handlerService.schemes.ircs.0.name=Freenode Web IRC
 +gecko.handlerService.schemes.ircs.0.uriTemplate=https://webchat.freenode.net
-diff -ruN mozilla-release.orig/dom/ipc/test.xul mozilla-release/dom/ipc/test.xul
---- mozilla-release.orig/dom/ipc/test.xul	2013-01-04 18:44:31.000000000 -0500
-+++ mozilla-release/dom/ipc/test.xul	2013-01-10 18:19:26.000000000 -0500
-@@ -299,6 +299,6 @@
-                oncommand="document.getElementById('page').QueryInterface(Components.interfaces.nsIFrameLoaderOwner).frameLoader.delayRemoteDialogs = this.checked;"/>
-   </toolbar>
- 
--  <browser type="content" src="http://www.google.com/" flex="1" id="page" remote="true"/>
-+  <browser type="content" src="https://duckduckgo.com/html" flex="1" id="page" remote="true"/>
-   <label id="messageLog" value="" crop="center"/>
- </window>
-diff -ruN mozilla-release.orig/layout/ipc/test-ipcbrowser.xul mozilla-release/layout/ipc/test-ipcbrowser.xul
---- mozilla-release.orig/layout/ipc/test-ipcbrowser.xul	2013-01-04 18:44:37.000000000 -0500
-+++ mozilla-release/layout/ipc/test-ipcbrowser.xul	2013-01-10 18:20:03.000000000 -0500
-@@ -73,6 +73,6 @@
-        label="setViewportScale"/>
-   </toolbar>
- 
--  <browser type="content" src="http://www.google.com/" flex="1" id="content"
-+  <browser type="content" src="https://duckduckgo.com/html" flex="1" id="content"
-            remote="true"/>
- </window>
-diff -urN mozilla-release.orig/browser/locales/generic/profile/bookmarks.html.in mozilla-release/browser/locales/generic/profile/bookmarks.html.in
---- mozilla-release.orig/browser/locales/generic/profile/bookmarks.html.in	2013-09-10 20:14:52.000000000 -0300
-+++ mozilla-release/browser/locales/generic/profile/bookmarks.html.in	2013-09-18 17:41:28.559462661 -0300
+diff -Nur mozilla-release.orig/browser/locales/generic/profile/bookmarks.html.in mozilla-release/browser/locales/generic/profile/bookmarks.html.in
+--- mozilla-release.orig/browser/locales/generic/profile/bookmarks.html.in	2013-10-25 20:27:09.000000000 -0200
++++ mozilla-release/browser/locales/generic/profile/bookmarks.html.in	2013-11-05 03:57:12.972326552 -0200
 @@ -15,13 +15,20 @@
      <DT><H3 PERSONAL_TOOLBAR_FOLDER="true" ID="rdf:#$FvPhC3">@bookmarks_toolbarfolder@</H3>
  <DD>@bookmarks_toolbarfolder_description@
@@ -310,10 +667,32 @@ diff -urN mozilla-release.orig/browser/locales/generic/profile/bookmarks.html.in
 +        <DT><A HREF="http://www.h-node.org/" ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAABgElEQVQ4jaXRz2uSARzHcb0vlRGEzTVWISU1BVkFYTIyjNK1pKcxHA+yhWMWIamHYikFgpoLIi9jwegi3QbL9SzdLmMbM9J+DkJBgm5RDvEPeHeQHOyQz0OH9+V7ePGBr0pqpPmfVPsP8a0AR4MnMEwf48x9K0s/E8oAY9iEMOvD+8yP2qVjrhhRBnSN61n5sIpULqC+pGHh8wNlgEY8jPQXcGh4VXukDND5evYAl46odIuXtYdKAANSudAChO52/XeMZMohecCbcoGdH99Y+7LO72adT9+/4nh8nYOjBl7/SsoB8gBkpHk8T0S2K++pN3fRin3cfnFDHvCuWkI9rEMvHGEo5gbAHnXhnLF1BpZLeRaLOVT2A8Q3A5wMngXgWtKLxX9KPqC+rCWQvYkpeK4NWKcGOgO50ts2MJJ0cPreeQDciTHMchZYIhcwh2wcuqjn+ccwGm9v6wsTxxn0dVgQXZ7Ek3Agpq6QrcaQGmmebtxFSDkRU1fJVmL/BpT2ByV/3eDMhinRAAAAAElFTkSuQmCC">h-node</A>
      </DL><p>
  </DL><p>
-diff -ruN mozilla-release.orig/modules/libpref/src/init/all.js mozilla-release/modules/libpref/src/init/all.js
---- mozilla-release.orig/modules/libpref/src/init/all.js	2013-08-07 10:36:49.851516239 -0300
-+++ mozilla-release/modules/libpref/src/init/all.js	2013-08-12 22:35:19.870374357 -0300
-@@ -4127,20 +4127,6 @@
+diff -Nur mozilla-release.orig/dom/ipc/test.xul mozilla-release/dom/ipc/test.xul
+--- mozilla-release.orig/dom/ipc/test.xul	2013-10-25 20:27:14.000000000 -0200
++++ mozilla-release/dom/ipc/test.xul	2013-11-05 03:57:12.982325866 -0200
+@@ -302,6 +302,6 @@
+                oncommand="document.getElementById('page').QueryInterface(Components.interfaces.nsIFrameLoaderOwner).frameLoader.delayRemoteDialogs = this.checked;"/>
+   </toolbar>
+ 
+-  <browser type="content" src="http://www.google.com/" flex="1" id="page" remote="true"/>
++  <browser type="content" src="https://duckduckgo.com/html" flex="1" id="page" remote="true"/>
+   <label id="messageLog" value="" crop="center"/>
+ </window>
+diff -Nur mozilla-release.orig/layout/ipc/test-ipcbrowser.xul mozilla-release/layout/ipc/test-ipcbrowser.xul
+--- mozilla-release.orig/layout/ipc/test-ipcbrowser.xul	2013-10-25 20:27:28.000000000 -0200
++++ mozilla-release/layout/ipc/test-ipcbrowser.xul	2013-11-05 03:57:12.982325866 -0200
+@@ -73,6 +73,6 @@
+        label="setViewportScale"/>
+   </toolbar>
+ 
+-  <browser type="content" src="http://www.google.com/" flex="1" id="content"
++  <browser type="content" src="https://duckduckgo.com/html" flex="1" id="content"
+            remote="true"/>
+ </window>
+diff -Nur mozilla-release.orig/modules/libpref/src/init/all.js mozilla-release/modules/libpref/src/init/all.js
+--- mozilla-release.orig/modules/libpref/src/init/all.js	2013-11-05 03:52:59.219584174 -0200
++++ mozilla-release/modules/libpref/src/init/all.js	2013-11-05 03:57:12.985658973 -0200
+@@ -4255,20 +4255,6 @@
  // Disable freeing dirty pages when minimizing memory.
  pref("memory.free_dirty_pages", false);
  
diff --git a/libre/iceweasel-libre/replace-urls.txt b/libre/iceweasel-libre/replace-urls.txt
index fc13e32fb..278dd1a74 100644
--- a/libre/iceweasel-libre/replace-urls.txt
+++ b/libre/iceweasel-libre/replace-urls.txt
@@ -2,24 +2,24 @@
 # These are whitespace-separated EREs, comments are lines starting with '#'
 
 https?://addons\.mozilla\.org/((%LOCALE%|@AB_CD@|en-US|ru)/)?([a-zA-Z%-]+)/dictionaries/?(\?[^"']*)?   https://parabolagnulinux.org/packages/\?repo=Extra\&q=hunspell-
-https?://addons\.mozilla\.org/((%LOCALE%|@AB_CD@|en-US|ru)/)?([a-zA-Z%-]+)/plugins/?(\?[^"']*)?        https://gnuzilla.gnu.org/plugins/
-https?://addons\.mozilla\.org/((%LOCALE%|@AB_CD@|en-US|ru)/)?([a-zA-Z%-]+)/personas/?(\?[^"']*)?       https://www.gnu.org/software/gnuzilla/addons.html
-https?://addons\.mozilla\.org/((%LOCALE%|@AB_CD@|en-US|ru)/)?([a-zA-Z%-]+)/recommended/?(\?[^"']*)?    https://www.gnu.org/software/gnuzilla/addons.html
-https?://addons\.mozilla\.org/((%LOCALE%|@AB_CD@|en-US|ru)/)?([a-zA-Z%-]+)/search-engines/?(\?[^"']*)? https://www.gnu.org/software/gnuzilla/addons.html#search%20engines
-https?://addons\.mozilla\.org/((%LOCALE%|@AB_CD@|en-US|ru)/)?([a-zA-Z%-]+)/search/?(\?[^"']*)?         https://www.gnu.org/software/gnuzilla/addons.html
-https?://addons\.mozilla\.org/((%LOCALE%|@AB_CD@|en-US|ru)/)?([a-zA-Z%-]+)/themes/?(\?[^"']*)?         https://www.gnu.org/software/gnuzilla/addons.html#themes
-https?://addons\.mozilla\.org/((%LOCALE%|@AB_CD@|en-US|ru)/)?([a-zA-Z%-]+)/?(\?[^"']*)?"               https://www.gnu.org/software/gnuzilla/addons.html"
-https?://addons\.mozilla\.org/((%LOCALE%|@AB_CD@|en-US|ru)/)?([a-zA-Z%-]+)/?(\?[^"']*)?$               https://www.gnu.org/software/gnuzilla/addons.html
+https?://addons\.mozilla\.org/((%LOCALE%|@AB_CD@|en-US|ru)/)?([a-zA-Z%-]+)/plugins/?(\?[^"']*)?        http://directory.fsf.org/wiki/GNU_IceCat
+https?://addons\.mozilla\.org/((%LOCALE%|@AB_CD@|en-US|ru)/)?([a-zA-Z%-]+)/personas/?(\?[^"']*)?       http://directory.fsf.org/wiki/GNU_IceCat
+https?://addons\.mozilla\.org/((%LOCALE%|@AB_CD@|en-US|ru)/)?([a-zA-Z%-]+)/recommended/?(\?[^"']*)?    http://directory.fsf.org/wiki/GNU_IceCat
+https?://addons\.mozilla\.org/((%LOCALE%|@AB_CD@|en-US|ru)/)?([a-zA-Z%-]+)/search-engines/?(\?[^"']*)? http://directory.fsf.org/wiki/GNU_IceCat
+https?://addons\.mozilla\.org/((%LOCALE%|@AB_CD@|en-US|ru)/)?([a-zA-Z%-]+)/search/?(\?[^"']*)?         http://directory.fsf.org/wiki/GNU_IceCat
+https?://addons\.mozilla\.org/((%LOCALE%|@AB_CD@|en-US|ru)/)?([a-zA-Z%-]+)/themes/?(\?[^"']*)?         http://directory.fsf.org/wiki/GNU_IceCat
+https?://addons\.mozilla\.org/((%LOCALE%|@AB_CD@|en-US|ru)/)?([a-zA-Z%-]+)/?(\?[^"']*)?"               http://directory.fsf.org/wiki/GNU_IceCat"
+https?://addons\.mozilla\.org/((%LOCALE%|@AB_CD@|en-US|ru)/)?([a-zA-Z%-]+)/?(\?[^"']*)?$               http://directory.fsf.org/wiki/GNU_IceCat
 
-https://addons.mozilla.org/firefox/collections/mozilla/webdeveloper/ https://www.gnu.org/software/gnuzilla/addons.html
+https://addons.mozilla.org/firefox/collections/mozilla/webdeveloper/ http://directory.fsf.org/wiki/GNU_IceCat
 
-https?://services\.addons\.mozilla\.org/(%LOCALE%|@AB_CD@|en-US|ru)/([a-zA-Z%-]+)/  https://www.gnu.org/software/gnuzilla/addons.html#bogus-services.\2/
+https?://services\.addons\.mozilla\.org/(%LOCALE%|@AB_CD@|en-US|ru)/([a-zA-Z%-]+)/  http://directory.fsf.org/wiki/GNU_IceCat.\2/
 
-https?://pfs\.mozilla\.org/plugins/PluginFinderService\.php             https://gnuzilla.gnu.org/plugins/PluginFinderService.php
+https?://pfs\.mozilla\.org/plugins/PluginFinderService\.php             http://directory.fsf.org/wiki/GNU_IceCat
 #https?://versioncheck\.addons\.mozilla\.org/update/VersionCheck\.php
 #https?://versioncheck-bg\.addons\.mozilla\.org/update/VersionCheck\.php
 
-"https?://addons\.mozilla\.org/" "https://www.gnu.org/software/gnuzilla/addons.html"
+"https?://addons\.mozilla\.org/" "http://directory.fsf.org/wiki/GNU_IceCat"
 
 # hack: these aren't URLs, per se
-(addonsBrowseAll\.description\s*=.*)addons\.mozilla\.org \1gnu.org/software/gnuzilla/addons.html
+(addonsBrowseAll\.description\s*=.*)addons\.mozilla\.org \1directory.fsf.org/wiki/GNU_IceCat
diff --git a/libre/iceweasel-libre/vendor.js b/libre/iceweasel-libre/vendor.js
index 91414dbbd..6510944a7 100644
--- a/libre/iceweasel-libre/vendor.js
+++ b/libre/iceweasel-libre/vendor.js
@@ -8,17 +8,15 @@ pref("browser.shell.checkDefaultBrowser", false);
 pref("extensions.autoDisableScopes", 11);
 pref("extensions.shownSelectionUI", true);
 
+// Disable Social API
+pref("social.remote-install.enabled", false);
+
 // Make sure that safebrowsing is disabled
 pref("browser.safebrowsing.enabled", false);
 pref("browser.safebrowsing.malware.enabled", false);
 
-pref("keyword.URL", "");
-pref("app.update.enabled", false);
-pref("app.update.auto", false);
+// Disable localstorage for privacy reasons.
 pref("dom.storage.enabled", false);
 
-// Disable Social API
-pref("social.remote-install.enabled", false);
-
 // Disable missing nonfree flash notification
 pref("plugins.notifyMissingFlash", false);
diff --git a/libre/iceweasel-noscript/PKGBUILD b/libre/iceweasel-noscript/PKGBUILD
index ba04053d1..7ff26b3b0 100644
--- a/libre/iceweasel-noscript/PKGBUILD
+++ b/libre/iceweasel-noscript/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 97930 2013-10-01 15:58:44Z spupykin $
+# $Id: PKGBUILD 99237 2013-10-26 10:36:31Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
+# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
 
 _pkgname=firefox-noscript
 pkgname=iceweasel-noscript
-pkgver=2.6.8.1
+pkgver=2.6.8.4
 pkgrel=1
 pkgdesc="plugin for iceweasel which disables script"
 arch=('any')
@@ -14,7 +14,7 @@ depends=()
 provides=$_pkgname=$pkgver
 makedepends=('unzip')
 source=(https://secure.informaction.com/download/releases/noscript-$pkgver.xpi)
-md5sums=('955e4c5706a73977c09d7b4d0bc6dd9f')
+md5sums=('3096cfcd43988c7a2f0caa031dc74d51')
 
 package() {
 #  _ffver=`pacman -Q iceweasel-libre | cut -f2 -d\ | cut -f1 -d-`
diff --git a/libre/ipsec-tools-libre/PKGBUILD b/libre/ipsec-tools-libre/PKGBUILD
index 6de9bd7d5..eb7a846bb 100644
--- a/libre/ipsec-tools-libre/PKGBUILD
+++ b/libre/ipsec-tools-libre/PKGBUILD
@@ -1,12 +1,12 @@
-# $Id: PKGBUILD 91859 2013-05-28 17:36:54Z spupykin $
+# $Id: PKGBUILD 100177 2013-11-01 20:59:04Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Allan Henriksen <allan.henriksen@gmail.com>
-# Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
+# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
 
 _pkgname=ipsec-tools
 pkgname=ipsec-tools-libre
 pkgver=0.8.1
-pkgrel=4
+pkgrel=5
 pkgdesc="KAME IPSec tools ported to Linux (built for the linux-libre-headers package)"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://ipsec-tools.sourceforge.net/"
@@ -16,7 +16,7 @@ replaces=$_pkgname
 conflicts=$_pkgname
 provides=$_pkgname=$pkgver
 license=('GPL')
-options=('!makeflags' '!libtool')
+options=('!makeflags')
 source=(http://downloads.sourceforge.net/sourceforge/ipsec-tools/$_pkgname-$pkgver.tar.bz2
 	racoon.service
 	ipsec.service
diff --git a/libre/kdebase-konqueror-libre/PKGBUILD b/libre/kdebase-konqueror-libre/PKGBUILD
index 077e6aee3..880197912 100644
--- a/libre/kdebase-konqueror-libre/PKGBUILD
+++ b/libre/kdebase-konqueror-libre/PKGBUILD
@@ -1,12 +1,12 @@
-# $Id: PKGBUILD 195531 2013-10-01 15:16:11Z svenstaro $
+# $Id: PKGBUILD 198792 2013-11-04 15:15:20Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 # Maintainer (Parabola): Michał Masłowski <mtjm@mtjm.eu>
-# Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
+# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
 
 _pkgname='kdebase-konqueror'
 pkgname='kdebase-konqueror-libre'
-pkgver=4.11.2
+pkgver=4.11.3
 pkgrel=1
 arch=('i686' 'x86_64' 'mips64el')
 url="http://kde.org/applications/internet/konqueror/"
@@ -15,7 +15,7 @@ groups=('kde' 'kdebase')
 makedepends=('kdelibs' 'cmake' 'automoc4' 'tidyhtml' 'nepomuk-widgets')
 source=("http://download.kde.org/stable/${pkgver}/src/kde-baseapps-${pkgver}.tar.xz"
         'konq-about-fsdg.diff')
-sha1sums=('6a988adf54e9f499365dce0ce1691d020411bd0d'
+sha1sums=('f2a6f4220efe395c124d8981edaaca0a462640b5'
           'd6cbb53c04179b8180f9439eca156b7ff2e76b3a')
 pkgdesc='KDE File Manager & Web Browser, without Google and nonfree software recommendation'
 depends=('kdebase-dolphin' 'kdebase-keditbookmarks')
diff --git a/libre/kdebase-konqueror-libre/kde-baseapps-4.9.4-fix-bugs-311206-311246.diff b/libre/kdebase-konqueror-libre/kde-baseapps-4.9.4-fix-bugs-311206-311246.diff
deleted file mode 100644
index 9f328ec60..000000000
--- a/libre/kdebase-konqueror-libre/kde-baseapps-4.9.4-fix-bugs-311206-311246.diff
+++ /dev/null
@@ -1,232 +0,0 @@
-diff --git a/dolphin/src/kitemviews/kstandarditemlistwidget.cpp b/dolphin/src/kitemviews/kstandarditemlistwidget.cpp
-index f92cab5..af16954 100644
---- a/dolphin/src/kitemviews/kstandarditemlistwidget.cpp
-+++ b/dolphin/src/kitemviews/kstandarditemlistwidget.cpp
-@@ -193,7 +193,8 @@ KStandardItemListWidget::KStandardItemListWidget(KItemListWidgetInformant* infor
-     m_additionalInfoTextColor(),
-     m_overlay(),
-     m_rating(),
--    m_roleEditor(0)
-+    m_roleEditor(0),
-+    m_oldRoleEditor(0)
- {
- }
- 
-@@ -203,6 +204,7 @@ KStandardItemListWidget::~KStandardItemListWidget()
-     m_textInfo.clear();
- 
-     delete m_roleEditor;
-+    delete m_oldRoleEditor;
- }
- 
- void KStandardItemListWidget::setLayout(Layout layout)
-@@ -609,13 +611,16 @@ void KStandardItemListWidget::editedRoleChanged(const QByteArray& current, const
-                        this, SLOT(slotRoleEditingCanceled(int,QByteArray,QVariant)));
-             disconnect(m_roleEditor, SIGNAL(roleEditingFinished(int,QByteArray,QVariant)),
-                        this, SLOT(slotRoleEditingFinished(int,QByteArray,QVariant)));
--            // Do not delete the role editor using deleteLater() because we might be
--            // inside a nested event loop which has been started by one of its event
--            // handlers (contextMenuEvent() or drag&drop inside mouseMoveEvent()).
--            m_roleEditor->deleteWhenIdle();
-+            m_oldRoleEditor = m_roleEditor;
-+            m_roleEditor->hide();
-             m_roleEditor = 0;
-         }
-         return;
-+    } else if (m_oldRoleEditor) {
-+        // Delete the old editor before constructing the new one to
-+        // prevent a memory leak.
-+        m_oldRoleEditor->deleteLater();
-+        m_oldRoleEditor = 0;
-     }
- 
-     Q_ASSERT(!m_roleEditor);
-@@ -1267,21 +1272,19 @@ QRectF KStandardItemListWidget::roleEditingRect(const QByteArray& role) const
- 
- void KStandardItemListWidget::closeRoleEditor()
- {
-+    disconnect(m_roleEditor, SIGNAL(roleEditingCanceled(int,QByteArray,QVariant)),
-+               this, SLOT(slotRoleEditingCanceled(int,QByteArray,QVariant)));
-+    disconnect(m_roleEditor, SIGNAL(roleEditingFinished(int,QByteArray,QVariant)),
-+               this, SLOT(slotRoleEditingFinished(int,QByteArray,QVariant)));
-+
-     if (m_roleEditor->hasFocus()) {
-         // If the editing was not ended by a FocusOut event, we have
-         // to transfer the keyboard focus back to the KItemListContainer.
-         scene()->views()[0]->parentWidget()->setFocus();
-     }
- 
--    disconnect(m_roleEditor, SIGNAL(roleEditingCanceled(int,QByteArray,QVariant)),
--               this, SLOT(slotRoleEditingCanceled(int,QByteArray,QVariant)));
--    disconnect(m_roleEditor, SIGNAL(roleEditingFinished(int,QByteArray,QVariant)),
--               this, SLOT(slotRoleEditingFinished(int,QByteArray,QVariant)));
--
--    // Do not delete the role editor using deleteLater() because we might be
--    // inside a nested event loop which has been started by one of its event
--    // handlers (contextMenuEvent() or drag&drop inside mouseMoveEvent()).
--    m_roleEditor->deleteWhenIdle();
-+    m_oldRoleEditor = m_roleEditor;
-+    m_roleEditor->hide();
-     m_roleEditor = 0;
- }
- 
-diff --git a/dolphin/src/kitemviews/kstandarditemlistwidget.h b/dolphin/src/kitemviews/kstandarditemlistwidget.h
-index 787722d..386f60e 100644
---- a/dolphin/src/kitemviews/kstandarditemlistwidget.h
-+++ b/dolphin/src/kitemviews/kstandarditemlistwidget.h
-@@ -241,6 +241,7 @@ private:
-     QPixmap m_rating;
- 
-     KItemListRoleEditor* m_roleEditor;
-+    KItemListRoleEditor* m_oldRoleEditor;
- 
-     friend class KStandardItemListWidgetInformant; // Accesses private static methods to be able to
-                                                    // share a common layout calculation
-diff --git a/dolphin/src/kitemviews/private/kitemlistroleeditor.cpp b/dolphin/src/kitemviews/private/kitemlistroleeditor.cpp
-index 78dbfe9..1e4b5fd 100644
---- a/dolphin/src/kitemviews/private/kitemlistroleeditor.cpp
-+++ b/dolphin/src/kitemviews/private/kitemlistroleeditor.cpp
-@@ -26,9 +26,7 @@ KItemListRoleEditor::KItemListRoleEditor(QWidget *parent) :
-     KTextEdit(parent),
-     m_index(0),
-     m_role(),
--    m_blockFinishedSignal(false),
--    m_eventHandlingLevel(0),
--    m_deleteAfterEventHandling(false)
-+    m_blockFinishedSignal(false)
- {
-     setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
-     setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
-@@ -66,20 +64,6 @@ QByteArray KItemListRoleEditor::role() const
-     return m_role;
- }
- 
--void KItemListRoleEditor::deleteWhenIdle()
--{
--    if (m_eventHandlingLevel > 0) {
--        // We are handling an event at the moment. It could be that we
--        // are in a nested event loop run by contextMenuEvent() or a
--        // call of mousePressEvent() which results in drag&drop.
--        // -> do not call deleteLater() to prevent a crash when we
--        //    return from the nested event loop.
--        m_deleteAfterEventHandling = true;
--    } else {
--        deleteLater();
--    }
--}
--
- bool KItemListRoleEditor::eventFilter(QObject* watched, QEvent* event)
- {
-     if (watched == parentWidget() && event->type() == QEvent::Resize) {
-@@ -91,42 +75,13 @@ bool KItemListRoleEditor::eventFilter(QObject* watched, QEvent* event)
- 
- bool KItemListRoleEditor::event(QEvent* event)
- {
--    ++m_eventHandlingLevel;
--
-     if (event->type() == QEvent::FocusOut) {
-         QFocusEvent* focusEvent = static_cast<QFocusEvent*>(event);
-         if (focusEvent->reason() != Qt::PopupFocusReason) {
-             emitRoleEditingFinished();
-         }
-     }
--
--    const int result = KTextEdit::event(event);
--    --m_eventHandlingLevel;
--
--    if (m_deleteAfterEventHandling && m_eventHandlingLevel == 0) {
--        // Schedule this object for deletion and make sure that we do not try
--        // to deleteLater() again when the DeferredDelete event is received.
--        deleteLater();
--        m_deleteAfterEventHandling = false;
--    }
--
--    return result;
--}
--
--bool KItemListRoleEditor::viewportEvent(QEvent* event)
--{
--    ++m_eventHandlingLevel;
--    const bool result = KTextEdit::viewportEvent(event);
--    --m_eventHandlingLevel;
--
--    if (m_deleteAfterEventHandling && m_eventHandlingLevel == 0) {
--        // Schedule this object for deletion and make sure that we do not try
--        // to deleteLater() again when the DeferredDelete event is received.
--        deleteLater();
--        m_deleteAfterEventHandling = false;
--    }
--
--    return result;
-+    return KTextEdit::event(event);
- }
- 
- void KItemListRoleEditor::keyPressEvent(QKeyEvent* event)
-@@ -144,8 +99,7 @@ void KItemListRoleEditor::keyPressEvent(QKeyEvent* event)
-         return;
-     case Qt::Key_Enter:
-     case Qt::Key_Return:
--        // TODO: find a better way to fix the bug 309760
--        clearFocus(); // emitRoleEditingFinished(); results in a crash
-+        emitRoleEditingFinished();
-         event->accept();
-         return;
-     default:
-diff --git a/dolphin/src/kitemviews/private/kitemlistroleeditor.h b/dolphin/src/kitemviews/private/kitemlistroleeditor.h
-index a2f7058..aa2c977 100644
---- a/dolphin/src/kitemviews/private/kitemlistroleeditor.h
-+++ b/dolphin/src/kitemviews/private/kitemlistroleeditor.h
-@@ -47,15 +47,6 @@ public:
-     void setRole(const QByteArray& role);
-     QByteArray role() const;
- 
--    /**
--     * Calls deleteLater() if no event is being handled at the moment.
--     * Otherwise, the deletion is deferred until the event handling is
--     * finished. This prevents that the deletion happens inside a nested
--     * event loop which might be run in contextMenuEvent() or
--     * mouseMoveEvent() because this would probably cause a crash.
--     */
--    void deleteWhenIdle();
--
-     virtual bool eventFilter(QObject* watched, QEvent* event);
- 
- signals:
-@@ -64,7 +55,6 @@ signals:
- 
- protected:
-     virtual bool event(QEvent* event);
--    virtual bool viewportEvent(QEvent* event);
-     virtual void keyPressEvent(QKeyEvent* event);
- 
- private slots:
-@@ -85,8 +75,6 @@ private:
-     int m_index;
-     QByteArray m_role;
-     bool m_blockFinishedSignal;
--    int m_eventHandlingLevel;
--    bool m_deleteAfterEventHandling;
- };
- 
- #endif
-diff --git a/dolphin/src/views/dolphinview.cpp b/dolphin/src/views/dolphinview.cpp
-index 70a7394..0e97c5a 100644
---- a/dolphin/src/views/dolphinview.cpp
-+++ b/dolphin/src/views/dolphinview.cpp
-@@ -1227,11 +1227,14 @@ void DolphinView::updateViewState()
- 
-         QSet<int> selectedItems = selectionManager->selectedItems();
- 
--        for (QList<KUrl>::iterator it = m_selectedUrls.begin(); it != m_selectedUrls.end(); ++it) {
-+        QList<KUrl>::iterator it = m_selectedUrls.begin();
-+        while (it != m_selectedUrls.end()) {
-             const int index = m_model->index(*it);
-             if (index >= 0) {
-                 selectedItems.insert(index);
--                m_selectedUrls.erase(it);
-+                it = m_selectedUrls.erase(it);
-+            } else {
-+                 ++it;
-             }
-         }
- 
diff --git a/libre/kdebase-konqueror-libre/kdebug-324511.patch b/libre/kdebase-konqueror-libre/kdebug-324511.patch
deleted file mode 100644
index cca2a7254..000000000
--- a/libre/kdebase-konqueror-libre/kdebug-324511.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-commit 43a981481ab9161a83dd200db39c093e2502f68a
-Author: Bernd Buschinski <b.buschinski@googlemail.com>
-Date:   Wed Sep 4 16:23:35 2013 +0200
-
-    Fix toplevel bookmarks not showing in toolbar
-    regression from d1963e23
-
-diff --git a/konqueror/src/konqbookmarkbar.cpp b/konqueror/src/konqbookmarkbar.cpp
-index 2141575..199e15f 100644
---- a/konqueror/src/konqbookmarkbar.cpp
-+++ b/konqueror/src/konqbookmarkbar.cpp
-@@ -184,10 +184,12 @@ void KBookmarkBar::fillBookmarkBar(const KBookmarkGroup & parent)
- 
-         if (!bm.isGroup())
-         {
--	    if ( bm.isSeparator() )
-+            if ( bm.isSeparator() )
-+            {
-                 if (m_toolBar) {
-                     m_toolBar->addSeparator();
-                 }
-+            }
-             else
-             {
-                 KAction *action = new KBookmarkAction( bm, m_pOwner, 0 );
diff --git a/libre/kdebase-runtime-libre/PKGBUILD b/libre/kdebase-runtime-libre/PKGBUILD
index fe99bd935..581317fff 100644
--- a/libre/kdebase-runtime-libre/PKGBUILD
+++ b/libre/kdebase-runtime-libre/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 195503 2013-10-01 15:14:05Z svenstaro $
+# $Id: PKGBUILD 198793 2013-11-04 15:15:34Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
-# Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
+# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
 
 _pkgname=kdebase-runtime
 pkgname=kdebase-runtime-libre
-pkgver=4.11.2
+pkgver=4.11.3
 pkgrel=1
 pkgdesc="Plugins and applications necessary for the running of KDE applications, without non-privacy search providers"
 arch=('i686' 'x86_64' 'mips64el')
@@ -26,14 +26,12 @@ install="${_pkgname}.install"
 source=("http://download.kde.org/stable/${pkgver}/src/kde-runtime-${pkgver}.tar.xz"
         'duckduckgo_html.desktop'
         'duckduckgo_lite.desktop')
-sha1sums=('b896ef9d8fe770720dc16ae3eae33538e4e699da'
+sha1sums=('c9af4e5e52018caf26113075f7ec5903122e43d5'
           'aa6f39f4b0ad3c110fd05cd6c41190afae9773dd'
           'ac3bac94a2c4b1444642524bc5fb539c4c5dcc5b')
 
 prepare() {
   mkdir build
-
-  cd kde-runtime-${pkgver}
 }
 
 build() {
diff --git a/libre/kdebase-runtime-libre/kdebug-324470.patch b/libre/kdebase-runtime-libre/kdebug-324470.patch
deleted file mode 100644
index 4269df829..000000000
--- a/libre/kdebase-runtime-libre/kdebug-324470.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-commit be1a5d484c70f4f6a383150810afbfbb367db2ac
-Author: Eike Hein <hein@kde.org>
-Date:   Tue Sep 3 20:29:23 2013 +0200
-
-    Discard the recorded events in the item-local handlers.
-    
-    Solves problems with identical events being ignored due to
-    QGraphicsView's reuse of QGraphicsSceneMouseEvent instances.
-    
-    CCMAIL:rdieter@fedoraproject.org
-    BUG:324470
-    BUG:324471
-
-diff --git a/plasma/declarativeimports/qtextracomponents/mouseeventlistener.cpp b/plasma/declarativeimports/qtextracomponents/mouseeventlistener.cpp
-index b534845..36530e0 100644
---- a/plasma/declarativeimports/qtextracomponents/mouseeventlistener.cpp
-+++ b/plasma/declarativeimports/qtextracomponents/mouseeventlistener.cpp
-@@ -90,6 +90,7 @@ bool MouseEventListener::containsMouse() const
- void MouseEventListener::mousePressEvent(QGraphicsSceneMouseEvent *me)
- {
-     if (m_lastEvent == me) {
-+        m_lastEvent = 0;
-         return;
-     }
- 
-@@ -112,6 +113,7 @@ void MouseEventListener::mousePressEvent(QGraphicsSceneMouseEvent *me)
- void MouseEventListener::mouseMoveEvent(QGraphicsSceneMouseEvent *me)
- {
-     if (m_lastEvent == me) {
-+        m_lastEvent = 0;
-         return;
-     }
- 
-@@ -122,6 +124,7 @@ void MouseEventListener::mouseMoveEvent(QGraphicsSceneMouseEvent *me)
- void MouseEventListener::mouseReleaseEvent(QGraphicsSceneMouseEvent *me)
- {
-     if (m_lastEvent == me) {
-+        m_lastEvent = 0;
-         return;
-     }
- 
-@@ -138,6 +141,7 @@ void MouseEventListener::mouseReleaseEvent(QGraphicsSceneMouseEvent *me)
- void MouseEventListener::wheelEvent(QGraphicsSceneWheelEvent *we)
- {
-     if (m_lastEvent == we) {
-+        m_lastEvent = 0;
-         return;
-     }
- 
diff --git a/libre/kdelibs-libre/PKGBUILD b/libre/kdelibs-libre/PKGBUILD
index bb657d4f3..6cee072a4 100644
--- a/libre/kdelibs-libre/PKGBUILD
+++ b/libre/kdelibs-libre/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 195493 2013-10-01 15:12:48Z svenstaro $
+# $Id: PKGBUILD 198988 2013-11-05 20:44:40Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
-# Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
+# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
 
 _pkgname=kdelibs
 pkgname=kdelibs-libre
-pkgver=4.11.2
+pkgver=4.11.3
 pkgrel=1
 pkgdesc="KDE Core Libraries"
 arch=('i686' 'x86_64' 'mips64el')
@@ -14,7 +14,7 @@ license=('GPL' 'LGPL' 'FDL')
 depends=('strigi' 'attica' 'libxss' 'soprano' 'krb5' 'grantlee'
         'shared-desktop-ontologies' 'qca' 'libdbusmenu-qt' 'polkit-qt'
         'shared-mime-info' 'enchant' 'giflib' 'jasper' 'openexr'
-        'docbook-xsl' 'upower' 'udisks2' 'libxcursor' 'phonon'
+        'docbook-xsl' 'upower' 'udisks2' 'libxcursor' 'phonon-qt4'
         'media-player-info' 'libxtst' 'libutempter' 'qtwebkit')
 makedepends=('cmake' 'automoc4' 'avahi' 'libgl' 'hspell' 'mesa')
 provides=("kdelibs=$pkgver")
@@ -24,7 +24,7 @@ install=${_pkgname}.install
 source=("http://download.kde.org/stable/${pkgver}/src/${_pkgname}-${pkgver}.tar.xz"
         'kde-applications-menu.patch' 'qt4.patch' 
         'khtml-fsdg.diff')
-sha1sums=('f9aec4ec00389067e6d2ea37f5042c926c07fd6a'
+sha1sums=('42bda7ca352b3f700af91262636380aa71d07519'
           '86ee8c8660f19de8141ac99cd6943964d97a1ed7'
           'ed1f57ee661e5c7440efcaba7e51d2554709701c'
           'a1502a964081ad583a00cf90c56e74bf60121830')
@@ -52,7 +52,6 @@ build() {
                -DHTML_INSTALL_DIR=/usr/share/doc/kde/html \
                -DKDE_DEFAULT_HOME='.kde4' \
                -DWITH_FAM=OFF \
-               -DWITH_HUpnp=OFF \
                -DWITH_SOLID_UDISKS2=ON
        make
 }
diff --git a/libre/kdenetwork-kopete-libre/PKGBUILD b/libre/kdenetwork-kopete-libre/PKGBUILD
index ef67d28c9..31ccd5275 100644
--- a/libre/kdenetwork-kopete-libre/PKGBUILD
+++ b/libre/kdenetwork-kopete-libre/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 195745 2013-10-01 15:33:32Z svenstaro $
+# $Id: PKGBUILD 198789 2013-11-04 15:13:00Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
-# Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
+# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
 
 _pkgname=kdenetwork-kopete
 pkgname=kdenetwork-kopete-libre
-pkgver=4.11.2
+pkgver=4.11.3
 pkgrel=1
 pkgdesc='Instant Messenger, without skype support'
 url='http://kde.org/applications/internet/kopete/'
@@ -21,7 +21,7 @@ provides=$_pkgname=$pkgver
 source=("http://download.kde.org/stable/${pkgver}/src/kopete-${pkgver}.tar.xz"
         'libotr3.patch'
         'mediastreamer29.patch')
-sha1sums=('d7616376d7488050ce2c6ec6b7a1f4010fe91084'
+sha1sums=('70fd03fb955574f4eba733d590ce15c841fd8805'
           '9c3b0ee15538fbfa36aa0a4748b1f6b5a7905384'
           '317683a5c2acd0a0058c5ab42f6006e9db511ef3')
 
diff --git a/libre/kdepim-libre/PKGBUILD b/libre/kdepim-libre/PKGBUILD
index 7725d7c2c..3d06c6054 100644
--- a/libre/kdepim-libre/PKGBUILD
+++ b/libre/kdepim-libre/PKGBUILD
@@ -1,7 +1,7 @@
-# $Id: PKGBUILD 195755 2013-10-01 15:34:16Z svenstaro $
+# $Id: PKGBUILD 198789 2013-11-04 15:13:00Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
-# Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
+# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
 
 _pkgbase=kdepim
 pkgbase=kdepim-libre
@@ -22,7 +22,7 @@ pkgname=('kdepim-akonadiconsole-libre'
          'kdepim-ktimetracker-libre'
          'kdepim-ktnef-libre'
          'kdepim-libkdepim-libre')
-pkgver=4.11.2
+pkgver=4.11.3
 pkgrel=1
 arch=('i686' 'x86_64' 'mips64el')
 url='http://pim.kde.org'
@@ -31,7 +31,7 @@ groups=('kde' 'kdepim-libre')
 makedepends=('cmake' 'automoc4' 'boost' 'kdepim-runtime' 'libxss'
              'kde-agent' 'nepomuk-widgets' 'link-grammar')
 source=("http://download.kde.org/stable/${pkgver}/src/${_pkgbase}-${pkgver}.tar.xz")
-sha1sums=('027a6560bcd8f55659f642f2041f1265453a02ad')
+sha1sums=('627b027bb276c41ac8a1face093e777bfafcabf0')
 
 build() {
 	mkdir build
diff --git a/libre/kdeutils-ark-libre/PKGBUILD b/libre/kdeutils-ark-libre/PKGBUILD
index 8dc8d1828..434dc57a9 100644
--- a/libre/kdeutils-ark-libre/PKGBUILD
+++ b/libre/kdeutils-ark-libre/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 195793 2013-10-01 15:36:58Z svenstaro $
+# $Id: PKGBUILD 198789 2013-11-04 15:13:00Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
-# Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
+# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
 
 _pkgname=kdeutils-ark
 pkgname=kdeutils-ark-libre
-pkgver=4.11.2
+pkgver=4.11.3
 pkgrel=1
 pkgdesc='Archiving Tool, with unar support'
 url='http://kde.org/applications/utilities/ark/'
@@ -20,7 +20,7 @@ replaces=('kdeutils-ark')
 conflicts=('kdeutils-ark')
 source=("http://download.kde.org/stable/${pkgver}/src/ark-${pkgver}.tar.xz"
         'ark-unar-06.patch')
-sha1sums=('4314876715804f52ca09f6555173b1542a406f0e'
+sha1sums=('02488f636275729980f6d15cbab7c79cecf219c8'
           'a0a836950f185d9b2245204579f969203036fdec')
 
 build() {
diff --git a/libre/kile-libre/PKGBUILD b/libre/kile-libre/PKGBUILD
index 212b32959..9fd47bf7a 100644
--- a/libre/kile-libre/PKGBUILD
+++ b/libre/kile-libre/PKGBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Ronald van Haren <ronald.archlinux.org>
 # Contributor: Damir Perisa <damir.perisa@bluewin.ch>
 # Maintainer (Parabola): Michał Masłowski <mtjm@mtjm.eu>
-# Contributor (Parabola): André Silva <emulatorman@lavabit.com>
+# Contributor (Parabola): André Silva <emulatorman@parabola.nu>
 
 _pkgname=kile
 pkgname=kile-libre
diff --git a/libre/lib32-mesa-demos-libre/PKGBUILD b/libre/lib32-mesa-demos-libre/PKGBUILD
index aa9fde2c3..d5efffe26 100644
--- a/libre/lib32-mesa-demos-libre/PKGBUILD
+++ b/libre/lib32-mesa-demos-libre/PKGBUILD
@@ -1,7 +1,7 @@
 # $Id: PKGBUILD 178740 2013-02-26 16:15:13Z andyrtr $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
-# Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
+# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
 
 _pkgbasename=mesa-demos-libre
 pkgname=lib32-$_pkgbasename
diff --git a/libre/lib32-sdl-libre/PKGBUILD b/libre/lib32-sdl-libre/PKGBUILD
index a1fa02a0a..6c319e676 100644
--- a/libre/lib32-sdl-libre/PKGBUILD
+++ b/libre/lib32-sdl-libre/PKGBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Contributor: Allan McRae <allan@archlinux.org>
 # Contributor: dorphell <dorphell@archlinux.org>
-# Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
+# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
 
 _pkgbasename=sdl-libre
 pkgname=lib32-$_pkgbasename
diff --git a/libre/libretools/PKGBUILD b/libre/libretools/PKGBUILD
index 1c9d0251c..a371f7733 100644
--- a/libre/libretools/PKGBUILD
+++ b/libre/libretools/PKGBUILD
@@ -9,9 +9,9 @@ pkgdesc="Programs for Parabola development"
 url="https://projects.parabolagnulinux.org/packages/libretools.git/"
 license=('GPL3' 'GPL2')
 
-pkgver=20131007
-_libretools_commit=75bef554ce82c3c086cc04a4c12ccd2e9644290f
-_devtools_commit=f566ebf8345cf39f1d50eaa6a679b3ca7088f4eb
+pkgver=20131027
+_libretools_commit=11ca293c188ad394e2383381a4bce152cc7f0723
+_devtools_commit=021653a0acecc8763e1bbe90dbb770b4e6df4390
 
 _packages_url=https://projects.parabolagnulinux.org/packages
 source=($_packages_url/libretools.git/snapshot/libretools-$_libretools_commit.tar.bz2
@@ -83,5 +83,5 @@ package_libretools-mips64el() {
   make install-libretools-mips64el DESTDIR="$pkgdir"
 }
 
-md5sums=('938d9909ed3ed3af9f31f82bbc54e788'
-         'a3cc8d8fc2daa370799249a4ea5caafc')
+md5sums=('455f0ac438436b3580eb79dd9eb5a9e2'
+         '656008e8e35e6adba527b7bfc367b9f7')
diff --git a/libre/licenses-libre/PKGBUILD b/libre/licenses-libre/PKGBUILD
index 634d345c1..24b2cc4d8 100644
--- a/libre/licenses-libre/PKGBUILD
+++ b/libre/licenses-libre/PKGBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Dan McGee <dan@archlinux.org>
 # Maintainer (Parabola): fauno <fauno@kiwwwi.com.ar>
 # Maintainer (Parabola): Márcio Silva <coadde@lavabit.com>
-# Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
+# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
 
 pkgname=licenses-libre
 pkgver=20130203
diff --git a/libre/liferea-libre/PKGBUILD b/libre/liferea-libre/PKGBUILD
index 8e715be0f..8db1deae6 100644
--- a/libre/liferea-libre/PKGBUILD
+++ b/libre/liferea-libre/PKGBUILD
@@ -1,7 +1,7 @@
 # $Id: PKGBUILD 196228 2013-10-08 23:20:06Z eric $
 # Maintainer: Eric Bélanger <eric@archlinux.org>
 # Contributor (Parabola): bitlord
-# Contributor (Parabola): André Silva <emulatorman@lavabit.com>
+# Contributor (Parabola): André Silva <emulatorman@parabola.nu>
 
 _pkgname=liferea
 pkgname=liferea-libre
diff --git a/libre/linux-libre-api-headers/PKGBUILD b/libre/linux-libre-api-headers/PKGBUILD
index e8876b3bd..0c4aa24af 100644
--- a/libre/linux-libre-api-headers/PKGBUILD
+++ b/libre/linux-libre-api-headers/PKGBUILD
@@ -1,6 +1,6 @@
 # $Id: PKGBUILD 192503 2013-08-13 10:47:26Z allan $
 # Maintainer: Allan McRae <allan@archlinux.org>
-# Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
+# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
 
 # toolchain build order: linux-libre-api-headers->glibc->binutils->gcc->binutils->glibc
 
diff --git a/libre/linux-libre-firmware/PKGBUILD b/libre/linux-libre-firmware/PKGBUILD
index 8bd7c5989..67c853582 100644
--- a/libre/linux-libre-firmware/PKGBUILD
+++ b/libre/linux-libre-firmware/PKGBUILD
@@ -1,8 +1,8 @@
-# Maintainer: André Silva <emulatorman@lavabit.com>
+# Maintainer: André Silva <emulatorman@parabola.nu>
 # Contributor: Márcio Silva <coadde@lavabit.com>
 
 pkgname=linux-libre-firmware
-pkgver=3.10
+pkgver=3.11
 pkgrel=1
 pkgdesc='Free firmware files for Linux-libre'
 arch=('any')
@@ -37,7 +37,7 @@ replaces=('linux-firmware'
           'rt2x00-rt61-fw'
           'rt2x00-rt71w-fw')
 source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/$pkgver-gnu/linux-libre-$pkgver-gnu.tar.xz")
-md5sums=('d562fd52580a3b6b18b6eeb5921d1d5c')
+md5sums=('7ec84223c7adcf01a5287eb7af96b7e7')
 
 package() {
 
diff --git a/libre/linux-libre-lts/ChangeLog b/libre/linux-libre-lts/ChangeLog
index 7bff7d34d..552a488bf 100644
--- a/libre/linux-libre-lts/ChangeLog
+++ b/libre/linux-libre-lts/ChangeLog
@@ -1,39 +1,39 @@
-2013-07-15  André Silva  <emulatorman@lavabit.com>
+2013-07-15  André Silva  <emulatorman@parabola.nu>
 
         * linux-libre-3.10.1-1
         * Removed linux-libre-kmod-alx package from Parabola due which CONFIG_ALX module was implemented by default in the kernel.
 
-2013-04-30  André Silva  <emulatorman@lavabit.com>
+2013-04-30  André Silva  <emulatorman@parabola.nu>
 
         * linux-libre-3.9-2
         * Removed CONFIG_STUB_POULSBO module from config files.
 
-2012-12-19  André Silva  <emulatorman@lavabit.com>
+2012-12-19  André Silva  <emulatorman@parabola.nu>
 
 	* linux-libre-3.7.1-1
 	* Replaced CONFIG_NFS_V4_1_IMPLEMENTATION_ID_DOMAIN="kernel.org" to CONFIG_NFS_V4_1_IMPLEMENTATION_ID_DOMAIN="linux-libre.fsfla.org"
 
-2012-06-23  André Silva  <emulatorman@lavabit.com>
+2012-06-23  André Silva  <emulatorman@parabola.nu>
 
 	* linux-libre-3.4.4-1
-	* Replaced email account andre.paulista@adinet.com.uy to emulatorman@lavabit.com.
+	* Replaced email account andre.paulista@adinet.com.uy to emulatorman@parabola.nu.
 
-2012-05-26  André Silva  <emulatorman@lavabit.com>
+2012-05-26  André Silva  <emulatorman@parabola.nu>
 
 	* linux-libre-3.4-1.2
 	* Disabled CONFIG_MICROCODE_INTEL and CONFIG_MICROCODE_AMD modules https://labs.parabola.nu/issues/116
 
-2012-04-24  André Silva  <emulatorman@lavabit.com>
+2012-04-24  André Silva  <emulatorman@parabola.nu>
 
 	* linux-libre-3.3.3-1
 	* Disabled CONFIG_STUB_POULSBO module https://labs.parabola.nu/issues/90 
 
-2012-04-08  André Silva  <emulatorman@lavabit.com>
+2012-04-08  André Silva  <emulatorman@parabola.nu>
 
 	* linux-libre-3.3.1-1.1
 	* Disabled CONFIG_IPW2100 and CONFIG_IPW2200 modules https://labs.parabola.nu/issues/47
 
-2012-03-03  André Silva  <emulatorman@lavabit.com>
+2012-03-03  André Silva  <emulatorman@parabola.nu>
 
 	* linux-libre-3.2.9-2
 	* Enabled CONFIG_FB_VT8623 module https://labs.parabola.nu/issues/14
diff --git a/libre/linux-libre-lts/PKGBUILD b/libre/linux-libre-lts/PKGBUILD
index 29e2366e1..8e8070111 100644
--- a/libre/linux-libre-lts/PKGBUILD
+++ b/libre/linux-libre-lts/PKGBUILD
@@ -1,7 +1,7 @@
-# $Id: PKGBUILD 195951 2013-10-06 10:39:36Z bpiotrowski $
+# $Id: PKGBUILD 196788 2013-10-19 07:01:13Z andyrtr $
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 # Maintainer: Thomas Baechler <thomas@archlinux.org>
-# Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
+# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
 # Contributor (Parabola): Nicolás Reynolds <fauno@kiwwwi.com.ar>
 # Contributor (Parabola): Sorin-Mihai Vârgolici <smv@yobicore.org>
 # Contributor (Parabola): Michał Masłowski <mtjm@mtjm.eu>
@@ -10,10 +10,10 @@
 pkgbase=linux-libre-lts     # Build stock -LIBRE-LTS kernel
 #pkgbase=linux-libre-custom # Build kernel with a different name
 _basekernel=3.10
-_sublevel=15
+_sublevel=17
 pkgver=${_basekernel}.${_sublevel}
 pkgrel=1
-_lxopkgver=${_basekernel}.15 # nearly always the same as pkgver
+_lxopkgver=${_basekernel}.16 # nearly always the same as pkgver
 arch=('i686' 'x86_64' 'mips64el')
 url="http://linux-libre.fsfla.org/"
 license=('GPL2')
@@ -33,9 +33,9 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn
         '3.10.6-logitech-dj.patch'
         "http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/debuginfo/linux-patches-${_lxopkgver}-gnu_0loongsonlibre_mipsel.tar.bz2")
 md5sums=('d562fd52580a3b6b18b6eeb5921d1d5c'
-         '9d85508aaa75442ec6e480a248102c5a'
-         '678afb6322e0b0caad6b08bdb2b23dc8'
-         '13e5a0aa3faf60f791403d0b367dca86'
+         '9a4ad6408ff3a2def1735f24b5ff02c5'
+         '59a0759df09a59d48d0c470895c50cbb'
+         'ad7f5988deb617e3789f95d7e675860d'
          'c072b17032e80debc6a8626299245d46'
          '2967cecc3af9f954ccc822fd63dca6ff'
          '8267264d9a8966e57fdacd1fa1fc65c4'
@@ -43,7 +43,7 @@ md5sums=('d562fd52580a3b6b18b6eeb5921d1d5c'
          'f3def2cefdcbb954c21d8505d23cc83c'
          'd50c1ac47394e9aec637002ef3392bd1'
          '3ff40ca684cfe719723e627e2cef7cea'
-         '8aab6ab727f49dffcae5fd1c3c7c5bdb')
+         '3b9f1cce64377f70eb8bf5978db629d5')
 if [ "$CARCH" != "mips64el" ]; then
     # don't use the Loongson-specific patches on non-mips64el arches.
     unset source[${#source[@]}-1]
@@ -163,9 +163,9 @@ _package() {
   backup=("etc/mkinitcpio.d/${pkgbase}.preset")
   install=${pkgbase}.install
   if [ "$CARCH" != "mips64el" ]; then
-     provides+=('linux-libre-lts-kmod-alx')
-     conflicts+=('linux-libre-lts-kmod-alx')
-     replaces+=('linux-libre-lts-kmod-alx')
+     provides+=("linux-libre${_kernelname}-kmod-alx")
+     conflicts+=("linux-libre${_kernelname}-kmod-alx")
+     replaces+=("linux-libre${_kernelname}-kmod-alx")
   fi
   if [ "$CARCH" = "mips64el" ]; then
       optdepends+=('mkinitcpio: to make the initramfs (needs reinstall of this package)')
@@ -399,7 +399,24 @@ _package-headers() {
   fi
 }
 
-pkgname=("${pkgbase}" "${pkgbase}-headers")
+_package-docs() {
+  pkgdesc="Kernel hackers manual - HTML documentation that comes with the ${pkgbase^} kernel"
+  provides=("kernel26${_kernelname}-docs=${pkgver}" "linux${_kernelname}-docs=${pkgver}")
+  conflicts=("kernel26${_kernelname}-docs" "kernel26-libre${_kernelname}-docs" "linux${_kernelname}-docs")
+  replaces=("kernel26${_kernelname}-docs" "kernel26-libre${_kernelname}-docs" "linux${_kernelname}-docs")
+
+  cd "${srcdir}/linux-${_basekernel}"
+
+  mkdir -p "${pkgdir}/usr/src/linux-${_kernver}"
+  cp -al Documentation "${pkgdir}/usr/src/linux-${_kernver}"
+  find "${pkgdir}" -type f -exec chmod 444 {} \;
+  find "${pkgdir}" -type d -exec chmod 755 {} \;
+
+  # remove a file already in linux package
+  rm -f "${pkgdir}/usr/src/linux-${_kernver}/Documentation/DocBook/Makefile"
+}
+
+pkgname=("${pkgbase}" "${pkgbase}-headers" "${pkgbase}-docs")
 for _p in ${pkgname[@]}; do
   eval "package_${_p}() {
     _package${_p#${pkgbase}}
diff --git a/libre/linux-libre-lts/config.i686 b/libre/linux-libre-lts/config.i686
index 3a2a9a4a5..00d4f295b 100644
--- a/libre/linux-libre-lts/config.i686
+++ b/libre/linux-libre-lts/config.i686
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86 3.10.10-1 Kernel Configuration
+# Linux/x86 3.10.15-1 Kernel Configuration
 #
 # CONFIG_64BIT is not set
 CONFIG_X86_32=y
@@ -118,7 +118,6 @@ CONFIG_TASK_IO_ACCOUNTING=y
 # RCU Subsystem
 #
 CONFIG_TREE_RCU=y
-# CONFIG_TREE_PREEMPT_RCU is not set
 # CONFIG_PREEMPT_RCU is not set
 CONFIG_RCU_STALL_COMMON=y
 CONFIG_RCU_FANOUT=32
@@ -1542,24 +1541,7 @@ CONFIG_MTD_BLOCK2MTD=m
 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
-# CONFIG_MTD_NAND_ECC_BCH is not set
-CONFIG_MTD_SM_COMMON=m
-# CONFIG_MTD_NAND_DENALI is not set
-CONFIG_MTD_NAND_IDS=m
-CONFIG_MTD_NAND_RICOH=m
-CONFIG_MTD_NAND_DISKONCHIP=m
-# CONFIG_MTD_NAND_DISKONCHIP_PROBE_ADVANCED is not set
-CONFIG_MTD_NAND_DISKONCHIP_PROBE_ADDRESS=0
-# CONFIG_MTD_NAND_DISKONCHIP_BBTWRITE is not set
-CONFIG_MTD_NAND_DOCG4=m
-# CONFIG_MTD_NAND_CAFE is not set
-CONFIG_MTD_NAND_CS553X=m
-CONFIG_MTD_NAND_NANDSIM=m
-# CONFIG_MTD_NAND_PLATFORM is not set
-CONFIG_MTD_ALAUDA=m
+# CONFIG_MTD_NAND is not set
 # CONFIG_MTD_ONENAND is not set
 
 #
@@ -1736,7 +1718,7 @@ CONFIG_SCSI_ENCLOSURE=m
 CONFIG_SCSI_MULTI_LUN=y
 # CONFIG_SCSI_CONSTANTS is not set
 # CONFIG_SCSI_LOGGING is not set
-# CONFIG_SCSI_SCAN_ASYNC is not set
+CONFIG_SCSI_SCAN_ASYNC=y 
 
 #
 # SCSI Transports
@@ -4804,9 +4786,7 @@ CONFIG_USB_STORAGE_ENE_UB6250=m
 CONFIG_USB_MDC800=m
 CONFIG_USB_MICROTEK=m
 # CONFIG_USB_DWC3 is not set
-CONFIG_USB_CHIPIDEA=m
-CONFIG_USB_CHIPIDEA_UDC=y
-# CONFIG_USB_CHIPIDEA_DEBUG is not set
+# CONFIG_USB_CHIPIDEA is not set
 
 #
 # USB port drivers
@@ -6094,7 +6074,7 @@ CONFIG_SECURITY_TOMOYO_ACTIVATION_TRIGGER="/usr/lib/systemd/systemd"
 CONFIG_SECURITY_APPARMOR=y
 CONFIG_SECURITY_APPARMOR_BOOTPARAM_VALUE=0
 CONFIG_SECURITY_YAMA=y
-CONFIG_SECURITY_YAMA_STACKED=y 
+CONFIG_SECURITY_YAMA_STACKED=y
 # CONFIG_IMA is not set
 # CONFIG_DEFAULT_SECURITY_TOMOYO is not set
 # CONFIG_DEFAULT_SECURITY_APPARMOR is not set
@@ -6303,7 +6283,6 @@ CONFIG_GENERIC_ALLOCATOR=y
 CONFIG_REED_SOLOMON=m
 CONFIG_REED_SOLOMON_ENC8=y
 CONFIG_REED_SOLOMON_DEC8=y
-CONFIG_REED_SOLOMON_DEC16=y
 CONFIG_BCH=m
 CONFIG_BCH_CONST_PARAMS=y
 CONFIG_TEXTSEARCH=y
diff --git a/libre/linux-libre-lts/config.x86_64 b/libre/linux-libre-lts/config.x86_64
index 36e06facd..8dc57a685 100644
--- a/libre/linux-libre-lts/config.x86_64
+++ b/libre/linux-libre-lts/config.x86_64
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86 3.10.10-1 Kernel Configuration
+# Linux/x86 3.10.15-1 Kernel Configuration
 #
 CONFIG_64BIT=y
 CONFIG_X86_64=y
@@ -122,7 +122,6 @@ CONFIG_TASK_IO_ACCOUNTING=y
 # RCU Subsystem
 #
 CONFIG_TREE_RCU=y
-# CONFIG_TREE_PREEMPT_RCU is not set
 # CONFIG_PREEMPT_RCU is not set
 CONFIG_RCU_STALL_COMMON=y
 # CONFIG_RCU_USER_QS is not set
@@ -386,7 +385,7 @@ CONFIG_CALGARY_IOMMU_ENABLED_BY_DEFAULT=y
 CONFIG_SWIOTLB=y
 CONFIG_IOMMU_HELPER=y
 # CONFIG_MAXSMP is not set
-CONFIG_NR_CPUS=64
+CONFIG_NR_CPUS=128
 CONFIG_SCHED_SMT=y
 CONFIG_SCHED_MC=y
 CONFIG_PREEMPT_NONE=y
@@ -1510,23 +1509,7 @@ CONFIG_MTD_BLOCK2MTD=m
 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
-# CONFIG_MTD_NAND_ECC_BCH is not set
-CONFIG_MTD_SM_COMMON=m
-# CONFIG_MTD_NAND_DENALI is not set
-CONFIG_MTD_NAND_IDS=m
-CONFIG_MTD_NAND_RICOH=m
-CONFIG_MTD_NAND_DISKONCHIP=m
-# CONFIG_MTD_NAND_DISKONCHIP_PROBE_ADVANCED is not set
-CONFIG_MTD_NAND_DISKONCHIP_PROBE_ADDRESS=0
-# CONFIG_MTD_NAND_DISKONCHIP_BBTWRITE is not set
-CONFIG_MTD_NAND_DOCG4=m
-# CONFIG_MTD_NAND_CAFE is not set
-CONFIG_MTD_NAND_NANDSIM=m
-# CONFIG_MTD_NAND_PLATFORM is not set
-CONFIG_MTD_ALAUDA=m
+# CONFIG_MTD_NAND is not set
 # CONFIG_MTD_ONENAND is not set
 
 #
@@ -1686,7 +1669,7 @@ CONFIG_SCSI_ENCLOSURE=m
 CONFIG_SCSI_MULTI_LUN=y
 # CONFIG_SCSI_CONSTANTS is not set
 # CONFIG_SCSI_LOGGING is not set
-# CONFIG_SCSI_SCAN_ASYNC is not set
+CONFIG_SCSI_SCAN_ASYNC=y 
 
 #
 # SCSI Transports
@@ -4622,9 +4605,7 @@ CONFIG_USB_STORAGE_ENE_UB6250=m
 CONFIG_USB_MDC800=m
 CONFIG_USB_MICROTEK=m
 # CONFIG_USB_DWC3 is not set
-CONFIG_USB_CHIPIDEA=m
-CONFIG_USB_CHIPIDEA_UDC=y
-# CONFIG_USB_CHIPIDEA_DEBUG is not set
+# CONFIG_USB_CHIPIDEA is not set
 
 #
 # USB port drivers
@@ -5885,7 +5866,7 @@ CONFIG_SECURITY_TOMOYO_ACTIVATION_TRIGGER="/usr/lib/systemd/systemd"
 CONFIG_SECURITY_APPARMOR=y
 CONFIG_SECURITY_APPARMOR_BOOTPARAM_VALUE=0
 CONFIG_SECURITY_YAMA=y
-CONFIG_SECURITY_YAMA_STACKED=y 
+CONFIG_SECURITY_YAMA_STACKED=y
 # CONFIG_IMA is not set
 # CONFIG_DEFAULT_SECURITY_TOMOYO is not set
 # CONFIG_DEFAULT_SECURITY_APPARMOR is not set
@@ -6103,7 +6084,6 @@ CONFIG_GENERIC_ALLOCATOR=y
 CONFIG_REED_SOLOMON=m
 CONFIG_REED_SOLOMON_ENC8=y
 CONFIG_REED_SOLOMON_DEC8=y
-CONFIG_REED_SOLOMON_DEC16=y
 CONFIG_BCH=m
 CONFIG_BCH_CONST_PARAMS=y
 CONFIG_TEXTSEARCH=y
diff --git a/libre/linux-libre-manpages/PKGBUILD b/libre/linux-libre-manpages/PKGBUILD
index 695ea966e..125d2ac50 100644
--- a/libre/linux-libre-manpages/PKGBUILD
+++ b/libre/linux-libre-manpages/PKGBUILD
@@ -1,7 +1,7 @@
 # $Id: PKGBUILD 185172 2013-05-11 17:49:25Z thomas $
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 # Maintainer: Thomas Baechler <thomas@archlinux.org>
-# Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
+# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
 
 pkgname=linux-libre-manpages
 pkgver=3.9
diff --git a/libre/linux-libre-tools/PKGBUILD b/libre/linux-libre-tools/PKGBUILD
index acaf04070..9a48c4dc4 100644
--- a/libre/linux-libre-tools/PKGBUILD
+++ b/libre/linux-libre-tools/PKGBUILD
@@ -1,6 +1,6 @@
-# $Id: PKGBUILD 96809 2013-09-05 18:48:20Z seblu $
+# $Id: PKGBUILD 98971 2013-10-21 20:21:06Z seblu $
 # Maintainer: Sébastien Luttringer <seblu@archlinux.org>
-# Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
+# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
 
 pkgbase=linux-libre-tools
 pkgname=('linux-libre-tools-meta'
@@ -12,7 +12,7 @@ _basekernel=3.11
 #_sublevel=6
 #_pkgver=$_basekernel.$_sublevel
 pkgver=$_basekernel
-pkgrel=1
+pkgrel=2
 license=('GPL2')
 arch=('i686' 'x86_64' 'mips64el')
 url='http://linux-libre.fsfla.org/'
@@ -174,7 +174,6 @@ package_x86_energy_perf_policy-libre() {
 package_usbip-libre() {
   pkgdesc='An USB device sharing system over IP network'
   depends=('glib2' 'sysfsutils')
-  options=('!libtool')
   replaces=('usbip')
   conflicts=('usbip')
   provides=("usbip=$pkgver")
diff --git a/libre/linux-libre/ChangeLog b/libre/linux-libre/ChangeLog
index 7bff7d34d..9020464ef 100644
--- a/libre/linux-libre/ChangeLog
+++ b/libre/linux-libre/ChangeLog
@@ -1,39 +1,44 @@
-2013-07-15  André Silva  <emulatorman@lavabit.com>
+2013-10-20  André Silva  <emulatorman@parabola.nu>
+
+        * linux-libre-3.11.5-1
+        * Replaced email account emulatorman@lavabit.com to emulatorman@parabola.nu.
+
+2013-07-15  André Silva  <emulatorman@parabola.nu>
 
         * linux-libre-3.10.1-1
         * Removed linux-libre-kmod-alx package from Parabola due which CONFIG_ALX module was implemented by default in the kernel.
 
-2013-04-30  André Silva  <emulatorman@lavabit.com>
+2013-04-30  André Silva  <emulatorman@parabola.nu>
 
         * linux-libre-3.9-2
         * Removed CONFIG_STUB_POULSBO module from config files.
 
-2012-12-19  André Silva  <emulatorman@lavabit.com>
+2012-12-19  André Silva  <emulatorman@parabola.nu>
 
 	* linux-libre-3.7.1-1
 	* Replaced CONFIG_NFS_V4_1_IMPLEMENTATION_ID_DOMAIN="kernel.org" to CONFIG_NFS_V4_1_IMPLEMENTATION_ID_DOMAIN="linux-libre.fsfla.org"
 
-2012-06-23  André Silva  <emulatorman@lavabit.com>
+2012-06-23  André Silva  <emulatorman@parabola.nu>
 
 	* linux-libre-3.4.4-1
 	* Replaced email account andre.paulista@adinet.com.uy to emulatorman@lavabit.com.
 
-2012-05-26  André Silva  <emulatorman@lavabit.com>
+2012-05-26  André Silva  <emulatorman@parabola.nu>
 
 	* linux-libre-3.4-1.2
 	* Disabled CONFIG_MICROCODE_INTEL and CONFIG_MICROCODE_AMD modules https://labs.parabola.nu/issues/116
 
-2012-04-24  André Silva  <emulatorman@lavabit.com>
+2012-04-24  André Silva  <emulatorman@parabola.nu>
 
 	* linux-libre-3.3.3-1
 	* Disabled CONFIG_STUB_POULSBO module https://labs.parabola.nu/issues/90 
 
-2012-04-08  André Silva  <emulatorman@lavabit.com>
+2012-04-08  André Silva  <emulatorman@parabola.nu>
 
 	* linux-libre-3.3.1-1.1
 	* Disabled CONFIG_IPW2100 and CONFIG_IPW2200 modules https://labs.parabola.nu/issues/47
 
-2012-03-03  André Silva  <emulatorman@lavabit.com>
+2012-03-03  André Silva  <emulatorman@parabola.nu>
 
 	* linux-libre-3.2.9-2
 	* Enabled CONFIG_FB_VT8623 module https://labs.parabola.nu/issues/14
diff --git a/libre/linux-libre/PKGBUILD b/libre/linux-libre/PKGBUILD
index 9273ac437..46c34e0e3 100644
--- a/libre/linux-libre/PKGBUILD
+++ b/libre/linux-libre/PKGBUILD
@@ -1,7 +1,7 @@
-# $Id: PKGBUILD 195930 2013-10-05 19:44:24Z tpowa $
+# $Id: PKGBUILD 196776 2013-10-18 23:07:51Z thomas $
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 # Maintainer: Thomas Baechler <thomas@archlinux.org>
-# Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
+# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
 # Contributor (Parabola): Nicolás Reynolds <fauno@kiwwwi.com.ar>
 # Contributor (Parabola): Sorin-Mihai Vârgolici <smv@yobicore.org>
 # Contributor (Parabola): Michał Masłowski <mtjm@mtjm.eu>
@@ -10,10 +10,10 @@
 pkgbase=linux-libre         # Build stock -LIBRE kernel
 #pkgbase=linux-libre-custom # Build kernel with a different name
 _basekernel=3.11
-_sublevel=4
+_sublevel=6
 pkgver=${_basekernel}.${_sublevel}
 pkgrel=1
-_lxopkgver=${_basekernel}.4 # nearly always the same as pkgver
+_lxopkgver=${_basekernel}.6 # nearly always the same as pkgver
 arch=('i686' 'x86_64' 'mips64el')
 url="http://linux-libre.fsfla.org/"
 license=('GPL2')
@@ -33,9 +33,9 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn
         '3.11-haswell-intel_pstate.patch'
         "http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/debuginfo/linux-patches-${_lxopkgver}-gnu_0loongsonlibre_mipsel.tar.xz")
 md5sums=('7ec84223c7adcf01a5287eb7af96b7e7'
-         'd09e8017d22370b873628942f3ece3b0'
-         'b7718a81faf845ab53234336122ad631'
-         'f7ee88ffc93b665345b6ee89ff192e1f'
+         '15dc0cd2ab1348d1af3475e7c539deb2'
+         '0084545e67de0e321d90b11405ab3988'
+         '615084511f033782ca7d29ab6165e5a1'
          'e49ac236dfeef709f91a3d993ea7b62c'
          '2967cecc3af9f954ccc822fd63dca6ff'
          '8267264d9a8966e57fdacd1fa1fc65c4'
@@ -43,7 +43,7 @@ md5sums=('7ec84223c7adcf01a5287eb7af96b7e7'
          '98beb36f9b8cf16e58de2483ea9985e3'
          'd50c1ac47394e9aec637002ef3392bd1'
          '1040ae6c10d4a68f89899f94a2318a17'
-         'e6db810c0d41180acca55f545b1681fb')
+         '9ddc5a221ab7cd26bc27aab164a6f843')
 if [ "$CARCH" != "mips64el" ]; then
     # don't use the Loongson-specific patches on non-mips64el arches.
     unset source[${#source[@]}-1]
@@ -176,9 +176,9 @@ _package() {
   backup=("etc/mkinitcpio.d/${pkgbase}.preset")
   install=${pkgbase}.install
   if [ "$CARCH" != "mips64el" ]; then
-     provides+=('linux-libre-kmod-alx')
-     conflicts+=('linux-libre-kmod-alx')
-     replaces+=('linux-libre-kmod-alx')
+     provides+=("linux-libre${_kernelname}-kmod-alx")
+     conflicts+=("linux-libre${_kernelname}-kmod-alx")
+     replaces+=("linux-libre${_kernelname}-kmod-alx")
   fi
   if [ "$CARCH" = "mips64el" ]; then
       optdepends+=('mkinitcpio: to make the initramfs (needs reinstall of this package)')
diff --git a/libre/linux-libre/config.i686 b/libre/linux-libre/config.i686
index a19c09d75..e52e8c0be 100644
--- a/libre/linux-libre/config.i686
+++ b/libre/linux-libre/config.i686
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86 3.11.0-1 Kernel Configuration
+# Linux/x86 3.11.4-1 Kernel Configuration
 #
 # CONFIG_64BIT is not set
 CONFIG_X86_32=y
@@ -1560,24 +1560,7 @@ CONFIG_MTD_BLOCK2MTD=m
 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
-# CONFIG_MTD_NAND_ECC_BCH is not set
-CONFIG_MTD_SM_COMMON=m
-# CONFIG_MTD_NAND_DENALI is not set
-CONFIG_MTD_NAND_IDS=m
-CONFIG_MTD_NAND_RICOH=m
-CONFIG_MTD_NAND_DISKONCHIP=m
-# CONFIG_MTD_NAND_DISKONCHIP_PROBE_ADVANCED is not set
-CONFIG_MTD_NAND_DISKONCHIP_PROBE_ADDRESS=0
-# CONFIG_MTD_NAND_DISKONCHIP_BBTWRITE is not set
-CONFIG_MTD_NAND_DOCG4=m
-# CONFIG_MTD_NAND_CAFE is not set
-CONFIG_MTD_NAND_CS553X=m
-CONFIG_MTD_NAND_NANDSIM=m
-# CONFIG_MTD_NAND_PLATFORM is not set
-CONFIG_MTD_ALAUDA=m
+# CONFIG_MTD_NAND is not set
 # CONFIG_MTD_ONENAND is not set
 
 #
@@ -1752,7 +1735,7 @@ CONFIG_SCSI_ENCLOSURE=m
 CONFIG_SCSI_MULTI_LUN=y
 # CONFIG_SCSI_CONSTANTS is not set
 # CONFIG_SCSI_LOGGING is not set
-# CONFIG_SCSI_SCAN_ASYNC is not set
+CONFIG_SCSI_SCAN_ASYNC=y 
 
 #
 # SCSI Transports
@@ -4842,9 +4825,7 @@ CONFIG_USB_STORAGE_ENE_UB6250=m
 CONFIG_USB_MDC800=m
 CONFIG_USB_MICROTEK=m
 # CONFIG_USB_DWC3 is not set
-CONFIG_USB_CHIPIDEA=m
-CONFIG_USB_CHIPIDEA_UDC=y
-# CONFIG_USB_CHIPIDEA_DEBUG is not set
+# CONFIG_USB_CHIPIDEA is not set
 
 #
 # USB port drivers
@@ -6401,7 +6382,6 @@ CONFIG_GENERIC_ALLOCATOR=y
 CONFIG_REED_SOLOMON=m
 CONFIG_REED_SOLOMON_ENC8=y
 CONFIG_REED_SOLOMON_DEC8=y
-CONFIG_REED_SOLOMON_DEC16=y
 CONFIG_BCH=m
 CONFIG_BCH_CONST_PARAMS=y
 CONFIG_TEXTSEARCH=y
diff --git a/libre/linux-libre/config.i686.3.12 b/libre/linux-libre/config.i686.3.12
new file mode 100644
index 000000000..be1ac2a86
--- /dev/null
+++ b/libre/linux-libre/config.i686.3.12
@@ -0,0 +1,6463 @@
+#
+# Automatically generated file; DO NOT EDIT.
+# Linux/x86 3.12.0-rc4 Kernel Configuration
+#
+# CONFIG_64BIT is not set
+CONFIG_X86_32=y
+CONFIG_X86=y
+CONFIG_INSTRUCTION_DECODER=y
+CONFIG_OUTPUT_FORMAT="elf32-i386"
+CONFIG_ARCH_DEFCONFIG="arch/x86/configs/i386_defconfig"
+CONFIG_LOCKDEP_SUPPORT=y
+CONFIG_STACKTRACE_SUPPORT=y
+CONFIG_HAVE_LATENCYTOP_SUPPORT=y
+CONFIG_MMU=y
+CONFIG_NEED_DMA_MAP_STATE=y
+CONFIG_NEED_SG_DMA_LENGTH=y
+CONFIG_GENERIC_ISA_DMA=y
+CONFIG_GENERIC_BUG=y
+CONFIG_GENERIC_HWEIGHT=y
+CONFIG_ARCH_MAY_HAVE_PC_FDC=y
+CONFIG_RWSEM_XCHGADD_ALGORITHM=y
+CONFIG_GENERIC_CALIBRATE_DELAY=y
+CONFIG_ARCH_HAS_CPU_RELAX=y
+CONFIG_ARCH_HAS_CACHE_LINE_SIZE=y
+CONFIG_ARCH_HAS_CPU_AUTOPROBE=y
+CONFIG_HAVE_SETUP_PER_CPU_AREA=y
+CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK=y
+CONFIG_NEED_PER_CPU_PAGE_FIRST_CHUNK=y
+CONFIG_ARCH_HIBERNATION_POSSIBLE=y
+CONFIG_ARCH_SUSPEND_POSSIBLE=y
+CONFIG_ARCH_WANT_HUGE_PMD_SHARE=y
+CONFIG_ARCH_WANT_GENERAL_HUGETLB=y
+# CONFIG_ZONE_DMA32 is not set
+# CONFIG_AUDIT_ARCH is not set
+CONFIG_ARCH_SUPPORTS_OPTIMIZED_INLINING=y
+CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y
+CONFIG_HAVE_INTEL_TXT=y
+CONFIG_X86_32_SMP=y
+CONFIG_X86_HT=y
+CONFIG_ARCH_HWEIGHT_CFLAGS="-fcall-saved-ecx -fcall-saved-edx"
+CONFIG_ARCH_CPU_PROBE_RELEASE=y
+CONFIG_ARCH_SUPPORTS_UPROBES=y
+CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
+CONFIG_IRQ_WORK=y
+CONFIG_BUILDTIME_EXTABLE_SORT=y
+
+#
+# General setup
+#
+CONFIG_INIT_ENV_ARG_LIMIT=32
+CONFIG_CROSS_COMPILE=""
+# CONFIG_COMPILE_TEST is not set
+CONFIG_LOCALVERSION="-LIBRE"
+CONFIG_LOCALVERSION_AUTO=y
+CONFIG_HAVE_KERNEL_GZIP=y
+CONFIG_HAVE_KERNEL_BZIP2=y
+CONFIG_HAVE_KERNEL_LZMA=y
+CONFIG_HAVE_KERNEL_XZ=y
+CONFIG_HAVE_KERNEL_LZO=y
+CONFIG_HAVE_KERNEL_LZ4=y
+CONFIG_KERNEL_GZIP=y
+# CONFIG_KERNEL_BZIP2 is not set
+# CONFIG_KERNEL_LZMA is not set
+# CONFIG_KERNEL_XZ is not set
+# CONFIG_KERNEL_LZO is not set
+# CONFIG_KERNEL_LZ4 is not set
+CONFIG_DEFAULT_HOSTNAME="(none)"
+CONFIG_SWAP=y
+CONFIG_SYSVIPC=y
+CONFIG_SYSVIPC_SYSCTL=y
+CONFIG_POSIX_MQUEUE=y
+CONFIG_POSIX_MQUEUE_SYSCTL=y
+CONFIG_FHANDLE=y
+CONFIG_AUDIT=y
+CONFIG_AUDITSYSCALL=y
+CONFIG_AUDIT_WATCH=y
+CONFIG_AUDIT_TREE=y
+CONFIG_AUDIT_LOGINUID_IMMUTABLE=y
+
+#
+# IRQ subsystem
+#
+CONFIG_GENERIC_IRQ_PROBE=y
+CONFIG_GENERIC_IRQ_SHOW=y
+CONFIG_GENERIC_PENDING_IRQ=y
+CONFIG_IRQ_DOMAIN=y
+# CONFIG_IRQ_DOMAIN_DEBUG is not set
+CONFIG_IRQ_FORCED_THREADING=y
+CONFIG_SPARSE_IRQ=y
+CONFIG_CLOCKSOURCE_WATCHDOG=y
+CONFIG_KTIME_SCALAR=y
+CONFIG_GENERIC_CLOCKEVENTS=y
+CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
+CONFIG_GENERIC_CLOCKEVENTS_BROADCAST=y
+CONFIG_GENERIC_CLOCKEVENTS_MIN_ADJUST=y
+CONFIG_GENERIC_CMOS_UPDATE=y
+
+#
+# Timers subsystem
+#
+CONFIG_TICK_ONESHOT=y
+CONFIG_NO_HZ_COMMON=y
+# CONFIG_HZ_PERIODIC is not set
+CONFIG_NO_HZ_IDLE=y
+CONFIG_NO_HZ=y
+CONFIG_HIGH_RES_TIMERS=y
+
+#
+# CPU/Task time and stats accounting
+#
+CONFIG_TICK_CPU_ACCOUNTING=y
+# CONFIG_IRQ_TIME_ACCOUNTING is not set
+CONFIG_BSD_PROCESS_ACCT=y
+CONFIG_BSD_PROCESS_ACCT_V3=y
+CONFIG_TASKSTATS=y
+CONFIG_TASK_DELAY_ACCT=y
+CONFIG_TASK_XACCT=y
+CONFIG_TASK_IO_ACCOUNTING=y
+
+#
+# RCU Subsystem
+#
+CONFIG_TREE_PREEMPT_RCU=y
+CONFIG_PREEMPT_RCU=y
+CONFIG_RCU_STALL_COMMON=y
+CONFIG_RCU_FANOUT=32
+CONFIG_RCU_FANOUT_LEAF=16
+# 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_RCU_NOCB_CPU=y
+CONFIG_RCU_NOCB_CPU_NONE=y
+# CONFIG_RCU_NOCB_CPU_ZERO is not set
+# CONFIG_RCU_NOCB_CPU_ALL is not set
+CONFIG_IKCONFIG=y
+CONFIG_IKCONFIG_PROC=y
+CONFIG_LOG_BUF_SHIFT=19
+CONFIG_HAVE_UNSTABLE_SCHED_CLOCK=y
+CONFIG_ARCH_SUPPORTS_NUMA_BALANCING=y
+CONFIG_ARCH_WANTS_PROT_NUMA_PROT_NONE=y
+CONFIG_CGROUPS=y
+# CONFIG_CGROUP_DEBUG is not set
+CONFIG_CGROUP_FREEZER=y
+CONFIG_CGROUP_DEVICE=y
+CONFIG_CPUSETS=y
+CONFIG_PROC_PID_CPUSET=y
+CONFIG_CGROUP_CPUACCT=y
+CONFIG_RESOURCE_COUNTERS=y
+CONFIG_MEMCG=y
+CONFIG_MEMCG_SWAP=y
+# CONFIG_MEMCG_SWAP_ENABLED is not set
+CONFIG_MEMCG_KMEM=y
+# CONFIG_CGROUP_HUGETLB is not set
+# CONFIG_CGROUP_PERF is not set
+CONFIG_CGROUP_SCHED=y
+CONFIG_FAIR_GROUP_SCHED=y
+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
+# CONFIG_USER_NS is not set
+CONFIG_PID_NS=y
+CONFIG_NET_NS=y
+# CONFIG_UIDGID_STRICT_TYPE_CHECKS is not set
+CONFIG_SCHED_AUTOGROUP=y
+CONFIG_MM_OWNER=y
+# CONFIG_SYSFS_DEPRECATED is not set
+CONFIG_RELAY=y
+CONFIG_BLK_DEV_INITRD=y
+CONFIG_INITRAMFS_SOURCE=""
+CONFIG_RD_GZIP=y
+CONFIG_RD_BZIP2=y
+CONFIG_RD_LZMA=y
+CONFIG_RD_XZ=y
+CONFIG_RD_LZO=y
+CONFIG_RD_LZ4=y
+# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
+CONFIG_SYSCTL=y
+CONFIG_ANON_INODES=y
+CONFIG_HAVE_UID16=y
+CONFIG_SYSCTL_EXCEPTION_TRACE=y
+CONFIG_HAVE_PCSPKR_PLATFORM=y
+# CONFIG_EXPERT is not set
+CONFIG_UID16=y
+# CONFIG_SYSCTL_SYSCALL is not set
+CONFIG_KALLSYMS=y
+# CONFIG_KALLSYMS_ALL is not set
+CONFIG_PRINTK=y
+CONFIG_BUG=y
+CONFIG_ELF_CORE=y
+CONFIG_PCSPKR_PLATFORM=y
+CONFIG_BASE_FULL=y
+CONFIG_FUTEX=y
+CONFIG_EPOLL=y
+CONFIG_SIGNALFD=y
+CONFIG_TIMERFD=y
+CONFIG_EVENTFD=y
+CONFIG_SHMEM=y
+CONFIG_AIO=y
+CONFIG_PCI_QUIRKS=y
+# CONFIG_EMBEDDED is not set
+CONFIG_HAVE_PERF_EVENTS=y
+
+#
+# Kernel Performance Events And Counters
+#
+CONFIG_PERF_EVENTS=y
+# CONFIG_DEBUG_PERF_USE_VMALLOC is not set
+CONFIG_VM_EVENT_COUNTERS=y
+CONFIG_SLUB_DEBUG=y
+# CONFIG_COMPAT_BRK is not set
+# CONFIG_SLAB is not set
+CONFIG_SLUB=y
+CONFIG_SLUB_CPU_PARTIAL=y
+CONFIG_PROFILING=y
+CONFIG_TRACEPOINTS=y
+CONFIG_OPROFILE=m
+# CONFIG_OPROFILE_EVENT_MULTIPLEX is not set
+CONFIG_HAVE_OPROFILE=y
+CONFIG_OPROFILE_NMI_TIMER=y
+CONFIG_KPROBES=y
+CONFIG_JUMP_LABEL=y
+CONFIG_KPROBES_ON_FTRACE=y
+CONFIG_UPROBES=y
+# CONFIG_HAVE_64BIT_ALIGNED_ACCESS is not set
+CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y
+CONFIG_ARCH_USE_BUILTIN_BSWAP=y
+CONFIG_KRETPROBES=y
+CONFIG_USER_RETURN_NOTIFIER=y
+CONFIG_HAVE_IOREMAP_PROT=y
+CONFIG_HAVE_KPROBES=y
+CONFIG_HAVE_KRETPROBES=y
+CONFIG_HAVE_OPTPROBES=y
+CONFIG_HAVE_KPROBES_ON_FTRACE=y
+CONFIG_HAVE_ARCH_TRACEHOOK=y
+CONFIG_HAVE_DMA_ATTRS=y
+CONFIG_HAVE_DMA_CONTIGUOUS=y
+CONFIG_USE_GENERIC_SMP_HELPERS=y
+CONFIG_GENERIC_SMP_IDLE_THREAD=y
+CONFIG_HAVE_REGS_AND_STACK_ACCESS_API=y
+CONFIG_HAVE_DMA_API_DEBUG=y
+CONFIG_HAVE_HW_BREAKPOINT=y
+CONFIG_HAVE_MIXED_BREAKPOINTS_REGS=y
+CONFIG_HAVE_USER_RETURN_NOTIFIER=y
+CONFIG_HAVE_PERF_EVENTS_NMI=y
+CONFIG_HAVE_PERF_REGS=y
+CONFIG_HAVE_PERF_USER_STACK_DUMP=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
+CONFIG_ARCH_WANT_IPC_PARSE_VERSION=y
+CONFIG_HAVE_ARCH_SECCOMP_FILTER=y
+CONFIG_SECCOMP_FILTER=y
+CONFIG_HAVE_IRQ_TIME_ACCOUNTING=y
+CONFIG_HAVE_ARCH_TRANSPARENT_HUGEPAGE=y
+CONFIG_HAVE_ARCH_SOFT_DIRTY=y
+CONFIG_MODULES_USE_ELF_REL=y
+CONFIG_CLONE_BACKWARDS=y
+CONFIG_OLD_SIGSUSPEND3=y
+CONFIG_OLD_SIGACTION=y
+
+#
+# GCOV-based kernel profiling
+#
+# CONFIG_GCOV_KERNEL is not set
+CONFIG_HAVE_GENERIC_DMA_COHERENT=y
+CONFIG_SLABINFO=y
+CONFIG_RT_MUTEXES=y
+CONFIG_BASE_SMALL=0
+CONFIG_MODULES=y
+CONFIG_MODULE_FORCE_LOAD=y
+CONFIG_MODULE_UNLOAD=y
+CONFIG_MODULE_FORCE_UNLOAD=y
+CONFIG_MODVERSIONS=y
+# CONFIG_MODULE_SRCVERSION_ALL is not set
+# CONFIG_MODULE_SIG is not set
+CONFIG_STOP_MACHINE=y
+CONFIG_BLOCK=y
+CONFIG_LBDAF=y
+CONFIG_BLK_DEV_BSG=y
+CONFIG_BLK_DEV_BSGLIB=y
+# CONFIG_BLK_DEV_INTEGRITY is not set
+CONFIG_BLK_DEV_THROTTLING=y
+# CONFIG_BLK_CMDLINE_PARSER is not set
+
+#
+# Partition Types
+#
+CONFIG_PARTITION_ADVANCED=y
+# CONFIG_ACORN_PARTITION is not set
+CONFIG_AIX_PARTITION=y
+# 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_CMDLINE_PARTITION is not set
+
+#
+# IO Schedulers
+#
+CONFIG_IOSCHED_NOOP=y
+CONFIG_IOSCHED_DEADLINE=y
+CONFIG_IOSCHED_CFQ=y
+CONFIG_CFQ_GROUP_IOSCHED=y
+# CONFIG_DEFAULT_DEADLINE is not set
+CONFIG_DEFAULT_CFQ=y
+# CONFIG_DEFAULT_NOOP is not set
+CONFIG_DEFAULT_IOSCHED="cfq"
+CONFIG_PREEMPT_NOTIFIERS=y
+CONFIG_PADATA=y
+CONFIG_ASN1=m
+CONFIG_UNINLINE_SPIN_UNLOCK=y
+CONFIG_FREEZER=y
+
+#
+# Processor type and features
+#
+CONFIG_ZONE_DMA=y
+CONFIG_SMP=y
+CONFIG_X86_MPPARSE=y
+# CONFIG_X86_BIGSMP is not set
+# CONFIG_X86_EXTENDED_PLATFORM is not set
+# CONFIG_X86_INTEL_LPSS is not set
+CONFIG_X86_SUPPORTS_MEMORY_FAILURE=y
+CONFIG_X86_32_IRIS=m
+CONFIG_SCHED_OMIT_FRAME_POINTER=y
+CONFIG_HYPERVISOR_GUEST=y
+CONFIG_PARAVIRT=y
+# CONFIG_PARAVIRT_DEBUG is not set
+# CONFIG_PARAVIRT_SPINLOCKS is not set
+# CONFIG_XEN_PRIVILEGED_GUEST is not set
+CONFIG_KVM_GUEST=y
+# CONFIG_KVM_DEBUG_FS is not set
+CONFIG_LGUEST_GUEST=y
+CONFIG_PARAVIRT_TIME_ACCOUNTING=y
+CONFIG_PARAVIRT_CLOCK=y
+CONFIG_NO_BOOTMEM=y
+# CONFIG_MEMTEST is not set
+# CONFIG_M486 is not set
+# CONFIG_M586 is not set
+# CONFIG_M586TSC is not set
+# CONFIG_M586MMX is not set
+CONFIG_M686=y
+# CONFIG_MPENTIUMII is not set
+# CONFIG_MPENTIUMIII is not set
+# CONFIG_MPENTIUMM is not set
+# CONFIG_MPENTIUM4 is not set
+# CONFIG_MK6 is not set
+# CONFIG_MK7 is not set
+# CONFIG_MK8 is not set
+# CONFIG_MCRUSOE is not set
+# CONFIG_MEFFICEON is not set
+# CONFIG_MWINCHIPC6 is not set
+# CONFIG_MWINCHIP3D is not set
+# CONFIG_MELAN is not set
+# CONFIG_MGEODEGX1 is not set
+# CONFIG_MGEODE_LX is not set
+# CONFIG_MCYRIXIII is not set
+# CONFIG_MVIAC3_2 is not set
+# CONFIG_MVIAC7 is not set
+# CONFIG_MCORE2 is not set
+# CONFIG_MATOM is not set
+CONFIG_X86_GENERIC=y
+CONFIG_X86_INTERNODE_CACHE_SHIFT=6
+CONFIG_X86_L1_CACHE_SHIFT=6
+# CONFIG_X86_PPRO_FENCE is not set
+CONFIG_X86_INTEL_USERCOPY=y
+CONFIG_X86_USE_PPRO_CHECKSUM=y
+CONFIG_X86_TSC=y
+CONFIG_X86_CMPXCHG64=y
+CONFIG_X86_CMOV=y
+CONFIG_X86_MINIMUM_CPU_FAMILY=5
+CONFIG_X86_DEBUGCTLMSR=y
+CONFIG_CPU_SUP_INTEL=y
+CONFIG_CPU_SUP_AMD=y
+CONFIG_CPU_SUP_CENTAUR=y
+CONFIG_CPU_SUP_TRANSMETA_32=y
+CONFIG_HPET_TIMER=y
+CONFIG_HPET_EMULATE_RTC=y
+CONFIG_DMI=y
+CONFIG_NR_CPUS=8
+CONFIG_SCHED_SMT=y
+CONFIG_SCHED_MC=y
+# CONFIG_PREEMPT_NONE is not set
+# CONFIG_PREEMPT_VOLUNTARY is not set
+CONFIG_PREEMPT=y
+CONFIG_PREEMPT_COUNT=y
+CONFIG_X86_LOCAL_APIC=y
+CONFIG_X86_IO_APIC=y
+CONFIG_X86_REROUTE_FOR_BROKEN_BOOT_IRQS=y
+CONFIG_X86_MCE=y
+CONFIG_X86_MCE_INTEL=y
+CONFIG_X86_MCE_AMD=y
+# CONFIG_X86_ANCIENT_MCE is not set
+CONFIG_X86_MCE_THRESHOLD=y
+# CONFIG_X86_MCE_INJECT is not set
+CONFIG_X86_THERMAL_VECTOR=y
+CONFIG_VM86=y
+CONFIG_TOSHIBA=m
+CONFIG_I8K=m
+CONFIG_X86_REBOOTFIXUPS=y
+CONFIG_MICROCODE=m
+# CONFIG_MICROCODE_INTEL is not set
+# CONFIG_MICROCODE_AMD is not set
+CONFIG_MICROCODE_OLD_INTERFACE=y
+CONFIG_X86_MSR=m
+CONFIG_X86_CPUID=m
+# CONFIG_NOHIGHMEM is not set
+CONFIG_HIGHMEM4G=y
+# CONFIG_HIGHMEM64G is not set
+CONFIG_PAGE_OFFSET=0xC0000000
+CONFIG_HIGHMEM=y
+CONFIG_ARCH_FLATMEM_ENABLE=y
+CONFIG_ARCH_SPARSEMEM_ENABLE=y
+CONFIG_ARCH_SELECT_MEMORY_MODEL=y
+CONFIG_ILLEGAL_POINTER_VALUE=0
+CONFIG_SELECT_MEMORY_MODEL=y
+CONFIG_FLATMEM_MANUAL=y
+# CONFIG_SPARSEMEM_MANUAL is not set
+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_MEMORY_ISOLATION=y
+# CONFIG_HAVE_BOOTMEM_INFO_NODE is not set
+CONFIG_PAGEFLAGS_EXTENDED=y
+CONFIG_SPLIT_PTLOCK_CPUS=4
+CONFIG_BALLOON_COMPACTION=y
+CONFIG_COMPACTION=y
+CONFIG_MIGRATION=y
+# CONFIG_PHYS_ADDR_T_64BIT is not set
+CONFIG_ZONE_DMA_FLAG=1
+CONFIG_BOUNCE=y
+CONFIG_VIRT_TO_BUS=y
+CONFIG_MMU_NOTIFIER=y
+CONFIG_KSM=y
+CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
+CONFIG_ARCH_SUPPORTS_MEMORY_FAILURE=y
+CONFIG_MEMORY_FAILURE=y
+CONFIG_HWPOISON_INJECT=m
+CONFIG_TRANSPARENT_HUGEPAGE=y
+CONFIG_TRANSPARENT_HUGEPAGE_ALWAYS=y
+# CONFIG_TRANSPARENT_HUGEPAGE_MADVISE is not set
+CONFIG_CROSS_MEMORY_ATTACH=y
+CONFIG_CLEANCACHE=y
+CONFIG_FRONTSWAP=y
+# CONFIG_CMA is not set
+CONFIG_ZBUD=y
+CONFIG_ZSWAP=y
+# CONFIG_HIGHPTE is not set
+CONFIG_X86_CHECK_BIOS_CORRUPTION=y
+CONFIG_X86_BOOTPARAM_MEMORY_CORRUPTION_CHECK=y
+CONFIG_X86_RESERVE_LOW=64
+# CONFIG_MATH_EMULATION is not set
+CONFIG_MTRR=y
+CONFIG_MTRR_SANITIZER=y
+CONFIG_MTRR_SANITIZER_ENABLE_DEFAULT=0
+CONFIG_MTRR_SANITIZER_SPARE_REG_NR_DEFAULT=1
+CONFIG_X86_PAT=y
+CONFIG_ARCH_USES_PG_UNCACHED=y
+CONFIG_ARCH_RANDOM=y
+CONFIG_X86_SMAP=y
+CONFIG_EFI=y
+CONFIG_EFI_STUB=y
+CONFIG_SECCOMP=y
+CONFIG_CC_STACKPROTECTOR=y
+# CONFIG_HZ_100 is not set
+# CONFIG_HZ_250 is not set
+CONFIG_HZ_300=y
+# CONFIG_HZ_1000 is not set
+CONFIG_HZ=300
+CONFIG_SCHED_HRTICK=y
+CONFIG_KEXEC=y
+# CONFIG_CRASH_DUMP is not set
+# CONFIG_KEXEC_JUMP is not set
+CONFIG_PHYSICAL_START=0x1000000
+CONFIG_RELOCATABLE=y
+CONFIG_X86_NEED_RELOCS=y
+CONFIG_PHYSICAL_ALIGN=0x100000
+CONFIG_HOTPLUG_CPU=y
+# CONFIG_BOOTPARAM_HOTPLUG_CPU0 is not set
+# CONFIG_DEBUG_HOTPLUG_CPU0 is not set
+# CONFIG_COMPAT_VDSO is not set
+# CONFIG_CMDLINE_BOOL is not set
+CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
+
+#
+# Power management and ACPI options
+#
+CONFIG_SUSPEND=y
+CONFIG_SUSPEND_FREEZER=y
+CONFIG_HIBERNATE_CALLBACKS=y
+CONFIG_HIBERNATION=y
+CONFIG_PM_STD_PARTITION=""
+CONFIG_PM_SLEEP=y
+CONFIG_PM_SLEEP_SMP=y
+CONFIG_PM_AUTOSLEEP=y
+CONFIG_PM_WAKELOCKS=y
+CONFIG_PM_WAKELOCKS_LIMIT=100
+CONFIG_PM_WAKELOCKS_GC=y
+CONFIG_PM_RUNTIME=y
+CONFIG_PM=y
+CONFIG_PM_DEBUG=y
+CONFIG_PM_ADVANCED_DEBUG=y
+# CONFIG_PM_TEST_SUSPEND is not set
+CONFIG_PM_SLEEP_DEBUG=y
+CONFIG_PM_TRACE=y
+CONFIG_PM_TRACE_RTC=y
+CONFIG_WQ_POWER_EFFICIENT_DEFAULT=y
+CONFIG_ACPI=y
+CONFIG_ACPI_SLEEP=y
+# CONFIG_ACPI_PROCFS is not set
+# CONFIG_ACPI_PROCFS_POWER is not set
+CONFIG_ACPI_EC_DEBUGFS=m
+CONFIG_ACPI_AC=m
+CONFIG_ACPI_BATTERY=m
+CONFIG_ACPI_BUTTON=m
+CONFIG_ACPI_VIDEO=m
+CONFIG_ACPI_FAN=m
+CONFIG_ACPI_DOCK=y
+CONFIG_ACPI_PROCESSOR=m
+CONFIG_ACPI_IPMI=m
+CONFIG_ACPI_HOTPLUG_CPU=y
+CONFIG_ACPI_PROCESSOR_AGGREGATOR=m
+CONFIG_ACPI_THERMAL=m
+# CONFIG_ACPI_CUSTOM_DSDT is not set
+CONFIG_ACPI_INITRD_TABLE_OVERRIDE=y
+CONFIG_ACPI_BLACKLIST_YEAR=0
+# CONFIG_ACPI_DEBUG is not set
+CONFIG_ACPI_PCI_SLOT=y
+CONFIG_X86_PM_TIMER=y
+CONFIG_ACPI_CONTAINER=y
+CONFIG_ACPI_SBS=m
+CONFIG_ACPI_HED=y
+CONFIG_ACPI_CUSTOM_METHOD=m
+CONFIG_ACPI_BGRT=y
+CONFIG_ACPI_APEI=y
+CONFIG_ACPI_APEI_GHES=y
+CONFIG_ACPI_APEI_PCIEAER=y
+CONFIG_ACPI_APEI_MEMORY_FAILURE=y
+CONFIG_ACPI_APEI_EINJ=m
+CONFIG_ACPI_APEI_ERST_DEBUG=m
+CONFIG_SFI=y
+CONFIG_X86_APM_BOOT=y
+CONFIG_APM=y
+# CONFIG_APM_IGNORE_USER_SUSPEND is not set
+CONFIG_APM_DO_ENABLE=y
+# CONFIG_APM_CPU_IDLE is not set
+# CONFIG_APM_DISPLAY_BLANK is not set
+# CONFIG_APM_ALLOW_INTS is not set
+
+#
+# CPU Frequency scaling
+#
+CONFIG_CPU_FREQ=y
+CONFIG_CPU_FREQ_TABLE=y
+CONFIG_CPU_FREQ_GOV_COMMON=y
+CONFIG_CPU_FREQ_STAT=m
+CONFIG_CPU_FREQ_STAT_DETAILS=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=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=y
+CONFIG_CPU_FREQ_GOV_CONSERVATIVE=m
+
+#
+# x86 CPU frequency scaling drivers
+#
+CONFIG_X86_INTEL_PSTATE=y
+CONFIG_X86_PCC_CPUFREQ=m
+CONFIG_X86_ACPI_CPUFREQ=m
+CONFIG_X86_ACPI_CPUFREQ_CPB=y
+CONFIG_X86_POWERNOW_K6=m
+CONFIG_X86_POWERNOW_K7=m
+CONFIG_X86_POWERNOW_K7_ACPI=y
+CONFIG_X86_POWERNOW_K8=m
+CONFIG_X86_AMD_FREQ_SENSITIVITY=m
+CONFIG_X86_GX_SUSPMOD=m
+# CONFIG_X86_SPEEDSTEP_CENTRINO is not set
+CONFIG_X86_SPEEDSTEP_ICH=m
+CONFIG_X86_SPEEDSTEP_SMI=m
+CONFIG_X86_P4_CLOCKMOD=m
+CONFIG_X86_CPUFREQ_NFORCE2=m
+CONFIG_X86_LONGRUN=m
+CONFIG_X86_LONGHAUL=m
+CONFIG_X86_E_POWERSAVER=m
+
+#
+# shared options
+#
+CONFIG_X86_SPEEDSTEP_LIB=m
+CONFIG_X86_SPEEDSTEP_RELAXED_CAP_CHECK=y
+
+#
+# CPU Idle
+#
+CONFIG_CPU_IDLE=y
+# CONFIG_CPU_IDLE_MULTIPLE_DRIVERS is not set
+CONFIG_CPU_IDLE_GOV_LADDER=y
+CONFIG_CPU_IDLE_GOV_MENU=y
+# CONFIG_ARCH_NEEDS_CPU_IDLE_COUPLED is not set
+CONFIG_INTEL_IDLE=y
+
+#
+# Bus options (PCI etc.)
+#
+CONFIG_PCI=y
+# CONFIG_PCI_GOBIOS is not set
+# CONFIG_PCI_GOMMCONFIG is not set
+# CONFIG_PCI_GODIRECT is not set
+# CONFIG_PCI_GOOLPC is not set
+CONFIG_PCI_GOANY=y
+CONFIG_PCI_BIOS=y
+CONFIG_PCI_DIRECT=y
+CONFIG_PCI_MMCONFIG=y
+CONFIG_PCI_OLPC=y
+CONFIG_PCI_DOMAINS=y
+CONFIG_PCIEPORTBUS=y
+CONFIG_HOTPLUG_PCI_PCIE=y
+CONFIG_PCIEAER=y
+# CONFIG_PCIE_ECRC is not set
+# CONFIG_PCIEAER_INJECT is not set
+CONFIG_PCIEASPM=y
+# CONFIG_PCIEASPM_DEBUG is not set
+CONFIG_PCIEASPM_DEFAULT=y
+# CONFIG_PCIEASPM_POWERSAVE is not set
+# CONFIG_PCIEASPM_PERFORMANCE is not set
+CONFIG_PCIE_PME=y
+CONFIG_PCI_MSI=y
+# CONFIG_PCI_DEBUG is not set
+CONFIG_PCI_REALLOC_ENABLE_AUTO=y
+CONFIG_PCI_STUB=m
+CONFIG_HT_IRQ=y
+CONFIG_PCI_ATS=y
+CONFIG_PCI_IOV=y
+CONFIG_PCI_PRI=y
+CONFIG_PCI_PASID=y
+CONFIG_PCI_IOAPIC=y
+CONFIG_PCI_LABEL=y
+
+#
+# PCI host controller drivers
+#
+CONFIG_ISA_DMA_API=y
+CONFIG_ISA=y
+# CONFIG_EISA is not set
+# CONFIG_SCx200 is not set
+CONFIG_OLPC=y
+CONFIG_OLPC_XO1_PM=y
+CONFIG_OLPC_XO1_RTC=y
+CONFIG_OLPC_XO1_SCI=y
+CONFIG_OLPC_XO15_SCI=y
+# CONFIG_ALIX is not set
+# CONFIG_NET5501 is not set
+# CONFIG_GEOS is not set
+CONFIG_AMD_NB=y
+CONFIG_PCCARD=m
+CONFIG_PCMCIA=m
+CONFIG_PCMCIA_LOAD_CIS=y
+CONFIG_CARDBUS=y
+
+#
+# PC-card bridges
+#
+CONFIG_YENTA=m
+CONFIG_YENTA_O2=y
+CONFIG_YENTA_RICOH=y
+CONFIG_YENTA_TI=y
+CONFIG_YENTA_ENE_TUNE=y
+CONFIG_YENTA_TOSHIBA=y
+CONFIG_PD6729=m
+CONFIG_I82092=m
+CONFIG_I82365=m
+CONFIG_TCIC=m
+CONFIG_PCMCIA_PROBE=y
+CONFIG_PCCARD_NONSTATIC=y
+CONFIG_HOTPLUG_PCI=y
+CONFIG_HOTPLUG_PCI_COMPAQ=m
+# CONFIG_HOTPLUG_PCI_COMPAQ_NVRAM is not set
+CONFIG_HOTPLUG_PCI_IBM=m
+CONFIG_HOTPLUG_PCI_ACPI=y
+CONFIG_HOTPLUG_PCI_ACPI_IBM=m
+CONFIG_HOTPLUG_PCI_CPCI=y
+CONFIG_HOTPLUG_PCI_CPCI_ZT5550=m
+CONFIG_HOTPLUG_PCI_CPCI_GENERIC=m
+CONFIG_HOTPLUG_PCI_SHPC=m
+CONFIG_RAPIDIO=y
+CONFIG_RAPIDIO_TSI721=y
+CONFIG_RAPIDIO_DISC_TIMEOUT=30
+# CONFIG_RAPIDIO_ENABLE_RX_TX_PORTS is not set
+CONFIG_RAPIDIO_DMA_ENGINE=y
+CONFIG_RAPIDIO_DEBUG=y
+CONFIG_RAPIDIO_ENUM_BASIC=m
+
+#
+# RapidIO Switch drivers
+#
+CONFIG_RAPIDIO_TSI57X=y
+CONFIG_RAPIDIO_CPS_XX=y
+CONFIG_RAPIDIO_TSI568=y
+CONFIG_RAPIDIO_CPS_GEN2=y
+# CONFIG_X86_SYSFB is not set
+
+#
+# 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_BINFMT_SCRIPT=y
+CONFIG_HAVE_AOUT=y
+CONFIG_BINFMT_AOUT=m
+CONFIG_BINFMT_MISC=y
+CONFIG_COREDUMP=y
+CONFIG_HAVE_ATOMIC_IOMAP=y
+CONFIG_NET=y
+
+#
+# Networking options
+#
+CONFIG_PACKET=y
+CONFIG_PACKET_DIAG=m
+CONFIG_UNIX=y
+CONFIG_UNIX_DIAG=m
+CONFIG_XFRM=y
+CONFIG_XFRM_ALGO=m
+CONFIG_XFRM_USER=m
+# CONFIG_XFRM_SUB_POLICY is not set
+# CONFIG_XFRM_MIGRATE is not set
+# CONFIG_XFRM_STATISTICS is not set
+CONFIG_XFRM_IPCOMP=m
+CONFIG_NET_KEY=m
+# CONFIG_NET_KEY_MIGRATE is not set
+CONFIG_INET=y
+CONFIG_IP_MULTICAST=y
+CONFIG_IP_ADVANCED_ROUTER=y
+CONFIG_IP_FIB_TRIE_STATS=y
+CONFIG_IP_MULTIPLE_TABLES=y
+CONFIG_IP_ROUTE_MULTIPATH=y
+CONFIG_IP_ROUTE_VERBOSE=y
+CONFIG_IP_ROUTE_CLASSID=y
+# CONFIG_IP_PNP is not set
+CONFIG_NET_IPIP=m
+CONFIG_NET_IPGRE_DEMUX=m
+CONFIG_NET_IP_TUNNEL=m
+CONFIG_NET_IPGRE=m
+# CONFIG_NET_IPGRE_BROADCAST is not set
+CONFIG_IP_MROUTE=y
+# CONFIG_IP_MROUTE_MULTIPLE_TABLES is not set
+CONFIG_IP_PIMSM_V1=y
+CONFIG_IP_PIMSM_V2=y
+CONFIG_SYN_COOKIES=y
+CONFIG_NET_IPVTI=m
+CONFIG_INET_AH=m
+CONFIG_INET_ESP=m
+CONFIG_INET_IPCOMP=m
+CONFIG_INET_XFRM_TUNNEL=m
+CONFIG_INET_TUNNEL=m
+CONFIG_INET_XFRM_MODE_TRANSPORT=m
+CONFIG_INET_XFRM_MODE_TUNNEL=m
+CONFIG_INET_XFRM_MODE_BEET=m
+CONFIG_INET_LRO=y
+CONFIG_INET_DIAG=m
+CONFIG_INET_TCP_DIAG=m
+CONFIG_INET_UDP_DIAG=m
+CONFIG_TCP_CONG_ADVANCED=y
+CONFIG_TCP_CONG_BIC=m
+CONFIG_TCP_CONG_CUBIC=y
+CONFIG_TCP_CONG_WESTWOOD=m
+CONFIG_TCP_CONG_HTCP=m
+CONFIG_TCP_CONG_HSTCP=m
+CONFIG_TCP_CONG_HYBLA=m
+CONFIG_TCP_CONG_VEGAS=m
+CONFIG_TCP_CONG_SCALABLE=m
+CONFIG_TCP_CONG_LP=m
+CONFIG_TCP_CONG_VENO=m
+CONFIG_TCP_CONG_YEAH=m
+CONFIG_TCP_CONG_ILLINOIS=m
+CONFIG_DEFAULT_CUBIC=y
+# CONFIG_DEFAULT_RENO is not set
+CONFIG_DEFAULT_TCP_CONG="cubic"
+# CONFIG_TCP_MD5SIG is not set
+CONFIG_IPV6=y
+CONFIG_IPV6_PRIVACY=y
+CONFIG_IPV6_ROUTER_PREF=y
+CONFIG_IPV6_ROUTE_INFO=y
+CONFIG_IPV6_OPTIMISTIC_DAD=y
+CONFIG_INET6_AH=m
+CONFIG_INET6_ESP=m
+CONFIG_INET6_IPCOMP=m
+CONFIG_IPV6_MIP6=m
+CONFIG_INET6_XFRM_TUNNEL=m
+CONFIG_INET6_TUNNEL=m
+CONFIG_INET6_XFRM_MODE_TRANSPORT=m
+CONFIG_INET6_XFRM_MODE_TUNNEL=m
+CONFIG_INET6_XFRM_MODE_BEET=m
+CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION=m
+CONFIG_IPV6_SIT=m
+CONFIG_IPV6_SIT_6RD=y
+CONFIG_IPV6_NDISC_NODETYPE=y
+CONFIG_IPV6_TUNNEL=m
+CONFIG_IPV6_GRE=m
+CONFIG_IPV6_MULTIPLE_TABLES=y
+CONFIG_IPV6_SUBTREES=y
+# CONFIG_IPV6_MROUTE is not set
+CONFIG_NETLABEL=y
+CONFIG_NETWORK_SECMARK=y
+CONFIG_NETWORK_PHY_TIMESTAMPING=y
+CONFIG_NETFILTER=y
+# CONFIG_NETFILTER_DEBUG is not set
+CONFIG_NETFILTER_ADVANCED=y
+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=y
+CONFIG_NF_CONNTRACK_EVENTS=y
+CONFIG_NF_CONNTRACK_TIMEOUT=y
+CONFIG_NF_CONNTRACK_TIMESTAMP=y
+CONFIG_NF_CONNTRACK_LABELS=y
+CONFIG_NF_CT_PROTO_DCCP=m
+CONFIG_NF_CT_PROTO_GRE=m
+CONFIG_NF_CT_PROTO_SCTP=m
+CONFIG_NF_CT_PROTO_UDPLITE=m
+CONFIG_NF_CONNTRACK_AMANDA=m
+CONFIG_NF_CONNTRACK_FTP=m
+CONFIG_NF_CONNTRACK_H323=m
+CONFIG_NF_CONNTRACK_IRC=m
+CONFIG_NF_CONNTRACK_BROADCAST=m
+CONFIG_NF_CONNTRACK_NETBIOS_NS=m
+CONFIG_NF_CONNTRACK_SNMP=m
+CONFIG_NF_CONNTRACK_PPTP=m
+CONFIG_NF_CONNTRACK_SANE=m
+CONFIG_NF_CONNTRACK_SIP=m
+CONFIG_NF_CONNTRACK_TFTP=m
+CONFIG_NF_CT_NETLINK=m
+CONFIG_NF_CT_NETLINK_TIMEOUT=m
+CONFIG_NF_CT_NETLINK_HELPER=m
+CONFIG_NETFILTER_NETLINK_QUEUE_CT=y
+CONFIG_NF_NAT=m
+CONFIG_NF_NAT_NEEDED=y
+CONFIG_NF_NAT_PROTO_DCCP=m
+CONFIG_NF_NAT_PROTO_UDPLITE=m
+CONFIG_NF_NAT_PROTO_SCTP=m
+CONFIG_NF_NAT_AMANDA=m
+CONFIG_NF_NAT_FTP=m
+CONFIG_NF_NAT_IRC=m
+CONFIG_NF_NAT_SIP=m
+CONFIG_NF_NAT_TFTP=m
+CONFIG_NETFILTER_SYNPROXY=m
+CONFIG_NETFILTER_XTABLES=m
+
+#
+# Xtables combined modules
+#
+CONFIG_NETFILTER_XT_MARK=m
+CONFIG_NETFILTER_XT_CONNMARK=m
+CONFIG_NETFILTER_XT_SET=m
+
+#
+# Xtables targets
+#
+CONFIG_NETFILTER_XT_TARGET_AUDIT=m
+CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m
+CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
+CONFIG_NETFILTER_XT_TARGET_CONNMARK=m
+CONFIG_NETFILTER_XT_TARGET_CONNSECMARK=m
+CONFIG_NETFILTER_XT_TARGET_CT=m
+CONFIG_NETFILTER_XT_TARGET_DSCP=m
+CONFIG_NETFILTER_XT_TARGET_HL=m
+CONFIG_NETFILTER_XT_TARGET_HMARK=m
+CONFIG_NETFILTER_XT_TARGET_IDLETIMER=m
+CONFIG_NETFILTER_XT_TARGET_LED=m
+CONFIG_NETFILTER_XT_TARGET_LOG=m
+CONFIG_NETFILTER_XT_TARGET_MARK=m
+CONFIG_NETFILTER_XT_TARGET_NETMAP=m
+CONFIG_NETFILTER_XT_TARGET_NFLOG=m
+CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
+CONFIG_NETFILTER_XT_TARGET_NOTRACK=m
+CONFIG_NETFILTER_XT_TARGET_RATEEST=m
+CONFIG_NETFILTER_XT_TARGET_REDIRECT=m
+CONFIG_NETFILTER_XT_TARGET_TEE=m
+CONFIG_NETFILTER_XT_TARGET_TPROXY=m
+CONFIG_NETFILTER_XT_TARGET_TRACE=m
+CONFIG_NETFILTER_XT_TARGET_SECMARK=m
+CONFIG_NETFILTER_XT_TARGET_TCPMSS=m
+CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m
+
+#
+# Xtables matches
+#
+CONFIG_NETFILTER_XT_MATCH_ADDRTYPE=m
+CONFIG_NETFILTER_XT_MATCH_BPF=m
+CONFIG_NETFILTER_XT_MATCH_CLUSTER=m
+CONFIG_NETFILTER_XT_MATCH_COMMENT=m
+CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m
+CONFIG_NETFILTER_XT_MATCH_CONNLABEL=m
+CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m
+CONFIG_NETFILTER_XT_MATCH_CONNMARK=m
+CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m
+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
+CONFIG_NETFILTER_XT_MATCH_HL=m
+CONFIG_NETFILTER_XT_MATCH_IPRANGE=m
+CONFIG_NETFILTER_XT_MATCH_IPVS=m
+CONFIG_NETFILTER_XT_MATCH_LENGTH=m
+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
+CONFIG_NETFILTER_XT_MATCH_PHYSDEV=m
+CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m
+CONFIG_NETFILTER_XT_MATCH_QUOTA=m
+CONFIG_NETFILTER_XT_MATCH_RATEEST=m
+CONFIG_NETFILTER_XT_MATCH_REALM=m
+CONFIG_NETFILTER_XT_MATCH_RECENT=m
+CONFIG_NETFILTER_XT_MATCH_SCTP=m
+CONFIG_NETFILTER_XT_MATCH_SOCKET=m
+CONFIG_NETFILTER_XT_MATCH_STATE=m
+CONFIG_NETFILTER_XT_MATCH_STATISTIC=m
+CONFIG_NETFILTER_XT_MATCH_STRING=m
+CONFIG_NETFILTER_XT_MATCH_TCPMSS=m
+CONFIG_NETFILTER_XT_MATCH_TIME=m
+CONFIG_NETFILTER_XT_MATCH_U32=m
+CONFIG_IP_SET=m
+CONFIG_IP_SET_MAX=256
+CONFIG_IP_SET_BITMAP_IP=m
+CONFIG_IP_SET_BITMAP_IPMAC=m
+CONFIG_IP_SET_BITMAP_PORT=m
+CONFIG_IP_SET_HASH_IP=m
+CONFIG_IP_SET_HASH_IPPORT=m
+CONFIG_IP_SET_HASH_IPPORTIP=m
+CONFIG_IP_SET_HASH_IPPORTNET=m
+CONFIG_IP_SET_HASH_NET=m
+CONFIG_IP_SET_HASH_NETPORT=m
+CONFIG_IP_SET_HASH_NETIFACE=m
+CONFIG_IP_SET_LIST_SET=m
+CONFIG_IP_VS=m
+# CONFIG_IP_VS_IPV6 is not set
+# CONFIG_IP_VS_DEBUG is not set
+CONFIG_IP_VS_TAB_BITS=12
+
+#
+# IPVS transport protocol load balancing support
+#
+CONFIG_IP_VS_PROTO_TCP=y
+CONFIG_IP_VS_PROTO_UDP=y
+CONFIG_IP_VS_PROTO_AH_ESP=y
+CONFIG_IP_VS_PROTO_ESP=y
+CONFIG_IP_VS_PROTO_AH=y
+CONFIG_IP_VS_PROTO_SCTP=y
+
+#
+# IPVS scheduler
+#
+CONFIG_IP_VS_RR=m
+CONFIG_IP_VS_WRR=m
+CONFIG_IP_VS_LC=m
+CONFIG_IP_VS_WLC=m
+CONFIG_IP_VS_LBLC=m
+CONFIG_IP_VS_LBLCR=m
+CONFIG_IP_VS_DH=m
+CONFIG_IP_VS_SH=m
+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
+CONFIG_IP_VS_NFCT=y
+CONFIG_IP_VS_PE_SIP=m
+
+#
+# IP: Netfilter Configuration
+#
+CONFIG_NF_DEFRAG_IPV4=m
+CONFIG_NF_CONNTRACK_IPV4=m
+# CONFIG_NF_CONNTRACK_PROC_COMPAT is not set
+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
+CONFIG_IP_NF_TARGET_SYNPROXY=m
+CONFIG_IP_NF_TARGET_ULOG=m
+CONFIG_NF_NAT_IPV4=m
+CONFIG_IP_NF_TARGET_MASQUERADE=m
+CONFIG_IP_NF_TARGET_NETMAP=m
+CONFIG_IP_NF_TARGET_REDIRECT=m
+CONFIG_NF_NAT_SNMP_BASIC=m
+CONFIG_NF_NAT_PROTO_GRE=m
+CONFIG_NF_NAT_PPTP=m
+CONFIG_NF_NAT_H323=m
+CONFIG_IP_NF_MANGLE=m
+CONFIG_IP_NF_TARGET_CLUSTERIP=m
+CONFIG_IP_NF_TARGET_ECN=m
+CONFIG_IP_NF_TARGET_TTL=m
+CONFIG_IP_NF_RAW=m
+CONFIG_IP_NF_SECURITY=m
+CONFIG_IP_NF_ARPTABLES=m
+CONFIG_IP_NF_ARPFILTER=m
+CONFIG_IP_NF_ARP_MANGLE=m
+
+#
+# IPv6: Netfilter Configuration
+#
+CONFIG_NF_DEFRAG_IPV6=m
+CONFIG_NF_CONNTRACK_IPV6=m
+CONFIG_IP6_NF_IPTABLES=m
+CONFIG_IP6_NF_MATCH_AH=m
+CONFIG_IP6_NF_MATCH_EUI64=m
+CONFIG_IP6_NF_MATCH_FRAG=m
+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_FILTER=m
+CONFIG_IP6_NF_TARGET_REJECT=m
+CONFIG_IP6_NF_TARGET_SYNPROXY=m
+CONFIG_IP6_NF_MANGLE=m
+CONFIG_IP6_NF_RAW=m
+CONFIG_IP6_NF_SECURITY=m
+CONFIG_NF_NAT_IPV6=m
+CONFIG_IP6_NF_TARGET_MASQUERADE=m
+CONFIG_IP6_NF_TARGET_NPT=m
+CONFIG_BRIDGE_NF_EBTABLES=m
+CONFIG_BRIDGE_EBT_BROUTE=m
+CONFIG_BRIDGE_EBT_T_FILTER=m
+CONFIG_BRIDGE_EBT_T_NAT=m
+CONFIG_BRIDGE_EBT_802_3=m
+CONFIG_BRIDGE_EBT_AMONG=m
+CONFIG_BRIDGE_EBT_ARP=m
+CONFIG_BRIDGE_EBT_IP=m
+CONFIG_BRIDGE_EBT_IP6=m
+CONFIG_BRIDGE_EBT_LIMIT=m
+CONFIG_BRIDGE_EBT_MARK=m
+CONFIG_BRIDGE_EBT_PKTTYPE=m
+CONFIG_BRIDGE_EBT_STP=m
+CONFIG_BRIDGE_EBT_VLAN=m
+CONFIG_BRIDGE_EBT_ARPREPLY=m
+CONFIG_BRIDGE_EBT_DNAT=m
+CONFIG_BRIDGE_EBT_MARK_T=m
+CONFIG_BRIDGE_EBT_REDIRECT=m
+CONFIG_BRIDGE_EBT_SNAT=m
+CONFIG_BRIDGE_EBT_LOG=m
+CONFIG_BRIDGE_EBT_ULOG=m
+CONFIG_BRIDGE_EBT_NFLOG=m
+CONFIG_IP_DCCP=m
+CONFIG_INET_DCCP_DIAG=m
+
+#
+# DCCP CCIDs Configuration
+#
+# CONFIG_IP_DCCP_CCID2_DEBUG is not set
+CONFIG_IP_DCCP_CCID3=y
+# CONFIG_IP_DCCP_CCID3_DEBUG is not set
+CONFIG_IP_DCCP_TFRC_LIB=y
+
+#
+# DCCP Kernel Hacking
+#
+# CONFIG_IP_DCCP_DEBUG is not set
+CONFIG_NET_DCCPPROBE=m
+CONFIG_IP_SCTP=m
+CONFIG_NET_SCTPPROBE=m
+# CONFIG_SCTP_DBG_OBJCNT is not set
+# CONFIG_SCTP_DEFAULT_COOKIE_HMAC_MD5 is not set
+CONFIG_SCTP_DEFAULT_COOKIE_HMAC_SHA1=y
+# CONFIG_SCTP_DEFAULT_COOKIE_HMAC_NONE is not set
+CONFIG_SCTP_COOKIE_HMAC_MD5=y
+CONFIG_SCTP_COOKIE_HMAC_SHA1=y
+# CONFIG_RDS is not set
+# CONFIG_TIPC is not set
+CONFIG_ATM=m
+CONFIG_ATM_CLIP=m
+# CONFIG_ATM_CLIP_NO_ICMP is not set
+CONFIG_ATM_LANE=m
+CONFIG_ATM_MPOA=m
+CONFIG_ATM_BR2684=m
+# CONFIG_ATM_BR2684_IPFILTER is not set
+CONFIG_L2TP=m
+# CONFIG_L2TP_DEBUGFS is not set
+CONFIG_L2TP_V3=y
+CONFIG_L2TP_IP=m
+CONFIG_L2TP_ETH=m
+CONFIG_STP=m
+CONFIG_MRP=m
+CONFIG_BRIDGE=m
+CONFIG_BRIDGE_IGMP_SNOOPING=y
+CONFIG_BRIDGE_VLAN_FILTERING=y
+CONFIG_HAVE_NET_DSA=y
+CONFIG_NET_DSA=m
+CONFIG_NET_DSA_TAG_DSA=y
+CONFIG_NET_DSA_TAG_EDSA=y
+CONFIG_NET_DSA_TAG_TRAILER=y
+CONFIG_VLAN_8021Q=m
+# CONFIG_VLAN_8021Q_GVRP is not set
+CONFIG_VLAN_8021Q_MVRP=y
+# CONFIG_DECNET is not set
+CONFIG_LLC=m
+CONFIG_LLC2=m
+CONFIG_IPX=m
+# CONFIG_IPX_INTERN is not set
+CONFIG_ATALK=m
+CONFIG_DEV_APPLETALK=m
+CONFIG_LTPC=m
+CONFIG_COPS=m
+CONFIG_COPS_DAYNA=y
+CONFIG_COPS_TANGENT=y
+CONFIG_IPDDP=m
+CONFIG_IPDDP_ENCAP=y
+# CONFIG_X25 is not set
+# CONFIG_LAPB is not set
+CONFIG_PHONET=m
+CONFIG_IEEE802154=m
+CONFIG_IEEE802154_6LOWPAN=m
+CONFIG_MAC802154=m
+CONFIG_NET_SCHED=y
+
+#
+# Queueing/Scheduling
+#
+CONFIG_NET_SCH_CBQ=m
+CONFIG_NET_SCH_HTB=m
+CONFIG_NET_SCH_HFSC=m
+CONFIG_NET_SCH_ATM=m
+CONFIG_NET_SCH_PRIO=m
+CONFIG_NET_SCH_MULTIQ=m
+CONFIG_NET_SCH_RED=m
+CONFIG_NET_SCH_SFB=m
+CONFIG_NET_SCH_SFQ=m
+CONFIG_NET_SCH_TEQL=m
+CONFIG_NET_SCH_TBF=m
+CONFIG_NET_SCH_GRED=m
+CONFIG_NET_SCH_DSMARK=m
+CONFIG_NET_SCH_NETEM=m
+CONFIG_NET_SCH_DRR=m
+CONFIG_NET_SCH_MQPRIO=m
+CONFIG_NET_SCH_CHOKE=m
+CONFIG_NET_SCH_QFQ=m
+CONFIG_NET_SCH_CODEL=m
+CONFIG_NET_SCH_FQ_CODEL=m
+CONFIG_NET_SCH_FQ=m
+CONFIG_NET_SCH_INGRESS=m
+CONFIG_NET_SCH_PLUG=m
+
+#
+# Classification
+#
+CONFIG_NET_CLS=y
+CONFIG_NET_CLS_BASIC=m
+CONFIG_NET_CLS_TCINDEX=m
+CONFIG_NET_CLS_ROUTE4=m
+CONFIG_NET_CLS_FW=m
+CONFIG_NET_CLS_U32=m
+# CONFIG_CLS_U32_PERF is not set
+# CONFIG_CLS_U32_MARK is not set
+CONFIG_NET_CLS_RSVP=m
+CONFIG_NET_CLS_RSVP6=m
+CONFIG_NET_CLS_FLOW=m
+CONFIG_NET_CLS_CGROUP=y
+# CONFIG_NET_EMATCH is not set
+CONFIG_NET_CLS_ACT=y
+CONFIG_NET_ACT_POLICE=m
+CONFIG_NET_ACT_GACT=m
+CONFIG_GACT_PROB=y
+CONFIG_NET_ACT_MIRRED=m
+CONFIG_NET_ACT_IPT=m
+CONFIG_NET_ACT_NAT=m
+CONFIG_NET_ACT_PEDIT=m
+CONFIG_NET_ACT_SIMP=m
+CONFIG_NET_ACT_SKBEDIT=m
+CONFIG_NET_ACT_CSUM=m
+CONFIG_NET_CLS_IND=y
+CONFIG_NET_SCH_FIFO=y
+# CONFIG_DCB is not set
+CONFIG_DNS_RESOLVER=y
+CONFIG_BATMAN_ADV=m
+CONFIG_BATMAN_ADV_BLA=y
+CONFIG_BATMAN_ADV_DAT=y
+CONFIG_BATMAN_ADV_NC=y
+# CONFIG_BATMAN_ADV_DEBUG is not set
+CONFIG_OPENVSWITCH=m
+CONFIG_OPENVSWITCH_GRE=y
+CONFIG_OPENVSWITCH_VXLAN=y
+CONFIG_VSOCKETS=m
+CONFIG_VMWARE_VMCI_VSOCKETS=m
+CONFIG_NETLINK_MMAP=y
+CONFIG_NETLINK_DIAG=m
+CONFIG_NET_MPLS_GSO=m
+CONFIG_RPS=y
+CONFIG_RFS_ACCEL=y
+CONFIG_XPS=y
+CONFIG_NETPRIO_CGROUP=m
+CONFIG_NET_RX_BUSY_POLL=y
+CONFIG_BQL=y
+CONFIG_NET_FLOW_LIMIT=y
+
+#
+# Network testing
+#
+CONFIG_NET_PKTGEN=m
+CONFIG_NET_TCPPROBE=m
+CONFIG_NET_DROP_MONITOR=y
+CONFIG_HAMRADIO=y
+
+#
+# Packet Radio protocols
+#
+CONFIG_AX25=m
+CONFIG_AX25_DAMA_SLAVE=y
+CONFIG_NETROM=m
+CONFIG_ROSE=m
+
+#
+# AX.25 network device drivers
+#
+CONFIG_MKISS=m
+CONFIG_6PACK=m
+CONFIG_BPQETHER=m
+CONFIG_SCC=m
+# CONFIG_SCC_DELAY is not set
+# CONFIG_SCC_TRXECHO is not set
+CONFIG_BAYCOM_SER_FDX=m
+CONFIG_BAYCOM_SER_HDX=m
+CONFIG_BAYCOM_PAR=m
+CONFIG_BAYCOM_EPP=m
+CONFIG_YAM=m
+# CONFIG_CAN is not set
+CONFIG_IRDA=m
+
+#
+# IrDA protocols
+#
+CONFIG_IRLAN=m
+CONFIG_IRNET=m
+CONFIG_IRCOMM=m
+CONFIG_IRDA_ULTRA=y
+
+#
+# IrDA options
+#
+CONFIG_IRDA_CACHE_LAST_LSAP=y
+CONFIG_IRDA_FAST_RR=y
+# CONFIG_IRDA_DEBUG is not set
+
+#
+# Infrared-port device drivers
+#
+
+#
+# SIR device drivers
+#
+CONFIG_IRTTY_SIR=m
+
+#
+# Dongle support
+#
+CONFIG_DONGLE=y
+CONFIG_ESI_DONGLE=m
+CONFIG_ACTISYS_DONGLE=m
+CONFIG_TEKRAM_DONGLE=m
+CONFIG_TOIM3232_DONGLE=m
+CONFIG_LITELINK_DONGLE=m
+CONFIG_MA600_DONGLE=m
+CONFIG_GIRBIL_DONGLE=m
+CONFIG_MCP2120_DONGLE=m
+CONFIG_OLD_BELKIN_DONGLE=m
+CONFIG_ACT200L_DONGLE=m
+CONFIG_KINGSUN_DONGLE=m
+CONFIG_KSDAZZLE_DONGLE=m
+CONFIG_KS959_DONGLE=m
+
+#
+# FIR device drivers
+#
+CONFIG_USB_IRDA=m
+CONFIG_SIGMATEL_FIR=m
+CONFIG_NSC_FIR=m
+CONFIG_WINBOND_FIR=m
+CONFIG_TOSHIBA_FIR=m
+CONFIG_SMC_IRCC_FIR=m
+CONFIG_ALI_FIR=m
+CONFIG_VLSI_FIR=m
+CONFIG_VIA_FIR=m
+CONFIG_MCS_FIR=m
+CONFIG_BT=m
+CONFIG_BT_RFCOMM=m
+CONFIG_BT_RFCOMM_TTY=y
+CONFIG_BT_BNEP=m
+# CONFIG_BT_BNEP_MC_FILTER is not set
+# CONFIG_BT_BNEP_PROTO_FILTER is not set
+# CONFIG_BT_CMTP is not set
+CONFIG_BT_HIDP=m
+
+#
+# Bluetooth device drivers
+#
+CONFIG_BT_HCIBTUSB=m
+CONFIG_BT_HCIBTSDIO=m
+CONFIG_BT_HCIUART=m
+CONFIG_BT_HCIUART_H4=y
+CONFIG_BT_HCIUART_BCSP=y
+CONFIG_BT_HCIUART_ATH3K=y
+CONFIG_BT_HCIUART_LL=y
+CONFIG_BT_HCIUART_3WIRE=y
+CONFIG_BT_HCIBCM203X=m
+CONFIG_BT_HCIBPA10X=m
+CONFIG_BT_HCIBFUSB=m
+CONFIG_BT_HCIDTL1=m
+CONFIG_BT_HCIBT3C=m
+CONFIG_BT_HCIBLUECARD=m
+CONFIG_BT_HCIBTUART=m
+CONFIG_BT_HCIVHCI=m
+CONFIG_BT_MRVL=m
+CONFIG_BT_MRVL_SDIO=m
+CONFIG_BT_ATH3K=m
+CONFIG_BT_WILINK=m
+CONFIG_AF_RXRPC=m
+# CONFIG_AF_RXRPC_DEBUG is not set
+CONFIG_RXKAD=m
+CONFIG_FIB_RULES=y
+CONFIG_WIRELESS=y
+CONFIG_WIRELESS_EXT=y
+CONFIG_WEXT_CORE=y
+CONFIG_WEXT_PROC=y
+CONFIG_WEXT_SPY=y
+CONFIG_WEXT_PRIV=y
+CONFIG_CFG80211=m
+# CONFIG_NL80211_TESTMODE is not set
+# CONFIG_CFG80211_DEVELOPER_WARNINGS is not set
+# CONFIG_CFG80211_REG_DEBUG is not set
+CONFIG_CFG80211_DEFAULT_PS=y
+# CONFIG_CFG80211_DEBUGFS is not set
+# CONFIG_CFG80211_INTERNAL_REGDB is not set
+CONFIG_CFG80211_WEXT=y
+CONFIG_LIB80211=m
+CONFIG_LIB80211_CRYPT_WEP=m
+CONFIG_LIB80211_CRYPT_CCMP=m
+CONFIG_LIB80211_CRYPT_TKIP=m
+# CONFIG_LIB80211_DEBUG is not set
+CONFIG_MAC80211=m
+CONFIG_MAC80211_HAS_RC=y
+CONFIG_MAC80211_RC_MINSTREL=y
+CONFIG_MAC80211_RC_MINSTREL_HT=y
+CONFIG_MAC80211_RC_DEFAULT_MINSTREL=y
+CONFIG_MAC80211_RC_DEFAULT="minstrel_ht"
+CONFIG_MAC80211_MESH=y
+CONFIG_MAC80211_LEDS=y
+# CONFIG_MAC80211_DEBUGFS is not set
+# CONFIG_MAC80211_MESSAGE_TRACING is not set
+# CONFIG_MAC80211_DEBUG_MENU is not set
+CONFIG_WIMAX=m
+CONFIG_WIMAX_DEBUG_LEVEL=8
+CONFIG_RFKILL=m
+CONFIG_RFKILL_LEDS=y
+CONFIG_RFKILL_INPUT=y
+CONFIG_NET_9P=m
+CONFIG_NET_9P_VIRTIO=m
+# CONFIG_NET_9P_DEBUG is not set
+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_NCI_SPI is not set
+CONFIG_NFC_HCI=m
+# CONFIG_NFC_SHDLC is not set
+
+#
+# Near Field Communication (NFC) devices
+#
+CONFIG_NFC_PN533=m
+CONFIG_NFC_WILINK=m
+CONFIG_NFC_MEI_PHY=m
+CONFIG_NFC_SIM=m
+CONFIG_NFC_PN544=m
+CONFIG_NFC_PN544_MEI=m
+CONFIG_NFC_MICROREAD=m
+CONFIG_NFC_MICROREAD_MEI=m
+
+#
+# Device Drivers
+#
+
+#
+# Generic Driver Options
+#
+CONFIG_UEVENT_HELPER_PATH=""
+CONFIG_DEVTMPFS=y
+# CONFIG_DEVTMPFS_MOUNT is not set
+CONFIG_STANDALONE=y
+CONFIG_PREVENT_FIRMWARE_BUILD=y
+CONFIG_FW_LOADER=y
+CONFIG_FIRMWARE_IN_KERNEL=y
+CONFIG_EXTRA_FIRMWARE=""
+CONFIG_FW_LOADER_USER_HELPER=y
+# 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_MMIO=m
+CONFIG_REGMAP_IRQ=y
+CONFIG_DMA_SHARED_BUFFER=y
+
+#
+# Bus devices
+#
+CONFIG_CONNECTOR=y
+CONFIG_PROC_EVENTS=y
+CONFIG_MTD=m
+CONFIG_MTD_TESTS=m
+CONFIG_MTD_REDBOOT_PARTS=m
+CONFIG_MTD_REDBOOT_DIRECTORY_BLOCK=-1
+# CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED is not set
+# CONFIG_MTD_REDBOOT_PARTS_READONLY is not set
+CONFIG_MTD_CMDLINE_PARTS=m
+CONFIG_MTD_OF_PARTS=m
+CONFIG_MTD_AR7_PARTS=m
+
+#
+# User Modules And Translation Layers
+#
+CONFIG_MTD_BLKDEVS=m
+CONFIG_MTD_BLOCK=m
+CONFIG_MTD_BLOCK_RO=m
+CONFIG_FTL=m
+CONFIG_NFTL=m
+CONFIG_NFTL_RW=y
+CONFIG_INFTL=m
+CONFIG_RFD_FTL=m
+CONFIG_SSFDC=m
+# CONFIG_SM_FTL is not set
+CONFIG_MTD_OOPS=m
+CONFIG_MTD_SWAP=m
+
+#
+# RAM/ROM/Flash chip drivers
+#
+CONFIG_MTD_CFI=m
+CONFIG_MTD_JEDECPROBE=m
+CONFIG_MTD_GEN_PROBE=m
+# CONFIG_MTD_CFI_ADV_OPTIONS is not set
+CONFIG_MTD_MAP_BANK_WIDTH_1=y
+CONFIG_MTD_MAP_BANK_WIDTH_2=y
+CONFIG_MTD_MAP_BANK_WIDTH_4=y
+# CONFIG_MTD_MAP_BANK_WIDTH_8 is not set
+# CONFIG_MTD_MAP_BANK_WIDTH_16 is not set
+# CONFIG_MTD_MAP_BANK_WIDTH_32 is not set
+CONFIG_MTD_CFI_I1=y
+CONFIG_MTD_CFI_I2=y
+# CONFIG_MTD_CFI_I4 is not set
+# CONFIG_MTD_CFI_I8 is not set
+CONFIG_MTD_CFI_INTELEXT=m
+CONFIG_MTD_CFI_AMDSTD=m
+CONFIG_MTD_CFI_STAA=m
+CONFIG_MTD_CFI_UTIL=m
+CONFIG_MTD_RAM=m
+CONFIG_MTD_ROM=m
+CONFIG_MTD_ABSENT=m
+
+#
+# Mapping drivers for chip access
+#
+CONFIG_MTD_COMPLEX_MAPPINGS=y
+# CONFIG_MTD_PHYSMAP is not set
+CONFIG_MTD_PHYSMAP_OF=m
+CONFIG_MTD_SC520CDP=m
+CONFIG_MTD_NETSC520=m
+CONFIG_MTD_TS5500=m
+# CONFIG_MTD_SBC_GXX is not set
+# CONFIG_MTD_AMD76XROM is not set
+# CONFIG_MTD_ICHXROM is not set
+# CONFIG_MTD_ESB2ROM is not set
+# CONFIG_MTD_CK804XROM is not set
+CONFIG_MTD_SCB2_FLASH=m
+# CONFIG_MTD_NETtel is not set
+# CONFIG_MTD_L440GX is not set
+CONFIG_MTD_PCI=m
+# CONFIG_MTD_PCMCIA is not set
+# CONFIG_MTD_GPIO_ADDR is not set
+# CONFIG_MTD_INTEL_VR_NOR is not set
+CONFIG_MTD_PLATRAM=m
+# CONFIG_MTD_LATCH_ADDR is not set
+
+#
+# Self-contained MTD device drivers
+#
+CONFIG_MTD_PMC551=m
+# CONFIG_MTD_PMC551_BUGFIX is not set
+# CONFIG_MTD_PMC551_DEBUG is not set
+# CONFIG_MTD_DATAFLASH is not set
+# CONFIG_MTD_M25P80 is not set
+# CONFIG_MTD_SST25L is not set
+# CONFIG_MTD_SLRAM is not set
+CONFIG_MTD_PHRAM=m
+CONFIG_MTD_MTDRAM=m
+CONFIG_MTDRAM_TOTAL_SIZE=4096
+CONFIG_MTDRAM_ERASE_SIZE=128
+CONFIG_MTD_BLOCK2MTD=m
+
+#
+# Disk-On-Chip Device Drivers
+#
+CONFIG_MTD_DOCG3=m
+CONFIG_BCH_CONST_M=14
+CONFIG_BCH_CONST_T=4
+# CONFIG_MTD_NAND is not set
+# CONFIG_MTD_ONENAND is not set
+
+#
+# LPDDR flash memory drivers
+#
+CONFIG_MTD_LPDDR=m
+CONFIG_MTD_QINFO_PROBE=m
+CONFIG_MTD_UBI=m
+CONFIG_MTD_UBI_WL_THRESHOLD=4096
+CONFIG_MTD_UBI_BEB_LIMIT=20
+# CONFIG_MTD_UBI_FASTMAP is not set
+# CONFIG_MTD_UBI_GLUEBI is not set
+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
+CONFIG_OF_NET=y
+CONFIG_OF_MDIO=m
+CONFIG_OF_PCI=y
+CONFIG_OF_PCI_IRQ=y
+CONFIG_OF_MTD=y
+CONFIG_PARPORT=m
+CONFIG_PARPORT_PC=m
+CONFIG_PARPORT_SERIAL=m
+# CONFIG_PARPORT_PC_FIFO is not set
+# CONFIG_PARPORT_PC_SUPERIO is not set
+CONFIG_PARPORT_PC_PCMCIA=m
+# CONFIG_PARPORT_GSC is not set
+CONFIG_PARPORT_AX88796=m
+CONFIG_PARPORT_1284=y
+CONFIG_PARPORT_NOT_PC=y
+CONFIG_PNP=y
+# CONFIG_PNP_DEBUG_MESSAGES is not set
+
+#
+# Protocols
+#
+CONFIG_ISAPNP=y
+# CONFIG_PNPBIOS is not set
+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
+CONFIG_BLK_DEV_DAC960=m
+# CONFIG_BLK_DEV_UMEM is not set
+# CONFIG_BLK_DEV_COW_COMMON is not set
+CONFIG_BLK_DEV_LOOP=m
+CONFIG_BLK_DEV_LOOP_MIN_COUNT=8
+CONFIG_BLK_DEV_CRYPTOLOOP=m
+CONFIG_BLK_DEV_DRBD=m
+# CONFIG_DRBD_FAULT_INJECTION is not set
+CONFIG_BLK_DEV_NBD=m
+CONFIG_BLK_DEV_NVME=m
+CONFIG_BLK_DEV_OSD=m
+CONFIG_BLK_DEV_SX8=m
+CONFIG_BLK_DEV_RAM=m
+CONFIG_BLK_DEV_RAM_COUNT=16
+CONFIG_BLK_DEV_RAM_SIZE=16384
+# CONFIG_BLK_DEV_XIP is not set
+CONFIG_CDROM_PKTCDVD=m
+CONFIG_CDROM_PKTCDVD_BUFFERS=8
+# CONFIG_CDROM_PKTCDVD_WCACHE is not set
+CONFIG_ATA_OVER_ETH=m
+CONFIG_VIRTIO_BLK=m
+# CONFIG_BLK_DEV_HD is not set
+CONFIG_BLK_DEV_RBD=m
+CONFIG_BLK_DEV_RSXX=m
+
+#
+# Misc devices
+#
+CONFIG_SENSORS_LIS3LV02D=m
+CONFIG_AD525X_DPOT=m
+CONFIG_AD525X_DPOT_I2C=m
+# CONFIG_AD525X_DPOT_SPI is not set
+# CONFIG_DUMMY_IRQ is not set
+# CONFIG_IBM_ASM is not set
+CONFIG_PHANTOM=m
+CONFIG_SGI_IOC4=m
+CONFIG_TIFM_CORE=m
+CONFIG_TIFM_7XX1=m
+CONFIG_ICS932S401=m
+# CONFIG_ATMEL_SSC is not set
+CONFIG_ENCLOSURE_SERVICES=m
+CONFIG_CS5535_MFGPT=m
+CONFIG_CS5535_MFGPT_DEFAULT_IRQ=7
+CONFIG_CS5535_CLOCK_EVENT_SRC=m
+CONFIG_HP_ILO=m
+CONFIG_APDS9802ALS=m
+CONFIG_ISL29003=m
+CONFIG_ISL29020=m
+CONFIG_SENSORS_TSL2550=m
+CONFIG_SENSORS_BH1780=m
+CONFIG_SENSORS_BH1770=m
+CONFIG_SENSORS_APDS990X=m
+CONFIG_HMC6352=m
+CONFIG_DS1682=m
+# CONFIG_TI_DAC7512 is not set
+CONFIG_VMWARE_BALLOON=m
+CONFIG_BMP085=y
+CONFIG_BMP085_I2C=m
+# CONFIG_BMP085_SPI is not set
+# CONFIG_PCH_PHUB is not set
+CONFIG_USB_SWITCH_FSA9480=m
+# CONFIG_LATTICE_ECP3_CONFIG is not set
+# CONFIG_SRAM is not set
+CONFIG_C2PORT=m
+CONFIG_C2PORT_DURAMAR_2150=m
+
+#
+# EEPROM support
+#
+CONFIG_EEPROM_AT24=m
+# CONFIG_EEPROM_AT25 is not set
+CONFIG_EEPROM_LEGACY=m
+CONFIG_EEPROM_MAX6875=m
+CONFIG_EEPROM_93CX6=m
+# CONFIG_EEPROM_93XX46 is not set
+CONFIG_CB710_CORE=m
+# CONFIG_CB710_DEBUG is not set
+CONFIG_CB710_DEBUG_ASSUMPTIONS=y
+
+#
+# Texas Instruments shared transport line discipline
+#
+CONFIG_TI_ST=m
+CONFIG_SENSORS_LIS3_I2C=m
+
+#
+# Altera FPGA firmware download module
+#
+CONFIG_ALTERA_STAPL=m
+CONFIG_INTEL_MEI=m
+CONFIG_INTEL_MEI_ME=m
+CONFIG_VMWARE_VMCI=m
+CONFIG_HAVE_IDE=y
+# CONFIG_IDE is not set
+
+#
+# SCSI device support
+#
+CONFIG_SCSI_MOD=m
+CONFIG_RAID_ATTRS=m
+CONFIG_SCSI=m
+CONFIG_SCSI_DMA=y
+CONFIG_SCSI_TGT=m
+CONFIG_SCSI_NETLINK=y
+CONFIG_SCSI_PROC_FS=y
+
+#
+# SCSI support type (disk, tape, CD-ROM)
+#
+CONFIG_BLK_DEV_SD=m
+CONFIG_CHR_DEV_ST=m
+CONFIG_CHR_DEV_OSST=m
+CONFIG_BLK_DEV_SR=m
+CONFIG_BLK_DEV_SR_VENDOR=y
+CONFIG_CHR_DEV_SG=m
+CONFIG_CHR_DEV_SCH=m
+CONFIG_SCSI_ENCLOSURE=m
+CONFIG_SCSI_MULTI_LUN=y
+# CONFIG_SCSI_CONSTANTS is not set
+# CONFIG_SCSI_LOGGING is not set
+CONFIG_SCSI_SCAN_ASYNC=y 
+
+#
+# SCSI Transports
+#
+CONFIG_SCSI_SPI_ATTRS=m
+CONFIG_SCSI_FC_ATTRS=m
+# CONFIG_SCSI_FC_TGT_ATTRS is not set
+CONFIG_SCSI_ISCSI_ATTRS=m
+CONFIG_SCSI_SAS_ATTRS=m
+CONFIG_SCSI_SAS_LIBSAS=m
+CONFIG_SCSI_SAS_ATA=y
+CONFIG_SCSI_SAS_HOST_SMP=y
+CONFIG_SCSI_SRP_ATTRS=m
+CONFIG_SCSI_SRP_TGT_ATTRS=y
+CONFIG_SCSI_LOWLEVEL=y
+CONFIG_ISCSI_TCP=m
+CONFIG_ISCSI_BOOT_SYSFS=m
+CONFIG_SCSI_CXGB3_ISCSI=m
+CONFIG_SCSI_CXGB4_ISCSI=m
+CONFIG_SCSI_BNX2_ISCSI=m
+CONFIG_SCSI_BNX2X_FCOE=m
+CONFIG_BE2ISCSI=m
+CONFIG_BLK_DEV_3W_XXXX_RAID=m
+CONFIG_SCSI_HPSA=m
+CONFIG_SCSI_3W_9XXX=m
+CONFIG_SCSI_3W_SAS=m
+CONFIG_SCSI_7000FASST=m
+CONFIG_SCSI_ACARD=m
+CONFIG_SCSI_AHA152X=m
+CONFIG_SCSI_AHA1542=m
+CONFIG_SCSI_AACRAID=m
+CONFIG_SCSI_AIC7XXX=m
+CONFIG_AIC7XXX_CMDS_PER_DEVICE=32
+CONFIG_AIC7XXX_RESET_DELAY_MS=15000
+# CONFIG_AIC7XXX_DEBUG_ENABLE is not set
+CONFIG_AIC7XXX_DEBUG_MASK=0
+CONFIG_AIC7XXX_REG_PRETTY_PRINT=y
+# CONFIG_SCSI_AIC7XXX_OLD is not set
+CONFIG_SCSI_AIC79XX=m
+CONFIG_AIC79XX_CMDS_PER_DEVICE=32
+CONFIG_AIC79XX_RESET_DELAY_MS=15000
+# CONFIG_AIC79XX_DEBUG_ENABLE is not set
+CONFIG_AIC79XX_DEBUG_MASK=0
+CONFIG_AIC79XX_REG_PRETTY_PRINT=y
+CONFIG_SCSI_AIC94XX=m
+# CONFIG_AIC94XX_DEBUG is not set
+CONFIG_SCSI_MVSAS=m
+# CONFIG_SCSI_MVSAS_DEBUG is not set
+CONFIG_SCSI_MVSAS_TASKLET=y
+CONFIG_SCSI_MVUMI=m
+CONFIG_SCSI_DPT_I2O=m
+CONFIG_SCSI_ADVANSYS=m
+CONFIG_SCSI_IN2000=m
+CONFIG_SCSI_ARCMSR=m
+CONFIG_SCSI_ESAS2R=m
+CONFIG_MEGARAID_NEWGEN=y
+CONFIG_MEGARAID_MM=m
+CONFIG_MEGARAID_MAILBOX=m
+CONFIG_MEGARAID_LEGACY=m
+CONFIG_MEGARAID_SAS=m
+CONFIG_SCSI_MPT2SAS=m
+CONFIG_SCSI_MPT2SAS_MAX_SGE=128
+# CONFIG_SCSI_MPT2SAS_LOGGING is not set
+CONFIG_SCSI_MPT3SAS=m
+CONFIG_SCSI_MPT3SAS_MAX_SGE=128
+CONFIG_SCSI_MPT3SAS_LOGGING=y
+CONFIG_SCSI_UFSHCD=m
+CONFIG_SCSI_UFSHCD_PCI=m
+CONFIG_SCSI_UFSHCD_PLATFORM=m
+CONFIG_SCSI_HPTIOP=m
+CONFIG_SCSI_BUSLOGIC=m
+# CONFIG_SCSI_FLASHPOINT is not set
+CONFIG_VMWARE_PVSCSI=m
+CONFIG_HYPERV_STORAGE=m
+CONFIG_LIBFC=m
+CONFIG_LIBFCOE=m
+CONFIG_FCOE=m
+CONFIG_FCOE_FNIC=m
+CONFIG_SCSI_DMX3191D=m
+CONFIG_SCSI_DTC3280=m
+CONFIG_SCSI_EATA=m
+# CONFIG_SCSI_EATA_TAGGED_QUEUE is not set
+# CONFIG_SCSI_EATA_LINKED_COMMANDS is not set
+CONFIG_SCSI_EATA_MAX_TAGS=16
+CONFIG_SCSI_FUTURE_DOMAIN=m
+CONFIG_SCSI_GDTH=m
+CONFIG_SCSI_ISCI=m
+CONFIG_SCSI_GENERIC_NCR5380=m
+CONFIG_SCSI_GENERIC_NCR5380_MMIO=m
+CONFIG_SCSI_GENERIC_NCR53C400=y
+CONFIG_SCSI_IPS=m
+CONFIG_SCSI_INITIO=m
+CONFIG_SCSI_INIA100=m
+CONFIG_SCSI_PPA=m
+CONFIG_SCSI_IMM=m
+# CONFIG_SCSI_IZIP_EPP16 is not set
+# CONFIG_SCSI_IZIP_SLOW_CTR is not set
+CONFIG_SCSI_NCR53C406A=m
+CONFIG_SCSI_STEX=m
+CONFIG_SCSI_SYM53C8XX_2=m
+CONFIG_SCSI_SYM53C8XX_DMA_ADDRESSING_MODE=1
+CONFIG_SCSI_SYM53C8XX_DEFAULT_TAGS=16
+CONFIG_SCSI_SYM53C8XX_MAX_TAGS=64
+CONFIG_SCSI_SYM53C8XX_MMIO=y
+CONFIG_SCSI_IPR=m
+# CONFIG_SCSI_IPR_TRACE is not set
+# CONFIG_SCSI_IPR_DUMP is not set
+CONFIG_SCSI_PAS16=m
+CONFIG_SCSI_QLOGIC_FAS=m
+CONFIG_SCSI_QLOGIC_1280=m
+CONFIG_SCSI_QLA_FC=m
+CONFIG_TCM_QLA2XXX=m
+CONFIG_SCSI_QLA_ISCSI=m
+CONFIG_SCSI_LPFC=m
+# CONFIG_SCSI_LPFC_DEBUG_FS is not set
+CONFIG_SCSI_SYM53C416=m
+CONFIG_SCSI_DC395x=m
+CONFIG_SCSI_DC390T=m
+CONFIG_SCSI_T128=m
+CONFIG_SCSI_U14_34F=m
+# CONFIG_SCSI_U14_34F_TAGGED_QUEUE is not set
+# CONFIG_SCSI_U14_34F_LINKED_COMMANDS is not set
+CONFIG_SCSI_U14_34F_MAX_TAGS=8
+CONFIG_SCSI_ULTRASTOR=m
+CONFIG_SCSI_NSP32=m
+# CONFIG_SCSI_DEBUG is not set
+CONFIG_SCSI_PMCRAID=m
+CONFIG_SCSI_PM8001=m
+CONFIG_SCSI_SRP=m
+CONFIG_SCSI_BFA_FC=m
+CONFIG_SCSI_VIRTIO=m
+CONFIG_SCSI_CHELSIO_FCOE=m
+CONFIG_SCSI_LOWLEVEL_PCMCIA=y
+CONFIG_PCMCIA_AHA152X=m
+CONFIG_PCMCIA_FDOMAIN=m
+CONFIG_PCMCIA_NINJA_SCSI=m
+CONFIG_PCMCIA_QLOGIC=m
+CONFIG_PCMCIA_SYM53C500=m
+CONFIG_SCSI_DH=m
+CONFIG_SCSI_DH_RDAC=m
+CONFIG_SCSI_DH_HP_SW=m
+CONFIG_SCSI_DH_EMC=m
+CONFIG_SCSI_DH_ALUA=m
+CONFIG_SCSI_OSD_INITIATOR=m
+CONFIG_SCSI_OSD_ULD=m
+CONFIG_SCSI_OSD_DPRINT_SENSE=0
+# CONFIG_SCSI_OSD_DEBUG is not set
+CONFIG_ATA=m
+# CONFIG_ATA_NONSTANDARD is not set
+CONFIG_ATA_VERBOSE_ERROR=y
+CONFIG_ATA_ACPI=y
+CONFIG_SATA_ZPODD=y
+CONFIG_SATA_PMP=y
+
+#
+# Controllers with non-SFF native interface
+#
+CONFIG_SATA_AHCI=m
+CONFIG_SATA_AHCI_PLATFORM=m
+CONFIG_SATA_INIC162X=m
+CONFIG_SATA_ACARD_AHCI=m
+CONFIG_SATA_SIL24=m
+CONFIG_ATA_SFF=y
+
+#
+# SFF controllers with custom DMA interface
+#
+CONFIG_PDC_ADMA=m
+CONFIG_SATA_QSTOR=m
+CONFIG_SATA_SX4=m
+CONFIG_ATA_BMDMA=y
+
+#
+# SATA SFF controllers with BMDMA
+#
+CONFIG_ATA_PIIX=m
+CONFIG_SATA_HIGHBANK=m
+CONFIG_SATA_MV=m
+CONFIG_SATA_NV=m
+CONFIG_SATA_PROMISE=m
+CONFIG_SATA_RCAR=m
+CONFIG_SATA_SIL=m
+CONFIG_SATA_SIS=m
+CONFIG_SATA_SVW=m
+CONFIG_SATA_ULI=m
+CONFIG_SATA_VIA=m
+CONFIG_SATA_VITESSE=m
+
+#
+# PATA SFF controllers with BMDMA
+#
+CONFIG_PATA_ALI=m
+CONFIG_PATA_AMD=m
+CONFIG_PATA_ARASAN_CF=m
+CONFIG_PATA_ARTOP=m
+CONFIG_PATA_ATIIXP=m
+CONFIG_PATA_ATP867X=m
+CONFIG_PATA_CMD64X=m
+CONFIG_PATA_CS5520=m
+CONFIG_PATA_CS5530=m
+CONFIG_PATA_CS5535=m
+CONFIG_PATA_CS5536=m
+CONFIG_PATA_CYPRESS=m
+CONFIG_PATA_EFAR=m
+CONFIG_PATA_HPT366=m
+CONFIG_PATA_HPT37X=m
+CONFIG_PATA_HPT3X2N=m
+CONFIG_PATA_HPT3X3=m
+# CONFIG_PATA_HPT3X3_DMA is not set
+CONFIG_PATA_IT8213=m
+CONFIG_PATA_IT821X=m
+CONFIG_PATA_JMICRON=m
+CONFIG_PATA_MARVELL=m
+CONFIG_PATA_NETCELL=m
+CONFIG_PATA_NINJA32=m
+CONFIG_PATA_NS87415=m
+CONFIG_PATA_OLDPIIX=m
+CONFIG_PATA_OPTIDMA=m
+CONFIG_PATA_PDC2027X=m
+CONFIG_PATA_PDC_OLD=m
+CONFIG_PATA_RADISYS=m
+CONFIG_PATA_RDC=m
+CONFIG_PATA_SC1200=m
+CONFIG_PATA_SCH=m
+CONFIG_PATA_SERVERWORKS=m
+CONFIG_PATA_SIL680=m
+CONFIG_PATA_SIS=m
+CONFIG_PATA_TOSHIBA=m
+CONFIG_PATA_TRIFLEX=m
+CONFIG_PATA_VIA=m
+CONFIG_PATA_WINBOND=m
+
+#
+# PIO-only SFF controllers
+#
+CONFIG_PATA_CMD640_PCI=m
+CONFIG_PATA_ISAPNP=m
+CONFIG_PATA_MPIIX=m
+CONFIG_PATA_NS87410=m
+CONFIG_PATA_OPTI=m
+CONFIG_PATA_PCMCIA=m
+CONFIG_PATA_QDI=m
+CONFIG_PATA_RZ1000=m
+CONFIG_PATA_WINBOND_VLB=m
+
+#
+# Generic fallback / legacy drivers
+#
+CONFIG_PATA_ACPI=m
+CONFIG_ATA_GENERIC=m
+CONFIG_PATA_LEGACY=m
+CONFIG_MD=y
+CONFIG_BLK_DEV_MD=m
+CONFIG_MD_LINEAR=m
+CONFIG_MD_RAID0=m
+CONFIG_MD_RAID1=m
+CONFIG_MD_RAID10=m
+CONFIG_MD_RAID456=m
+CONFIG_MD_MULTIPATH=m
+CONFIG_MD_FAULTY=m
+CONFIG_BCACHE=m
+# CONFIG_BCACHE_DEBUG is not set
+# CONFIG_BCACHE_EDEBUG is not set
+# CONFIG_BCACHE_CLOSURES_DEBUG is not set
+CONFIG_BLK_DEV_DM=m
+# CONFIG_DM_DEBUG is not set
+CONFIG_DM_BUFIO=m
+CONFIG_DM_BIO_PRISON=m
+CONFIG_DM_PERSISTENT_DATA=m
+CONFIG_DM_CRYPT=m
+CONFIG_DM_SNAPSHOT=m
+CONFIG_DM_THIN_PROVISIONING=m
+# CONFIG_DM_DEBUG_BLOCK_STACK_TRACING is not set
+CONFIG_DM_CACHE=m
+CONFIG_DM_CACHE_MQ=m
+CONFIG_DM_CACHE_CLEANER=m
+CONFIG_DM_MIRROR=m
+CONFIG_DM_RAID=m
+CONFIG_DM_LOG_USERSPACE=m
+CONFIG_DM_ZERO=m
+CONFIG_DM_MULTIPATH=m
+CONFIG_DM_MULTIPATH_QL=m
+CONFIG_DM_MULTIPATH_ST=m
+CONFIG_DM_DELAY=m
+CONFIG_DM_UEVENT=y
+CONFIG_DM_FLAKEY=m
+CONFIG_DM_VERITY=m
+CONFIG_DM_SWITCH=m
+CONFIG_TARGET_CORE=m
+CONFIG_TCM_IBLOCK=m
+CONFIG_TCM_FILEIO=m
+CONFIG_TCM_PSCSI=m
+CONFIG_LOOPBACK_TARGET=m
+CONFIG_TCM_FC=m
+CONFIG_ISCSI_TARGET=m
+CONFIG_SBP_TARGET=m
+CONFIG_FUSION=y
+CONFIG_FUSION_SPI=m
+CONFIG_FUSION_FC=m
+CONFIG_FUSION_SAS=m
+CONFIG_FUSION_MAX_SGE=128
+CONFIG_FUSION_CTL=m
+# CONFIG_FUSION_LOGGING is not set
+
+#
+# IEEE 1394 (FireWire) support
+#
+CONFIG_FIREWIRE=m
+CONFIG_FIREWIRE_OHCI=m
+CONFIG_FIREWIRE_SBP2=m
+CONFIG_FIREWIRE_NET=m
+CONFIG_FIREWIRE_NOSY=m
+CONFIG_I2O=m
+CONFIG_I2O_LCT_NOTIFY_ON_CHANGES=y
+CONFIG_I2O_EXT_ADAPTEC=y
+CONFIG_I2O_CONFIG=m
+CONFIG_I2O_CONFIG_OLD_IOCTL=y
+CONFIG_I2O_BUS=m
+CONFIG_I2O_BLOCK=m
+CONFIG_I2O_SCSI=m
+CONFIG_I2O_PROC=m
+CONFIG_MACINTOSH_DRIVERS=y
+CONFIG_MAC_EMUMOUSEBTN=y
+CONFIG_NETDEVICES=y
+CONFIG_MII=m
+CONFIG_NET_CORE=y
+CONFIG_BONDING=m
+CONFIG_DUMMY=m
+CONFIG_EQUALIZER=m
+# CONFIG_NET_FC is not set
+CONFIG_IFB=m
+CONFIG_NET_TEAM=m
+CONFIG_NET_TEAM_MODE_BROADCAST=m
+CONFIG_NET_TEAM_MODE_ROUNDROBIN=m
+CONFIG_NET_TEAM_MODE_RANDOM=m
+CONFIG_NET_TEAM_MODE_ACTIVEBACKUP=m
+CONFIG_NET_TEAM_MODE_LOADBALANCE=m
+CONFIG_MACVLAN=m
+CONFIG_MACVTAP=m
+CONFIG_VXLAN=m
+CONFIG_NETCONSOLE=m
+CONFIG_NETCONSOLE_DYNAMIC=y
+CONFIG_NETPOLL=y
+# CONFIG_NETPOLL_TRAP is not set
+CONFIG_NET_POLL_CONTROLLER=y
+CONFIG_RIONET=m
+CONFIG_RIONET_TX_SIZE=128
+CONFIG_RIONET_RX_SIZE=128
+CONFIG_TUN=m
+CONFIG_VETH=m
+CONFIG_VIRTIO_NET=m
+CONFIG_NLMON=m
+CONFIG_SUNGEM_PHY=m
+# CONFIG_ARCNET is not set
+CONFIG_ATM_DRIVERS=y
+# CONFIG_ATM_DUMMY is not set
+CONFIG_ATM_TCP=m
+CONFIG_ATM_LANAI=m
+CONFIG_ATM_ENI=m
+# CONFIG_ATM_ENI_DEBUG is not set
+# CONFIG_ATM_ENI_TUNE_BURST is not set
+CONFIG_ATM_FIRESTREAM=m
+CONFIG_ATM_ZATM=m
+# CONFIG_ATM_ZATM_DEBUG is not set
+CONFIG_ATM_NICSTAR=m
+# CONFIG_ATM_NICSTAR_USE_SUNI is not set
+# CONFIG_ATM_NICSTAR_USE_IDT77105 is not set
+CONFIG_ATM_IDT77252=m
+# CONFIG_ATM_IDT77252_DEBUG is not set
+# CONFIG_ATM_IDT77252_RCV_ALL is not set
+CONFIG_ATM_IDT77252_USE_SUNI=y
+CONFIG_ATM_AMBASSADOR=m
+# CONFIG_ATM_AMBASSADOR_DEBUG is not set
+CONFIG_ATM_HORIZON=m
+# CONFIG_ATM_HORIZON_DEBUG is not set
+CONFIG_ATM_IA=m
+# CONFIG_ATM_IA_DEBUG is not set
+CONFIG_ATM_FORE200E=m
+# CONFIG_ATM_FORE200E_USE_TASKLET is not set
+CONFIG_ATM_FORE200E_TX_RETRY=16
+CONFIG_ATM_FORE200E_DEBUG=0
+CONFIG_ATM_HE=m
+# CONFIG_ATM_HE_USE_SUNI is not set
+CONFIG_ATM_SOLOS=m
+
+#
+# CAIF transport drivers
+#
+CONFIG_CAIF_TTY=m
+CONFIG_CAIF_SPI_SLAVE=m
+CONFIG_CAIF_SPI_SYNC=y
+CONFIG_CAIF_HSI=m
+CONFIG_CAIF_VIRTIO=m
+CONFIG_VHOST_NET=m
+CONFIG_VHOST_SCSI=m
+CONFIG_VHOST_RING=m
+CONFIG_VHOST=m
+
+#
+# Distributed Switch Architecture drivers
+#
+CONFIG_NET_DSA_MV88E6XXX=m
+CONFIG_NET_DSA_MV88E6060=m
+CONFIG_NET_DSA_MV88E6XXX_NEED_PPU=y
+CONFIG_NET_DSA_MV88E6131=m
+CONFIG_NET_DSA_MV88E6123_61_65=m
+CONFIG_ETHERNET=y
+CONFIG_MDIO=m
+CONFIG_NET_VENDOR_3COM=y
+CONFIG_EL3=m
+CONFIG_3C515=m
+CONFIG_PCMCIA_3C574=m
+CONFIG_PCMCIA_3C589=m
+CONFIG_VORTEX=m
+CONFIG_TYPHOON=m
+CONFIG_NET_VENDOR_ADAPTEC=y
+CONFIG_ADAPTEC_STARFIRE=m
+CONFIG_NET_VENDOR_ALTEON=y
+CONFIG_ACENIC=m
+# CONFIG_ACENIC_OMIT_TIGON_I is not set
+CONFIG_NET_VENDOR_AMD=y
+CONFIG_AMD8111_ETH=m
+CONFIG_LANCE=m
+CONFIG_PCNET32=m
+CONFIG_PCMCIA_NMCLAN=m
+CONFIG_NI65=m
+CONFIG_NET_VENDOR_ARC=y
+CONFIG_ARC_EMAC=m
+CONFIG_NET_VENDOR_ATHEROS=y
+CONFIG_ATL2=m
+CONFIG_ATL1=m
+CONFIG_ATL1E=m
+CONFIG_ATL1C=m
+CONFIG_ALX=m
+CONFIG_NET_CADENCE=y
+CONFIG_ARM_AT91_ETHER=m
+CONFIG_MACB=m
+CONFIG_NET_VENDOR_BROADCOM=y
+CONFIG_B44=m
+CONFIG_B44_PCI_AUTOSELECT=y
+CONFIG_B44_PCICORE_AUTOSELECT=y
+CONFIG_B44_PCI=y
+CONFIG_BNX2=m
+CONFIG_CNIC=m
+CONFIG_TIGON3=m
+CONFIG_BNX2X=m
+CONFIG_BNX2X_SRIOV=y
+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
+CONFIG_CHELSIO_T3=m
+CONFIG_CHELSIO_T4=m
+CONFIG_CHELSIO_T4VF=m
+CONFIG_NET_VENDOR_CIRRUS=y
+CONFIG_CS89x0=m
+# CONFIG_CS89x0_PLATFORM is not set
+CONFIG_NET_VENDOR_CISCO=y
+CONFIG_ENIC=m
+CONFIG_DNET=m
+CONFIG_NET_VENDOR_DEC=y
+CONFIG_NET_TULIP=y
+CONFIG_DE2104X=m
+CONFIG_DE2104X_DSL=0
+CONFIG_TULIP=m
+# CONFIG_TULIP_MWI is not set
+# CONFIG_TULIP_MMIO is not set
+# CONFIG_TULIP_NAPI is not set
+CONFIG_DE4X5=m
+CONFIG_WINBOND_840=m
+CONFIG_DM9102=m
+CONFIG_ULI526X=m
+CONFIG_PCMCIA_XIRCOM=m
+CONFIG_NET_VENDOR_DLINK=y
+CONFIG_DL2K=m
+CONFIG_SUNDANCE=m
+# CONFIG_SUNDANCE_MMIO is not set
+CONFIG_NET_VENDOR_EMULEX=y
+CONFIG_BE2NET=m
+CONFIG_NET_VENDOR_EXAR=y
+CONFIG_S2IO=m
+CONFIG_VXGE=m
+# CONFIG_VXGE_DEBUG_TRACE_ALL is not set
+CONFIG_NET_VENDOR_FUJITSU=y
+CONFIG_PCMCIA_FMVJ18X=m
+CONFIG_NET_VENDOR_HP=y
+CONFIG_HP100=m
+CONFIG_NET_VENDOR_INTEL=y
+CONFIG_E100=m
+CONFIG_E1000=m
+CONFIG_E1000E=m
+CONFIG_IGB=m
+CONFIG_IGB_HWMON=y
+CONFIG_IGB_DCA=y
+CONFIG_IGBVF=m
+CONFIG_IXGB=m
+CONFIG_IXGBE=m
+CONFIG_IXGBE_HWMON=y
+CONFIG_IXGBE_DCA=y
+CONFIG_IXGBEVF=m
+CONFIG_I40E=m
+CONFIG_NET_VENDOR_I825XX=y
+CONFIG_IP1000=m
+CONFIG_JME=m
+CONFIG_NET_VENDOR_MARVELL=y
+CONFIG_MVMDIO=m
+CONFIG_SKGE=m
+# CONFIG_SKGE_DEBUG is not set
+CONFIG_SKGE_GENESIS=y
+CONFIG_SKY2=m
+# CONFIG_SKY2_DEBUG is not set
+CONFIG_NET_VENDOR_MELLANOX=y
+CONFIG_MLX4_EN=m
+CONFIG_MLX4_CORE=m
+CONFIG_MLX4_DEBUG=y
+# CONFIG_MLX5_CORE is not set
+CONFIG_NET_VENDOR_MICREL=y
+CONFIG_KS8842=m
+# CONFIG_KS8851 is not set
+CONFIG_KS8851_MLL=m
+CONFIG_KSZ884X_PCI=m
+CONFIG_NET_VENDOR_MICROCHIP=y
+# CONFIG_ENC28J60 is not set
+CONFIG_NET_VENDOR_MYRI=y
+CONFIG_MYRI10GE=m
+CONFIG_MYRI10GE_DCA=y
+CONFIG_FEALNX=m
+CONFIG_NET_VENDOR_NATSEMI=y
+CONFIG_NATSEMI=m
+CONFIG_NS83820=m
+CONFIG_NET_VENDOR_8390=y
+CONFIG_PCMCIA_AXNET=m
+CONFIG_NE2000=m
+CONFIG_NE2K_PCI=m
+CONFIG_PCMCIA_PCNET=m
+CONFIG_ULTRA=m
+CONFIG_WD80x3=m
+CONFIG_NET_VENDOR_NVIDIA=y
+CONFIG_FORCEDETH=m
+CONFIG_NET_VENDOR_OKI=y
+CONFIG_PCH_GBE=m
+CONFIG_ETHOC=m
+CONFIG_NET_PACKET_ENGINE=y
+CONFIG_HAMACHI=m
+CONFIG_YELLOWFIN=m
+CONFIG_NET_VENDOR_QLOGIC=y
+CONFIG_QLA3XXX=m
+CONFIG_QLCNIC=m
+CONFIG_QLCNIC_SRIOV=y
+CONFIG_QLGE=m
+CONFIG_NETXEN_NIC=m
+CONFIG_NET_VENDOR_REALTEK=y
+CONFIG_ATP=m
+CONFIG_8139CP=m
+CONFIG_8139TOO=m
+# CONFIG_8139TOO_PIO is not set
+CONFIG_8139TOO_TUNE_TWISTER=y
+CONFIG_8139TOO_8129=y
+# CONFIG_8139_OLD_RX_RESET is not set
+CONFIG_R8169=m
+CONFIG_SH_ETH=m
+CONFIG_NET_VENDOR_RDC=y
+CONFIG_R6040=m
+CONFIG_NET_VENDOR_SEEQ=y
+CONFIG_NET_VENDOR_SILAN=y
+CONFIG_SC92031=m
+CONFIG_NET_VENDOR_SIS=y
+CONFIG_SIS900=m
+CONFIG_SIS190=m
+CONFIG_SFC=m
+CONFIG_SFC_MTD=y
+CONFIG_SFC_MCDI_MON=y
+CONFIG_SFC_SRIOV=y
+CONFIG_NET_VENDOR_SMSC=y
+CONFIG_SMC9194=m
+CONFIG_PCMCIA_SMC91C92=m
+CONFIG_EPIC100=m
+CONFIG_SMSC911X=m
+# CONFIG_SMSC911X_ARCH_HOOKS is not set
+CONFIG_SMSC9420=m
+CONFIG_NET_VENDOR_STMICRO=y
+CONFIG_STMMAC_ETH=m
+# CONFIG_STMMAC_PLATFORM is not set
+CONFIG_STMMAC_PCI=y
+# CONFIG_STMMAC_DEBUG_FS is not set
+# CONFIG_STMMAC_DA is not set
+CONFIG_NET_VENDOR_SUN=y
+CONFIG_HAPPYMEAL=m
+CONFIG_SUNGEM=m
+CONFIG_CASSINI=m
+CONFIG_NIU=m
+CONFIG_NET_VENDOR_TEHUTI=y
+CONFIG_TEHUTI=m
+CONFIG_NET_VENDOR_TI=y
+CONFIG_TLAN=m
+CONFIG_NET_VENDOR_VIA=y
+CONFIG_VIA_RHINE=m
+# CONFIG_VIA_RHINE_MMIO is not set
+CONFIG_VIA_VELOCITY=m
+CONFIG_NET_VENDOR_WIZNET=y
+CONFIG_WIZNET_W5100=m
+CONFIG_WIZNET_W5300=m
+# CONFIG_WIZNET_BUS_DIRECT is not set
+# CONFIG_WIZNET_BUS_INDIRECT is not set
+CONFIG_WIZNET_BUS_ANY=y
+CONFIG_NET_VENDOR_XIRCOM=y
+CONFIG_PCMCIA_XIRC2PS=m
+# CONFIG_FDDI is not set
+# CONFIG_HIPPI is not set
+CONFIG_NET_SB1000=m
+CONFIG_PHYLIB=m
+
+#
+# MII PHY device drivers
+#
+CONFIG_AT803X_PHY=m
+CONFIG_AMD_PHY=m
+CONFIG_MARVELL_PHY=m
+CONFIG_DAVICOM_PHY=m
+CONFIG_QSEMI_PHY=m
+CONFIG_LXT_PHY=m
+CONFIG_CICADA_PHY=m
+CONFIG_VITESSE_PHY=m
+CONFIG_SMSC_PHY=m
+CONFIG_BROADCOM_PHY=m
+CONFIG_BCM87XX_PHY=m
+CONFIG_ICPLUS_PHY=m
+CONFIG_REALTEK_PHY=m
+CONFIG_NATIONAL_PHY=m
+CONFIG_STE10XP=m
+CONFIG_LSI_ET1011C_PHY=m
+CONFIG_MICREL_PHY=m
+CONFIG_MDIO_BITBANG=m
+# CONFIG_MDIO_GPIO is not set
+CONFIG_MDIO_BUS_MUX=m
+CONFIG_MDIO_BUS_MUX_GPIO=m
+CONFIG_MDIO_BUS_MUX_MMIOREG=m
+# CONFIG_MICREL_KS8995MA is not set
+CONFIG_PLIP=m
+CONFIG_PPP=m
+CONFIG_PPP_BSDCOMP=m
+CONFIG_PPP_DEFLATE=m
+CONFIG_PPP_FILTER=y
+CONFIG_PPP_MPPE=m
+CONFIG_PPP_MULTILINK=y
+CONFIG_PPPOATM=m
+CONFIG_PPPOE=m
+CONFIG_PPTP=m
+CONFIG_PPPOL2TP=m
+CONFIG_PPP_ASYNC=m
+CONFIG_PPP_SYNC_TTY=m
+CONFIG_SLIP=m
+CONFIG_SLHC=m
+# CONFIG_SLIP_COMPRESSED is not set
+# CONFIG_SLIP_SMART is not set
+# CONFIG_SLIP_MODE_SLIP6 is not set
+
+#
+# USB Network Adapters
+#
+CONFIG_USB_CATC=m
+CONFIG_USB_KAWETH=m
+CONFIG_USB_PEGASUS=m
+CONFIG_USB_RTL8150=m
+CONFIG_USB_RTL8152=m
+CONFIG_USB_USBNET=m
+CONFIG_USB_NET_AX8817X=m
+CONFIG_USB_NET_AX88179_178A=m
+CONFIG_USB_NET_CDCETHER=m
+CONFIG_USB_NET_CDC_EEM=m
+CONFIG_USB_NET_CDC_NCM=m
+CONFIG_USB_NET_CDC_MBIM=m
+CONFIG_USB_NET_DM9601=m
+CONFIG_USB_NET_SR9700=m
+CONFIG_USB_NET_SMSC75XX=m
+CONFIG_USB_NET_SMSC95XX=m
+CONFIG_USB_NET_GL620A=m
+CONFIG_USB_NET_NET1080=m
+CONFIG_USB_NET_PLUSB=m
+CONFIG_USB_NET_MCS7830=m
+CONFIG_USB_NET_RNDIS_HOST=m
+CONFIG_USB_NET_CDC_SUBSET=m
+CONFIG_USB_ALI_M5632=y
+CONFIG_USB_AN2720=y
+CONFIG_USB_BELKIN=y
+CONFIG_USB_ARMLINUX=y
+CONFIG_USB_EPSON2888=y
+CONFIG_USB_KC2190=y
+CONFIG_USB_NET_ZAURUS=m
+CONFIG_USB_NET_CX82310_ETH=m
+CONFIG_USB_NET_KALMIA=m
+CONFIG_USB_NET_QMI_WWAN=m
+CONFIG_USB_HSO=m
+CONFIG_USB_NET_INT51X1=m
+CONFIG_USB_CDC_PHONET=m
+CONFIG_USB_IPHETH=m
+CONFIG_USB_SIERRA_NET=m
+CONFIG_USB_VL600=m
+CONFIG_WLAN=y
+CONFIG_PCMCIA_RAYCS=m
+CONFIG_LIBERTAS_THINFIRM=m
+# CONFIG_LIBERTAS_THINFIRM_DEBUG is not set
+CONFIG_LIBERTAS_THINFIRM_USB=m
+CONFIG_AIRO=m
+CONFIG_ATMEL=m
+CONFIG_PCI_ATMEL=m
+CONFIG_PCMCIA_ATMEL=m
+CONFIG_AT76C50X_USB=m
+CONFIG_AIRO_CS=m
+CONFIG_PCMCIA_WL3501=m
+CONFIG_PRISM54=m
+CONFIG_USB_ZD1201=m
+CONFIG_USB_NET_RNDIS_WLAN=m
+CONFIG_RTL8180=m
+CONFIG_RTL8187=m
+CONFIG_RTL8187_LEDS=y
+CONFIG_ADM8211=m
+# CONFIG_MAC80211_HWSIM is not set
+CONFIG_MWL8K=m
+CONFIG_ATH_COMMON=m
+CONFIG_ATH_CARDS=m
+# CONFIG_ATH_DEBUG is not set
+CONFIG_ATH5K=m
+# CONFIG_ATH5K_DEBUG is not set
+# CONFIG_ATH5K_TRACER is not set
+CONFIG_ATH5K_PCI=y
+CONFIG_ATH9K_HW=m
+CONFIG_ATH9K_COMMON=m
+CONFIG_ATH9K_BTCOEX_SUPPORT=y
+CONFIG_ATH9K=m
+CONFIG_ATH9K_PCI=y
+CONFIG_ATH9K_AHB=y
+# CONFIG_ATH9K_DEBUGFS is not set
+# CONFIG_ATH9K_LEGACY_RATE_CONTROL is not set
+CONFIG_ATH9K_RFKILL=y
+CONFIG_ATH9K_HTC=m
+# CONFIG_ATH9K_HTC_DEBUGFS is not set
+CONFIG_CARL9170=m
+CONFIG_CARL9170_LEDS=y
+CONFIG_CARL9170_WPC=y
+# CONFIG_CARL9170_HWRNG is not set
+CONFIG_ATH6KL=m
+CONFIG_ATH6KL_SDIO=m
+CONFIG_ATH6KL_USB=m
+# CONFIG_ATH6KL_DEBUG is not set
+# CONFIG_ATH6KL_TRACING is not set
+CONFIG_AR5523=m
+CONFIG_WIL6210=m
+CONFIG_WIL6210_ISR_COR=y
+# CONFIG_WIL6210_TRACING is not set
+CONFIG_ATH10K=m
+CONFIG_ATH10K_PCI=m
+# CONFIG_ATH10K_DEBUG is not set
+CONFIG_ATH10K_DEBUGFS=y
+# CONFIG_ATH10K_TRACING is not set
+CONFIG_B43=m
+CONFIG_B43_BCMA=y
+CONFIG_B43_SSB=y
+CONFIG_B43_PCI_AUTOSELECT=y
+CONFIG_B43_PCICORE_AUTOSELECT=y
+CONFIG_B43_PCMCIA=y
+CONFIG_B43_SDIO=y
+CONFIG_B43_BCMA_PIO=y
+CONFIG_B43_PIO=y
+CONFIG_B43_PHY_N=y
+CONFIG_B43_PHY_LP=y
+CONFIG_B43_PHY_HT=y
+CONFIG_B43_LEDS=y
+CONFIG_B43_HWRNG=y
+# CONFIG_B43_DEBUG is not set
+CONFIG_B43LEGACY=m
+CONFIG_B43LEGACY_PCI_AUTOSELECT=y
+CONFIG_B43LEGACY_PCICORE_AUTOSELECT=y
+CONFIG_B43LEGACY_LEDS=y
+CONFIG_B43LEGACY_HWRNG=y
+# CONFIG_B43LEGACY_DEBUG is not set
+CONFIG_B43LEGACY_DMA=y
+CONFIG_B43LEGACY_PIO=y
+CONFIG_B43LEGACY_DMA_AND_PIO_MODE=y
+# CONFIG_B43LEGACY_DMA_MODE is not set
+# CONFIG_B43LEGACY_PIO_MODE is not set
+CONFIG_BRCMUTIL=m
+CONFIG_BRCMSMAC=m
+CONFIG_BRCMFMAC=m
+CONFIG_BRCMFMAC_SDIO=y
+CONFIG_BRCMFMAC_USB=y
+# CONFIG_BRCM_TRACING is not set
+# CONFIG_BRCMDBG is not set
+CONFIG_HOSTAP=m
+CONFIG_HOSTAP_FIRMWARE=y
+# CONFIG_HOSTAP_FIRMWARE_NVRAM is not set
+CONFIG_HOSTAP_PLX=m
+CONFIG_HOSTAP_PCI=m
+CONFIG_HOSTAP_CS=m
+# CONFIG_IPW2100 is not set
+# CONFIG_IPW2200 is not set
+CONFIG_IWLWIFI=m
+CONFIG_IWLDVM=m
+CONFIG_IWLMVM=m
+CONFIG_IWLWIFI_OPMODE_MODULAR=y
+
+#
+# Debugging Options
+#
+# CONFIG_IWLWIFI_DEBUG is not set
+CONFIG_IWLWIFI_DEVICE_TRACING=y
+CONFIG_IWLEGACY=m
+CONFIG_IWL4965=m
+CONFIG_IWL3945=m
+
+#
+# iwl3945 / iwl4965 Debugging Options
+#
+# CONFIG_IWLEGACY_DEBUG is not set
+CONFIG_LIBERTAS=m
+CONFIG_LIBERTAS_USB=m
+CONFIG_LIBERTAS_CS=m
+CONFIG_LIBERTAS_SDIO=m
+# CONFIG_LIBERTAS_SPI is not set
+# CONFIG_LIBERTAS_DEBUG is not set
+CONFIG_LIBERTAS_MESH=y
+CONFIG_HERMES=m
+CONFIG_HERMES_PRISM=y
+CONFIG_HERMES_CACHE_FW_ON_INIT=y
+CONFIG_PLX_HERMES=m
+CONFIG_TMD_HERMES=m
+CONFIG_NORTEL_HERMES=m
+CONFIG_PCI_HERMES=m
+CONFIG_PCMCIA_HERMES=m
+CONFIG_PCMCIA_SPECTRUM=m
+CONFIG_ORINOCO_USB=m
+CONFIG_P54_COMMON=m
+CONFIG_P54_USB=m
+CONFIG_P54_PCI=m
+# CONFIG_P54_SPI is not set
+CONFIG_P54_LEDS=y
+CONFIG_RT2X00=m
+CONFIG_RT2400PCI=m
+CONFIG_RT2500PCI=m
+CONFIG_RT61PCI=m
+CONFIG_RT2800PCI=m
+CONFIG_RT2800PCI_RT33XX=y
+CONFIG_RT2800PCI_RT35XX=y
+CONFIG_RT2800PCI_RT53XX=y
+CONFIG_RT2800PCI_RT3290=y
+CONFIG_RT2500USB=m
+CONFIG_RT73USB=m
+CONFIG_RT2800USB=m
+CONFIG_RT2800USB_RT33XX=y
+CONFIG_RT2800USB_RT35XX=y
+CONFIG_RT2800USB_RT3573=y
+CONFIG_RT2800USB_RT53XX=y
+CONFIG_RT2800USB_RT55XX=y
+CONFIG_RT2800USB_UNKNOWN=y
+CONFIG_RT2800_LIB=m
+CONFIG_RT2X00_LIB_MMIO=m
+CONFIG_RT2X00_LIB_PCI=m
+CONFIG_RT2X00_LIB_USB=m
+CONFIG_RT2X00_LIB=m
+CONFIG_RT2X00_LIB_FIRMWARE=y
+CONFIG_RT2X00_LIB_CRYPTO=y
+CONFIG_RT2X00_LIB_LEDS=y
+# CONFIG_RT2X00_DEBUG is not set
+CONFIG_RTL_CARDS=m
+CONFIG_RTL8192CE=m
+CONFIG_RTL8192SE=m
+CONFIG_RTL8192DE=m
+CONFIG_RTL8723AE=m
+CONFIG_RTL8188EE=m
+CONFIG_RTL8192CU=m
+CONFIG_RTLWIFI=m
+CONFIG_RTLWIFI_PCI=m
+CONFIG_RTLWIFI_USB=m
+# CONFIG_RTLWIFI_DEBUG is not set
+CONFIG_RTL8192C_COMMON=m
+CONFIG_WL_TI=y
+CONFIG_WL1251=m
+# CONFIG_WL1251_SPI is not set
+CONFIG_WL1251_SDIO=m
+CONFIG_WL12XX=m
+CONFIG_WL18XX=m
+CONFIG_WLCORE=m
+# CONFIG_WLCORE_SPI is not set
+CONFIG_WLCORE_SDIO=m
+CONFIG_WILINK_PLATFORM_DATA=y
+CONFIG_ZD1211RW=m
+# CONFIG_ZD1211RW_DEBUG is not set
+CONFIG_MWIFIEX=m
+CONFIG_MWIFIEX_SDIO=m
+CONFIG_MWIFIEX_PCIE=m
+CONFIG_MWIFIEX_USB=m
+CONFIG_CW1200=m
+CONFIG_CW1200_WLAN_SDIO=m
+CONFIG_CW1200_WLAN_SPI=m
+
+#
+# WiMAX Wireless Broadband devices
+#
+CONFIG_WIMAX_I2400M=m
+CONFIG_WIMAX_I2400M_USB=m
+CONFIG_WIMAX_I2400M_DEBUG_LEVEL=8
+# CONFIG_WAN is not set
+CONFIG_IEEE802154_DRIVERS=m
+CONFIG_IEEE802154_FAKEHARD=m
+CONFIG_IEEE802154_FAKELB=m
+CONFIG_IEEE802154_AT86RF230=m
+# CONFIG_IEEE802154_MRF24J40 is not set
+CONFIG_VMXNET3=m
+CONFIG_HYPERV_NET=m
+CONFIG_ISDN=y
+CONFIG_ISDN_I4L=m
+CONFIG_ISDN_PPP=y
+CONFIG_ISDN_PPP_VJ=y
+CONFIG_ISDN_MPP=y
+CONFIG_IPPP_FILTER=y
+CONFIG_ISDN_PPP_BSDCOMP=m
+CONFIG_ISDN_AUDIO=y
+CONFIG_ISDN_TTY_FAX=y
+
+#
+# ISDN feature submodules
+#
+CONFIG_ISDN_DIVERSION=m
+
+#
+# ISDN4Linux hardware drivers
+#
+
+#
+# Passive cards
+#
+CONFIG_ISDN_DRV_HISAX=m
+
+#
+# D-channel protocol features
+#
+CONFIG_HISAX_EURO=y
+CONFIG_DE_AOC=y
+# CONFIG_HISAX_NO_SENDCOMPLETE is not set
+# CONFIG_HISAX_NO_LLC is not set
+# CONFIG_HISAX_NO_KEYPAD is not set
+CONFIG_HISAX_1TR6=y
+CONFIG_HISAX_NI1=y
+CONFIG_HISAX_MAX_CARDS=8
+
+#
+# HiSax supported cards
+#
+CONFIG_HISAX_16_0=y
+CONFIG_HISAX_16_3=y
+CONFIG_HISAX_TELESPCI=y
+CONFIG_HISAX_S0BOX=y
+CONFIG_HISAX_AVM_A1=y
+CONFIG_HISAX_FRITZPCI=y
+CONFIG_HISAX_AVM_A1_PCMCIA=y
+CONFIG_HISAX_ELSA=y
+CONFIG_HISAX_IX1MICROR2=y
+CONFIG_HISAX_DIEHLDIVA=y
+CONFIG_HISAX_ASUSCOM=y
+CONFIG_HISAX_TELEINT=y
+CONFIG_HISAX_HFCS=y
+CONFIG_HISAX_SEDLBAUER=y
+CONFIG_HISAX_SPORTSTER=y
+CONFIG_HISAX_MIC=y
+CONFIG_HISAX_NETJET=y
+CONFIG_HISAX_NETJET_U=y
+CONFIG_HISAX_NICCY=y
+CONFIG_HISAX_ISURF=y
+CONFIG_HISAX_HSTSAPHIR=y
+CONFIG_HISAX_BKM_A4T=y
+CONFIG_HISAX_SCT_QUADRO=y
+CONFIG_HISAX_GAZEL=y
+CONFIG_HISAX_HFC_PCI=y
+CONFIG_HISAX_W6692=y
+CONFIG_HISAX_HFC_SX=y
+CONFIG_HISAX_ENTERNOW_PCI=y
+# CONFIG_HISAX_DEBUG is not set
+
+#
+# HiSax PCMCIA card service modules
+#
+CONFIG_HISAX_SEDLBAUER_CS=m
+CONFIG_HISAX_ELSA_CS=m
+CONFIG_HISAX_AVM_A1_CS=m
+CONFIG_HISAX_TELES_CS=m
+
+#
+# HiSax sub driver modules
+#
+CONFIG_HISAX_ST5481=m
+CONFIG_HISAX_HFCUSB=m
+CONFIG_HISAX_HFC4S8S=m
+CONFIG_HISAX_FRITZ_PCIPNP=m
+
+#
+# Active cards
+#
+CONFIG_ISDN_DRV_ICN=m
+CONFIG_ISDN_DRV_PCBIT=m
+CONFIG_ISDN_DRV_SC=m
+CONFIG_ISDN_DRV_ACT2000=m
+CONFIG_ISDN_CAPI=m
+CONFIG_ISDN_DRV_AVMB1_VERBOSE_REASON=y
+CONFIG_CAPI_TRACE=y
+CONFIG_ISDN_CAPI_MIDDLEWARE=y
+CONFIG_ISDN_CAPI_CAPI20=m
+CONFIG_ISDN_CAPI_CAPIDRV=m
+
+#
+# CAPI hardware drivers
+#
+CONFIG_CAPI_AVM=y
+CONFIG_ISDN_DRV_AVMB1_B1ISA=m
+CONFIG_ISDN_DRV_AVMB1_B1PCI=m
+CONFIG_ISDN_DRV_AVMB1_B1PCIV4=y
+CONFIG_ISDN_DRV_AVMB1_T1ISA=m
+CONFIG_ISDN_DRV_AVMB1_B1PCMCIA=m
+CONFIG_ISDN_DRV_AVMB1_AVM_CS=m
+CONFIG_ISDN_DRV_AVMB1_T1PCI=m
+CONFIG_ISDN_DRV_AVMB1_C4=m
+CONFIG_CAPI_EICON=y
+CONFIG_ISDN_DIVAS=m
+CONFIG_ISDN_DIVAS_BRIPCI=y
+CONFIG_ISDN_DIVAS_PRIPCI=y
+CONFIG_ISDN_DIVAS_DIVACAPI=m
+CONFIG_ISDN_DIVAS_USERIDI=m
+CONFIG_ISDN_DIVAS_MAINT=m
+CONFIG_ISDN_DRV_GIGASET=m
+CONFIG_GIGASET_CAPI=y
+# CONFIG_GIGASET_I4L is not set
+# CONFIG_GIGASET_DUMMYLL is not set
+CONFIG_GIGASET_BASE=m
+CONFIG_GIGASET_M105=m
+CONFIG_GIGASET_M101=m
+# CONFIG_GIGASET_DEBUG is not set
+CONFIG_HYSDN=m
+CONFIG_HYSDN_CAPI=y
+CONFIG_MISDN=m
+CONFIG_MISDN_DSP=m
+CONFIG_MISDN_L1OIP=m
+
+#
+# mISDN hardware drivers
+#
+CONFIG_MISDN_HFCPCI=m
+CONFIG_MISDN_HFCMULTI=m
+CONFIG_MISDN_HFCUSB=m
+CONFIG_MISDN_AVMFRITZ=m
+CONFIG_MISDN_SPEEDFAX=m
+CONFIG_MISDN_INFINEON=m
+CONFIG_MISDN_W6692=m
+CONFIG_MISDN_NETJET=m
+CONFIG_MISDN_IPAC=m
+CONFIG_MISDN_ISAR=m
+CONFIG_ISDN_HDLC=m
+
+#
+# Input device support
+#
+CONFIG_INPUT=y
+CONFIG_INPUT_FF_MEMLESS=m
+CONFIG_INPUT_POLLDEV=m
+CONFIG_INPUT_SPARSEKMAP=m
+CONFIG_INPUT_MATRIXKMAP=m
+
+#
+# Userland interfaces
+#
+CONFIG_INPUT_MOUSEDEV=y
+CONFIG_INPUT_MOUSEDEV_PSAUX=y
+CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024
+CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
+CONFIG_INPUT_JOYDEV=m
+CONFIG_INPUT_EVDEV=m
+# CONFIG_INPUT_EVBUG is not set
+
+#
+# Input Device Drivers
+#
+CONFIG_INPUT_KEYBOARD=y
+CONFIG_KEYBOARD_ADP5588=m
+CONFIG_KEYBOARD_ADP5589=m
+CONFIG_KEYBOARD_ATKBD=y
+CONFIG_KEYBOARD_QT1070=m
+CONFIG_KEYBOARD_QT2160=m
+# CONFIG_KEYBOARD_LKKBD is not set
+# CONFIG_KEYBOARD_GPIO is not set
+# CONFIG_KEYBOARD_GPIO_POLLED is not set
+CONFIG_KEYBOARD_TCA6416=m
+CONFIG_KEYBOARD_TCA8418=m
+CONFIG_KEYBOARD_MATRIX=m
+# CONFIG_KEYBOARD_LM8323 is not set
+CONFIG_KEYBOARD_LM8333=m
+# CONFIG_KEYBOARD_MAX7359 is not set
+CONFIG_KEYBOARD_MCS=m
+CONFIG_KEYBOARD_MPR121=m
+# CONFIG_KEYBOARD_NEWTON is not set
+# CONFIG_KEYBOARD_OPENCORES is not set
+# CONFIG_KEYBOARD_STOWAWAY is not set
+# CONFIG_KEYBOARD_SUNKBD is not set
+# CONFIG_KEYBOARD_XTKBD is not set
+CONFIG_INPUT_MOUSE=y
+CONFIG_MOUSE_PS2=m
+CONFIG_MOUSE_PS2_ALPS=y
+CONFIG_MOUSE_PS2_LOGIPS2PP=y
+CONFIG_MOUSE_PS2_SYNAPTICS=y
+CONFIG_MOUSE_PS2_CYPRESS=y
+CONFIG_MOUSE_PS2_LIFEBOOK=y
+CONFIG_MOUSE_PS2_TRACKPOINT=y
+CONFIG_MOUSE_PS2_ELANTECH=y
+CONFIG_MOUSE_PS2_SENTELIC=y
+# CONFIG_MOUSE_PS2_TOUCHKIT is not set
+CONFIG_MOUSE_PS2_OLPC=y
+CONFIG_MOUSE_SERIAL=y
+CONFIG_MOUSE_APPLETOUCH=m
+CONFIG_MOUSE_BCM5974=m
+CONFIG_MOUSE_CYAPA=m
+CONFIG_MOUSE_INPORT=m
+# CONFIG_MOUSE_ATIXL is not set
+CONFIG_MOUSE_LOGIBM=m
+CONFIG_MOUSE_PC110PAD=m
+CONFIG_MOUSE_VSXXXAA=m
+# CONFIG_MOUSE_GPIO is not set
+CONFIG_MOUSE_SYNAPTICS_I2C=m
+CONFIG_MOUSE_SYNAPTICS_USB=m
+CONFIG_INPUT_JOYSTICK=y
+CONFIG_JOYSTICK_ANALOG=m
+CONFIG_JOYSTICK_A3D=m
+CONFIG_JOYSTICK_ADI=m
+CONFIG_JOYSTICK_COBRA=m
+CONFIG_JOYSTICK_GF2K=m
+CONFIG_JOYSTICK_GRIP=m
+CONFIG_JOYSTICK_GRIP_MP=m
+CONFIG_JOYSTICK_GUILLEMOT=m
+CONFIG_JOYSTICK_INTERACT=m
+CONFIG_JOYSTICK_SIDEWINDER=m
+CONFIG_JOYSTICK_TMDC=m
+CONFIG_JOYSTICK_IFORCE=m
+CONFIG_JOYSTICK_IFORCE_USB=y
+CONFIG_JOYSTICK_IFORCE_232=y
+CONFIG_JOYSTICK_WARRIOR=m
+CONFIG_JOYSTICK_MAGELLAN=m
+CONFIG_JOYSTICK_SPACEORB=m
+CONFIG_JOYSTICK_SPACEBALL=m
+CONFIG_JOYSTICK_STINGER=m
+CONFIG_JOYSTICK_TWIDJOY=m
+CONFIG_JOYSTICK_ZHENHUA=m
+CONFIG_JOYSTICK_DB9=m
+CONFIG_JOYSTICK_GAMECON=m
+CONFIG_JOYSTICK_TURBOGRAFX=m
+CONFIG_JOYSTICK_AS5011=m
+CONFIG_JOYSTICK_JOYDUMP=m
+CONFIG_JOYSTICK_XPAD=m
+CONFIG_JOYSTICK_XPAD_FF=y
+CONFIG_JOYSTICK_XPAD_LEDS=y
+CONFIG_JOYSTICK_WALKERA0701=m
+CONFIG_INPUT_TABLET=y
+CONFIG_TABLET_USB_ACECAD=m
+CONFIG_TABLET_USB_AIPTEK=m
+CONFIG_TABLET_USB_GTCO=m
+CONFIG_TABLET_USB_HANWANG=m
+CONFIG_TABLET_USB_KBTAB=m
+CONFIG_TABLET_USB_WACOM=m
+CONFIG_INPUT_TOUCHSCREEN=y
+# CONFIG_TOUCHSCREEN_ADS7846 is not set
+# CONFIG_TOUCHSCREEN_AD7877 is not set
+CONFIG_TOUCHSCREEN_AD7879=m
+CONFIG_TOUCHSCREEN_AD7879_I2C=m
+# CONFIG_TOUCHSCREEN_AD7879_SPI is not set
+CONFIG_TOUCHSCREEN_ATMEL_MXT=m
+CONFIG_TOUCHSCREEN_AUO_PIXCIR=m
+CONFIG_TOUCHSCREEN_BU21013=m
+CONFIG_TOUCHSCREEN_CY8CTMG110=m
+CONFIG_TOUCHSCREEN_CYTTSP_CORE=m
+CONFIG_TOUCHSCREEN_CYTTSP_I2C=m
+# CONFIG_TOUCHSCREEN_CYTTSP_SPI is not set
+CONFIG_TOUCHSCREEN_CYTTSP4_CORE=m
+CONFIG_TOUCHSCREEN_CYTTSP4_I2C=m
+CONFIG_TOUCHSCREEN_CYTTSP4_SPI=m
+CONFIG_TOUCHSCREEN_DYNAPRO=m
+CONFIG_TOUCHSCREEN_HAMPSHIRE=m
+CONFIG_TOUCHSCREEN_EETI=m
+CONFIG_TOUCHSCREEN_EGALAX=m
+CONFIG_TOUCHSCREEN_FUJITSU=m
+CONFIG_TOUCHSCREEN_ILI210X=m
+CONFIG_TOUCHSCREEN_GUNZE=m
+CONFIG_TOUCHSCREEN_ELO=m
+CONFIG_TOUCHSCREEN_WACOM_W8001=m
+CONFIG_TOUCHSCREEN_WACOM_I2C=m
+CONFIG_TOUCHSCREEN_MAX11801=m
+CONFIG_TOUCHSCREEN_MCS5000=m
+CONFIG_TOUCHSCREEN_MMS114=m
+CONFIG_TOUCHSCREEN_MTOUCH=m
+CONFIG_TOUCHSCREEN_INEXIO=m
+CONFIG_TOUCHSCREEN_MK712=m
+CONFIG_TOUCHSCREEN_HTCPEN=m
+CONFIG_TOUCHSCREEN_PENMOUNT=m
+CONFIG_TOUCHSCREEN_EDT_FT5X06=m
+CONFIG_TOUCHSCREEN_TOUCHRIGHT=m
+CONFIG_TOUCHSCREEN_TOUCHWIN=m
+CONFIG_TOUCHSCREEN_TI_AM335X_TSC=m
+CONFIG_TOUCHSCREEN_UCB1400=m
+CONFIG_TOUCHSCREEN_PIXCIR=m
+CONFIG_TOUCHSCREEN_WM97XX=m
+CONFIG_TOUCHSCREEN_WM9705=y
+CONFIG_TOUCHSCREEN_WM9712=y
+CONFIG_TOUCHSCREEN_WM9713=y
+CONFIG_TOUCHSCREEN_USB_COMPOSITE=m
+CONFIG_TOUCHSCREEN_MC13783=m
+CONFIG_TOUCHSCREEN_USB_EGALAX=y
+CONFIG_TOUCHSCREEN_USB_PANJIT=y
+CONFIG_TOUCHSCREEN_USB_3M=y
+CONFIG_TOUCHSCREEN_USB_ITM=y
+CONFIG_TOUCHSCREEN_USB_ETURBO=y
+CONFIG_TOUCHSCREEN_USB_GUNZE=y
+CONFIG_TOUCHSCREEN_USB_DMC_TSC10=y
+CONFIG_TOUCHSCREEN_USB_IRTOUCH=y
+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
+CONFIG_TOUCHSCREEN_USB_NEXIO=y
+CONFIG_TOUCHSCREEN_USB_EASYTOUCH=y
+CONFIG_TOUCHSCREEN_TOUCHIT213=m
+CONFIG_TOUCHSCREEN_TSC_SERIO=m
+# CONFIG_TOUCHSCREEN_TSC2005 is not set
+CONFIG_TOUCHSCREEN_TSC2007=m
+CONFIG_TOUCHSCREEN_ST1232=m
+CONFIG_TOUCHSCREEN_TPS6507X=m
+CONFIG_INPUT_MISC=y
+CONFIG_INPUT_AD714X=m
+CONFIG_INPUT_AD714X_I2C=m
+CONFIG_INPUT_AD714X_SPI=m
+CONFIG_INPUT_BMA150=m
+CONFIG_INPUT_PCSPKR=m
+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 is not set
+CONFIG_INPUT_WISTRON_BTNS=m
+CONFIG_INPUT_ATLAS_BTNS=m
+CONFIG_INPUT_ATI_REMOTE2=m
+CONFIG_INPUT_KEYSPAN_REMOTE=m
+CONFIG_INPUT_KXTJ9=m
+# CONFIG_INPUT_KXTJ9_POLLED_MODE is not set
+CONFIG_INPUT_POWERMATE=m
+CONFIG_INPUT_YEALINK=m
+CONFIG_INPUT_CM109=m
+CONFIG_INPUT_RETU_PWRBUTTON=m
+CONFIG_INPUT_UINPUT=m
+CONFIG_INPUT_PCF50633_PMU=m
+CONFIG_INPUT_PCF8574=m
+# CONFIG_INPUT_PWM_BEEPER is not set
+CONFIG_INPUT_GPIO_ROTARY_ENCODER=m
+CONFIG_INPUT_ADXL34X=m
+CONFIG_INPUT_ADXL34X_I2C=m
+CONFIG_INPUT_ADXL34X_SPI=m
+# CONFIG_INPUT_IMS_PCU is not set
+CONFIG_INPUT_CMA3000=m
+CONFIG_INPUT_CMA3000_I2C=m
+CONFIG_INPUT_IDEAPAD_SLIDEBAR=m
+
+#
+# Hardware I/O ports
+#
+CONFIG_SERIO=y
+CONFIG_SERIO_I8042=y
+CONFIG_SERIO_SERPORT=m
+CONFIG_SERIO_CT82C710=m
+CONFIG_SERIO_PARKBD=m
+CONFIG_SERIO_PCIPS2=m
+CONFIG_SERIO_LIBPS2=y
+CONFIG_SERIO_RAW=m
+CONFIG_SERIO_ALTERA_PS2=m
+CONFIG_SERIO_PS2MULT=m
+CONFIG_SERIO_ARC_PS2=m
+CONFIG_SERIO_APBPS2=m
+CONFIG_SERIO_OLPC_APSP=m
+CONFIG_GAMEPORT=m
+CONFIG_GAMEPORT_NS558=m
+CONFIG_GAMEPORT_L4=m
+CONFIG_GAMEPORT_EMU10K1=m
+CONFIG_GAMEPORT_FM801=m
+
+#
+# Character devices
+#
+CONFIG_TTY=y
+CONFIG_VT=y
+CONFIG_CONSOLE_TRANSLATIONS=y
+CONFIG_VT_CONSOLE=y
+CONFIG_VT_CONSOLE_SLEEP=y
+CONFIG_HW_CONSOLE=y
+CONFIG_VT_HW_CONSOLE_BINDING=y
+CONFIG_UNIX98_PTYS=y
+CONFIG_DEVPTS_MULTIPLE_INSTANCES=y
+# CONFIG_LEGACY_PTYS is not set
+CONFIG_SERIAL_NONSTANDARD=y
+CONFIG_ROCKETPORT=m
+CONFIG_CYCLADES=m
+# CONFIG_CYZ_INTR is not set
+# CONFIG_MOXA_INTELLIO is not set
+# CONFIG_MOXA_SMARTIO is not set
+CONFIG_SYNCLINK=m
+CONFIG_SYNCLINKMP=m
+# CONFIG_SYNCLINK_GT is not set
+CONFIG_NOZOMI=m
+# CONFIG_ISI is not set
+CONFIG_N_HDLC=m
+CONFIG_N_GSM=m
+CONFIG_TRACE_ROUTER=m
+CONFIG_TRACE_SINK=m
+# CONFIG_DEVKMEM is not set
+
+#
+# Serial drivers
+#
+CONFIG_SERIAL_8250=y
+# CONFIG_SERIAL_8250_DEPRECATED_OPTIONS is not set
+CONFIG_SERIAL_8250_PNP=y
+CONFIG_SERIAL_8250_CONSOLE=y
+CONFIG_FIX_EARLYCON_MEM=y
+CONFIG_SERIAL_8250_DMA=y
+CONFIG_SERIAL_8250_PCI=y
+CONFIG_SERIAL_8250_CS=m
+CONFIG_SERIAL_8250_NR_UARTS=32
+CONFIG_SERIAL_8250_RUNTIME_UARTS=4
+# CONFIG_SERIAL_8250_EXTENDED is not set
+CONFIG_SERIAL_8250_DW=m
+
+#
+# Non-8250 serial port support
+#
+# CONFIG_SERIAL_MAX3100 is not set
+# CONFIG_SERIAL_MAX310X is not set
+CONFIG_SERIAL_MFD_HSU=m
+CONFIG_SERIAL_CORE=y
+CONFIG_SERIAL_CORE_CONSOLE=y
+CONFIG_SERIAL_JSM=m
+CONFIG_SERIAL_OF_PLATFORM=m
+CONFIG_SERIAL_SCCNXP=m
+# CONFIG_SERIAL_TIMBERDALE is not set
+CONFIG_SERIAL_ALTERA_JTAGUART=m
+CONFIG_SERIAL_ALTERA_UART=m
+CONFIG_SERIAL_ALTERA_UART_MAXPORTS=4
+CONFIG_SERIAL_ALTERA_UART_BAUDRATE=115200
+# CONFIG_SERIAL_IFX6X60 is not set
+CONFIG_SERIAL_PCH_UART=m
+CONFIG_SERIAL_XILINX_PS_UART=m
+CONFIG_SERIAL_ARC=m
+CONFIG_SERIAL_ARC_NR_PORTS=1
+CONFIG_SERIAL_RP2=m
+CONFIG_SERIAL_RP2_NR_UARTS=32
+CONFIG_SERIAL_FSL_LPUART=m
+CONFIG_SERIAL_ST_ASC=m
+CONFIG_PRINTER=m
+# CONFIG_LP_CONSOLE is not set
+CONFIG_PPDEV=m
+CONFIG_HVC_DRIVER=y
+CONFIG_VIRTIO_CONSOLE=y
+CONFIG_IPMI_HANDLER=m
+# CONFIG_IPMI_PANIC_EVENT is not set
+CONFIG_IPMI_DEVICE_INTERFACE=m
+CONFIG_IPMI_SI=m
+CONFIG_IPMI_WATCHDOG=m
+CONFIG_IPMI_POWEROFF=m
+CONFIG_HW_RANDOM=y
+CONFIG_HW_RANDOM_TIMERIOMEM=m
+CONFIG_HW_RANDOM_INTEL=m
+CONFIG_HW_RANDOM_AMD=m
+CONFIG_HW_RANDOM_GEODE=m
+CONFIG_HW_RANDOM_VIA=m
+CONFIG_HW_RANDOM_VIRTIO=m
+CONFIG_HW_RANDOM_TPM=m
+CONFIG_NVRAM=m
+CONFIG_DTLK=m
+CONFIG_R3964=m
+CONFIG_APPLICOM=m
+CONFIG_SONYPI=m
+
+#
+# PCMCIA character devices
+#
+CONFIG_SYNCLINK_CS=m
+CONFIG_CARDMAN_4000=m
+CONFIG_CARDMAN_4040=m
+CONFIG_IPWIRELESS=m
+CONFIG_MWAVE=m
+CONFIG_PC8736x_GPIO=m
+CONFIG_NSC_GPIO=m
+# CONFIG_RAW_DRIVER is not set
+CONFIG_HPET=y
+CONFIG_HPET_MMAP=y
+CONFIG_HANGCHECK_TIMER=m
+CONFIG_TCG_TPM=m
+CONFIG_TCG_TIS=m
+CONFIG_TCG_TIS_I2C_INFINEON=m
+CONFIG_TCG_NSC=m
+CONFIG_TCG_ATMEL=m
+CONFIG_TCG_INFINEON=m
+CONFIG_TCG_ST33_I2C=m
+CONFIG_TELCLOCK=m
+CONFIG_DEVPORT=y
+CONFIG_I2C=m
+CONFIG_I2C_BOARDINFO=y
+CONFIG_I2C_COMPAT=y
+CONFIG_I2C_CHARDEV=m
+# CONFIG_I2C_MUX is not set
+CONFIG_I2C_HELPER_AUTO=y
+CONFIG_I2C_SMBUS=m
+CONFIG_I2C_ALGOBIT=m
+CONFIG_I2C_ALGOPCA=m
+
+#
+# I2C Hardware Bus support
+#
+
+#
+# PC SMBus host controller drivers
+#
+CONFIG_I2C_ALI1535=m
+CONFIG_I2C_ALI1563=m
+CONFIG_I2C_ALI15X3=m
+CONFIG_I2C_AMD756=m
+CONFIG_I2C_AMD756_S4882=m
+CONFIG_I2C_AMD8111=m
+CONFIG_I2C_I801=m
+CONFIG_I2C_ISCH=m
+CONFIG_I2C_ISMT=m
+CONFIG_I2C_PIIX4=m
+CONFIG_I2C_NFORCE2=m
+CONFIG_I2C_NFORCE2_S4985=m
+CONFIG_I2C_SIS5595=m
+CONFIG_I2C_SIS630=m
+CONFIG_I2C_SIS96X=m
+CONFIG_I2C_VIA=m
+CONFIG_I2C_VIAPRO=m
+
+#
+# ACPI drivers
+#
+CONFIG_I2C_SCMI=m
+
+#
+# I2C system bus drivers (mostly embedded / system-on-chip)
+#
+# CONFIG_I2C_CBUS_GPIO is not set
+CONFIG_I2C_DESIGNWARE_CORE=m
+CONFIG_I2C_DESIGNWARE_PCI=m
+CONFIG_I2C_EG20T=m
+# CONFIG_I2C_GPIO is not set
+CONFIG_I2C_OCORES=m
+CONFIG_I2C_PCA_PLATFORM=m
+CONFIG_I2C_PXA=m
+CONFIG_I2C_PXA_PCI=y
+CONFIG_I2C_SIMTEC=m
+CONFIG_I2C_XILINX=m
+
+#
+# External I2C/SMBus adapter drivers
+#
+CONFIG_I2C_DIOLAN_U2C=m
+CONFIG_I2C_PARPORT=m
+CONFIG_I2C_PARPORT_LIGHT=m
+CONFIG_I2C_TAOS_EVM=m
+CONFIG_I2C_TINY_USB=m
+CONFIG_I2C_VIPERBOARD=m
+
+#
+# Other I2C/SMBus bus drivers
+#
+CONFIG_I2C_PCA_ISA=m
+CONFIG_SCx200_ACB=m
+# CONFIG_I2C_STUB is not set
+# CONFIG_I2C_DEBUG_CORE is not set
+# CONFIG_I2C_DEBUG_ALGO is not set
+# CONFIG_I2C_DEBUG_BUS is not set
+CONFIG_SPI=y
+# CONFIG_SPI_DEBUG is not set
+CONFIG_SPI_MASTER=y
+
+#
+# SPI Master Controller Drivers
+#
+# CONFIG_SPI_ALTERA is not set
+# CONFIG_SPI_BITBANG is not set
+# CONFIG_SPI_BUTTERFLY is not set
+# CONFIG_SPI_GPIO is not set
+# CONFIG_SPI_LM70_LLP is not set
+# CONFIG_SPI_FSL_SPI is not set
+# CONFIG_SPI_FSL_DSPI is not set
+# CONFIG_SPI_OC_TINY is not set
+# CONFIG_SPI_PXA2XX is not set
+# CONFIG_SPI_PXA2XX_PCI is not set
+# CONFIG_SPI_SC18IS602 is not set
+# CONFIG_SPI_TOPCLIFF_PCH is not set
+# CONFIG_SPI_XCOMM is not set
+# CONFIG_SPI_XILINX is not set
+# CONFIG_SPI_DESIGNWARE is not set
+
+#
+# SPI Protocol Masters
+#
+# CONFIG_SPI_SPIDEV is not set
+# CONFIG_SPI_TLE62X0 is not set
+# CONFIG_HSI is not set
+
+#
+# PPS support
+#
+CONFIG_PPS=m
+# CONFIG_PPS_DEBUG is not set
+
+#
+# PPS clients support
+#
+CONFIG_PPS_CLIENT_KTIMER=m
+CONFIG_PPS_CLIENT_LDISC=m
+CONFIG_PPS_CLIENT_PARPORT=m
+CONFIG_PPS_CLIENT_GPIO=m
+
+#
+# PPS generators support
+#
+
+#
+# PTP clock support
+#
+CONFIG_PTP_1588_CLOCK=m
+CONFIG_DP83640_PHY=m
+CONFIG_PTP_1588_CLOCK_PCH=m
+CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y
+CONFIG_GPIO_DEVRES=y
+CONFIG_GPIOLIB=y
+CONFIG_OF_GPIO=y
+CONFIG_GPIO_ACPI=y
+# CONFIG_DEBUG_GPIO is not set
+CONFIG_GPIO_SYSFS=y
+
+#
+# Memory mapped GPIO drivers:
+#
+# CONFIG_GPIO_GENERIC_PLATFORM is not set
+# CONFIG_GPIO_IT8761E is not set
+# CONFIG_GPIO_F7188X is not set
+# CONFIG_GPIO_TS5500 is not set
+CONFIG_GPIO_SCH=m
+CONFIG_GPIO_ICH=m
+# CONFIG_GPIO_VX855 is not set
+# CONFIG_GPIO_LYNXPOINT is not set
+# CONFIG_GPIO_GRGPIO is not set
+
+#
+# I2C GPIO expanders:
+#
+CONFIG_GPIO_ARIZONA=m
+# CONFIG_GPIO_MAX7300 is not set
+# CONFIG_GPIO_MAX732X is not set
+# CONFIG_GPIO_PCA953X is not set
+# CONFIG_GPIO_PCF857X is not set
+# CONFIG_GPIO_ADP5588 is not set
+# CONFIG_GPIO_ADNP is not set
+
+#
+# PCI GPIO expanders:
+#
+CONFIG_GPIO_CS5535=y
+CONFIG_GPIO_AMD8111=m
+# CONFIG_GPIO_LANGWELL is not set
+# CONFIG_GPIO_PCH is not set
+# CONFIG_GPIO_ML_IOH is not set
+# CONFIG_GPIO_SODAVILLE is not set
+# CONFIG_GPIO_RDC321X is not set
+
+#
+# SPI GPIO expanders:
+#
+# CONFIG_GPIO_MAX7301 is not set
+# CONFIG_GPIO_MCP23S08 is not set
+# CONFIG_GPIO_MC33880 is not set
+# CONFIG_GPIO_74X164 is not set
+
+#
+# AC97 GPIO expanders:
+#
+CONFIG_GPIO_UCB1400=y
+
+#
+# LPC GPIO expanders:
+#
+
+#
+# MODULbus GPIO expanders:
+#
+
+#
+# USB GPIO expanders:
+#
+CONFIG_GPIO_VIPERBOARD=m
+# CONFIG_W1 is not set
+CONFIG_POWER_SUPPLY=y
+# CONFIG_POWER_SUPPLY_DEBUG is not set
+CONFIG_PDA_POWER=m
+CONFIG_TEST_POWER=m
+# CONFIG_BATTERY_DS2780 is not set
+# CONFIG_BATTERY_DS2781 is not set
+# CONFIG_BATTERY_DS2782 is not set
+CONFIG_BATTERY_OLPC=m
+# CONFIG_BATTERY_SBS is not set
+# CONFIG_BATTERY_BQ27x00 is not set
+# CONFIG_BATTERY_MAX17040 is not set
+# CONFIG_BATTERY_MAX17042 is not set
+# CONFIG_CHARGER_PCF50633 is not set
+# CONFIG_CHARGER_ISP1704 is not set
+# CONFIG_CHARGER_MAX8903 is not set
+# CONFIG_CHARGER_LP8727 is not set
+# CONFIG_CHARGER_GPIO is not set
+# CONFIG_CHARGER_BQ2415X is not set
+# CONFIG_CHARGER_BQ24190 is not set
+# CONFIG_CHARGER_SMB347 is not set
+CONFIG_POWER_RESET=y
+CONFIG_POWER_RESET_GPIO=y
+CONFIG_POWER_AVS=y
+CONFIG_HWMON=y
+CONFIG_HWMON_VID=m
+# CONFIG_HWMON_DEBUG_CHIP is not set
+
+#
+# Native drivers
+#
+CONFIG_SENSORS_ABITUGURU=m
+CONFIG_SENSORS_ABITUGURU3=m
+# CONFIG_SENSORS_AD7314 is not set
+CONFIG_SENSORS_AD7414=m
+CONFIG_SENSORS_AD7418=m
+# CONFIG_SENSORS_ADCXX is not set
+CONFIG_SENSORS_ADM1021=m
+CONFIG_SENSORS_ADM1025=m
+CONFIG_SENSORS_ADM1026=m
+CONFIG_SENSORS_ADM1029=m
+CONFIG_SENSORS_ADM1031=m
+CONFIG_SENSORS_ADM9240=m
+CONFIG_SENSORS_ADT7X10=m
+CONFIG_SENSORS_ADT7310=m
+CONFIG_SENSORS_ADT7410=m
+CONFIG_SENSORS_ADT7411=m
+CONFIG_SENSORS_ADT7462=m
+CONFIG_SENSORS_ADT7470=m
+CONFIG_SENSORS_ADT7475=m
+CONFIG_SENSORS_ASC7621=m
+CONFIG_SENSORS_K8TEMP=m
+CONFIG_SENSORS_K10TEMP=m
+CONFIG_SENSORS_FAM15H_POWER=m
+CONFIG_SENSORS_ASB100=m
+CONFIG_SENSORS_ATXP1=m
+CONFIG_SENSORS_DS620=m
+CONFIG_SENSORS_DS1621=m
+CONFIG_SENSORS_I5K_AMB=m
+CONFIG_SENSORS_F71805F=m
+CONFIG_SENSORS_F71882FG=m
+CONFIG_SENSORS_F75375S=m
+CONFIG_SENSORS_FSCHMD=m
+CONFIG_SENSORS_G760A=m
+CONFIG_SENSORS_G762=m
+CONFIG_SENSORS_GL518SM=m
+CONFIG_SENSORS_GL520SM=m
+# CONFIG_SENSORS_GPIO_FAN is not set
+CONFIG_SENSORS_HIH6130=m
+CONFIG_SENSORS_HTU21=m
+CONFIG_SENSORS_CORETEMP=m
+CONFIG_SENSORS_IBMAEM=m
+CONFIG_SENSORS_IBMPEX=m
+CONFIG_SENSORS_IT87=m
+CONFIG_SENSORS_JC42=m
+CONFIG_SENSORS_LINEAGE=m
+CONFIG_SENSORS_LM63=m
+# CONFIG_SENSORS_LM70 is not set
+CONFIG_SENSORS_LM73=m
+CONFIG_SENSORS_LM75=m
+CONFIG_SENSORS_LM77=m
+CONFIG_SENSORS_LM78=m
+CONFIG_SENSORS_LM80=m
+CONFIG_SENSORS_LM83=m
+CONFIG_SENSORS_LM85=m
+CONFIG_SENSORS_LM87=m
+CONFIG_SENSORS_LM90=m
+CONFIG_SENSORS_LM92=m
+CONFIG_SENSORS_LM93=m
+CONFIG_SENSORS_LTC4151=m
+CONFIG_SENSORS_LTC4215=m
+CONFIG_SENSORS_LTC4245=m
+CONFIG_SENSORS_LTC4261=m
+CONFIG_SENSORS_LM95234=m
+CONFIG_SENSORS_LM95241=m
+CONFIG_SENSORS_LM95245=m
+# CONFIG_SENSORS_MAX1111 is not set
+CONFIG_SENSORS_MAX16065=m
+CONFIG_SENSORS_MAX1619=m
+CONFIG_SENSORS_MAX1668=m
+CONFIG_SENSORS_MAX197=m
+CONFIG_SENSORS_MAX6639=m
+CONFIG_SENSORS_MAX6642=m
+CONFIG_SENSORS_MAX6650=m
+CONFIG_SENSORS_MAX6697=m
+CONFIG_SENSORS_MCP3021=m
+CONFIG_SENSORS_NCT6775=m
+CONFIG_SENSORS_PC87360=m
+CONFIG_SENSORS_PC87427=m
+CONFIG_SENSORS_PCF8591=m
+CONFIG_PMBUS=m
+CONFIG_SENSORS_PMBUS=m
+CONFIG_SENSORS_ADM1275=m
+CONFIG_SENSORS_LM25066=m
+CONFIG_SENSORS_LTC2978=m
+CONFIG_SENSORS_MAX16064=m
+CONFIG_SENSORS_MAX34440=m
+CONFIG_SENSORS_MAX8688=m
+CONFIG_SENSORS_UCD9000=m
+CONFIG_SENSORS_UCD9200=m
+CONFIG_SENSORS_ZL6100=m
+CONFIG_SENSORS_SHT15=m
+CONFIG_SENSORS_SHT21=m
+CONFIG_SENSORS_SIS5595=m
+CONFIG_SENSORS_SMM665=m
+CONFIG_SENSORS_DME1737=m
+CONFIG_SENSORS_EMC1403=m
+CONFIG_SENSORS_EMC2103=m
+CONFIG_SENSORS_EMC6W201=m
+CONFIG_SENSORS_SMSC47M1=m
+CONFIG_SENSORS_SMSC47M192=m
+CONFIG_SENSORS_SMSC47B397=m
+CONFIG_SENSORS_SCH56XX_COMMON=m
+CONFIG_SENSORS_SCH5627=m
+CONFIG_SENSORS_SCH5636=m
+CONFIG_SENSORS_ADS1015=m
+CONFIG_SENSORS_ADS7828=m
+# CONFIG_SENSORS_ADS7871 is not set
+CONFIG_SENSORS_AMC6821=m
+CONFIG_SENSORS_INA209=m
+CONFIG_SENSORS_INA2XX=m
+CONFIG_SENSORS_THMC50=m
+CONFIG_SENSORS_TMP102=m
+CONFIG_SENSORS_TMP401=m
+CONFIG_SENSORS_TMP421=m
+CONFIG_SENSORS_VIA_CPUTEMP=m
+CONFIG_SENSORS_VIA686A=m
+CONFIG_SENSORS_VT1211=m
+CONFIG_SENSORS_VT8231=m
+CONFIG_SENSORS_W83781D=m
+CONFIG_SENSORS_W83791D=m
+CONFIG_SENSORS_W83792D=m
+CONFIG_SENSORS_W83793=m
+CONFIG_SENSORS_W83795=m
+# CONFIG_SENSORS_W83795_FANCTRL is not set
+CONFIG_SENSORS_W83L785TS=m
+CONFIG_SENSORS_W83L786NG=m
+CONFIG_SENSORS_W83627HF=m
+CONFIG_SENSORS_W83627EHF=m
+CONFIG_SENSORS_APPLESMC=m
+CONFIG_SENSORS_MC13783_ADC=m
+
+#
+# ACPI drivers
+#
+CONFIG_SENSORS_ACPI_POWER=m
+CONFIG_SENSORS_ATK0110=m
+CONFIG_THERMAL=y
+CONFIG_THERMAL_HWMON=y
+CONFIG_THERMAL_DEFAULT_GOV_STEP_WISE=y
+# CONFIG_THERMAL_DEFAULT_GOV_FAIR_SHARE is not set
+# CONFIG_THERMAL_DEFAULT_GOV_USER_SPACE is not set
+CONFIG_THERMAL_GOV_FAIR_SHARE=y
+CONFIG_THERMAL_GOV_STEP_WISE=y
+CONFIG_THERMAL_GOV_USER_SPACE=y
+# CONFIG_CPU_THERMAL is not set
+# CONFIG_THERMAL_EMULATION is not set
+CONFIG_INTEL_POWERCLAMP=m
+CONFIG_X86_PKG_TEMP_THERMAL=m
+
+#
+# Texas Instruments thermal drivers
+#
+CONFIG_WATCHDOG=y
+CONFIG_WATCHDOG_CORE=y
+# CONFIG_WATCHDOG_NOWAYOUT is not set
+
+#
+# Watchdog Device Drivers
+#
+CONFIG_SOFT_WATCHDOG=m
+CONFIG_RETU_WATCHDOG=m
+CONFIG_ACQUIRE_WDT=m
+CONFIG_ADVANTECH_WDT=m
+CONFIG_ALIM1535_WDT=m
+CONFIG_ALIM7101_WDT=m
+CONFIG_F71808E_WDT=m
+CONFIG_SP5100_TCO=m
+CONFIG_GEODE_WDT=m
+CONFIG_SC520_WDT=m
+CONFIG_SBC_FITPC2_WATCHDOG=m
+CONFIG_EUROTECH_WDT=m
+CONFIG_IB700_WDT=m
+CONFIG_IBMASR=m
+CONFIG_WAFER_WDT=m
+CONFIG_I6300ESB_WDT=m
+CONFIG_IE6XX_WDT=m
+CONFIG_ITCO_WDT=m
+CONFIG_ITCO_VENDOR_SUPPORT=y
+CONFIG_IT8712F_WDT=m
+CONFIG_IT87_WDT=m
+CONFIG_HP_WATCHDOG=m
+CONFIG_HPWDT_NMI_DECODING=y
+CONFIG_SC1200_WDT=m
+CONFIG_PC87413_WDT=m
+CONFIG_NV_TCO=m
+CONFIG_60XX_WDT=m
+CONFIG_SBC8360_WDT=m
+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
+CONFIG_W83877F_WDT=m
+CONFIG_W83977F_WDT=m
+CONFIG_MACHZ_WDT=m
+CONFIG_SBC_EPX_C3_WATCHDOG=m
+CONFIG_MEN_A21_WDT=m
+
+#
+# ISA-based Watchdog Cards
+#
+CONFIG_PCWATCHDOG=m
+CONFIG_MIXCOMWD=m
+CONFIG_WDT=m
+
+#
+# PCI-based Watchdog Cards
+#
+CONFIG_PCIPCWATCHDOG=m
+CONFIG_WDTPCI=m
+
+#
+# USB-based Watchdog Cards
+#
+CONFIG_USBPCWATCHDOG=m
+CONFIG_SSB_POSSIBLE=y
+
+#
+# Sonics Silicon Backplane
+#
+CONFIG_SSB=m
+CONFIG_SSB_SPROM=y
+CONFIG_SSB_BLOCKIO=y
+CONFIG_SSB_PCIHOST_POSSIBLE=y
+CONFIG_SSB_PCIHOST=y
+CONFIG_SSB_B43_PCI_BRIDGE=y
+CONFIG_SSB_PCMCIAHOST_POSSIBLE=y
+CONFIG_SSB_PCMCIAHOST=y
+CONFIG_SSB_SDIOHOST_POSSIBLE=y
+CONFIG_SSB_SDIOHOST=y
+# CONFIG_SSB_DEBUG is not set
+CONFIG_SSB_DRIVER_PCICORE_POSSIBLE=y
+CONFIG_SSB_DRIVER_PCICORE=y
+CONFIG_SSB_DRIVER_GPIO=y
+CONFIG_BCMA_POSSIBLE=y
+
+#
+# Broadcom specific AMBA
+#
+CONFIG_BCMA=m
+CONFIG_BCMA_BLOCKIO=y
+CONFIG_BCMA_HOST_PCI_POSSIBLE=y
+CONFIG_BCMA_HOST_PCI=y
+# CONFIG_BCMA_HOST_SOC is not set
+CONFIG_BCMA_DRIVER_GMAC_CMN=y
+CONFIG_BCMA_DRIVER_GPIO=y
+# CONFIG_BCMA_DEBUG is not set
+
+#
+# Multifunction device drivers
+#
+CONFIG_MFD_CORE=y
+CONFIG_MFD_CS5535=m
+# CONFIG_MFD_CROS_EC is not set
+# CONFIG_MFD_DA9052_SPI is not set
+CONFIG_MFD_MC13783=m
+CONFIG_MFD_MC13XXX=m
+# CONFIG_MFD_MC13XXX_SPI is not set
+CONFIG_MFD_MC13XXX_I2C=m
+CONFIG_HTC_PASIC3=m
+CONFIG_LPC_ICH=m
+CONFIG_LPC_SCH=m
+# CONFIG_MFD_JANZ_CMODIO is not set
+# CONFIG_MFD_KEMPLD is not set
+# CONFIG_EZX_PCAP is not set
+CONFIG_MFD_VIPERBOARD=m
+CONFIG_MFD_RETU=m
+CONFIG_MFD_PCF50633=m
+CONFIG_PCF50633_ADC=m
+CONFIG_PCF50633_GPIO=m
+CONFIG_UCB1400_CORE=m
+CONFIG_MFD_RDC321X=m
+CONFIG_MFD_RTSX_PCI=m
+CONFIG_MFD_SI476X_CORE=m
+CONFIG_MFD_SM501=m
+CONFIG_MFD_SM501_GPIO=y
+CONFIG_ABX500_CORE=y
+# CONFIG_MFD_STMPE is not set
+# CONFIG_MFD_SYSCON is not set
+CONFIG_MFD_TI_AM335X_TSCADC=m
+# CONFIG_TPS6105X is not set
+CONFIG_TPS65010=m
+CONFIG_TPS6507X=m
+CONFIG_MFD_TPS65217=m
+# CONFIG_MFD_TPS65912 is not set
+# CONFIG_MFD_TPS65912_SPI is not set
+CONFIG_MFD_WL1273_CORE=m
+CONFIG_MFD_LM3533=m
+# CONFIG_MFD_TIMBERDALE is not set
+# CONFIG_MFD_TMIO is not set
+CONFIG_MFD_VX855=m
+CONFIG_MFD_ARIZONA=y
+CONFIG_MFD_ARIZONA_I2C=m
+# CONFIG_MFD_ARIZONA_SPI is not set
+CONFIG_MFD_WM5102=y
+CONFIG_MFD_WM5110=y
+# CONFIG_MFD_WM8997 is not set
+# CONFIG_MFD_WM831X_SPI is not set
+# CONFIG_REGULATOR is not set
+CONFIG_MEDIA_SUPPORT=m
+
+#
+# Multimedia core support
+#
+CONFIG_MEDIA_CAMERA_SUPPORT=y
+CONFIG_MEDIA_ANALOG_TV_SUPPORT=y
+CONFIG_MEDIA_DIGITAL_TV_SUPPORT=y
+CONFIG_MEDIA_RADIO_SUPPORT=y
+CONFIG_MEDIA_RC_SUPPORT=y
+CONFIG_MEDIA_CONTROLLER=y
+CONFIG_VIDEO_DEV=m
+CONFIG_VIDEO_V4L2_SUBDEV_API=y
+CONFIG_VIDEO_V4L2=m
+# CONFIG_VIDEO_ADV_DEBUG is not set
+# CONFIG_VIDEO_FIXED_MINOR_RANGES is not set
+CONFIG_VIDEO_TUNER=m
+CONFIG_V4L2_MEM2MEM_DEV=m
+CONFIG_VIDEOBUF_GEN=m
+CONFIG_VIDEOBUF_DMA_SG=m
+CONFIG_VIDEOBUF_VMALLOC=m
+CONFIG_VIDEOBUF_DVB=m
+CONFIG_VIDEOBUF2_CORE=m
+CONFIG_VIDEOBUF2_MEMOPS=m
+CONFIG_VIDEOBUF2_DMA_CONTIG=m
+CONFIG_VIDEOBUF2_VMALLOC=m
+CONFIG_VIDEOBUF2_DMA_SG=m
+# CONFIG_VIDEO_V4L2_INT_DEVICE is not set
+CONFIG_DVB_CORE=m
+CONFIG_DVB_NET=y
+CONFIG_TTPCI_EEPROM=m
+CONFIG_DVB_MAX_ADAPTERS=8
+# CONFIG_DVB_DYNAMIC_MINORS is not set
+
+#
+# Media drivers
+#
+CONFIG_RC_CORE=m
+CONFIG_RC_MAP=m
+CONFIG_RC_DECODERS=y
+CONFIG_LIRC=m
+CONFIG_IR_LIRC_CODEC=m
+CONFIG_IR_NEC_DECODER=m
+CONFIG_IR_RC5_DECODER=m
+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_RC_DEVICES=y
+CONFIG_RC_ATI_REMOTE=m
+CONFIG_IR_ENE=m
+CONFIG_IR_IMON=m
+CONFIG_IR_MCEUSB=m
+CONFIG_IR_ITE_CIR=m
+CONFIG_IR_FINTEK=m
+CONFIG_IR_NUVOTON=m
+CONFIG_IR_REDRAT3=m
+CONFIG_IR_STREAMZAP=m
+CONFIG_IR_WINBOND_CIR=m
+CONFIG_IR_IGUANA=m
+CONFIG_IR_TTUSBIR=m
+CONFIG_RC_LOOPBACK=m
+CONFIG_IR_GPIO_CIR=m
+CONFIG_MEDIA_USB_SUPPORT=y
+
+#
+# Webcam devices
+#
+CONFIG_USB_VIDEO_CLASS=m
+CONFIG_USB_VIDEO_CLASS_INPUT_EVDEV=y
+CONFIG_USB_GSPCA=m
+CONFIG_USB_M5602=m
+CONFIG_USB_STV06XX=m
+CONFIG_USB_GL860=m
+CONFIG_USB_GSPCA_BENQ=m
+CONFIG_USB_GSPCA_CONEX=m
+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
+CONFIG_USB_GSPCA_MR97310A=m
+CONFIG_USB_GSPCA_NW80X=m
+CONFIG_USB_GSPCA_OV519=m
+CONFIG_USB_GSPCA_OV534=m
+CONFIG_USB_GSPCA_OV534_9=m
+CONFIG_USB_GSPCA_PAC207=m
+CONFIG_USB_GSPCA_PAC7302=m
+CONFIG_USB_GSPCA_PAC7311=m
+CONFIG_USB_GSPCA_SE401=m
+CONFIG_USB_GSPCA_SN9C2028=m
+CONFIG_USB_GSPCA_SN9C20X=m
+CONFIG_USB_GSPCA_SONIXB=m
+CONFIG_USB_GSPCA_SONIXJ=m
+CONFIG_USB_GSPCA_SPCA500=m
+CONFIG_USB_GSPCA_SPCA501=m
+CONFIG_USB_GSPCA_SPCA505=m
+CONFIG_USB_GSPCA_SPCA506=m
+CONFIG_USB_GSPCA_SPCA508=m
+CONFIG_USB_GSPCA_SPCA561=m
+CONFIG_USB_GSPCA_SPCA1528=m
+CONFIG_USB_GSPCA_SQ905=m
+CONFIG_USB_GSPCA_SQ905C=m
+CONFIG_USB_GSPCA_SQ930X=m
+CONFIG_USB_GSPCA_STK014=m
+CONFIG_USB_GSPCA_STK1135=m
+CONFIG_USB_GSPCA_STV0680=m
+CONFIG_USB_GSPCA_SUNPLUS=m
+CONFIG_USB_GSPCA_T613=m
+CONFIG_USB_GSPCA_TOPRO=m
+CONFIG_USB_GSPCA_TV8532=m
+CONFIG_USB_GSPCA_VC032X=m
+CONFIG_USB_GSPCA_VICAM=m
+CONFIG_USB_GSPCA_XIRLINK_CIT=m
+CONFIG_USB_GSPCA_ZC3XX=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_USB_SN9C102=m
+CONFIG_VIDEO_USBTV=m
+
+#
+# Analog TV USB devices
+#
+CONFIG_VIDEO_PVRUSB2=m
+CONFIG_VIDEO_PVRUSB2_SYSFS=y
+CONFIG_VIDEO_PVRUSB2_DVB=y
+# CONFIG_VIDEO_PVRUSB2_DEBUGIFC is not set
+CONFIG_VIDEO_HDPVR=m
+CONFIG_VIDEO_TLG2300=m
+CONFIG_VIDEO_USBVISION=m
+CONFIG_VIDEO_STK1160_COMMON=m
+CONFIG_VIDEO_STK1160_AC97=y
+CONFIG_VIDEO_STK1160=m
+
+#
+# Analog/digital TV USB devices
+#
+CONFIG_VIDEO_AU0828=m
+CONFIG_VIDEO_AU0828_V4L2=y
+CONFIG_VIDEO_CX231XX=m
+CONFIG_VIDEO_CX231XX_RC=y
+CONFIG_VIDEO_CX231XX_ALSA=m
+CONFIG_VIDEO_CX231XX_DVB=m
+CONFIG_VIDEO_TM6000=m
+CONFIG_VIDEO_TM6000_ALSA=m
+CONFIG_VIDEO_TM6000_DVB=m
+
+#
+# Digital TV USB devices
+#
+CONFIG_DVB_USB=m
+# CONFIG_DVB_USB_DEBUG is not set
+CONFIG_DVB_USB_A800=m
+CONFIG_DVB_USB_DIBUSB_MB=m
+CONFIG_DVB_USB_DIBUSB_MB_FAULTY=y
+CONFIG_DVB_USB_DIBUSB_MC=m
+CONFIG_DVB_USB_DIB0700=m
+CONFIG_DVB_USB_UMT_010=m
+CONFIG_DVB_USB_CXUSB=m
+CONFIG_DVB_USB_M920X=m
+CONFIG_DVB_USB_DIGITV=m
+CONFIG_DVB_USB_VP7045=m
+CONFIG_DVB_USB_VP702X=m
+CONFIG_DVB_USB_GP8PSK=m
+CONFIG_DVB_USB_NOVA_T_USB2=m
+CONFIG_DVB_USB_TTUSB2=m
+CONFIG_DVB_USB_DTT200U=m
+CONFIG_DVB_USB_OPERA1=m
+CONFIG_DVB_USB_AF9005=m
+CONFIG_DVB_USB_AF9005_REMOTE=m
+CONFIG_DVB_USB_PCTV452E=m
+CONFIG_DVB_USB_DW2102=m
+CONFIG_DVB_USB_CINERGY_T2=m
+CONFIG_DVB_USB_DTV5100=m
+CONFIG_DVB_USB_FRIIO=m
+CONFIG_DVB_USB_AZ6027=m
+CONFIG_DVB_USB_TECHNISAT_USB2=m
+CONFIG_DVB_USB_V2=m
+CONFIG_DVB_USB_AF9015=m
+CONFIG_DVB_USB_AF9035=m
+CONFIG_DVB_USB_ANYSEE=m
+CONFIG_DVB_USB_AU6610=m
+CONFIG_DVB_USB_AZ6007=m
+CONFIG_DVB_USB_CE6230=m
+CONFIG_DVB_USB_EC168=m
+CONFIG_DVB_USB_GL861=m
+CONFIG_DVB_USB_IT913X=m
+CONFIG_DVB_USB_LME2510=m
+CONFIG_DVB_USB_MXL111SF=m
+CONFIG_DVB_USB_RTL28XXU=m
+CONFIG_DVB_TTUSB_BUDGET=m
+CONFIG_DVB_TTUSB_DEC=m
+CONFIG_SMS_USB_DRV=m
+CONFIG_DVB_B2C2_FLEXCOP_USB=m
+# CONFIG_DVB_B2C2_FLEXCOP_USB_DEBUG is not set
+
+#
+# Webcam, TV (analog/digital) USB devices
+#
+CONFIG_VIDEO_EM28XX=m
+CONFIG_VIDEO_EM28XX_ALSA=m
+CONFIG_VIDEO_EM28XX_DVB=m
+CONFIG_VIDEO_EM28XX_RC=m
+CONFIG_MEDIA_PCI_SUPPORT=y
+
+#
+# Media capture support
+#
+CONFIG_VIDEO_MEYE=m
+
+#
+# Media capture/analog TV support
+#
+CONFIG_VIDEO_IVTV=m
+CONFIG_VIDEO_IVTV_ALSA=m
+CONFIG_VIDEO_FB_IVTV=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_HEXIUM_GEMINI=m
+CONFIG_VIDEO_HEXIUM_ORION=m
+CONFIG_VIDEO_MXB=m
+
+#
+# Media capture/analog/hybrid TV support
+#
+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_ENABLE_VP3054=y
+CONFIG_VIDEO_CX88_VP3054=m
+CONFIG_VIDEO_CX88_MPEG=m
+CONFIG_VIDEO_BT848=m
+CONFIG_DVB_BT8XX=m
+CONFIG_VIDEO_SAA7134=m
+CONFIG_VIDEO_SAA7134_ALSA=m
+CONFIG_VIDEO_SAA7134_RC=y
+CONFIG_VIDEO_SAA7134_DVB=m
+CONFIG_VIDEO_SAA7164=m
+
+#
+# Media digital TV PCI Adapters
+#
+CONFIG_DVB_AV7110=m
+CONFIG_DVB_AV7110_OSD=y
+CONFIG_DVB_BUDGET_CORE=m
+CONFIG_DVB_BUDGET=m
+CONFIG_DVB_BUDGET_CI=m
+CONFIG_DVB_BUDGET_AV=m
+CONFIG_DVB_BUDGET_PATCH=m
+CONFIG_DVB_B2C2_FLEXCOP_PCI=m
+# CONFIG_DVB_B2C2_FLEXCOP_PCI_DEBUG is not set
+CONFIG_DVB_PLUTO2=m
+CONFIG_DVB_DM1105=m
+CONFIG_DVB_PT1=m
+CONFIG_MANTIS_CORE=m
+CONFIG_DVB_MANTIS=m
+CONFIG_DVB_HOPPER=m
+CONFIG_DVB_NGENE=m
+CONFIG_DVB_DDBRIDGE=m
+# CONFIG_V4L_PLATFORM_DRIVERS is not set
+CONFIG_V4L_MEM2MEM_DRIVERS=y
+CONFIG_VIDEO_MEM2MEM_DEINTERLACE=m
+CONFIG_VIDEO_SH_VEU=m
+CONFIG_VIDEO_RENESAS_VSP1=m
+# CONFIG_V4L_TEST_DRIVERS is not set
+
+#
+# Supported MMC/SDIO adapters
+#
+CONFIG_SMS_SDIO_DRV=m
+CONFIG_MEDIA_PARPORT_SUPPORT=y
+CONFIG_VIDEO_BWQCAM=m
+CONFIG_VIDEO_CQCAM=m
+CONFIG_VIDEO_PMS=m
+CONFIG_VIDEO_W9966=m
+CONFIG_RADIO_ADAPTERS=y
+CONFIG_RADIO_TEA575X=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_RADIO_SHARK=m
+CONFIG_RADIO_SHARK2=m
+CONFIG_I2C_SI4713=m
+CONFIG_RADIO_SI4713=m
+CONFIG_USB_KEENE=m
+CONFIG_USB_MA901=m
+CONFIG_RADIO_TEA5764=m
+CONFIG_RADIO_SAA7706H=m
+CONFIG_RADIO_TEF6862=m
+CONFIG_RADIO_WL1273=m
+
+#
+# Texas Instruments WL128x FM driver (ST based)
+#
+CONFIG_RADIO_WL128X=m
+# CONFIG_V4L_RADIO_ISA_DRIVERS is not set
+
+#
+# Supported FireWire (IEEE 1394) Adapters
+#
+CONFIG_DVB_FIREDTV=m
+CONFIG_DVB_FIREDTV_INPUT=y
+CONFIG_MEDIA_COMMON_OPTIONS=y
+
+#
+# common driver options
+#
+CONFIG_VIDEO_CX2341X=m
+CONFIG_VIDEO_BTCX=m
+CONFIG_VIDEO_TVEEPROM=m
+CONFIG_CYPRESS_FIRMWARE=m
+CONFIG_DVB_B2C2_FLEXCOP=m
+CONFIG_VIDEO_SAA7146=m
+CONFIG_VIDEO_SAA7146_VV=m
+CONFIG_SMS_SIANO_MDTV=m
+CONFIG_SMS_SIANO_RC=y
+
+#
+# Media ancillary drivers (tuners, sensors, i2c, frontends)
+#
+CONFIG_MEDIA_SUBDRV_AUTOSELECT=y
+CONFIG_MEDIA_ATTACH=y
+CONFIG_VIDEO_IR_I2C=m
+
+#
+# Audio decoders, processors and mixers
+#
+CONFIG_VIDEO_TVAUDIO=m
+CONFIG_VIDEO_TDA7432=m
+CONFIG_VIDEO_TDA9840=m
+CONFIG_VIDEO_TEA6415C=m
+CONFIG_VIDEO_TEA6420=m
+CONFIG_VIDEO_MSP3400=m
+CONFIG_VIDEO_CS5345=m
+CONFIG_VIDEO_CS53L32A=m
+CONFIG_VIDEO_UDA1342=m
+CONFIG_VIDEO_WM8775=m
+CONFIG_VIDEO_WM8739=m
+CONFIG_VIDEO_VP27SMPX=m
+CONFIG_VIDEO_SONY_BTF_MPX=m
+
+#
+# RDS decoders
+#
+CONFIG_VIDEO_SAA6588=m
+
+#
+# Video decoders
+#
+CONFIG_VIDEO_BT819=m
+CONFIG_VIDEO_BT856=m
+CONFIG_VIDEO_BT866=m
+CONFIG_VIDEO_KS0127=m
+CONFIG_VIDEO_SAA7110=m
+CONFIG_VIDEO_SAA711X=m
+CONFIG_VIDEO_TVP5150=m
+CONFIG_VIDEO_TW2804=m
+CONFIG_VIDEO_TW9903=m
+CONFIG_VIDEO_TW9906=m
+CONFIG_VIDEO_VPX3220=m
+
+#
+# Video and audio decoders
+#
+CONFIG_VIDEO_SAA717X=m
+CONFIG_VIDEO_CX25840=m
+
+#
+# Video encoders
+#
+CONFIG_VIDEO_SAA7127=m
+CONFIG_VIDEO_SAA7185=m
+CONFIG_VIDEO_ADV7170=m
+CONFIG_VIDEO_ADV7175=m
+
+#
+# Camera sensor devices
+#
+CONFIG_VIDEO_OV7640=m
+CONFIG_VIDEO_MT9V011=m
+
+#
+# Flash devices
+#
+
+#
+# Video improvement chips
+#
+CONFIG_VIDEO_UPD64031A=m
+CONFIG_VIDEO_UPD64083=m
+
+#
+# Miscelaneous helper chips
+#
+CONFIG_VIDEO_M52790=m
+
+#
+# Sensors used on soc_camera driver
+#
+CONFIG_MEDIA_TUNER=m
+CONFIG_MEDIA_TUNER_SIMPLE=m
+CONFIG_MEDIA_TUNER_TDA8290=m
+CONFIG_MEDIA_TUNER_TDA827X=m
+CONFIG_MEDIA_TUNER_TDA18271=m
+CONFIG_MEDIA_TUNER_TDA9887=m
+CONFIG_MEDIA_TUNER_TEA5761=m
+CONFIG_MEDIA_TUNER_TEA5767=m
+CONFIG_MEDIA_TUNER_MT20XX=m
+CONFIG_MEDIA_TUNER_MT2060=m
+CONFIG_MEDIA_TUNER_MT2063=m
+CONFIG_MEDIA_TUNER_MT2266=m
+CONFIG_MEDIA_TUNER_MT2131=m
+CONFIG_MEDIA_TUNER_QT1010=m
+CONFIG_MEDIA_TUNER_XC2028=m
+CONFIG_MEDIA_TUNER_XC5000=m
+CONFIG_MEDIA_TUNER_XC4000=m
+CONFIG_MEDIA_TUNER_MXL5005S=m
+CONFIG_MEDIA_TUNER_MXL5007T=m
+CONFIG_MEDIA_TUNER_MC44S803=m
+CONFIG_MEDIA_TUNER_MAX2165=m
+CONFIG_MEDIA_TUNER_TDA18218=m
+CONFIG_MEDIA_TUNER_FC0011=m
+CONFIG_MEDIA_TUNER_FC0012=m
+CONFIG_MEDIA_TUNER_FC0013=m
+CONFIG_MEDIA_TUNER_TDA18212=m
+CONFIG_MEDIA_TUNER_E4000=m
+CONFIG_MEDIA_TUNER_FC2580=m
+CONFIG_MEDIA_TUNER_TUA9001=m
+CONFIG_MEDIA_TUNER_IT913X=m
+CONFIG_MEDIA_TUNER_R820T=m
+
+#
+# Multistandard (satellite) frontends
+#
+CONFIG_DVB_STB0899=m
+CONFIG_DVB_STB6100=m
+CONFIG_DVB_STV090x=m
+CONFIG_DVB_STV6110x=m
+
+#
+# Multistandard (cable + terrestrial) frontends
+#
+CONFIG_DVB_DRXK=m
+CONFIG_DVB_TDA18271C2DD=m
+
+#
+# DVB-S (satellite) frontends
+#
+CONFIG_DVB_CX24110=m
+CONFIG_DVB_CX24123=m
+CONFIG_DVB_MT312=m
+CONFIG_DVB_ZL10036=m
+CONFIG_DVB_ZL10039=m
+CONFIG_DVB_S5H1420=m
+CONFIG_DVB_STV0288=m
+CONFIG_DVB_STB6000=m
+CONFIG_DVB_STV0299=m
+CONFIG_DVB_STV6110=m
+CONFIG_DVB_STV0900=m
+CONFIG_DVB_TDA8083=m
+CONFIG_DVB_TDA10086=m
+CONFIG_DVB_TDA8261=m
+CONFIG_DVB_VES1X93=m
+CONFIG_DVB_TUNER_ITD1000=m
+CONFIG_DVB_TUNER_CX24113=m
+CONFIG_DVB_TDA826X=m
+CONFIG_DVB_TUA6100=m
+CONFIG_DVB_CX24116=m
+CONFIG_DVB_SI21XX=m
+CONFIG_DVB_TS2020=m
+CONFIG_DVB_DS3000=m
+CONFIG_DVB_MB86A16=m
+CONFIG_DVB_TDA10071=m
+
+#
+# DVB-T (terrestrial) frontends
+#
+CONFIG_DVB_SP8870=m
+CONFIG_DVB_SP887X=m
+CONFIG_DVB_CX22700=m
+CONFIG_DVB_CX22702=m
+CONFIG_DVB_DRXD=m
+CONFIG_DVB_L64781=m
+CONFIG_DVB_TDA1004X=m
+CONFIG_DVB_NXT6000=m
+CONFIG_DVB_MT352=m
+CONFIG_DVB_ZL10353=m
+CONFIG_DVB_DIB3000MB=m
+CONFIG_DVB_DIB3000MC=m
+CONFIG_DVB_DIB7000M=m
+CONFIG_DVB_DIB7000P=m
+CONFIG_DVB_TDA10048=m
+CONFIG_DVB_AF9013=m
+CONFIG_DVB_EC100=m
+CONFIG_DVB_STV0367=m
+CONFIG_DVB_CXD2820R=m
+CONFIG_DVB_RTL2830=m
+CONFIG_DVB_RTL2832=m
+
+#
+# DVB-C (cable) frontends
+#
+CONFIG_DVB_VES1820=m
+CONFIG_DVB_TDA10021=m
+CONFIG_DVB_TDA10023=m
+CONFIG_DVB_STV0297=m
+
+#
+# ATSC (North American/Korean Terrestrial/Cable DTV) frontends
+#
+CONFIG_DVB_NXT200X=m
+CONFIG_DVB_OR51211=m
+CONFIG_DVB_OR51132=m
+CONFIG_DVB_BCM3510=m
+CONFIG_DVB_LGDT330X=m
+CONFIG_DVB_LGDT3305=m
+CONFIG_DVB_LG2160=m
+CONFIG_DVB_S5H1409=m
+CONFIG_DVB_AU8522=m
+CONFIG_DVB_AU8522_DTV=m
+CONFIG_DVB_AU8522_V4L=m
+CONFIG_DVB_S5H1411=m
+
+#
+# ISDB-T (terrestrial) frontends
+#
+CONFIG_DVB_S921=m
+CONFIG_DVB_DIB8000=m
+CONFIG_DVB_MB86A20S=m
+
+#
+# Digital terrestrial only tuners/PLL
+#
+CONFIG_DVB_PLL=m
+CONFIG_DVB_TUNER_DIB0070=m
+CONFIG_DVB_TUNER_DIB0090=m
+
+#
+# SEC control devices for DVB-S
+#
+CONFIG_DVB_LNBP21=m
+CONFIG_DVB_LNBP22=m
+CONFIG_DVB_ISL6405=m
+CONFIG_DVB_ISL6421=m
+CONFIG_DVB_ISL6423=m
+CONFIG_DVB_A8293=m
+CONFIG_DVB_LGS8GXX=m
+CONFIG_DVB_ATBM8830=m
+CONFIG_DVB_TDA665x=m
+CONFIG_DVB_IX2505V=m
+CONFIG_DVB_IT913X_FE=m
+CONFIG_DVB_M88RS2000=m
+CONFIG_DVB_AF9033=m
+
+#
+# Tools to develop new frontends
+#
+# CONFIG_DVB_DUMMY_FE is not set
+
+#
+# Graphics support
+#
+CONFIG_AGP=m
+CONFIG_AGP_ALI=m
+CONFIG_AGP_ATI=m
+CONFIG_AGP_AMD=m
+CONFIG_AGP_AMD64=m
+CONFIG_AGP_INTEL=m
+CONFIG_AGP_NVIDIA=m
+CONFIG_AGP_SIS=m
+CONFIG_AGP_SWORKS=m
+CONFIG_AGP_VIA=m
+CONFIG_AGP_EFFICEON=m
+CONFIG_VGA_ARB=y
+CONFIG_VGA_ARB_MAX_GPUS=16
+CONFIG_VGA_SWITCHEROO=y
+CONFIG_DRM=m
+CONFIG_DRM_USB=m
+CONFIG_DRM_KMS_HELPER=m
+CONFIG_DRM_LOAD_EDID_FIRMWARE=y
+CONFIG_DRM_TTM=m
+
+#
+# I2C encoder or helper chips
+#
+CONFIG_DRM_I2C_CH7006=m
+CONFIG_DRM_I2C_SIL164=m
+CONFIG_DRM_I2C_NXP_TDA998X=m
+CONFIG_DRM_TDFX=m
+CONFIG_DRM_R128=m
+CONFIG_DRM_RADEON=m
+# CONFIG_DRM_RADEON_UMS is not set
+CONFIG_DRM_NOUVEAU=m
+CONFIG_NOUVEAU_DEBUG=5
+CONFIG_NOUVEAU_DEBUG_DEFAULT=3
+CONFIG_DRM_NOUVEAU_BACKLIGHT=y
+CONFIG_DRM_I915=m
+CONFIG_DRM_I915_KMS=y
+# CONFIG_DRM_I915_PRELIMINARY_HW_SUPPORT is not set
+CONFIG_DRM_MGA=m
+CONFIG_DRM_SIS=m
+CONFIG_DRM_VIA=m
+CONFIG_DRM_SAVAGE=m
+CONFIG_DRM_VMWGFX=m
+CONFIG_DRM_VMWGFX_FBCON=y
+CONFIG_DRM_GMA500=m
+CONFIG_DRM_GMA600=y
+CONFIG_DRM_GMA3600=y
+CONFIG_DRM_UDL=m
+CONFIG_DRM_AST=m
+CONFIG_DRM_MGAG200=m
+CONFIG_DRM_CIRRUS_QEMU=m
+CONFIG_DRM_QXL=m
+CONFIG_VGASTATE=m
+CONFIG_VIDEO_OUTPUT_CONTROL=m
+CONFIG_HDMI=y
+CONFIG_FB=y
+CONFIG_FIRMWARE_EDID=y
+CONFIG_FB_DDC=m
+CONFIG_FB_BOOT_VESA_SUPPORT=y
+CONFIG_FB_CFB_FILLRECT=y
+CONFIG_FB_CFB_COPYAREA=y
+CONFIG_FB_CFB_IMAGEBLIT=y
+# CONFIG_FB_CFB_REV_PIXELS_IN_BYTE is not set
+CONFIG_FB_SYS_FILLRECT=m
+CONFIG_FB_SYS_COPYAREA=m
+CONFIG_FB_SYS_IMAGEBLIT=m
+# CONFIG_FB_FOREIGN_ENDIAN is not set
+CONFIG_FB_SYS_FOPS=m
+CONFIG_FB_DEFERRED_IO=y
+# CONFIG_FB_SVGALIB is not set
+# CONFIG_FB_MACMODES is not set
+CONFIG_FB_BACKLIGHT=y
+CONFIG_FB_MODE_HELPERS=y
+CONFIG_FB_TILEBLITTING=y
+
+#
+# Frame buffer hardware drivers
+#
+# CONFIG_FB_CIRRUS is not set
+# CONFIG_FB_PM2 is not set
+# CONFIG_FB_CYBER2000 is not set
+# CONFIG_FB_ARC is not set
+# CONFIG_FB_ASILIANT is not set
+# CONFIG_FB_IMSTT is not set
+CONFIG_FB_VGA16=m
+CONFIG_FB_UVESA=m
+CONFIG_FB_VESA=y
+CONFIG_FB_EFI=y
+# CONFIG_FB_N411 is not set
+# CONFIG_FB_HGA is not set
+# CONFIG_FB_S1D13XXX is not set
+# CONFIG_FB_NVIDIA is not set
+# CONFIG_FB_RIVA is not set
+# CONFIG_FB_I740 is not set
+CONFIG_FB_I810=m
+CONFIG_FB_I810_GTF=y
+CONFIG_FB_I810_I2C=y
+# CONFIG_FB_LE80578 is not set
+# CONFIG_FB_MATROX is not set
+# CONFIG_FB_RADEON is not set
+# CONFIG_FB_ATY128 is not set
+# CONFIG_FB_ATY is not set
+# CONFIG_FB_S3 is not set
+# CONFIG_FB_SAVAGE is not set
+# CONFIG_FB_SIS is not set
+CONFIG_FB_VIA=m
+CONFIG_FB_VIA_DIRECT_PROCFS=y
+CONFIG_FB_VIA_X_COMPATIBILITY=y
+# CONFIG_FB_NEOMAGIC is not set
+# CONFIG_FB_KYRO is not set
+# CONFIG_FB_3DFX is not set
+CONFIG_FB_VOODOO1=m
+CONFIG_FB_VT8623=m
+# CONFIG_FB_TRIDENT is not set
+# CONFIG_FB_ARK is not set
+# CONFIG_FB_PM3 is not set
+# CONFIG_FB_CARMINE is not set
+# CONFIG_FB_GEODE is not set
+# CONFIG_FB_TMIO is not set
+# CONFIG_FB_SM501 is not set
+# CONFIG_FB_SMSCUFX is not set
+CONFIG_FB_UDL=m
+# CONFIG_FB_GOLDFISH is not set
+CONFIG_FB_VIRTUAL=m
+# CONFIG_FB_METRONOME is not set
+# CONFIG_FB_MB862XX is not set
+# CONFIG_FB_BROADSHEET is not set
+# CONFIG_FB_AUO_K190X is not set
+CONFIG_FB_HYPERV=m
+# CONFIG_FB_SIMPLE is not set
+# CONFIG_EXYNOS_VIDEO is not set
+CONFIG_BACKLIGHT_LCD_SUPPORT=y
+CONFIG_LCD_CLASS_DEVICE=m
+# CONFIG_LCD_L4F00242T03 is not set
+# CONFIG_LCD_LMS283GF05 is not set
+# CONFIG_LCD_LTV350QV is not set
+# CONFIG_LCD_ILI922X is not set
+# CONFIG_LCD_ILI9320 is not set
+# CONFIG_LCD_TDO24M is not set
+# CONFIG_LCD_VGG2432A4 is not set
+CONFIG_LCD_PLATFORM=m
+# CONFIG_LCD_S6E63M0 is not set
+# CONFIG_LCD_LD9040 is not set
+# CONFIG_LCD_AMS369FG06 is not set
+# CONFIG_LCD_LMS501KF03 is not set
+# CONFIG_LCD_HX8357 is not set
+CONFIG_BACKLIGHT_CLASS_DEVICE=y
+# CONFIG_BACKLIGHT_GENERIC is not set
+CONFIG_BACKLIGHT_LM3533=m
+# CONFIG_BACKLIGHT_PWM is not set
+CONFIG_BACKLIGHT_APPLE=m
+# CONFIG_BACKLIGHT_SAHARA is not set
+# CONFIG_BACKLIGHT_ADP8860 is not set
+# CONFIG_BACKLIGHT_ADP8870 is not set
+CONFIG_BACKLIGHT_PCF50633=m
+# CONFIG_BACKLIGHT_LM3630 is not set
+# CONFIG_BACKLIGHT_LM3639 is not set
+# CONFIG_BACKLIGHT_LP855X is not set
+# CONFIG_BACKLIGHT_OT200 is not set
+# CONFIG_BACKLIGHT_TPS65217 is not set
+# CONFIG_BACKLIGHT_GPIO is not set
+# CONFIG_BACKLIGHT_LV5207LP is not set
+# CONFIG_BACKLIGHT_BD6107 is not set
+
+#
+# Console display driver support
+#
+CONFIG_VGA_CONSOLE=y
+# CONFIG_VGACON_SOFT_SCROLLBACK is not set
+# CONFIG_MDA_CONSOLE is not set
+CONFIG_DUMMY_CONSOLE=y
+CONFIG_FRAMEBUFFER_CONSOLE=y
+CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y
+CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y
+# CONFIG_LOGO is not set
+CONFIG_FB_SSD1307=m
+CONFIG_SOUND=m
+CONFIG_SOUND_OSS_CORE=y
+# CONFIG_SOUND_OSS_CORE_PRECLAIM is not set
+CONFIG_SND=m
+CONFIG_SND_TIMER=m
+CONFIG_SND_PCM=m
+CONFIG_SND_HWDEP=m
+CONFIG_SND_RAWMIDI=m
+CONFIG_SND_JACK=y
+CONFIG_SND_SEQUENCER=m
+CONFIG_SND_SEQ_DUMMY=m
+CONFIG_SND_OSSEMUL=y
+CONFIG_SND_MIXER_OSS=m
+CONFIG_SND_PCM_OSS=m
+CONFIG_SND_PCM_OSS_PLUGINS=y
+CONFIG_SND_SEQUENCER_OSS=y
+CONFIG_SND_HRTIMER=m
+CONFIG_SND_SEQ_HRTIMER_DEFAULT=y
+CONFIG_SND_DYNAMIC_MINORS=y
+CONFIG_SND_MAX_CARDS=32
+CONFIG_SND_SUPPORT_OLD_API=y
+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
+CONFIG_SND_OPL4_LIB_SEQ=m
+CONFIG_SND_SBAWE_SEQ=m
+CONFIG_SND_EMU10K1_SEQ=m
+CONFIG_SND_MPU401_UART=m
+CONFIG_SND_OPL3_LIB=m
+CONFIG_SND_OPL4_LIB=m
+CONFIG_SND_VX_LIB=m
+CONFIG_SND_AC97_CODEC=m
+CONFIG_SND_DRIVERS=y
+# CONFIG_SND_PCSP is not set
+CONFIG_SND_DUMMY=m
+CONFIG_SND_ALOOP=m
+CONFIG_SND_VIRMIDI=m
+CONFIG_SND_MTPAV=m
+CONFIG_SND_MTS64=m
+CONFIG_SND_SERIAL_U16550=m
+CONFIG_SND_MPU401=m
+CONFIG_SND_PORTMAN2X4=m
+CONFIG_SND_AC97_POWER_SAVE=y
+CONFIG_SND_AC97_POWER_SAVE_DEFAULT=0
+CONFIG_SND_WSS_LIB=m
+CONFIG_SND_SB_COMMON=m
+CONFIG_SND_SB8_DSP=m
+CONFIG_SND_SB16_DSP=m
+CONFIG_SND_ISA=y
+CONFIG_SND_ADLIB=m
+CONFIG_SND_AD1816A=m
+CONFIG_SND_AD1848=m
+CONFIG_SND_ALS100=m
+CONFIG_SND_AZT1605=m
+CONFIG_SND_AZT2316=m
+CONFIG_SND_AZT2320=m
+CONFIG_SND_CMI8328=m
+CONFIG_SND_CMI8330=m
+CONFIG_SND_CS4231=m
+CONFIG_SND_CS4236=m
+CONFIG_SND_ES1688=m
+CONFIG_SND_ES18XX=m
+CONFIG_SND_SC6000=m
+CONFIG_SND_GUSCLASSIC=m
+CONFIG_SND_GUSEXTREME=m
+CONFIG_SND_GUSMAX=m
+CONFIG_SND_INTERWAVE=m
+CONFIG_SND_INTERWAVE_STB=m
+CONFIG_SND_JAZZ16=m
+CONFIG_SND_OPL3SA2=m
+CONFIG_SND_OPTI92X_AD1848=m
+CONFIG_SND_OPTI92X_CS4231=m
+CONFIG_SND_OPTI93X=m
+CONFIG_SND_MIRO=m
+CONFIG_SND_SB8=m
+CONFIG_SND_SB16=m
+CONFIG_SND_SBAWE=m
+CONFIG_SND_SB16_CSP=y
+CONFIG_SND_SSCAPE=m
+CONFIG_SND_WAVEFRONT=m
+CONFIG_SND_MSND_PINNACLE=m
+CONFIG_SND_MSND_CLASSIC=m
+CONFIG_SND_PCI=y
+CONFIG_SND_AD1889=m
+CONFIG_SND_ALS300=m
+CONFIG_SND_ALS4000=m
+CONFIG_SND_ALI5451=m
+CONFIG_SND_ASIHPI=m
+CONFIG_SND_ATIIXP=m
+CONFIG_SND_ATIIXP_MODEM=m
+CONFIG_SND_AU8810=m
+CONFIG_SND_AU8820=m
+CONFIG_SND_AU8830=m
+CONFIG_SND_AW2=m
+CONFIG_SND_AZT3328=m
+CONFIG_SND_BT87X=m
+# CONFIG_SND_BT87X_OVERCLOCK is not set
+CONFIG_SND_CA0106=m
+CONFIG_SND_CMIPCI=m
+CONFIG_SND_OXYGEN_LIB=m
+CONFIG_SND_OXYGEN=m
+CONFIG_SND_CS4281=m
+CONFIG_SND_CS46XX=m
+CONFIG_SND_CS46XX_NEW_DSP=y
+CONFIG_SND_CS5530=m
+CONFIG_SND_CS5535AUDIO=m
+CONFIG_SND_CTXFI=m
+CONFIG_SND_DARLA20=m
+CONFIG_SND_GINA20=m
+CONFIG_SND_LAYLA20=m
+CONFIG_SND_DARLA24=m
+CONFIG_SND_GINA24=m
+CONFIG_SND_LAYLA24=m
+CONFIG_SND_MONA=m
+CONFIG_SND_MIA=m
+CONFIG_SND_ECHO3G=m
+CONFIG_SND_INDIGO=m
+CONFIG_SND_INDIGOIO=m
+CONFIG_SND_INDIGODJ=m
+CONFIG_SND_INDIGOIOX=m
+CONFIG_SND_INDIGODJX=m
+CONFIG_SND_EMU10K1=m
+CONFIG_SND_EMU10K1X=m
+CONFIG_SND_ENS1370=m
+CONFIG_SND_ENS1371=m
+CONFIG_SND_ES1938=m
+CONFIG_SND_ES1968=m
+CONFIG_SND_ES1968_INPUT=y
+CONFIG_SND_ES1968_RADIO=y
+CONFIG_SND_FM801=m
+CONFIG_SND_FM801_TEA575X_BOOL=y
+CONFIG_SND_HDA_INTEL=m
+CONFIG_SND_HDA_DSP_LOADER=y
+CONFIG_SND_HDA_PREALLOC_SIZE=4096
+CONFIG_SND_HDA_HWDEP=y
+CONFIG_SND_HDA_RECONFIG=y
+CONFIG_SND_HDA_INPUT_BEEP=y
+CONFIG_SND_HDA_INPUT_BEEP_MODE=1
+CONFIG_SND_HDA_INPUT_JACK=y
+CONFIG_SND_HDA_PATCH_LOADER=y
+CONFIG_SND_HDA_CODEC_REALTEK=y
+CONFIG_SND_HDA_CODEC_ANALOG=y
+CONFIG_SND_HDA_CODEC_SIGMATEL=y
+CONFIG_SND_HDA_CODEC_VIA=y
+CONFIG_SND_HDA_CODEC_HDMI=y
+CONFIG_SND_HDA_I915=y
+CONFIG_SND_HDA_CODEC_CIRRUS=y
+CONFIG_SND_HDA_CODEC_CONEXANT=y
+CONFIG_SND_HDA_CODEC_CA0110=y
+CONFIG_SND_HDA_CODEC_CA0132=y
+CONFIG_SND_HDA_CODEC_CA0132_DSP=y
+CONFIG_SND_HDA_CODEC_CMEDIA=y
+CONFIG_SND_HDA_CODEC_SI3054=y
+CONFIG_SND_HDA_GENERIC=y
+CONFIG_SND_HDA_POWER_SAVE_DEFAULT=0
+CONFIG_SND_HDSP=m
+CONFIG_SND_HDSPM=m
+CONFIG_SND_ICE1712=m
+CONFIG_SND_ICE1724=m
+CONFIG_SND_INTEL8X0=m
+CONFIG_SND_INTEL8X0M=m
+CONFIG_SND_KORG1212=m
+CONFIG_SND_LOLA=m
+CONFIG_SND_LX6464ES=m
+CONFIG_SND_MAESTRO3=m
+CONFIG_SND_MAESTRO3_INPUT=y
+CONFIG_SND_MIXART=m
+CONFIG_SND_NM256=m
+CONFIG_SND_PCXHR=m
+CONFIG_SND_RIPTIDE=m
+CONFIG_SND_RME32=m
+CONFIG_SND_RME96=m
+CONFIG_SND_RME9652=m
+CONFIG_SND_SIS7019=m
+CONFIG_SND_SONICVIBES=m
+CONFIG_SND_TRIDENT=m
+CONFIG_SND_VIA82XX=m
+CONFIG_SND_VIA82XX_MODEM=m
+CONFIG_SND_VIRTUOSO=m
+CONFIG_SND_VX222=m
+CONFIG_SND_YMFPCI=m
+CONFIG_SND_SPI=y
+CONFIG_SND_USB=y
+CONFIG_SND_USB_AUDIO=m
+CONFIG_SND_USB_UA101=m
+CONFIG_SND_USB_USX2Y=m
+CONFIG_SND_USB_CAIAQ=m
+CONFIG_SND_USB_CAIAQ_INPUT=y
+CONFIG_SND_USB_US122L=m
+CONFIG_SND_USB_6FIRE=m
+CONFIG_SND_USB_HIFACE=m
+CONFIG_SND_FIREWIRE=y
+CONFIG_SND_FIREWIRE_LIB=m
+CONFIG_SND_FIREWIRE_SPEAKERS=m
+CONFIG_SND_ISIGHT=m
+CONFIG_SND_SCS1X=m
+CONFIG_SND_PCMCIA=y
+CONFIG_SND_VXPOCKET=m
+CONFIG_SND_PDAUDIOCF=m
+# CONFIG_SND_SOC is not set
+# CONFIG_SOUND_PRIME is not set
+CONFIG_AC97_BUS=m
+
+#
+# HID support
+#
+CONFIG_HID=m
+CONFIG_HIDRAW=y
+CONFIG_UHID=m
+CONFIG_HID_GENERIC=m
+
+#
+# Special HID drivers
+#
+CONFIG_HID_A4TECH=m
+CONFIG_HID_ACRUX=m
+CONFIG_HID_ACRUX_FF=y
+CONFIG_HID_APPLE=m
+CONFIG_HID_APPLEIR=m
+CONFIG_HID_AUREAL=m
+CONFIG_HID_BELKIN=m
+CONFIG_HID_CHERRY=m
+CONFIG_HID_CHICONY=m
+CONFIG_HID_PRODIKEYS=m
+CONFIG_HID_CYPRESS=m
+CONFIG_HID_DRAGONRISE=m
+CONFIG_DRAGONRISE_FF=y
+CONFIG_HID_EMS_FF=m
+CONFIG_HID_ELECOM=m
+CONFIG_HID_ELO=m
+CONFIG_HID_EZKEY=m
+CONFIG_HID_HOLTEK=m
+CONFIG_HOLTEK_FF=y
+CONFIG_HID_HUION=m
+CONFIG_HID_KEYTOUCH=m
+CONFIG_HID_KYE=m
+CONFIG_HID_UCLOGIC=m
+CONFIG_HID_WALTOP=m
+CONFIG_HID_GYRATION=m
+CONFIG_HID_ICADE=m
+CONFIG_HID_TWINHAN=m
+CONFIG_HID_KENSINGTON=m
+CONFIG_HID_LCPOWER=m
+CONFIG_HID_LENOVO_TPKBD=m
+CONFIG_HID_LOGITECH=m
+CONFIG_HID_LOGITECH_DJ=m
+CONFIG_LOGITECH_FF=y
+CONFIG_LOGIRUMBLEPAD2_FF=y
+CONFIG_LOGIG940_FF=y
+CONFIG_LOGIWHEELS_FF=y
+CONFIG_HID_MAGICMOUSE=m
+CONFIG_HID_MICROSOFT=m
+CONFIG_HID_MONTEREY=m
+CONFIG_HID_MULTITOUCH=m
+CONFIG_HID_NTRIG=m
+CONFIG_HID_ORTEK=m
+CONFIG_HID_PANTHERLORD=m
+CONFIG_PANTHERLORD_FF=y
+CONFIG_HID_PETALYNX=m
+CONFIG_HID_PICOLCD=m
+CONFIG_HID_PICOLCD_FB=y
+CONFIG_HID_PICOLCD_BACKLIGHT=y
+CONFIG_HID_PICOLCD_LCD=y
+CONFIG_HID_PICOLCD_LEDS=y
+CONFIG_HID_PICOLCD_CIR=y
+CONFIG_HID_PRIMAX=m
+CONFIG_HID_ROCCAT=m
+CONFIG_HID_SAITEK=m
+CONFIG_HID_SAMSUNG=m
+CONFIG_HID_SONY=m
+CONFIG_HID_SPEEDLINK=m
+CONFIG_HID_STEELSERIES=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_TIVO=m
+CONFIG_HID_TOPSEED=m
+CONFIG_HID_THINGM=m
+CONFIG_HID_THRUSTMASTER=m
+CONFIG_THRUSTMASTER_FF=y
+CONFIG_HID_WACOM=m
+CONFIG_HID_WIIMOTE=m
+CONFIG_HID_XINMO=m
+CONFIG_HID_ZEROPLUS=m
+CONFIG_ZEROPLUS_FF=y
+CONFIG_HID_ZYDACRON=m
+CONFIG_HID_SENSOR_HUB=m
+
+#
+# USB HID support
+#
+CONFIG_USB_HID=m
+CONFIG_HID_PID=y
+CONFIG_USB_HIDDEV=y
+
+#
+# I2C HID support
+#
+CONFIG_I2C_HID=m
+CONFIG_USB_OHCI_LITTLE_ENDIAN=y
+CONFIG_USB_SUPPORT=y
+CONFIG_USB_COMMON=m
+CONFIG_USB_ARCH_HAS_HCD=y
+CONFIG_USB=m
+# CONFIG_USB_DEBUG is not set
+# CONFIG_USB_ANNOUNCE_NEW_DEVICES is not set
+
+#
+# Miscellaneous USB options
+#
+CONFIG_USB_DEFAULT_PERSIST=y
+CONFIG_USB_DYNAMIC_MINORS=y
+# CONFIG_USB_OTG is not set
+CONFIG_USB_MON=m
+CONFIG_USB_WUSB=m
+CONFIG_USB_WUSB_CBAF=m
+# CONFIG_USB_WUSB_CBAF_DEBUG is not set
+
+#
+# USB Host Controller Drivers
+#
+CONFIG_USB_C67X00_HCD=m
+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_PCI=m
+# CONFIG_USB_EHCI_HCD_PLATFORM is not set
+CONFIG_USB_OXU210HP_HCD=m
+CONFIG_USB_ISP116X_HCD=m
+CONFIG_USB_ISP1760_HCD=m
+CONFIG_USB_ISP1362_HCD=m
+CONFIG_USB_FUSBH200_HCD=m
+CONFIG_USB_FOTG210_HCD=m
+CONFIG_USB_OHCI_HCD=m
+CONFIG_USB_OHCI_HCD_PCI=m
+# CONFIG_USB_OHCI_HCD_SSB is not set
+# CONFIG_USB_OHCI_HCD_PLATFORM is not set
+CONFIG_USB_UHCI_HCD=m
+CONFIG_USB_U132_HCD=m
+CONFIG_USB_SL811_HCD=m
+# CONFIG_USB_SL811_HCD_ISO is not set
+CONFIG_USB_SL811_CS=m
+CONFIG_USB_R8A66597_HCD=m
+CONFIG_USB_RENESAS_USBHS_HCD=m
+CONFIG_USB_WHCI_HCD=m
+CONFIG_USB_HWA_HCD=m
+# CONFIG_USB_HCD_BCMA is not set
+# CONFIG_USB_HCD_SSB is not set
+# CONFIG_USB_HCD_TEST_MODE is not set
+CONFIG_USB_MUSB_HDRC=m
+# CONFIG_USB_MUSB_HOST is not set
+# CONFIG_USB_MUSB_GADGET is not set
+CONFIG_USB_MUSB_DUAL_ROLE=y
+CONFIG_USB_MUSB_TUSB6010=m
+CONFIG_USB_MUSB_DSPS=m
+CONFIG_USB_MUSB_UX500=m
+CONFIG_USB_MUSB_AM335X_CHILD=m
+# CONFIG_USB_UX500_DMA is not set
+CONFIG_MUSB_PIO_ONLY=y
+CONFIG_USB_RENESAS_USBHS=m
+
+#
+# USB Device Class drivers
+#
+CONFIG_USB_ACM=m
+CONFIG_USB_PRINTER=m
+CONFIG_USB_WDM=m
+CONFIG_USB_TMC=m
+
+#
+# NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may
+#
+
+#
+# also be needed; see USB_STORAGE Help for more info
+#
+CONFIG_USB_STORAGE=m
+# CONFIG_USB_STORAGE_DEBUG is not set
+CONFIG_USB_STORAGE_REALTEK=m
+CONFIG_REALTEK_AUTOPM=y
+CONFIG_USB_STORAGE_DATAFAB=m
+CONFIG_USB_STORAGE_FREECOM=m
+CONFIG_USB_STORAGE_ISD200=m
+CONFIG_USB_STORAGE_USBAT=m
+CONFIG_USB_STORAGE_SDDR09=m
+CONFIG_USB_STORAGE_SDDR55=m
+CONFIG_USB_STORAGE_JUMPSHOT=m
+CONFIG_USB_STORAGE_ALAUDA=m
+CONFIG_USB_STORAGE_ONETOUCH=m
+CONFIG_USB_STORAGE_KARMA=m
+CONFIG_USB_STORAGE_CYPRESS_ATACB=m
+CONFIG_USB_STORAGE_ENE_UB6250=m
+
+#
+# USB Imaging devices
+#
+CONFIG_USB_MDC800=m
+CONFIG_USB_MICROTEK=m
+# CONFIG_USB_DWC3 is not set
+# CONFIG_USB_CHIPIDEA is not set
+
+#
+# USB port drivers
+#
+CONFIG_USB_USS720=m
+CONFIG_USB_SERIAL=m
+CONFIG_USB_SERIAL_GENERIC=y
+CONFIG_USB_SERIAL_SIMPLE=m
+CONFIG_USB_SERIAL_AIRCABLE=m
+CONFIG_USB_SERIAL_ARK3116=m
+CONFIG_USB_SERIAL_BELKIN=m
+CONFIG_USB_SERIAL_CH341=m
+CONFIG_USB_SERIAL_WHITEHEAT=m
+CONFIG_USB_SERIAL_DIGI_ACCELEPORT=m
+CONFIG_USB_SERIAL_CP210X=m
+CONFIG_USB_SERIAL_CYPRESS_M8=m
+CONFIG_USB_SERIAL_EMPEG=m
+CONFIG_USB_SERIAL_FTDI_SIO=m
+CONFIG_USB_SERIAL_VISOR=m
+CONFIG_USB_SERIAL_IPAQ=m
+CONFIG_USB_SERIAL_IR=m
+CONFIG_USB_SERIAL_EDGEPORT=m
+CONFIG_USB_SERIAL_EDGEPORT_TI=m
+CONFIG_USB_SERIAL_F81232=m
+CONFIG_USB_SERIAL_GARMIN=m
+CONFIG_USB_SERIAL_IPW=m
+CONFIG_USB_SERIAL_IUU=m
+CONFIG_USB_SERIAL_KEYSPAN_PDA=m
+CONFIG_USB_SERIAL_KEYSPAN=m
+CONFIG_USB_SERIAL_KEYSPAN_MPR=y
+CONFIG_USB_SERIAL_KEYSPAN_USA28=y
+CONFIG_USB_SERIAL_KEYSPAN_USA28X=y
+CONFIG_USB_SERIAL_KEYSPAN_USA28XA=y
+CONFIG_USB_SERIAL_KEYSPAN_USA28XB=y
+CONFIG_USB_SERIAL_KEYSPAN_USA19=y
+CONFIG_USB_SERIAL_KEYSPAN_USA18X=y
+CONFIG_USB_SERIAL_KEYSPAN_USA19W=y
+CONFIG_USB_SERIAL_KEYSPAN_USA19QW=y
+CONFIG_USB_SERIAL_KEYSPAN_USA19QI=y
+CONFIG_USB_SERIAL_KEYSPAN_USA49W=y
+CONFIG_USB_SERIAL_KEYSPAN_USA49WLC=y
+CONFIG_USB_SERIAL_KLSI=m
+CONFIG_USB_SERIAL_KOBIL_SCT=m
+CONFIG_USB_SERIAL_MCT_U232=m
+CONFIG_USB_SERIAL_METRO=m
+CONFIG_USB_SERIAL_MOS7720=m
+CONFIG_USB_SERIAL_MOS7715_PARPORT=y
+CONFIG_USB_SERIAL_MOS7840=m
+CONFIG_USB_SERIAL_NAVMAN=m
+CONFIG_USB_SERIAL_PL2303=m
+CONFIG_USB_SERIAL_OTI6858=m
+CONFIG_USB_SERIAL_QCAUX=m
+CONFIG_USB_SERIAL_QUALCOMM=m
+CONFIG_USB_SERIAL_SPCP8X5=m
+CONFIG_USB_SERIAL_SAFE=m
+# CONFIG_USB_SERIAL_SAFE_PADDED is not set
+CONFIG_USB_SERIAL_SIERRAWIRELESS=m
+CONFIG_USB_SERIAL_SYMBOL=m
+CONFIG_USB_SERIAL_TI=m
+CONFIG_USB_SERIAL_CYBERJACK=m
+CONFIG_USB_SERIAL_XIRCOM=m
+CONFIG_USB_SERIAL_WWAN=m
+CONFIG_USB_SERIAL_OPTION=m
+CONFIG_USB_SERIAL_OMNINET=m
+CONFIG_USB_SERIAL_OPTICON=m
+CONFIG_USB_SERIAL_XSENS_MT=m
+CONFIG_USB_SERIAL_WISHBONE=m
+CONFIG_USB_SERIAL_ZTE=m
+CONFIG_USB_SERIAL_SSU100=m
+CONFIG_USB_SERIAL_QT2=m
+# CONFIG_USB_SERIAL_DEBUG is not set
+
+#
+# USB Miscellaneous drivers
+#
+CONFIG_USB_EMI62=m
+CONFIG_USB_EMI26=m
+CONFIG_USB_ADUTUX=m
+CONFIG_USB_SEVSEG=m
+CONFIG_USB_RIO500=m
+CONFIG_USB_LEGOTOWER=m
+CONFIG_USB_LCD=m
+CONFIG_USB_LED=m
+CONFIG_USB_CYPRESS_CY7C63=m
+CONFIG_USB_CYTHERM=m
+CONFIG_USB_IDMOUSE=m
+CONFIG_USB_FTDI_ELAN=m
+CONFIG_USB_APPLEDISPLAY=m
+CONFIG_USB_SISUSBVGA=m
+# CONFIG_USB_SISUSBVGA_CON is not set
+CONFIG_USB_LD=m
+CONFIG_USB_TRANCEVIBRATOR=m
+CONFIG_USB_IOWARRIOR=m
+CONFIG_USB_TEST=m
+# CONFIG_USB_EHSET_TEST_FIXTURE is not set
+CONFIG_USB_ISIGHTFW=m
+CONFIG_USB_YUREX=m
+CONFIG_USB_EZUSB_FX2=m
+CONFIG_USB_HSIC_USB3503=m
+CONFIG_USB_ATM=m
+CONFIG_USB_SPEEDTOUCH=m
+CONFIG_USB_CXACRU=m
+CONFIG_USB_UEAGLEATM=m
+CONFIG_USB_XUSBATM=m
+
+#
+# USB Physical Layer drivers
+#
+CONFIG_USB_PHY=y
+CONFIG_NOP_USB_XCEIV=m
+# CONFIG_AM335X_PHY_USB is not set
+CONFIG_SAMSUNG_USBPHY=m
+CONFIG_SAMSUNG_USB2PHY=m
+CONFIG_SAMSUNG_USB3PHY=m
+# CONFIG_USB_GPIO_VBUS is not set
+CONFIG_USB_ISP1301=m
+CONFIG_USB_RCAR_PHY=m
+CONFIG_USB_GADGET=m
+# CONFIG_USB_GADGET_DEBUG is not set
+# CONFIG_USB_GADGET_DEBUG_FILES is not set
+# CONFIG_USB_GADGET_DEBUG_FS is not set
+CONFIG_USB_GADGET_VBUS_DRAW=2
+CONFIG_USB_GADGET_STORAGE_NUM_BUFFERS=2
+
+#
+# USB Peripheral Controller
+#
+CONFIG_USB_FUSB300=m
+CONFIG_USB_FOTG210_UDC=m
+CONFIG_USB_R8A66597=m
+CONFIG_USB_RENESAS_USBHS_UDC=m
+CONFIG_USB_PXA27X=m
+CONFIG_USB_MV_UDC=m
+CONFIG_USB_MV_U3D=m
+CONFIG_USB_M66592=m
+CONFIG_USB_AMD5536UDC=m
+CONFIG_USB_NET2272=m
+CONFIG_USB_NET2272_DMA=y
+CONFIG_USB_NET2280=m
+CONFIG_USB_GOKU=m
+CONFIG_USB_EG20T=m
+CONFIG_USB_DUMMY_HCD=m
+CONFIG_USB_LIBCOMPOSITE=m
+CONFIG_USB_F_ACM=m
+CONFIG_USB_U_SERIAL=m
+CONFIG_USB_U_ETHER=m
+CONFIG_USB_U_RNDIS=m
+CONFIG_USB_F_SERIAL=m
+CONFIG_USB_F_OBEX=m
+CONFIG_USB_F_NCM=m
+CONFIG_USB_F_ECM=m
+CONFIG_USB_F_SUBSET=m
+CONFIG_USB_F_RNDIS=m
+# CONFIG_USB_CONFIGFS is not set
+# CONFIG_USB_ZERO is not set
+CONFIG_USB_AUDIO=m
+# CONFIG_GADGET_UAC1 is not set
+CONFIG_USB_ETH=m
+CONFIG_USB_ETH_RNDIS=y
+# CONFIG_USB_ETH_EEM is not set
+CONFIG_USB_G_NCM=m
+CONFIG_USB_GADGETFS=m
+CONFIG_USB_FUNCTIONFS=m
+CONFIG_USB_FUNCTIONFS_ETH=y
+CONFIG_USB_FUNCTIONFS_RNDIS=y
+CONFIG_USB_FUNCTIONFS_GENERIC=y
+CONFIG_USB_MASS_STORAGE=m
+CONFIG_USB_GADGET_TARGET=m
+CONFIG_USB_G_SERIAL=m
+CONFIG_USB_MIDI_GADGET=m
+CONFIG_USB_G_PRINTER=m
+# CONFIG_USB_CDC_COMPOSITE is not set
+# CONFIG_USB_G_NOKIA is not set
+# CONFIG_USB_G_ACM_MS is not set
+# CONFIG_USB_G_MULTI is not set
+CONFIG_USB_G_HID=m
+CONFIG_USB_G_DBGP=m
+# CONFIG_USB_G_DBGP_PRINTK is not set
+CONFIG_USB_G_DBGP_SERIAL=y
+CONFIG_USB_G_WEBCAM=m
+CONFIG_UWB=m
+CONFIG_UWB_HWA=m
+CONFIG_UWB_WHCI=m
+CONFIG_UWB_I1480U=m
+CONFIG_MMC=m
+# CONFIG_MMC_DEBUG is not set
+# CONFIG_MMC_UNSAFE_RESUME is not set
+# CONFIG_MMC_CLKGATE is not set
+
+#
+# MMC/SD/SDIO Card Drivers
+#
+CONFIG_MMC_BLOCK=m
+CONFIG_MMC_BLOCK_MINORS=8
+CONFIG_MMC_BLOCK_BOUNCE=y
+CONFIG_SDIO_UART=m
+# CONFIG_MMC_TEST is not set
+
+#
+# MMC/SD/SDIO Host Controller Drivers
+#
+CONFIG_MMC_SDHCI=m
+CONFIG_MMC_SDHCI_PCI=m
+CONFIG_MMC_RICOH_MMC=y
+CONFIG_MMC_SDHCI_ACPI=m
+CONFIG_MMC_SDHCI_PLTFM=m
+CONFIG_MMC_WBSD=m
+CONFIG_MMC_TIFM_SD=m
+CONFIG_MMC_SDRICOH_CS=m
+CONFIG_MMC_CB710=m
+CONFIG_MMC_VIA_SDMMC=m
+CONFIG_MMC_VUB300=m
+CONFIG_MMC_USHC=m
+CONFIG_MMC_REALTEK_PCI=m
+CONFIG_MEMSTICK=m
+# CONFIG_MEMSTICK_DEBUG is not set
+
+#
+# MemoryStick drivers
+#
+# CONFIG_MEMSTICK_UNSAFE_RESUME is not set
+CONFIG_MSPRO_BLOCK=m
+# CONFIG_MS_BLOCK is not set
+
+#
+# MemoryStick Host Controller Drivers
+#
+CONFIG_MEMSTICK_TIFM_MS=m
+CONFIG_MEMSTICK_JMICRON_38X=m
+CONFIG_MEMSTICK_R592=m
+CONFIG_MEMSTICK_REALTEK_PCI=m
+CONFIG_NEW_LEDS=y
+CONFIG_LEDS_CLASS=y
+
+#
+# LED drivers
+#
+CONFIG_LEDS_LM3530=m
+CONFIG_LEDS_LM3533=m
+CONFIG_LEDS_LM3642=m
+CONFIG_LEDS_PCA9532=m
+# CONFIG_LEDS_PCA9532_GPIO is not set
+# CONFIG_LEDS_GPIO is not set
+CONFIG_LEDS_LP3944=m
+CONFIG_LEDS_LP55XX_COMMON=m
+CONFIG_LEDS_LP5521=m
+CONFIG_LEDS_LP5523=m
+CONFIG_LEDS_LP5562=m
+# CONFIG_LEDS_LP8501 is not set
+CONFIG_LEDS_CLEVO_MAIL=m
+CONFIG_LEDS_PCA955X=m
+# CONFIG_LEDS_PCA963X is not set
+# CONFIG_LEDS_DAC124S085 is not set
+# CONFIG_LEDS_PWM is not set
+CONFIG_LEDS_BD2802=m
+CONFIG_LEDS_INTEL_SS4200=m
+CONFIG_LEDS_LT3593=m
+CONFIG_LEDS_DELL_NETBOOKS=m
+CONFIG_LEDS_MC13783=m
+CONFIG_LEDS_TCA6507=m
+CONFIG_LEDS_LM355x=m
+CONFIG_LEDS_OT200=m
+CONFIG_LEDS_BLINKM=m
+
+#
+# LED Triggers
+#
+CONFIG_LEDS_TRIGGERS=y
+CONFIG_LEDS_TRIGGER_TIMER=m
+CONFIG_LEDS_TRIGGER_ONESHOT=m
+CONFIG_LEDS_TRIGGER_HEARTBEAT=m
+CONFIG_LEDS_TRIGGER_BACKLIGHT=m
+# CONFIG_LEDS_TRIGGER_CPU is not set
+CONFIG_LEDS_TRIGGER_GPIO=m
+CONFIG_LEDS_TRIGGER_DEFAULT_ON=m
+
+#
+# iptables trigger is under Netfilter config (LED target)
+#
+CONFIG_LEDS_TRIGGER_TRANSIENT=m
+CONFIG_LEDS_TRIGGER_CAMERA=m
+CONFIG_ACCESSIBILITY=y
+CONFIG_A11Y_BRAILLE_CONSOLE=y
+# CONFIG_INFINIBAND is not set
+CONFIG_EDAC=y
+CONFIG_EDAC_LEGACY_SYSFS=y
+# CONFIG_EDAC_DEBUG is not set
+CONFIG_EDAC_DECODE_MCE=m
+CONFIG_EDAC_MCE_INJ=m
+CONFIG_EDAC_MM_EDAC=m
+CONFIG_EDAC_AMD76X=m
+CONFIG_EDAC_E7XXX=m
+CONFIG_EDAC_E752X=m
+CONFIG_EDAC_I82875P=m
+CONFIG_EDAC_I82975X=m
+CONFIG_EDAC_I3000=m
+CONFIG_EDAC_I3200=m
+CONFIG_EDAC_X38=m
+CONFIG_EDAC_I5400=m
+CONFIG_EDAC_I7CORE=m
+CONFIG_EDAC_I82860=m
+CONFIG_EDAC_R82600=m
+CONFIG_EDAC_I5000=m
+CONFIG_EDAC_I5100=m
+CONFIG_EDAC_I7300=m
+CONFIG_RTC_LIB=y
+CONFIG_RTC_CLASS=y
+CONFIG_RTC_HCTOSYS=y
+CONFIG_RTC_SYSTOHC=y
+CONFIG_RTC_HCTOSYS_DEVICE="rtc0"
+# CONFIG_RTC_DEBUG is not set
+
+#
+# RTC interfaces
+#
+CONFIG_RTC_INTF_SYSFS=y
+CONFIG_RTC_INTF_PROC=y
+CONFIG_RTC_INTF_DEV=y
+CONFIG_RTC_INTF_DEV_UIE_EMUL=y
+CONFIG_RTC_DRV_TEST=m
+
+#
+# I2C RTC drivers
+#
+CONFIG_RTC_DRV_DS1307=m
+CONFIG_RTC_DRV_DS1374=m
+CONFIG_RTC_DRV_DS1672=m
+CONFIG_RTC_DRV_DS3232=m
+CONFIG_RTC_DRV_MAX6900=m
+CONFIG_RTC_DRV_RS5C372=m
+CONFIG_RTC_DRV_ISL1208=m
+CONFIG_RTC_DRV_ISL12022=m
+CONFIG_RTC_DRV_X1205=m
+CONFIG_RTC_DRV_PCF2127=m
+CONFIG_RTC_DRV_PCF8523=m
+CONFIG_RTC_DRV_PCF8563=m
+CONFIG_RTC_DRV_PCF8583=m
+CONFIG_RTC_DRV_M41T80=m
+CONFIG_RTC_DRV_M41T80_WDT=y
+CONFIG_RTC_DRV_BQ32K=m
+CONFIG_RTC_DRV_S35390A=m
+CONFIG_RTC_DRV_FM3130=m
+CONFIG_RTC_DRV_RX8581=m
+CONFIG_RTC_DRV_RX8025=m
+CONFIG_RTC_DRV_EM3027=m
+CONFIG_RTC_DRV_RV3029C2=m
+
+#
+# SPI RTC drivers
+#
+# CONFIG_RTC_DRV_M41T93 is not set
+# CONFIG_RTC_DRV_M41T94 is not set
+# CONFIG_RTC_DRV_DS1305 is not set
+# CONFIG_RTC_DRV_DS1390 is not set
+# CONFIG_RTC_DRV_MAX6902 is not set
+# CONFIG_RTC_DRV_R9701 is not set
+# CONFIG_RTC_DRV_RS5C348 is not set
+# CONFIG_RTC_DRV_DS3234 is not set
+# CONFIG_RTC_DRV_PCF2123 is not set
+# CONFIG_RTC_DRV_RX4581 is not set
+
+#
+# Platform RTC drivers
+#
+CONFIG_RTC_DRV_CMOS=y
+CONFIG_RTC_DRV_DS1286=m
+CONFIG_RTC_DRV_DS1511=m
+CONFIG_RTC_DRV_DS1553=m
+CONFIG_RTC_DRV_DS1742=m
+CONFIG_RTC_DRV_STK17TA8=m
+CONFIG_RTC_DRV_M48T86=m
+CONFIG_RTC_DRV_M48T35=m
+CONFIG_RTC_DRV_M48T59=m
+CONFIG_RTC_DRV_MSM6242=m
+CONFIG_RTC_DRV_BQ4802=m
+CONFIG_RTC_DRV_RP5C01=m
+CONFIG_RTC_DRV_V3020=m
+CONFIG_RTC_DRV_DS2404=m
+CONFIG_RTC_DRV_PCF50633=m
+
+#
+# on-CPU RTC drivers
+#
+CONFIG_RTC_DRV_MC13XXX=m
+CONFIG_RTC_DRV_SNVS=m
+# CONFIG_RTC_DRV_MOXART is not set
+
+#
+# HID Sensor RTC drivers
+#
+# CONFIG_RTC_DRV_HID_SENSOR_TIME is not set
+CONFIG_DMADEVICES=y
+# CONFIG_DMADEVICES_DEBUG is not set
+
+#
+# DMA Devices
+#
+CONFIG_INTEL_MID_DMAC=m
+CONFIG_INTEL_IOATDMA=m
+CONFIG_DW_DMAC_CORE=m
+CONFIG_DW_DMAC=m
+CONFIG_DW_DMAC_PCI=m
+CONFIG_TIMB_DMA=m
+CONFIG_PCH_DMA=m
+CONFIG_DMA_ENGINE=y
+CONFIG_DMA_ACPI=y
+CONFIG_DMA_OF=y
+
+#
+# DMA Clients
+#
+CONFIG_NET_DMA=y
+CONFIG_ASYNC_TX_DMA=y
+# CONFIG_DMATEST is not set
+CONFIG_DCA=m
+CONFIG_AUXDISPLAY=y
+CONFIG_KS0108=m
+CONFIG_KS0108_PORT=0x378
+CONFIG_KS0108_DELAY=2
+CONFIG_CFAG12864B=m
+CONFIG_CFAG12864B_RATE=20
+CONFIG_UIO=m
+CONFIG_UIO_CIF=m
+CONFIG_UIO_PDRV_GENIRQ=m
+# CONFIG_UIO_DMEM_GENIRQ is not set
+CONFIG_UIO_AEC=m
+CONFIG_UIO_SERCOS3=m
+CONFIG_UIO_PCI_GENERIC=m
+CONFIG_UIO_NETX=m
+# CONFIG_UIO_MF624 is not set
+CONFIG_VFIO_IOMMU_TYPE1=m
+CONFIG_VFIO=m
+CONFIG_VFIO_PCI=m
+CONFIG_VFIO_PCI_VGA=y
+CONFIG_VIRT_DRIVERS=y
+CONFIG_VIRTIO=y
+
+#
+# Virtio drivers
+#
+CONFIG_VIRTIO_PCI=m
+CONFIG_VIRTIO_BALLOON=m
+CONFIG_VIRTIO_MMIO=m
+CONFIG_VIRTIO_MMIO_CMDLINE_DEVICES=y
+
+#
+# Microsoft Hyper-V guest support
+#
+CONFIG_HYPERV=m
+CONFIG_HYPERV_UTILS=m
+CONFIG_HYPERV_BALLOON=m
+CONFIG_STAGING=y
+CONFIG_ET131X=m
+CONFIG_SLICOSS=m
+CONFIG_USBIP_CORE=m
+CONFIG_USBIP_VHCI_HCD=m
+CONFIG_USBIP_HOST=m
+# CONFIG_USBIP_DEBUG is not set
+CONFIG_W35UND=m
+CONFIG_PRISM2_USB=m
+CONFIG_ECHO=m
+CONFIG_COMEDI=m
+# CONFIG_COMEDI_DEBUG is not set
+CONFIG_COMEDI_DEFAULT_BUF_SIZE_KB=2048
+CONFIG_COMEDI_DEFAULT_BUF_MAXSIZE_KB=20480
+CONFIG_COMEDI_MISC_DRIVERS=y
+CONFIG_COMEDI_KCOMEDILIB=m
+CONFIG_COMEDI_BOND=m
+CONFIG_COMEDI_TEST=m
+CONFIG_COMEDI_PARPORT=m
+CONFIG_COMEDI_SERIAL2002=m
+CONFIG_COMEDI_SKEL=m
+CONFIG_COMEDI_SSV_DNP=m
+CONFIG_COMEDI_ISA_DRIVERS=y
+CONFIG_COMEDI_PCL711=m
+CONFIG_COMEDI_PCL724=m
+CONFIG_COMEDI_PCL726=m
+CONFIG_COMEDI_PCL730=m
+CONFIG_COMEDI_PCL812=m
+CONFIG_COMEDI_PCL816=m
+CONFIG_COMEDI_PCL818=m
+CONFIG_COMEDI_PCM3724=m
+CONFIG_COMEDI_AMPLC_DIO200_ISA=m
+CONFIG_COMEDI_AMPLC_PC236_ISA=m
+CONFIG_COMEDI_AMPLC_PC263_ISA=m
+CONFIG_COMEDI_RTI800=m
+CONFIG_COMEDI_RTI802=m
+CONFIG_COMEDI_DAS16M1=m
+CONFIG_COMEDI_DAS08_ISA=m
+CONFIG_COMEDI_DAS16=m
+CONFIG_COMEDI_DAS800=m
+CONFIG_COMEDI_DAS1800=m
+CONFIG_COMEDI_DAS6402=m
+CONFIG_COMEDI_DT2801=m
+CONFIG_COMEDI_DT2811=m
+CONFIG_COMEDI_DT2814=m
+CONFIG_COMEDI_DT2815=m
+CONFIG_COMEDI_DT2817=m
+CONFIG_COMEDI_DT282X=m
+CONFIG_COMEDI_DMM32AT=m
+CONFIG_COMEDI_UNIOXX5=m
+CONFIG_COMEDI_FL512=m
+CONFIG_COMEDI_AIO_AIO12_8=m
+CONFIG_COMEDI_AIO_IIRO_16=m
+CONFIG_COMEDI_II_PCI20KC=m
+CONFIG_COMEDI_C6XDIGIO=m
+CONFIG_COMEDI_MPC624=m
+CONFIG_COMEDI_ADQ12B=m
+CONFIG_COMEDI_NI_AT_A2150=m
+CONFIG_COMEDI_NI_AT_AO=m
+CONFIG_COMEDI_NI_ATMIO=m
+CONFIG_COMEDI_NI_ATMIO16D=m
+CONFIG_COMEDI_NI_LABPC_ISA=m
+CONFIG_COMEDI_PCMAD=m
+CONFIG_COMEDI_PCMDA12=m
+CONFIG_COMEDI_PCMMIO=m
+CONFIG_COMEDI_PCMUIO=m
+CONFIG_COMEDI_MULTIQ3=m
+CONFIG_COMEDI_POC=m
+CONFIG_COMEDI_S526=m
+CONFIG_COMEDI_PCI_DRIVERS=y
+CONFIG_COMEDI_8255_PCI=m
+CONFIG_COMEDI_ADDI_WATCHDOG=m
+CONFIG_COMEDI_ADDI_APCI_035=m
+CONFIG_COMEDI_ADDI_APCI_1032=m
+CONFIG_COMEDI_ADDI_APCI_1500=m
+CONFIG_COMEDI_ADDI_APCI_1516=m
+CONFIG_COMEDI_ADDI_APCI_1564=m
+CONFIG_COMEDI_ADDI_APCI_16XX=m
+CONFIG_COMEDI_ADDI_APCI_2032=m
+CONFIG_COMEDI_ADDI_APCI_2200=m
+CONFIG_COMEDI_ADDI_APCI_3120=m
+CONFIG_COMEDI_ADDI_APCI_3501=m
+CONFIG_COMEDI_ADDI_APCI_3XXX=m
+CONFIG_COMEDI_ADL_PCI6208=m
+CONFIG_COMEDI_ADL_PCI7X3X=m
+CONFIG_COMEDI_ADL_PCI8164=m
+CONFIG_COMEDI_ADL_PCI9111=m
+CONFIG_COMEDI_ADL_PCI9118=m
+CONFIG_COMEDI_ADV_PCI1710=m
+CONFIG_COMEDI_ADV_PCI1723=m
+CONFIG_COMEDI_ADV_PCI1724=m
+CONFIG_COMEDI_ADV_PCI_DIO=m
+CONFIG_COMEDI_AMPLC_DIO200_PCI=m
+CONFIG_COMEDI_AMPLC_PC236_PCI=m
+CONFIG_COMEDI_AMPLC_PC263_PCI=m
+CONFIG_COMEDI_AMPLC_PCI224=m
+CONFIG_COMEDI_AMPLC_PCI230=m
+CONFIG_COMEDI_CONTEC_PCI_DIO=m
+CONFIG_COMEDI_DAS08_PCI=m
+CONFIG_COMEDI_DT3000=m
+CONFIG_COMEDI_DYNA_PCI10XX=m
+CONFIG_COMEDI_GSC_HPDI=m
+CONFIG_COMEDI_ICP_MULTI=m
+CONFIG_COMEDI_DAQBOARD2000=m
+CONFIG_COMEDI_JR3_PCI=m
+CONFIG_COMEDI_KE_COUNTER=m
+CONFIG_COMEDI_CB_PCIDAS64=m
+CONFIG_COMEDI_CB_PCIDAS=m
+CONFIG_COMEDI_CB_PCIDDA=m
+# CONFIG_COMEDI_CB_PCIMDAS is not set
+CONFIG_COMEDI_CB_PCIMDDA=m
+CONFIG_COMEDI_ME4000=m
+CONFIG_COMEDI_ME_DAQ=m
+CONFIG_COMEDI_NI_6527=m
+CONFIG_COMEDI_NI_65XX=m
+CONFIG_COMEDI_NI_660X=m
+CONFIG_COMEDI_NI_670X=m
+CONFIG_COMEDI_NI_LABPC_PCI=m
+CONFIG_COMEDI_NI_PCIDIO=m
+CONFIG_COMEDI_NI_PCIMIO=m
+CONFIG_COMEDI_RTD520=m
+CONFIG_COMEDI_S626=m
+CONFIG_COMEDI_MITE=m
+CONFIG_COMEDI_NI_TIOCMD=m
+CONFIG_COMEDI_PCMCIA_DRIVERS=y
+CONFIG_COMEDI_CB_DAS16_CS=m
+CONFIG_COMEDI_DAS08_CS=m
+CONFIG_COMEDI_NI_DAQ_700_CS=m
+CONFIG_COMEDI_NI_DAQ_DIO24_CS=m
+CONFIG_COMEDI_NI_LABPC_CS=m
+CONFIG_COMEDI_NI_MIO_CS=m
+CONFIG_COMEDI_QUATECH_DAQP_CS=m
+CONFIG_COMEDI_USB_DRIVERS=y
+CONFIG_COMEDI_DT9812=m
+CONFIG_COMEDI_USBDUX=m
+CONFIG_COMEDI_USBDUXFAST=m
+CONFIG_COMEDI_USBDUXSIGMA=m
+CONFIG_COMEDI_VMK80XX=m
+CONFIG_COMEDI_8255=m
+CONFIG_COMEDI_FC=m
+CONFIG_COMEDI_AMPLC_DIO200=m
+CONFIG_COMEDI_AMPLC_PC236=m
+CONFIG_COMEDI_DAS08=m
+CONFIG_COMEDI_NI_LABPC=m
+CONFIG_COMEDI_NI_LABPC_ISADMA=m
+CONFIG_COMEDI_NI_TIO=m
+# CONFIG_FB_OLPC_DCON is not set
+# 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_R8188EU=m
+CONFIG_88EU_AP_MODE=y
+CONFIG_88EU_P2P=y
+CONFIG_RTS5139=m
+# CONFIG_RTS5139_DEBUG is not set
+# CONFIG_TRANZPORT is not set
+CONFIG_IDE_PHISON=m
+CONFIG_LINE6_USB=m
+# CONFIG_LINE6_USB_IMPULSE_RESPONSE is not set
+CONFIG_USB_SERIAL_QUATECH2=m
+CONFIG_VT6655=m
+CONFIG_VT6656=m
+CONFIG_DX_SEP=m
+CONFIG_ZSMALLOC=y
+CONFIG_ZRAM=m
+# CONFIG_ZRAM_DEBUG is not set
+CONFIG_WLAGS49_H2=m
+CONFIG_WLAGS49_H25=m
+CONFIG_FB_SM7XX=m
+CONFIG_CRYSTALHD=m
+CONFIG_FB_XGI=m
+CONFIG_ACPI_QUICKSTART=m
+CONFIG_USB_ENESTORAGE=m
+CONFIG_BCM_WIMAX=m
+CONFIG_FT1000=m
+CONFIG_FT1000_USB=m
+CONFIG_FT1000_PCMCIA=m
+
+#
+# Speakup console speech
+#
+CONFIG_SPEAKUP=m
+CONFIG_SPEAKUP_SYNTH_ACNTSA=m
+CONFIG_SPEAKUP_SYNTH_ACNTPC=m
+CONFIG_SPEAKUP_SYNTH_APOLLO=m
+CONFIG_SPEAKUP_SYNTH_AUDPTR=m
+CONFIG_SPEAKUP_SYNTH_BNS=m
+CONFIG_SPEAKUP_SYNTH_DECTLK=m
+CONFIG_SPEAKUP_SYNTH_DECEXT=m
+CONFIG_SPEAKUP_SYNTH_DECPC=m
+CONFIG_SPEAKUP_SYNTH_DTLK=m
+CONFIG_SPEAKUP_SYNTH_KEYPC=m
+CONFIG_SPEAKUP_SYNTH_LTLK=m
+CONFIG_SPEAKUP_SYNTH_SOFT=m
+CONFIG_SPEAKUP_SYNTH_SPKOUT=m
+CONFIG_SPEAKUP_SYNTH_TXPRT=m
+CONFIG_SPEAKUP_SYNTH_DUMMY=m
+CONFIG_TOUCHSCREEN_CLEARPAD_TM1217=m
+CONFIG_TOUCHSCREEN_SYNAPTICS_I2C_RMI4=m
+CONFIG_STAGING_MEDIA=y
+CONFIG_DVB_AS102=m
+CONFIG_DVB_CXD2099=m
+CONFIG_VIDEO_DT3155=m
+CONFIG_DT3155_CCIR=y
+CONFIG_DT3155_STREAMING=y
+CONFIG_VIDEO_GO7007=m
+CONFIG_VIDEO_GO7007_USB=m
+CONFIG_VIDEO_GO7007_LOADER=m
+# CONFIG_VIDEO_GO7007_USB_S2250_BOARD is not set
+# CONFIG_USB_MSI3101 is not set
+CONFIG_SOLO6X10=m
+CONFIG_LIRC_STAGING=y
+CONFIG_LIRC_BT829=m
+CONFIG_LIRC_IGORPLUGUSB=m
+CONFIG_LIRC_IMON=m
+CONFIG_LIRC_PARALLEL=m
+CONFIG_LIRC_SASEM=m
+CONFIG_LIRC_SERIAL=m
+CONFIG_LIRC_SERIAL_TRANSMITTER=y
+CONFIG_LIRC_SIR=m
+CONFIG_LIRC_ZILOG=m
+
+#
+# Android
+#
+# CONFIG_ANDROID is not set
+CONFIG_USB_WPAN_HCD=m
+CONFIG_WIMAX_GDM72XX=m
+CONFIG_WIMAX_GDM72XX_QOS=y
+CONFIG_WIMAX_GDM72XX_K_MODE=y
+CONFIG_WIMAX_GDM72XX_WIMAX2=y
+CONFIG_WIMAX_GDM72XX_USB=y
+# CONFIG_WIMAX_GDM72XX_SDIO is not set
+CONFIG_WIMAX_GDM72XX_USB_PM=y
+# CONFIG_LTE_GDM724X is not set
+CONFIG_NET_VENDOR_SILICOM=y
+CONFIG_SBYPASS=m
+CONFIG_BPCTL=m
+CONFIG_CED1401=m
+CONFIG_DGRP=m
+CONFIG_FIREWIRE_SERIAL=m
+# CONFIG_USB_DWC2 is not set
+CONFIG_LUSTRE_FS=m 
+CONFIG_USB_BTMTK=m
+# CONFIG_XILLYBUS is not set
+CONFIG_DGNC=m
+CONFIG_DGAP=m
+CONFIG_X86_PLATFORM_DEVICES=y
+CONFIG_ACER_WMI=m
+CONFIG_ACERHDF=m
+CONFIG_ASUS_LAPTOP=m
+CONFIG_CHROMEOS_LAPTOP=m
+CONFIG_DELL_LAPTOP=m
+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
+CONFIG_MSI_LAPTOP=m
+CONFIG_PANASONIC_LAPTOP=m
+CONFIG_COMPAL_LAPTOP=m
+CONFIG_SONY_LAPTOP=m
+# CONFIG_SONYPI_COMPAT is not set
+CONFIG_IDEAPAD_LAPTOP=m
+CONFIG_THINKPAD_ACPI=m
+CONFIG_THINKPAD_ACPI_ALSA_SUPPORT=y
+# CONFIG_THINKPAD_ACPI_DEBUGFACILITIES is not set
+# CONFIG_THINKPAD_ACPI_DEBUG is not set
+# CONFIG_THINKPAD_ACPI_UNSAFE_LEDS is not set
+CONFIG_THINKPAD_ACPI_VIDEO=y
+CONFIG_THINKPAD_ACPI_HOTKEY_POLL=y
+CONFIG_SENSORS_HDAPS=m
+CONFIG_INTEL_MENLOW=m
+CONFIG_EEEPC_LAPTOP=m
+CONFIG_ASUS_WMI=m
+CONFIG_ASUS_NB_WMI=m
+CONFIG_EEEPC_WMI=m
+CONFIG_ACPI_WMI=m
+CONFIG_MSI_WMI=m
+CONFIG_TOPSTAR_LAPTOP=m
+CONFIG_ACPI_TOSHIBA=m
+CONFIG_TOSHIBA_BT_RFKILL=m
+CONFIG_ACPI_CMPC=m
+CONFIG_INTEL_IPS=m
+CONFIG_IBM_RTL=m
+CONFIG_XO1_RFKILL=m
+CONFIG_XO15_EBOOK=m
+CONFIG_SAMSUNG_LAPTOP=m
+CONFIG_MXM_WMI=m
+CONFIG_INTEL_OAKTRAIL=m
+CONFIG_SAMSUNG_Q10=m
+CONFIG_APPLE_GMUX=m
+CONFIG_INTEL_RST=y
+CONFIG_INTEL_SMARTCONNECT=y
+CONFIG_PVPANIC=m
+
+#
+# Hardware Spinlock drivers
+#
+CONFIG_CLKSRC_I8253=y
+CONFIG_CLKEVT_I8253=y
+CONFIG_I8253_LOCK=y
+CONFIG_CLKBLD_I8253=y
+# CONFIG_MAILBOX is not set
+CONFIG_IOMMU_API=y
+CONFIG_IOMMU_SUPPORT=y
+CONFIG_OF_IOMMU=y
+CONFIG_DMAR_TABLE=y
+CONFIG_INTEL_IOMMU=y
+# CONFIG_INTEL_IOMMU_DEFAULT_ON is not set
+CONFIG_INTEL_IOMMU_FLOPPY_WA=y
+
+#
+# Remoteproc drivers
+#
+CONFIG_REMOTEPROC=m
+CONFIG_STE_MODEM_RPROC=m
+
+#
+# Rpmsg drivers
+#
+# CONFIG_PM_DEVFREQ is not set
+CONFIG_EXTCON=m
+
+#
+# Extcon Device Drivers
+#
+CONFIG_OF_EXTCON=m
+CONFIG_EXTCON_GPIO=m
+CONFIG_MEMORY=y
+# CONFIG_IIO is not set
+# CONFIG_NTB is not set
+# CONFIG_VME_BUS is not set
+CONFIG_PWM=y
+CONFIG_PWM_SYSFS=y
+# CONFIG_PWM_PCA9685 is not set
+CONFIG_IRQCHIP=y
+CONFIG_IPACK_BUS=m
+CONFIG_BOARD_TPCI200=m
+CONFIG_SERIAL_IPOCTAL=m
+# CONFIG_RESET_CONTROLLER is not set
+CONFIG_FMC=m
+CONFIG_FMC_FAKEDEV=m
+CONFIG_FMC_TRIVIAL=m
+CONFIG_FMC_WRITE_EEPROM=m
+CONFIG_FMC_CHARDEV=m
+
+#
+# Firmware Drivers
+#
+CONFIG_EDD=m
+# CONFIG_EDD_OFF is not set
+CONFIG_FIRMWARE_MEMMAP=y
+CONFIG_DELL_RBU=m
+CONFIG_DCDBAS=m
+CONFIG_DMIID=y
+CONFIG_DMI_SYSFS=m
+CONFIG_ISCSI_IBFT_FIND=y
+CONFIG_ISCSI_IBFT=m
+# CONFIG_GOOGLE_FIRMWARE is not set
+
+#
+# EFI (Extensible Firmware Interface) Support
+#
+# CONFIG_EFI_VARS is not set
+
+#
+# File systems
+#
+CONFIG_DCACHE_WORD_ACCESS=y
+# CONFIG_EXT2_FS is not set
+# CONFIG_EXT3_FS is not set
+CONFIG_EXT4_FS=m
+CONFIG_EXT4_USE_FOR_EXT23=y
+CONFIG_EXT4_FS_POSIX_ACL=y
+CONFIG_EXT4_FS_SECURITY=y
+# CONFIG_EXT4_DEBUG is not set
+CONFIG_JBD2=m
+# CONFIG_JBD2_DEBUG is not set
+CONFIG_FS_MBCACHE=m
+CONFIG_REISERFS_FS=m
+# CONFIG_REISERFS_CHECK is not set
+CONFIG_REISERFS_PROC_INFO=y
+CONFIG_REISERFS_FS_XATTR=y
+CONFIG_REISERFS_FS_POSIX_ACL=y
+CONFIG_REISERFS_FS_SECURITY=y
+CONFIG_JFS_FS=m
+CONFIG_JFS_POSIX_ACL=y
+CONFIG_JFS_SECURITY=y
+# CONFIG_JFS_DEBUG is not set
+CONFIG_JFS_STATISTICS=y
+CONFIG_XFS_FS=m
+CONFIG_XFS_QUOTA=y
+CONFIG_XFS_POSIX_ACL=y
+CONFIG_XFS_RT=y
+# CONFIG_XFS_WARN is not set
+# CONFIG_XFS_DEBUG is not set
+CONFIG_GFS2_FS=m
+CONFIG_GFS2_FS_LOCKING_DLM=y
+CONFIG_OCFS2_FS=m
+CONFIG_OCFS2_FS_O2CB=m
+CONFIG_OCFS2_FS_USERSPACE_CLUSTER=m
+CONFIG_OCFS2_FS_STATS=y
+# CONFIG_OCFS2_DEBUG_MASKLOG is not set
+# 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_BTRFS_FS_RUN_SANITY_TESTS is not set
+# CONFIG_BTRFS_DEBUG is not set
+# CONFIG_BTRFS_ASSERT is not set
+CONFIG_NILFS2_FS=m
+CONFIG_FS_POSIX_ACL=y
+CONFIG_EXPORTFS=y
+CONFIG_FILE_LOCKING=y
+CONFIG_FSNOTIFY=y
+CONFIG_DNOTIFY=y
+CONFIG_INOTIFY_USER=y
+CONFIG_FANOTIFY=y
+CONFIG_FANOTIFY_ACCESS_PERMISSIONS=y
+CONFIG_QUOTA=y
+CONFIG_QUOTA_NETLINK_INTERFACE=y
+# CONFIG_PRINT_QUOTA_WARNING is not set
+# CONFIG_QUOTA_DEBUG is not set
+CONFIG_QUOTA_TREE=m
+CONFIG_QFMT_V1=m
+CONFIG_QFMT_V2=m
+CONFIG_QUOTACTL=y
+CONFIG_AUTOFS4_FS=y
+CONFIG_FUSE_FS=m
+CONFIG_CUSE=m
+CONFIG_GENERIC_ACL=y
+
+#
+# Caches
+#
+CONFIG_FSCACHE=m
+CONFIG_FSCACHE_STATS=y
+CONFIG_FSCACHE_HISTOGRAM=y
+# CONFIG_FSCACHE_DEBUG is not set
+# CONFIG_FSCACHE_OBJECT_LIST is not set
+CONFIG_CACHEFILES=m
+# CONFIG_CACHEFILES_DEBUG is not set
+# CONFIG_CACHEFILES_HISTOGRAM is not set
+
+#
+# CD-ROM/DVD Filesystems
+#
+CONFIG_ISO9660_FS=m
+CONFIG_JOLIET=y
+CONFIG_ZISOFS=y
+CONFIG_UDF_FS=m
+CONFIG_UDF_NLS=y
+
+#
+# DOS/FAT/NT Filesystems
+#
+CONFIG_FAT_FS=m
+CONFIG_MSDOS_FS=m
+CONFIG_VFAT_FS=m
+CONFIG_FAT_DEFAULT_CODEPAGE=437
+CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
+CONFIG_NTFS_FS=m
+# CONFIG_NTFS_DEBUG is not set
+CONFIG_NTFS_RW=y
+
+#
+# Pseudo filesystems
+#
+CONFIG_PROC_FS=y
+CONFIG_PROC_KCORE=y
+CONFIG_PROC_SYSCTL=y
+CONFIG_PROC_PAGE_MONITOR=y
+CONFIG_SYSFS=y
+CONFIG_TMPFS=y
+CONFIG_TMPFS_POSIX_ACL=y
+CONFIG_TMPFS_XATTR=y
+CONFIG_HUGETLBFS=y
+CONFIG_HUGETLB_PAGE=y
+CONFIG_CONFIGFS_FS=y
+CONFIG_MISC_FILESYSTEMS=y
+# CONFIG_ADFS_FS is not set
+CONFIG_AFFS_FS=m
+CONFIG_ECRYPT_FS=m
+# CONFIG_ECRYPT_FS_MESSAGING is not set
+CONFIG_HFS_FS=m
+CONFIG_HFSPLUS_FS=m
+CONFIG_HFSPLUS_FS_POSIX_ACL=y
+CONFIG_BEFS_FS=m
+# CONFIG_BEFS_DEBUG is not set
+# CONFIG_BFS_FS is not set
+# CONFIG_EFS_FS is not set
+CONFIG_JFFS2_FS=m
+CONFIG_JFFS2_FS_DEBUG=0
+CONFIG_JFFS2_FS_WRITEBUFFER=y
+# CONFIG_JFFS2_FS_WBUF_VERIFY is not set
+# CONFIG_JFFS2_SUMMARY is not set
+# CONFIG_JFFS2_FS_XATTR is not set
+# CONFIG_JFFS2_COMPRESSION_OPTIONS is not set
+CONFIG_JFFS2_ZLIB=y
+# CONFIG_JFFS2_LZO is not set
+CONFIG_JFFS2_RTIME=y
+# CONFIG_JFFS2_RUBIN is not set
+CONFIG_UBIFS_FS=m
+# CONFIG_UBIFS_FS_ADVANCED_COMPR is not set
+CONFIG_UBIFS_FS_LZO=y
+CONFIG_UBIFS_FS_ZLIB=y
+CONFIG_LOGFS=m
+CONFIG_CRAMFS=m
+CONFIG_SQUASHFS=m
+CONFIG_SQUASHFS_XATTR=y
+CONFIG_SQUASHFS_ZLIB=y
+CONFIG_SQUASHFS_LZO=y
+CONFIG_SQUASHFS_XZ=y
+# CONFIG_SQUASHFS_4K_DEVBLK_SIZE is not set
+# CONFIG_SQUASHFS_EMBEDDED is not set
+CONFIG_SQUASHFS_FRAGMENT_CACHE_SIZE=3
+# CONFIG_VXFS_FS is not set
+CONFIG_MINIX_FS=m
+CONFIG_OMFS_FS=m
+# CONFIG_HPFS_FS is not set
+# CONFIG_QNX4FS_FS is not set
+# CONFIG_QNX6FS_FS is not set
+# CONFIG_ROMFS_FS is not set
+CONFIG_PSTORE=y
+# CONFIG_PSTORE_CONSOLE is not set
+# CONFIG_PSTORE_FTRACE is not set
+CONFIG_PSTORE_RAM=m
+# CONFIG_SYSV_FS is not set
+CONFIG_UFS_FS=m
+# CONFIG_UFS_FS_WRITE is not set
+# CONFIG_UFS_DEBUG is not set
+CONFIG_EXOFS_FS=m
+# CONFIG_EXOFS_DEBUG is not set
+CONFIG_F2FS_FS=m
+CONFIG_F2FS_STAT_FS=y
+CONFIG_F2FS_FS_XATTR=y
+CONFIG_F2FS_FS_POSIX_ACL=y
+CONFIG_F2FS_FS_SECURITY=y
+CONFIG_EFIVAR_FS=y
+CONFIG_ORE=m
+CONFIG_NETWORK_FILESYSTEMS=y
+CONFIG_NFS_FS=m
+CONFIG_NFS_V2=m
+CONFIG_NFS_V3=m
+CONFIG_NFS_V3_ACL=y
+CONFIG_NFS_V4=m
+CONFIG_NFS_SWAP=y
+CONFIG_NFS_V4_1=y
+CONFIG_NFS_V4_2=y
+CONFIG_PNFS_FILE_LAYOUT=m
+CONFIG_PNFS_BLOCK=m
+CONFIG_PNFS_OBJLAYOUT=m
+CONFIG_NFS_V4_1_IMPLEMENTATION_ID_DOMAIN="linux-libre.fsfla.org"
+CONFIG_NFS_V4_SECURITY_LABEL=y
+CONFIG_NFS_FSCACHE=y
+# CONFIG_NFS_USE_LEGACY_DNS is not set
+CONFIG_NFS_USE_KERNEL_DNS=y
+CONFIG_NFS_DEBUG=y
+CONFIG_NFSD=m
+CONFIG_NFSD_V2_ACL=y
+CONFIG_NFSD_V3=y
+CONFIG_NFSD_V3_ACL=y
+CONFIG_NFSD_V4=y
+CONFIG_NFSD_V4_SECURITY_LABEL=y
+# CONFIG_NFSD_FAULT_INJECTION is not set
+CONFIG_LOCKD=m
+CONFIG_LOCKD_V4=y
+CONFIG_NFS_ACL_SUPPORT=m
+CONFIG_NFS_COMMON=y
+CONFIG_SUNRPC=m
+CONFIG_SUNRPC_GSS=m
+CONFIG_SUNRPC_BACKCHANNEL=y
+CONFIG_SUNRPC_SWAP=y
+CONFIG_RPCSEC_GSS_KRB5=m
+CONFIG_SUNRPC_DEBUG=y
+CONFIG_CEPH_FS=m
+CONFIG_CEPH_FSCACHE=y
+CONFIG_CIFS=m
+CONFIG_CIFS_STATS=y
+# CONFIG_CIFS_STATS2 is not set
+CONFIG_CIFS_WEAK_PW_HASH=y
+CONFIG_CIFS_UPCALL=y
+CONFIG_CIFS_XATTR=y
+CONFIG_CIFS_POSIX=y
+CONFIG_CIFS_ACL=y
+# CONFIG_CIFS_DEBUG is not set
+CONFIG_CIFS_DFS_UPCALL=y
+CONFIG_CIFS_SMB2=y
+CONFIG_CIFS_FSCACHE=y
+CONFIG_NCP_FS=m
+# CONFIG_NCPFS_PACKET_SIGNING is not set
+# CONFIG_NCPFS_IOCTL_LOCKING is not set
+# CONFIG_NCPFS_STRONG is not set
+CONFIG_NCPFS_NFS_NS=y
+CONFIG_NCPFS_OS2_NS=y
+CONFIG_NCPFS_SMALLDOS=y
+CONFIG_NCPFS_NLS=y
+# CONFIG_NCPFS_EXTRAS is not set
+CONFIG_CODA_FS=m
+CONFIG_AFS_FS=m
+# CONFIG_AFS_DEBUG is not set
+CONFIG_AFS_FSCACHE=y
+CONFIG_9P_FS=m
+CONFIG_9P_FSCACHE=y
+CONFIG_9P_FS_POSIX_ACL=y
+CONFIG_9P_FS_SECURITY=y
+CONFIG_NLS=y
+CONFIG_NLS_DEFAULT="utf8"
+CONFIG_NLS_CODEPAGE_437=m
+CONFIG_NLS_CODEPAGE_737=m
+CONFIG_NLS_CODEPAGE_775=m
+CONFIG_NLS_CODEPAGE_850=m
+CONFIG_NLS_CODEPAGE_852=m
+CONFIG_NLS_CODEPAGE_855=m
+CONFIG_NLS_CODEPAGE_857=m
+CONFIG_NLS_CODEPAGE_860=m
+CONFIG_NLS_CODEPAGE_861=m
+CONFIG_NLS_CODEPAGE_862=m
+CONFIG_NLS_CODEPAGE_863=m
+CONFIG_NLS_CODEPAGE_864=m
+CONFIG_NLS_CODEPAGE_865=m
+CONFIG_NLS_CODEPAGE_866=m
+CONFIG_NLS_CODEPAGE_869=m
+CONFIG_NLS_CODEPAGE_936=m
+CONFIG_NLS_CODEPAGE_950=m
+CONFIG_NLS_CODEPAGE_932=m
+CONFIG_NLS_CODEPAGE_949=m
+CONFIG_NLS_CODEPAGE_874=m
+CONFIG_NLS_ISO8859_8=m
+CONFIG_NLS_CODEPAGE_1250=m
+CONFIG_NLS_CODEPAGE_1251=m
+CONFIG_NLS_ASCII=m
+CONFIG_NLS_ISO8859_1=y
+CONFIG_NLS_ISO8859_2=m
+CONFIG_NLS_ISO8859_3=m
+CONFIG_NLS_ISO8859_4=m
+CONFIG_NLS_ISO8859_5=m
+CONFIG_NLS_ISO8859_6=m
+CONFIG_NLS_ISO8859_7=m
+CONFIG_NLS_ISO8859_9=m
+CONFIG_NLS_ISO8859_13=m
+CONFIG_NLS_ISO8859_14=m
+CONFIG_NLS_ISO8859_15=m
+CONFIG_NLS_KOI8_R=m
+CONFIG_NLS_KOI8_U=m
+CONFIG_NLS_MAC_ROMAN=m
+CONFIG_NLS_MAC_CELTIC=m
+CONFIG_NLS_MAC_CENTEURO=m
+CONFIG_NLS_MAC_CROATIAN=m
+CONFIG_NLS_MAC_CYRILLIC=m
+CONFIG_NLS_MAC_GAELIC=m
+CONFIG_NLS_MAC_GREEK=m
+CONFIG_NLS_MAC_ICELAND=m
+CONFIG_NLS_MAC_INUIT=m
+CONFIG_NLS_MAC_ROMANIAN=m
+CONFIG_NLS_MAC_TURKISH=m
+CONFIG_NLS_UTF8=m
+CONFIG_DLM=m
+# CONFIG_DLM_DEBUG is not set
+
+#
+# Kernel hacking
+#
+CONFIG_TRACE_IRQFLAGS_SUPPORT=y
+
+#
+# printk and dmesg options
+#
+CONFIG_PRINTK_TIME=y
+CONFIG_DEFAULT_MESSAGE_LOGLEVEL=4
+# CONFIG_BOOT_PRINTK_DELAY is not set
+CONFIG_DYNAMIC_DEBUG=y
+
+#
+# Compile-time checks and compiler options
+#
+# CONFIG_DEBUG_INFO is not set
+CONFIG_ENABLE_WARN_DEPRECATED=y
+# CONFIG_ENABLE_MUST_CHECK is not set
+CONFIG_FRAME_WARN=1024
+CONFIG_STRIP_ASM_SYMS=y
+# CONFIG_READABLE_ASM is not set
+CONFIG_UNUSED_SYMBOLS=y
+CONFIG_DEBUG_FS=y
+# CONFIG_HEADERS_CHECK is not set
+# CONFIG_DEBUG_SECTION_MISMATCH is not set
+CONFIG_ARCH_WANT_FRAME_POINTERS=y
+CONFIG_FRAME_POINTER=y
+# CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set
+CONFIG_MAGIC_SYSRQ=y
+CONFIG_DEBUG_KERNEL=y
+
+#
+# Memory Debugging
+#
+# CONFIG_DEBUG_PAGEALLOC is not set
+# CONFIG_DEBUG_OBJECTS is not set
+# CONFIG_SLUB_DEBUG_ON is not set
+# CONFIG_SLUB_STATS is not set
+CONFIG_HAVE_DEBUG_KMEMLEAK=y
+# CONFIG_DEBUG_KMEMLEAK is not set
+# CONFIG_DEBUG_STACK_USAGE is not set
+# CONFIG_DEBUG_VM is not set
+# CONFIG_DEBUG_VIRTUAL is not set
+CONFIG_DEBUG_MEMORY_INIT=y
+# CONFIG_DEBUG_PER_CPU_MAPS is not set
+# CONFIG_DEBUG_HIGHMEM is not set
+CONFIG_HAVE_DEBUG_STACKOVERFLOW=y
+# CONFIG_DEBUG_STACKOVERFLOW is not set
+CONFIG_HAVE_ARCH_KMEMCHECK=y
+# CONFIG_DEBUG_SHIRQ is not set
+
+#
+# Debug Lockups and Hangs
+#
+CONFIG_LOCKUP_DETECTOR=y
+CONFIG_HARDLOCKUP_DETECTOR=y
+# CONFIG_BOOTPARAM_HARDLOCKUP_PANIC is not set
+CONFIG_BOOTPARAM_HARDLOCKUP_PANIC_VALUE=0
+# CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set
+CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0
+CONFIG_DETECT_HUNG_TASK=y
+CONFIG_DEFAULT_HUNG_TASK_TIMEOUT=120
+# CONFIG_BOOTPARAM_HUNG_TASK_PANIC is not set
+CONFIG_BOOTPARAM_HUNG_TASK_PANIC_VALUE=0
+# CONFIG_PANIC_ON_OOPS is not set
+CONFIG_PANIC_ON_OOPS_VALUE=0
+CONFIG_SCHED_DEBUG=y
+CONFIG_SCHEDSTATS=y
+CONFIG_TIMER_STATS=y
+# CONFIG_DEBUG_PREEMPT is not set
+
+#
+# Lock Debugging (spinlocks, mutexes, etc...)
+#
+# CONFIG_DEBUG_RT_MUTEXES is not set
+# CONFIG_RT_MUTEX_TESTER is not set
+# CONFIG_DEBUG_SPINLOCK is not set
+CONFIG_DEBUG_MUTEXES=y
+# CONFIG_DEBUG_WW_MUTEX_SLOWPATH is not set
+# CONFIG_DEBUG_LOCK_ALLOC is not set
+# CONFIG_PROVE_LOCKING is not set
+# CONFIG_LOCK_STAT is not set
+# CONFIG_DEBUG_ATOMIC_SLEEP is not set
+# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
+CONFIG_STACKTRACE=y
+# CONFIG_DEBUG_KOBJECT is not set
+# CONFIG_DEBUG_KOBJECT_RELEASE is not set
+CONFIG_DEBUG_BUGVERBOSE=y
+# CONFIG_DEBUG_WRITECOUNT is not set
+# CONFIG_DEBUG_LIST is not set
+# CONFIG_DEBUG_SG is not set
+# CONFIG_DEBUG_NOTIFIERS is not set
+# CONFIG_DEBUG_CREDENTIALS is not set
+
+#
+# RCU Debugging
+#
+# CONFIG_PROVE_RCU_DELAY is not set
+# CONFIG_SPARSE_RCU_POINTER is not set
+# CONFIG_RCU_TORTURE_TEST is not set
+CONFIG_RCU_CPU_STALL_TIMEOUT=60
+# CONFIG_RCU_CPU_STALL_VERBOSE is not set
+# CONFIG_RCU_CPU_STALL_INFO is not set
+# CONFIG_RCU_TRACE is not set
+# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set
+# CONFIG_NOTIFIER_ERROR_INJECTION is not set
+# CONFIG_FAULT_INJECTION is not set
+# CONFIG_LATENCYTOP is not set
+CONFIG_ARCH_HAS_DEBUG_STRICT_USER_COPY_CHECKS=y
+# CONFIG_DEBUG_STRICT_USER_COPY_CHECKS is not set
+CONFIG_USER_STACKTRACE_SUPPORT=y
+CONFIG_NOP_TRACER=y
+CONFIG_HAVE_FUNCTION_TRACER=y
+CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y
+CONFIG_HAVE_FUNCTION_GRAPH_FP_TEST=y
+CONFIG_HAVE_FUNCTION_TRACE_MCOUNT_TEST=y
+CONFIG_HAVE_DYNAMIC_FTRACE=y
+CONFIG_HAVE_DYNAMIC_FTRACE_WITH_REGS=y
+CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
+CONFIG_HAVE_SYSCALL_TRACEPOINTS=y
+CONFIG_HAVE_C_RECORDMCOUNT=y
+CONFIG_TRACER_MAX_TRACE=y
+CONFIG_TRACE_CLOCK=y
+CONFIG_RING_BUFFER=y
+CONFIG_EVENT_TRACING=y
+CONFIG_CONTEXT_SWITCH_TRACER=y
+CONFIG_RING_BUFFER_ALLOW_SWAP=y
+CONFIG_TRACING=y
+CONFIG_GENERIC_TRACER=y
+CONFIG_TRACING_SUPPORT=y
+CONFIG_FTRACE=y
+CONFIG_FUNCTION_TRACER=y
+CONFIG_FUNCTION_GRAPH_TRACER=y
+# CONFIG_IRQSOFF_TRACER is not set
+# CONFIG_PREEMPT_TRACER is not set
+CONFIG_SCHED_TRACER=y
+CONFIG_FTRACE_SYSCALLS=y
+CONFIG_TRACER_SNAPSHOT=y
+# CONFIG_TRACER_SNAPSHOT_PER_CPU_SWAP is not set
+CONFIG_BRANCH_PROFILE_NONE=y
+# CONFIG_PROFILE_ANNOTATED_BRANCHES is not set
+# CONFIG_PROFILE_ALL_BRANCHES is not set
+CONFIG_STACK_TRACER=y
+CONFIG_BLK_DEV_IO_TRACE=y
+CONFIG_KPROBE_EVENT=y
+CONFIG_UPROBE_EVENT=y
+CONFIG_PROBE_EVENTS=y
+CONFIG_DYNAMIC_FTRACE=y
+CONFIG_DYNAMIC_FTRACE_WITH_REGS=y
+CONFIG_FUNCTION_PROFILER=y
+CONFIG_FTRACE_MCOUNT_RECORD=y
+# CONFIG_FTRACE_STARTUP_TEST is not set
+CONFIG_MMIOTRACE=y
+# CONFIG_MMIOTRACE_TEST is not set
+CONFIG_RING_BUFFER_BENCHMARK=m
+# CONFIG_RING_BUFFER_STARTUP_TEST is not set
+
+#
+# Runtime Testing
+#
+CONFIG_LKDTM=m
+# CONFIG_TEST_LIST_SORT is not set
+# CONFIG_KPROBES_SANITY_TEST is not set
+# CONFIG_BACKTRACE_SELF_TEST is not set
+# CONFIG_RBTREE_TEST is not set
+# CONFIG_INTERVAL_TREE_TEST is not set
+# CONFIG_ATOMIC64_SELFTEST is not set
+CONFIG_ASYNC_RAID6_TEST=m
+# CONFIG_TEST_STRING_HELPERS is not set
+CONFIG_TEST_KSTRTOX=m
+# CONFIG_PROVIDE_OHCI1394_DMA_INIT is not set
+# CONFIG_FIREWIRE_OHCI_REMOTE_DMA is not set
+# CONFIG_DMA_API_DEBUG is not set
+# CONFIG_SAMPLES is not set
+CONFIG_HAVE_ARCH_KGDB=y
+# CONFIG_KGDB is not set
+CONFIG_STRICT_DEVMEM=y
+CONFIG_X86_VERBOSE_BOOTUP=y
+CONFIG_EARLY_PRINTK=y
+# CONFIG_EARLY_PRINTK_DBGP is not set
+# CONFIG_X86_PTDUMP is not set
+CONFIG_DEBUG_RODATA=y
+# CONFIG_DEBUG_RODATA_TEST is not set
+# CONFIG_DEBUG_SET_MODULE_RONX is not set
+# CONFIG_DEBUG_NX_TEST is not set
+CONFIG_DOUBLEFAULT=y
+# CONFIG_DEBUG_TLBFLUSH is not set
+# CONFIG_IOMMU_STRESS is not set
+CONFIG_HAVE_MMIOTRACE_SUPPORT=y
+# CONFIG_X86_DECODER_SELFTEST is not set
+CONFIG_IO_DELAY_TYPE_0X80=0
+CONFIG_IO_DELAY_TYPE_0XED=1
+CONFIG_IO_DELAY_TYPE_UDELAY=2
+CONFIG_IO_DELAY_TYPE_NONE=3
+CONFIG_IO_DELAY_0X80=y
+# CONFIG_IO_DELAY_0XED is not set
+# CONFIG_IO_DELAY_UDELAY is not set
+# CONFIG_IO_DELAY_NONE is not set
+CONFIG_DEFAULT_IO_DELAY_TYPE=0
+# CONFIG_DEBUG_BOOT_PARAMS is not set
+# CONFIG_CPA_DEBUG is not set
+# CONFIG_OPTIMIZE_INLINING is not set
+# CONFIG_DEBUG_NMI_SELFTEST is not set
+# CONFIG_X86_DEBUG_STATIC_CPU_HAS is not set
+
+#
+# Security options
+#
+CONFIG_KEYS=y
+CONFIG_TRUSTED_KEYS=m
+CONFIG_ENCRYPTED_KEYS=m
+# CONFIG_KEYS_DEBUG_PROC_KEYS is not set
+# CONFIG_SECURITY_DMESG_RESTRICT is not set
+CONFIG_SECURITY=y
+CONFIG_SECURITYFS=y
+CONFIG_SECURITY_NETWORK=y
+# CONFIG_SECURITY_NETWORK_XFRM is not set
+CONFIG_SECURITY_PATH=y
+# CONFIG_INTEL_TXT is not set
+# CONFIG_SECURITY_SELINUX is not set
+# CONFIG_SECURITY_SMACK is not set
+CONFIG_SECURITY_TOMOYO=y
+CONFIG_SECURITY_TOMOYO_MAX_ACCEPT_ENTRY=2048
+CONFIG_SECURITY_TOMOYO_MAX_AUDIT_LOG=1024
+# CONFIG_SECURITY_TOMOYO_OMIT_USERSPACE_LOADER is not set
+CONFIG_SECURITY_TOMOYO_POLICY_LOADER="/usr/bin/tomoyo-init"
+CONFIG_SECURITY_TOMOYO_ACTIVATION_TRIGGER="/usr/lib/systemd/systemd"
+CONFIG_SECURITY_APPARMOR=y
+CONFIG_SECURITY_APPARMOR_BOOTPARAM_VALUE=0
+CONFIG_SECURITY_APPARMOR_HASH=y
+CONFIG_SECURITY_YAMA=y
+CONFIG_SECURITY_YAMA_STACKED=y
+# CONFIG_IMA is not set
+# CONFIG_DEFAULT_SECURITY_TOMOYO is not set
+# CONFIG_DEFAULT_SECURITY_APPARMOR is not set
+# CONFIG_DEFAULT_SECURITY_YAMA is not set
+CONFIG_DEFAULT_SECURITY_DAC=y
+CONFIG_DEFAULT_SECURITY=""
+CONFIG_XOR_BLOCKS=m
+CONFIG_ASYNC_CORE=m
+CONFIG_ASYNC_MEMCPY=m
+CONFIG_ASYNC_XOR=m
+CONFIG_ASYNC_PQ=m
+CONFIG_ASYNC_RAID6_RECOV=m
+CONFIG_CRYPTO=y
+
+#
+# Crypto core or helper
+#
+CONFIG_CRYPTO_ALGAPI=y
+CONFIG_CRYPTO_ALGAPI2=y
+CONFIG_CRYPTO_AEAD=m
+CONFIG_CRYPTO_AEAD2=y
+CONFIG_CRYPTO_BLKCIPHER=m
+CONFIG_CRYPTO_BLKCIPHER2=y
+CONFIG_CRYPTO_HASH=y
+CONFIG_CRYPTO_HASH2=y
+CONFIG_CRYPTO_RNG=m
+CONFIG_CRYPTO_RNG2=y
+CONFIG_CRYPTO_PCOMP=m
+CONFIG_CRYPTO_PCOMP2=y
+CONFIG_CRYPTO_MANAGER=y
+CONFIG_CRYPTO_MANAGER2=y
+CONFIG_CRYPTO_USER=m
+CONFIG_CRYPTO_MANAGER_DISABLE_TESTS=y
+CONFIG_CRYPTO_GF128MUL=m
+CONFIG_CRYPTO_NULL=m
+CONFIG_CRYPTO_PCRYPT=m
+CONFIG_CRYPTO_WORKQUEUE=y
+CONFIG_CRYPTO_CRYPTD=m
+CONFIG_CRYPTO_AUTHENC=m
+CONFIG_CRYPTO_TEST=m
+CONFIG_CRYPTO_ABLK_HELPER_X86=m
+CONFIG_CRYPTO_GLUE_HELPER_X86=m
+
+#
+# Authenticated Encryption with Associated Data
+#
+CONFIG_CRYPTO_CCM=m
+CONFIG_CRYPTO_GCM=m
+CONFIG_CRYPTO_SEQIV=m
+
+#
+# Block modes
+#
+CONFIG_CRYPTO_CBC=m
+CONFIG_CRYPTO_CTR=m
+CONFIG_CRYPTO_CTS=m
+CONFIG_CRYPTO_ECB=m
+CONFIG_CRYPTO_LRW=m
+CONFIG_CRYPTO_PCBC=m
+CONFIG_CRYPTO_XTS=m
+
+#
+# Hash modes
+#
+CONFIG_CRYPTO_CMAC=m
+CONFIG_CRYPTO_HMAC=m
+CONFIG_CRYPTO_XCBC=m
+CONFIG_CRYPTO_VMAC=m
+
+#
+# Digest
+#
+CONFIG_CRYPTO_CRC32C=m
+CONFIG_CRYPTO_CRC32C_INTEL=m
+CONFIG_CRYPTO_CRC32=m
+CONFIG_CRYPTO_CRC32_PCLMUL=m
+CONFIG_CRYPTO_CRCT10DIF=m
+CONFIG_CRYPTO_GHASH=m
+CONFIG_CRYPTO_MD4=m
+CONFIG_CRYPTO_MD5=m
+CONFIG_CRYPTO_MICHAEL_MIC=m
+CONFIG_CRYPTO_RMD128=m
+CONFIG_CRYPTO_RMD160=m
+CONFIG_CRYPTO_RMD256=m
+CONFIG_CRYPTO_RMD320=m
+CONFIG_CRYPTO_SHA1=y
+CONFIG_CRYPTO_SHA256=m
+CONFIG_CRYPTO_SHA512=m
+CONFIG_CRYPTO_TGR192=m
+CONFIG_CRYPTO_WP512=m
+
+#
+# Ciphers
+#
+CONFIG_CRYPTO_AES=y
+CONFIG_CRYPTO_AES_586=m
+CONFIG_CRYPTO_AES_NI_INTEL=m
+CONFIG_CRYPTO_ANUBIS=m
+CONFIG_CRYPTO_ARC4=m
+CONFIG_CRYPTO_BLOWFISH=m
+CONFIG_CRYPTO_BLOWFISH_COMMON=m
+CONFIG_CRYPTO_CAMELLIA=m
+CONFIG_CRYPTO_CAST_COMMON=m
+CONFIG_CRYPTO_CAST5=m
+CONFIG_CRYPTO_CAST6=m
+CONFIG_CRYPTO_DES=m
+CONFIG_CRYPTO_FCRYPT=m
+CONFIG_CRYPTO_KHAZAD=m
+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
+CONFIG_CRYPTO_TWOFISH_586=m
+
+#
+# Compression
+#
+CONFIG_CRYPTO_DEFLATE=m
+CONFIG_CRYPTO_ZLIB=m
+CONFIG_CRYPTO_LZO=y
+CONFIG_CRYPTO_LZ4=m
+CONFIG_CRYPTO_LZ4HC=m
+
+#
+# Random Number Generation
+#
+CONFIG_CRYPTO_ANSI_CPRNG=m
+CONFIG_CRYPTO_USER_API=m
+CONFIG_CRYPTO_USER_API_HASH=m
+CONFIG_CRYPTO_USER_API_SKCIPHER=m
+CONFIG_CRYPTO_HW=y
+CONFIG_CRYPTO_DEV_PADLOCK=m
+CONFIG_CRYPTO_DEV_PADLOCK_AES=m
+CONFIG_CRYPTO_DEV_PADLOCK_SHA=m
+CONFIG_CRYPTO_DEV_GEODE=m
+CONFIG_CRYPTO_DEV_HIFN_795X=m
+CONFIG_CRYPTO_DEV_HIFN_795X_RNG=y
+CONFIG_ASYMMETRIC_KEY_TYPE=m
+CONFIG_ASYMMETRIC_PUBLIC_KEY_SUBTYPE=m
+CONFIG_PUBLIC_KEY_ALGO_RSA=m
+CONFIG_X509_CERTIFICATE_PARSER=m
+CONFIG_HAVE_KVM=y
+CONFIG_HAVE_KVM_IRQCHIP=y
+CONFIG_HAVE_KVM_IRQ_ROUTING=y
+CONFIG_HAVE_KVM_EVENTFD=y
+CONFIG_KVM_APIC_ARCHITECTURE=y
+CONFIG_KVM_MMIO=y
+CONFIG_KVM_ASYNC_PF=y
+CONFIG_HAVE_KVM_MSI=y
+CONFIG_HAVE_KVM_CPU_RELAX_INTERCEPT=y
+CONFIG_VIRTUALIZATION=y
+CONFIG_KVM=m
+CONFIG_KVM_INTEL=m
+CONFIG_KVM_AMD=m
+CONFIG_KVM_MMU_AUDIT=y
+CONFIG_KVM_DEVICE_ASSIGNMENT=y
+CONFIG_LGUEST=m
+CONFIG_BINARY_PRINTF=y
+
+#
+# Library routines
+#
+CONFIG_RAID6_PQ=m
+CONFIG_BITREVERSE=y
+CONFIG_GENERIC_STRNCPY_FROM_USER=y
+CONFIG_GENERIC_STRNLEN_USER=y
+CONFIG_GENERIC_NET_UTILS=y
+CONFIG_GENERIC_FIND_FIRST_BIT=y
+CONFIG_GENERIC_PCI_IOMAP=y
+CONFIG_GENERIC_IOMAP=y
+CONFIG_GENERIC_IO=y
+CONFIG_PERCPU_RWSEM=y
+CONFIG_CRC_CCITT=m
+CONFIG_CRC16=m
+CONFIG_CRC_T10DIF=m
+CONFIG_CRC_ITU_T=m
+CONFIG_CRC32=y
+# CONFIG_CRC32_SELFTEST is not set
+CONFIG_CRC32_SLICEBY8=y
+# CONFIG_CRC32_SLICEBY4 is not set
+# CONFIG_CRC32_SARWATE is not set
+# CONFIG_CRC32_BIT is not set
+CONFIG_CRC7=m
+CONFIG_LIBCRC32C=m
+CONFIG_CRC8=m
+CONFIG_AUDIT_GENERIC=y
+CONFIG_ZLIB_INFLATE=y
+CONFIG_ZLIB_DEFLATE=y
+CONFIG_LZO_COMPRESS=y
+CONFIG_LZO_DECOMPRESS=y
+CONFIG_LZ4_COMPRESS=m
+CONFIG_LZ4HC_COMPRESS=m
+CONFIG_LZ4_DECOMPRESS=y
+CONFIG_XZ_DEC=y
+CONFIG_XZ_DEC_X86=y
+CONFIG_XZ_DEC_POWERPC=y
+CONFIG_XZ_DEC_IA64=y
+CONFIG_XZ_DEC_ARM=y
+CONFIG_XZ_DEC_ARMTHUMB=y
+CONFIG_XZ_DEC_SPARC=y
+CONFIG_XZ_DEC_BCJ=y
+# CONFIG_XZ_DEC_TEST is not set
+CONFIG_DECOMPRESS_GZIP=y
+CONFIG_DECOMPRESS_BZIP2=y
+CONFIG_DECOMPRESS_LZMA=y
+CONFIG_DECOMPRESS_XZ=y
+CONFIG_DECOMPRESS_LZO=y
+CONFIG_DECOMPRESS_LZ4=y
+CONFIG_GENERIC_ALLOCATOR=y
+CONFIG_REED_SOLOMON=m
+CONFIG_REED_SOLOMON_ENC8=y
+CONFIG_REED_SOLOMON_DEC8=y
+CONFIG_BCH=m
+CONFIG_BCH_CONST_PARAMS=y
+CONFIG_TEXTSEARCH=y
+CONFIG_TEXTSEARCH_KMP=m
+CONFIG_TEXTSEARCH_BM=m
+CONFIG_TEXTSEARCH_FSM=m
+CONFIG_BTREE=y
+CONFIG_HAS_IOMEM=y
+CONFIG_HAS_IOPORT=y
+CONFIG_HAS_DMA=y
+CONFIG_CHECK_SIGNATURE=y
+CONFIG_CPU_RMAP=y
+CONFIG_DQL=y
+CONFIG_NLATTR=y
+CONFIG_ARCH_HAS_ATOMIC64_DEC_IF_POSITIVE=y
+CONFIG_LRU_CACHE=m
+CONFIG_AVERAGE=y
+CONFIG_CLZ_TAB=y
+CONFIG_CORDIC=m
+CONFIG_DDR=y
+CONFIG_MPILIB=m
+CONFIG_OID_REGISTRY=m
+CONFIG_UCS2_STRING=y
+CONFIG_FONT_SUPPORT=y
+CONFIG_FONTS=y
+# CONFIG_FONT_8x8 is not set
+CONFIG_FONT_8x16=y
+# CONFIG_FONT_6x11 is not set
+# CONFIG_FONT_7x14 is not set
+# CONFIG_FONT_PEARL_8x8 is not set
+# CONFIG_FONT_ACORN_8x8 is not set
+# CONFIG_FONT_MINI_4x6 is not set
+# CONFIG_FONT_SUN8x16 is not set
+# CONFIG_FONT_SUN12x22 is not set
+# CONFIG_FONT_10x18 is not set
+CONFIG_FONT_AUTOSELECT=y
diff --git a/libre/linux-libre/config.x86_64 b/libre/linux-libre/config.x86_64
index 169a2285b..fdad1a009 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 3.11.0-1 Kernel Configuration
+# Linux/x86 3.11.4-1 Kernel Configuration
 #
 CONFIG_64BIT=y
 CONFIG_X86_64=y
@@ -389,7 +389,7 @@ CONFIG_CALGARY_IOMMU_ENABLED_BY_DEFAULT=y
 CONFIG_SWIOTLB=y
 CONFIG_IOMMU_HELPER=y
 # CONFIG_MAXSMP is not set
-CONFIG_NR_CPUS=64
+CONFIG_NR_CPUS=128
 CONFIG_SCHED_SMT=y
 CONFIG_SCHED_MC=y
 # CONFIG_PREEMPT_NONE is not set
@@ -1530,23 +1530,7 @@ CONFIG_MTD_BLOCK2MTD=m
 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
-# CONFIG_MTD_NAND_ECC_BCH is not set
-CONFIG_MTD_SM_COMMON=m
-# CONFIG_MTD_NAND_DENALI is not set
-CONFIG_MTD_NAND_IDS=m
-CONFIG_MTD_NAND_RICOH=m
-CONFIG_MTD_NAND_DISKONCHIP=m
-# CONFIG_MTD_NAND_DISKONCHIP_PROBE_ADVANCED is not set
-CONFIG_MTD_NAND_DISKONCHIP_PROBE_ADDRESS=0
-# CONFIG_MTD_NAND_DISKONCHIP_BBTWRITE is not set
-CONFIG_MTD_NAND_DOCG4=m
-# CONFIG_MTD_NAND_CAFE is not set
-CONFIG_MTD_NAND_NANDSIM=m
-# CONFIG_MTD_NAND_PLATFORM is not set
-CONFIG_MTD_ALAUDA=m
+# CONFIG_MTD_NAND is not set
 # CONFIG_MTD_ONENAND is not set
 
 #
@@ -1705,7 +1689,7 @@ CONFIG_SCSI_ENCLOSURE=m
 CONFIG_SCSI_MULTI_LUN=y
 # CONFIG_SCSI_CONSTANTS is not set
 # CONFIG_SCSI_LOGGING is not set
-# CONFIG_SCSI_SCAN_ASYNC is not set
+CONFIG_SCSI_SCAN_ASYNC=y 
 
 #
 # SCSI Transports
@@ -4661,9 +4645,7 @@ CONFIG_USB_STORAGE_ENE_UB6250=m
 CONFIG_USB_MDC800=m
 CONFIG_USB_MICROTEK=m
 # CONFIG_USB_DWC3 is not set
-CONFIG_USB_CHIPIDEA=m
-CONFIG_USB_CHIPIDEA_UDC=y
-# CONFIG_USB_CHIPIDEA_DEBUG is not set
+# CONFIG_USB_CHIPIDEA is not set
 
 #
 # USB port drivers
@@ -6203,7 +6185,6 @@ CONFIG_GENERIC_ALLOCATOR=y
 CONFIG_REED_SOLOMON=m
 CONFIG_REED_SOLOMON_ENC8=y
 CONFIG_REED_SOLOMON_DEC8=y
-CONFIG_REED_SOLOMON_DEC16=y
 CONFIG_BCH=m
 CONFIG_BCH_CONST_PARAMS=y
 CONFIG_TEXTSEARCH=y
diff --git a/libre/linux-libre/config.x86_64.3.12 b/libre/linux-libre/config.x86_64.3.12
new file mode 100644
index 000000000..e23ad6ef4
--- /dev/null
+++ b/libre/linux-libre/config.x86_64.3.12
@@ -0,0 +1,6263 @@
+#
+# Automatically generated file; DO NOT EDIT.
+# Linux/x86 3.12.0-rc4 Kernel Configuration
+#
+CONFIG_64BIT=y
+CONFIG_X86_64=y
+CONFIG_X86=y
+CONFIG_INSTRUCTION_DECODER=y
+CONFIG_OUTPUT_FORMAT="elf64-x86-64"
+CONFIG_ARCH_DEFCONFIG="arch/x86/configs/x86_64_defconfig"
+CONFIG_LOCKDEP_SUPPORT=y
+CONFIG_STACKTRACE_SUPPORT=y
+CONFIG_HAVE_LATENCYTOP_SUPPORT=y
+CONFIG_MMU=y
+CONFIG_NEED_DMA_MAP_STATE=y
+CONFIG_NEED_SG_DMA_LENGTH=y
+CONFIG_GENERIC_ISA_DMA=y
+CONFIG_GENERIC_BUG=y
+CONFIG_GENERIC_BUG_RELATIVE_POINTERS=y
+CONFIG_GENERIC_HWEIGHT=y
+CONFIG_ARCH_MAY_HAVE_PC_FDC=y
+CONFIG_RWSEM_XCHGADD_ALGORITHM=y
+CONFIG_GENERIC_CALIBRATE_DELAY=y
+CONFIG_ARCH_HAS_CPU_RELAX=y
+CONFIG_ARCH_HAS_CACHE_LINE_SIZE=y
+CONFIG_ARCH_HAS_CPU_AUTOPROBE=y
+CONFIG_HAVE_SETUP_PER_CPU_AREA=y
+CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK=y
+CONFIG_NEED_PER_CPU_PAGE_FIRST_CHUNK=y
+CONFIG_ARCH_HIBERNATION_POSSIBLE=y
+CONFIG_ARCH_SUSPEND_POSSIBLE=y
+CONFIG_ARCH_WANT_HUGE_PMD_SHARE=y
+CONFIG_ARCH_WANT_GENERAL_HUGETLB=y
+CONFIG_ZONE_DMA32=y
+CONFIG_AUDIT_ARCH=y
+CONFIG_ARCH_SUPPORTS_OPTIMIZED_INLINING=y
+CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y
+CONFIG_HAVE_INTEL_TXT=y
+CONFIG_X86_64_SMP=y
+CONFIG_X86_HT=y
+CONFIG_ARCH_HWEIGHT_CFLAGS="-fcall-saved-rdi -fcall-saved-rsi -fcall-saved-rdx -fcall-saved-rcx -fcall-saved-r8 -fcall-saved-r9 -fcall-saved-r10 -fcall-saved-r11"
+CONFIG_ARCH_CPU_PROBE_RELEASE=y
+CONFIG_ARCH_SUPPORTS_UPROBES=y
+CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
+CONFIG_IRQ_WORK=y
+CONFIG_BUILDTIME_EXTABLE_SORT=y
+
+#
+# General setup
+#
+CONFIG_INIT_ENV_ARG_LIMIT=32
+CONFIG_CROSS_COMPILE=""
+# CONFIG_COMPILE_TEST is not set
+CONFIG_LOCALVERSION="-LIBRE"
+CONFIG_LOCALVERSION_AUTO=y
+CONFIG_HAVE_KERNEL_GZIP=y
+CONFIG_HAVE_KERNEL_BZIP2=y
+CONFIG_HAVE_KERNEL_LZMA=y
+CONFIG_HAVE_KERNEL_XZ=y
+CONFIG_HAVE_KERNEL_LZO=y
+CONFIG_HAVE_KERNEL_LZ4=y
+CONFIG_KERNEL_GZIP=y
+# CONFIG_KERNEL_BZIP2 is not set
+# CONFIG_KERNEL_LZMA is not set
+# CONFIG_KERNEL_XZ is not set
+# CONFIG_KERNEL_LZO is not set
+# CONFIG_KERNEL_LZ4 is not set
+CONFIG_DEFAULT_HOSTNAME="(none)"
+CONFIG_SWAP=y
+CONFIG_SYSVIPC=y
+CONFIG_SYSVIPC_SYSCTL=y
+CONFIG_POSIX_MQUEUE=y
+CONFIG_POSIX_MQUEUE_SYSCTL=y
+CONFIG_FHANDLE=y
+CONFIG_AUDIT=y
+CONFIG_AUDITSYSCALL=y
+CONFIG_AUDIT_WATCH=y
+CONFIG_AUDIT_TREE=y
+CONFIG_AUDIT_LOGINUID_IMMUTABLE=y
+
+#
+# IRQ subsystem
+#
+CONFIG_GENERIC_IRQ_PROBE=y
+CONFIG_GENERIC_IRQ_SHOW=y
+CONFIG_GENERIC_PENDING_IRQ=y
+CONFIG_IRQ_DOMAIN=y
+# CONFIG_IRQ_DOMAIN_DEBUG is not set
+CONFIG_IRQ_FORCED_THREADING=y
+CONFIG_SPARSE_IRQ=y
+CONFIG_CLOCKSOURCE_WATCHDOG=y
+CONFIG_ARCH_CLOCKSOURCE_DATA=y
+CONFIG_GENERIC_TIME_VSYSCALL=y
+CONFIG_GENERIC_CLOCKEVENTS=y
+CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
+CONFIG_GENERIC_CLOCKEVENTS_BROADCAST=y
+CONFIG_GENERIC_CLOCKEVENTS_MIN_ADJUST=y
+CONFIG_GENERIC_CMOS_UPDATE=y
+
+#
+# Timers subsystem
+#
+CONFIG_TICK_ONESHOT=y
+CONFIG_NO_HZ_COMMON=y
+# CONFIG_HZ_PERIODIC is not set
+CONFIG_NO_HZ_IDLE=y
+# CONFIG_NO_HZ_FULL is not set
+CONFIG_NO_HZ=y
+CONFIG_HIGH_RES_TIMERS=y
+
+#
+# CPU/Task time and stats accounting
+#
+CONFIG_TICK_CPU_ACCOUNTING=y
+# CONFIG_VIRT_CPU_ACCOUNTING_GEN is not set
+# CONFIG_IRQ_TIME_ACCOUNTING is not set
+CONFIG_BSD_PROCESS_ACCT=y
+CONFIG_BSD_PROCESS_ACCT_V3=y
+CONFIG_TASKSTATS=y
+CONFIG_TASK_DELAY_ACCT=y
+CONFIG_TASK_XACCT=y
+CONFIG_TASK_IO_ACCOUNTING=y
+
+#
+# RCU Subsystem
+#
+CONFIG_TREE_PREEMPT_RCU=y
+CONFIG_PREEMPT_RCU=y
+CONFIG_RCU_STALL_COMMON=y
+# CONFIG_RCU_USER_QS is not set
+CONFIG_RCU_FANOUT=64
+CONFIG_RCU_FANOUT_LEAF=16
+# 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_RCU_NOCB_CPU=y
+CONFIG_RCU_NOCB_CPU_NONE=y
+# CONFIG_RCU_NOCB_CPU_ZERO is not set
+# CONFIG_RCU_NOCB_CPU_ALL is not set
+CONFIG_IKCONFIG=y
+CONFIG_IKCONFIG_PROC=y
+CONFIG_LOG_BUF_SHIFT=19
+CONFIG_HAVE_UNSTABLE_SCHED_CLOCK=y
+CONFIG_ARCH_SUPPORTS_NUMA_BALANCING=y
+CONFIG_ARCH_WANTS_PROT_NUMA_PROT_NONE=y
+CONFIG_ARCH_USES_NUMA_PROT_NONE=y
+CONFIG_NUMA_BALANCING_DEFAULT_ENABLED=y
+CONFIG_NUMA_BALANCING=y
+CONFIG_CGROUPS=y
+# CONFIG_CGROUP_DEBUG is not set
+CONFIG_CGROUP_FREEZER=y
+CONFIG_CGROUP_DEVICE=y
+CONFIG_CPUSETS=y
+CONFIG_PROC_PID_CPUSET=y
+CONFIG_CGROUP_CPUACCT=y
+CONFIG_RESOURCE_COUNTERS=y
+CONFIG_MEMCG=y
+CONFIG_MEMCG_SWAP=y
+# CONFIG_MEMCG_SWAP_ENABLED is not set
+CONFIG_MEMCG_KMEM=y
+# CONFIG_CGROUP_HUGETLB is not set
+# CONFIG_CGROUP_PERF is not set
+CONFIG_CGROUP_SCHED=y
+CONFIG_FAIR_GROUP_SCHED=y
+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
+# CONFIG_USER_NS is not set
+CONFIG_PID_NS=y
+CONFIG_NET_NS=y
+# CONFIG_UIDGID_STRICT_TYPE_CHECKS is not set
+CONFIG_SCHED_AUTOGROUP=y
+CONFIG_MM_OWNER=y
+# CONFIG_SYSFS_DEPRECATED is not set
+CONFIG_RELAY=y
+CONFIG_BLK_DEV_INITRD=y
+CONFIG_INITRAMFS_SOURCE=""
+CONFIG_RD_GZIP=y
+CONFIG_RD_BZIP2=y
+CONFIG_RD_LZMA=y
+CONFIG_RD_XZ=y
+CONFIG_RD_LZO=y
+CONFIG_RD_LZ4=y
+# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
+CONFIG_SYSCTL=y
+CONFIG_ANON_INODES=y
+CONFIG_HAVE_UID16=y
+CONFIG_SYSCTL_EXCEPTION_TRACE=y
+CONFIG_HAVE_PCSPKR_PLATFORM=y
+# CONFIG_EXPERT is not set
+CONFIG_UID16=y
+# CONFIG_SYSCTL_SYSCALL is not set
+CONFIG_KALLSYMS=y
+# CONFIG_KALLSYMS_ALL is not set
+CONFIG_PRINTK=y
+CONFIG_BUG=y
+CONFIG_ELF_CORE=y
+CONFIG_PCSPKR_PLATFORM=y
+CONFIG_BASE_FULL=y
+CONFIG_FUTEX=y
+CONFIG_EPOLL=y
+CONFIG_SIGNALFD=y
+CONFIG_TIMERFD=y
+CONFIG_EVENTFD=y
+CONFIG_SHMEM=y
+CONFIG_AIO=y
+CONFIG_PCI_QUIRKS=y
+# CONFIG_EMBEDDED is not set
+CONFIG_HAVE_PERF_EVENTS=y
+
+#
+# Kernel Performance Events And Counters
+#
+CONFIG_PERF_EVENTS=y
+# CONFIG_DEBUG_PERF_USE_VMALLOC is not set
+CONFIG_VM_EVENT_COUNTERS=y
+CONFIG_SLUB_DEBUG=y
+# CONFIG_COMPAT_BRK is not set
+# CONFIG_SLAB is not set
+CONFIG_SLUB=y
+CONFIG_SLUB_CPU_PARTIAL=y
+CONFIG_PROFILING=y
+CONFIG_TRACEPOINTS=y
+CONFIG_OPROFILE=m
+# CONFIG_OPROFILE_EVENT_MULTIPLEX is not set
+CONFIG_HAVE_OPROFILE=y
+CONFIG_OPROFILE_NMI_TIMER=y
+CONFIG_KPROBES=y
+CONFIG_JUMP_LABEL=y
+CONFIG_KPROBES_ON_FTRACE=y
+CONFIG_UPROBES=y
+# CONFIG_HAVE_64BIT_ALIGNED_ACCESS is not set
+CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y
+CONFIG_ARCH_USE_BUILTIN_BSWAP=y
+CONFIG_KRETPROBES=y
+CONFIG_USER_RETURN_NOTIFIER=y
+CONFIG_HAVE_IOREMAP_PROT=y
+CONFIG_HAVE_KPROBES=y
+CONFIG_HAVE_KRETPROBES=y
+CONFIG_HAVE_OPTPROBES=y
+CONFIG_HAVE_KPROBES_ON_FTRACE=y
+CONFIG_HAVE_ARCH_TRACEHOOK=y
+CONFIG_HAVE_DMA_ATTRS=y
+CONFIG_USE_GENERIC_SMP_HELPERS=y
+CONFIG_GENERIC_SMP_IDLE_THREAD=y
+CONFIG_HAVE_REGS_AND_STACK_ACCESS_API=y
+CONFIG_HAVE_DMA_API_DEBUG=y
+CONFIG_HAVE_HW_BREAKPOINT=y
+CONFIG_HAVE_MIXED_BREAKPOINTS_REGS=y
+CONFIG_HAVE_USER_RETURN_NOTIFIER=y
+CONFIG_HAVE_PERF_EVENTS_NMI=y
+CONFIG_HAVE_PERF_REGS=y
+CONFIG_HAVE_PERF_USER_STACK_DUMP=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
+CONFIG_ARCH_WANT_COMPAT_IPC_PARSE_VERSION=y
+CONFIG_ARCH_WANT_OLD_COMPAT_IPC=y
+CONFIG_HAVE_ARCH_SECCOMP_FILTER=y
+CONFIG_SECCOMP_FILTER=y
+CONFIG_HAVE_CONTEXT_TRACKING=y
+CONFIG_HAVE_IRQ_TIME_ACCOUNTING=y
+CONFIG_HAVE_ARCH_TRANSPARENT_HUGEPAGE=y
+CONFIG_HAVE_ARCH_SOFT_DIRTY=y
+CONFIG_MODULES_USE_ELF_RELA=y
+CONFIG_OLD_SIGSUSPEND3=y
+CONFIG_COMPAT_OLD_SIGACTION=y
+
+#
+# GCOV-based kernel profiling
+#
+# CONFIG_GCOV_KERNEL is not set
+# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set
+CONFIG_SLABINFO=y
+CONFIG_RT_MUTEXES=y
+CONFIG_BASE_SMALL=0
+CONFIG_MODULES=y
+CONFIG_MODULE_FORCE_LOAD=y
+CONFIG_MODULE_UNLOAD=y
+CONFIG_MODULE_FORCE_UNLOAD=y
+CONFIG_MODVERSIONS=y
+# CONFIG_MODULE_SRCVERSION_ALL is not set
+# CONFIG_MODULE_SIG is not set
+CONFIG_STOP_MACHINE=y
+CONFIG_BLOCK=y
+CONFIG_BLK_DEV_BSG=y
+CONFIG_BLK_DEV_BSGLIB=y
+# CONFIG_BLK_DEV_INTEGRITY is not set
+CONFIG_BLK_DEV_THROTTLING=y
+# CONFIG_BLK_CMDLINE_PARSER is not set
+
+#
+# Partition Types
+#
+CONFIG_PARTITION_ADVANCED=y
+# CONFIG_ACORN_PARTITION is not set
+CONFIG_AIX_PARTITION=y
+# 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_CMDLINE_PARTITION is not set
+CONFIG_BLOCK_COMPAT=y
+
+#
+# IO Schedulers
+#
+CONFIG_IOSCHED_NOOP=y
+CONFIG_IOSCHED_DEADLINE=y
+CONFIG_IOSCHED_CFQ=y
+CONFIG_CFQ_GROUP_IOSCHED=y
+# CONFIG_DEFAULT_DEADLINE is not set
+CONFIG_DEFAULT_CFQ=y
+# CONFIG_DEFAULT_NOOP is not set
+CONFIG_DEFAULT_IOSCHED="cfq"
+CONFIG_PREEMPT_NOTIFIERS=y
+CONFIG_PADATA=y
+CONFIG_ASN1=m
+CONFIG_UNINLINE_SPIN_UNLOCK=y
+CONFIG_FREEZER=y
+
+#
+# Processor type and features
+#
+CONFIG_ZONE_DMA=y
+CONFIG_SMP=y
+CONFIG_X86_X2APIC=y
+CONFIG_X86_MPPARSE=y
+# CONFIG_X86_EXTENDED_PLATFORM is not set
+# CONFIG_X86_INTEL_LPSS is not set
+CONFIG_X86_SUPPORTS_MEMORY_FAILURE=y
+CONFIG_SCHED_OMIT_FRAME_POINTER=y
+CONFIG_HYPERVISOR_GUEST=y
+CONFIG_PARAVIRT=y
+# CONFIG_PARAVIRT_DEBUG is not set
+# CONFIG_PARAVIRT_SPINLOCKS is not set
+CONFIG_XEN=y
+CONFIG_XEN_DOM0=y
+CONFIG_XEN_PRIVILEGED_GUEST=y
+CONFIG_XEN_PVHVM=y
+CONFIG_XEN_MAX_DOMAIN_MEMORY=500
+CONFIG_XEN_SAVE_RESTORE=y
+# CONFIG_XEN_DEBUG_FS is not set
+CONFIG_KVM_GUEST=y
+# CONFIG_KVM_DEBUG_FS is not set
+CONFIG_PARAVIRT_TIME_ACCOUNTING=y
+CONFIG_PARAVIRT_CLOCK=y
+CONFIG_NO_BOOTMEM=y
+# CONFIG_MEMTEST is not set
+# CONFIG_MK8 is not set
+# CONFIG_MPSC is not set
+# CONFIG_MCORE2 is not set
+# CONFIG_MATOM is not set
+CONFIG_GENERIC_CPU=y
+CONFIG_X86_INTERNODE_CACHE_SHIFT=6
+CONFIG_X86_L1_CACHE_SHIFT=6
+CONFIG_X86_TSC=y
+CONFIG_X86_CMPXCHG64=y
+CONFIG_X86_CMOV=y
+CONFIG_X86_MINIMUM_CPU_FAMILY=64
+CONFIG_X86_DEBUGCTLMSR=y
+CONFIG_CPU_SUP_INTEL=y
+CONFIG_CPU_SUP_AMD=y
+CONFIG_CPU_SUP_CENTAUR=y
+CONFIG_HPET_TIMER=y
+CONFIG_HPET_EMULATE_RTC=y
+CONFIG_DMI=y
+CONFIG_GART_IOMMU=y
+CONFIG_CALGARY_IOMMU=y
+CONFIG_CALGARY_IOMMU_ENABLED_BY_DEFAULT=y
+CONFIG_SWIOTLB=y
+CONFIG_IOMMU_HELPER=y
+# CONFIG_MAXSMP is not set
+CONFIG_NR_CPUS=128
+CONFIG_SCHED_SMT=y
+CONFIG_SCHED_MC=y
+# CONFIG_PREEMPT_NONE is not set
+# CONFIG_PREEMPT_VOLUNTARY is not set
+CONFIG_PREEMPT=y
+CONFIG_PREEMPT_COUNT=y
+CONFIG_X86_LOCAL_APIC=y
+CONFIG_X86_IO_APIC=y
+CONFIG_X86_REROUTE_FOR_BROKEN_BOOT_IRQS=y
+CONFIG_X86_MCE=y
+CONFIG_X86_MCE_INTEL=y
+CONFIG_X86_MCE_AMD=y
+CONFIG_X86_MCE_THRESHOLD=y
+# CONFIG_X86_MCE_INJECT is not set
+CONFIG_X86_THERMAL_VECTOR=y
+CONFIG_I8K=m
+CONFIG_MICROCODE=m
+# CONFIG_MICROCODE_INTEL is not set
+# CONFIG_MICROCODE_AMD is not set
+CONFIG_MICROCODE_OLD_INTERFACE=y
+CONFIG_X86_MSR=m
+CONFIG_X86_CPUID=m
+CONFIG_ARCH_PHYS_ADDR_T_64BIT=y
+CONFIG_ARCH_DMA_ADDR_T_64BIT=y
+CONFIG_DIRECT_GBPAGES=y
+CONFIG_NUMA=y
+CONFIG_AMD_NUMA=y
+CONFIG_X86_64_ACPI_NUMA=y
+CONFIG_NODES_SPAN_OTHER_NODES=y
+# CONFIG_NUMA_EMU is not set
+CONFIG_NODES_SHIFT=6
+CONFIG_ARCH_SPARSEMEM_ENABLE=y
+CONFIG_ARCH_SPARSEMEM_DEFAULT=y
+CONFIG_ARCH_SELECT_MEMORY_MODEL=y
+CONFIG_ARCH_MEMORY_PROBE=y
+CONFIG_ARCH_PROC_KCORE_TEXT=y
+CONFIG_ILLEGAL_POINTER_VALUE=0xdead000000000000
+CONFIG_SELECT_MEMORY_MODEL=y
+CONFIG_SPARSEMEM_MANUAL=y
+CONFIG_SPARSEMEM=y
+CONFIG_NEED_MULTIPLE_NODES=y
+CONFIG_HAVE_MEMORY_PRESENT=y
+CONFIG_SPARSEMEM_EXTREME=y
+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_ISOLATION=y
+# CONFIG_MOVABLE_NODE is not set
+CONFIG_HAVE_BOOTMEM_INFO_NODE=y
+CONFIG_MEMORY_HOTPLUG=y
+CONFIG_MEMORY_HOTPLUG_SPARSE=y
+CONFIG_MEMORY_HOTREMOVE=y
+CONFIG_PAGEFLAGS_EXTENDED=y
+CONFIG_SPLIT_PTLOCK_CPUS=4
+CONFIG_BALLOON_COMPACTION=y
+CONFIG_COMPACTION=y
+CONFIG_MIGRATION=y
+CONFIG_PHYS_ADDR_T_64BIT=y
+CONFIG_ZONE_DMA_FLAG=1
+CONFIG_BOUNCE=y
+CONFIG_VIRT_TO_BUS=y
+CONFIG_MMU_NOTIFIER=y
+CONFIG_KSM=y
+CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
+CONFIG_ARCH_SUPPORTS_MEMORY_FAILURE=y
+CONFIG_MEMORY_FAILURE=y
+CONFIG_HWPOISON_INJECT=m
+CONFIG_TRANSPARENT_HUGEPAGE=y
+CONFIG_TRANSPARENT_HUGEPAGE_ALWAYS=y
+# CONFIG_TRANSPARENT_HUGEPAGE_MADVISE is not set
+CONFIG_CROSS_MEMORY_ATTACH=y
+CONFIG_CLEANCACHE=y
+CONFIG_FRONTSWAP=y
+# CONFIG_CMA is not set
+CONFIG_ZBUD=y
+CONFIG_ZSWAP=y
+CONFIG_X86_CHECK_BIOS_CORRUPTION=y
+CONFIG_X86_BOOTPARAM_MEMORY_CORRUPTION_CHECK=y
+CONFIG_X86_RESERVE_LOW=64
+CONFIG_MTRR=y
+CONFIG_MTRR_SANITIZER=y
+CONFIG_MTRR_SANITIZER_ENABLE_DEFAULT=0
+CONFIG_MTRR_SANITIZER_SPARE_REG_NR_DEFAULT=1
+CONFIG_X86_PAT=y
+CONFIG_ARCH_USES_PG_UNCACHED=y
+CONFIG_ARCH_RANDOM=y
+CONFIG_X86_SMAP=y
+CONFIG_EFI=y
+CONFIG_EFI_STUB=y
+CONFIG_SECCOMP=y
+CONFIG_CC_STACKPROTECTOR=y
+# CONFIG_HZ_100 is not set
+# CONFIG_HZ_250 is not set
+CONFIG_HZ_300=y
+# CONFIG_HZ_1000 is not set
+CONFIG_HZ=300
+CONFIG_SCHED_HRTICK=y
+CONFIG_KEXEC=y
+# CONFIG_CRASH_DUMP is not set
+CONFIG_KEXEC_JUMP=y
+CONFIG_PHYSICAL_START=0x1000000
+CONFIG_RELOCATABLE=y
+CONFIG_PHYSICAL_ALIGN=0x1000000
+CONFIG_HOTPLUG_CPU=y
+# CONFIG_BOOTPARAM_HOTPLUG_CPU0 is not set
+# CONFIG_DEBUG_HOTPLUG_CPU0 is not set
+# CONFIG_COMPAT_VDSO is not set
+# CONFIG_CMDLINE_BOOL is not set
+CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
+CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
+CONFIG_USE_PERCPU_NUMA_NODE_ID=y
+
+#
+# Power management and ACPI options
+#
+CONFIG_ARCH_HIBERNATION_HEADER=y
+CONFIG_SUSPEND=y
+CONFIG_SUSPEND_FREEZER=y
+CONFIG_HIBERNATE_CALLBACKS=y
+CONFIG_HIBERNATION=y
+CONFIG_PM_STD_PARTITION=""
+CONFIG_PM_SLEEP=y
+CONFIG_PM_SLEEP_SMP=y
+CONFIG_PM_AUTOSLEEP=y
+CONFIG_PM_WAKELOCKS=y
+CONFIG_PM_WAKELOCKS_LIMIT=100
+CONFIG_PM_WAKELOCKS_GC=y
+CONFIG_PM_RUNTIME=y
+CONFIG_PM=y
+CONFIG_PM_DEBUG=y
+CONFIG_PM_ADVANCED_DEBUG=y
+# CONFIG_PM_TEST_SUSPEND is not set
+CONFIG_PM_SLEEP_DEBUG=y
+CONFIG_PM_TRACE=y
+CONFIG_PM_TRACE_RTC=y
+# CONFIG_WQ_POWER_EFFICIENT_DEFAULT is not set
+CONFIG_ACPI=y
+CONFIG_ACPI_SLEEP=y
+# CONFIG_ACPI_PROCFS is not set
+# CONFIG_ACPI_PROCFS_POWER is not set
+CONFIG_ACPI_EC_DEBUGFS=m
+CONFIG_ACPI_AC=m
+CONFIG_ACPI_BATTERY=m
+CONFIG_ACPI_BUTTON=m
+CONFIG_ACPI_VIDEO=m
+CONFIG_ACPI_FAN=m
+CONFIG_ACPI_DOCK=y
+CONFIG_ACPI_PROCESSOR=m
+CONFIG_ACPI_IPMI=m
+CONFIG_ACPI_HOTPLUG_CPU=y
+CONFIG_ACPI_PROCESSOR_AGGREGATOR=m
+CONFIG_ACPI_THERMAL=m
+CONFIG_ACPI_NUMA=y
+# CONFIG_ACPI_CUSTOM_DSDT is not set
+CONFIG_ACPI_INITRD_TABLE_OVERRIDE=y
+CONFIG_ACPI_BLACKLIST_YEAR=0
+# CONFIG_ACPI_DEBUG is not set
+CONFIG_ACPI_PCI_SLOT=y
+CONFIG_X86_PM_TIMER=y
+CONFIG_ACPI_CONTAINER=y
+CONFIG_ACPI_HOTPLUG_MEMORY=y
+CONFIG_ACPI_SBS=m
+CONFIG_ACPI_HED=y
+CONFIG_ACPI_CUSTOM_METHOD=m
+CONFIG_ACPI_BGRT=y
+CONFIG_ACPI_APEI=y
+CONFIG_ACPI_APEI_GHES=y
+CONFIG_ACPI_APEI_PCIEAER=y
+CONFIG_ACPI_APEI_MEMORY_FAILURE=y
+CONFIG_ACPI_APEI_EINJ=m
+CONFIG_ACPI_APEI_ERST_DEBUG=m
+CONFIG_SFI=y
+
+#
+# CPU Frequency scaling
+#
+CONFIG_CPU_FREQ=y
+CONFIG_CPU_FREQ_TABLE=y
+CONFIG_CPU_FREQ_GOV_COMMON=y
+CONFIG_CPU_FREQ_STAT=m
+CONFIG_CPU_FREQ_STAT_DETAILS=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=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=y
+CONFIG_CPU_FREQ_GOV_CONSERVATIVE=m
+
+#
+# x86 CPU frequency scaling drivers
+#
+CONFIG_X86_INTEL_PSTATE=y
+CONFIG_X86_PCC_CPUFREQ=m
+CONFIG_X86_ACPI_CPUFREQ=m
+CONFIG_X86_ACPI_CPUFREQ_CPB=y
+CONFIG_X86_POWERNOW_K8=m
+CONFIG_X86_AMD_FREQ_SENSITIVITY=m
+# CONFIG_X86_SPEEDSTEP_CENTRINO is not set
+CONFIG_X86_P4_CLOCKMOD=m
+
+#
+# shared options
+#
+CONFIG_X86_SPEEDSTEP_LIB=m
+
+#
+# CPU Idle
+#
+CONFIG_CPU_IDLE=y
+# CONFIG_CPU_IDLE_MULTIPLE_DRIVERS is not set
+CONFIG_CPU_IDLE_GOV_LADDER=y
+CONFIG_CPU_IDLE_GOV_MENU=y
+# CONFIG_ARCH_NEEDS_CPU_IDLE_COUPLED is not set
+CONFIG_INTEL_IDLE=y
+
+#
+# Memory power savings
+#
+CONFIG_I7300_IDLE_IOAT_CHANNEL=y
+CONFIG_I7300_IDLE=m
+
+#
+# Bus options (PCI etc.)
+#
+CONFIG_PCI=y
+CONFIG_PCI_DIRECT=y
+CONFIG_PCI_MMCONFIG=y
+CONFIG_PCI_XEN=y
+CONFIG_PCI_DOMAINS=y
+CONFIG_PCIEPORTBUS=y
+CONFIG_HOTPLUG_PCI_PCIE=y
+CONFIG_PCIEAER=y
+# CONFIG_PCIE_ECRC is not set
+# CONFIG_PCIEAER_INJECT is not set
+CONFIG_PCIEASPM=y
+# CONFIG_PCIEASPM_DEBUG is not set
+CONFIG_PCIEASPM_DEFAULT=y
+# CONFIG_PCIEASPM_POWERSAVE is not set
+# CONFIG_PCIEASPM_PERFORMANCE is not set
+CONFIG_PCIE_PME=y
+CONFIG_PCI_MSI=y
+# CONFIG_PCI_DEBUG is not set
+CONFIG_PCI_REALLOC_ENABLE_AUTO=y
+CONFIG_PCI_STUB=m
+CONFIG_XEN_PCIDEV_FRONTEND=m
+CONFIG_HT_IRQ=y
+CONFIG_PCI_ATS=y
+CONFIG_PCI_IOV=y
+CONFIG_PCI_PRI=y
+CONFIG_PCI_PASID=y
+CONFIG_PCI_IOAPIC=y
+CONFIG_PCI_LABEL=y
+
+#
+# PCI host controller drivers
+#
+CONFIG_ISA_DMA_API=y
+CONFIG_AMD_NB=y
+CONFIG_PCCARD=m
+CONFIG_PCMCIA=m
+CONFIG_PCMCIA_LOAD_CIS=y
+CONFIG_CARDBUS=y
+
+#
+# PC-card bridges
+#
+CONFIG_YENTA=m
+CONFIG_YENTA_O2=y
+CONFIG_YENTA_RICOH=y
+CONFIG_YENTA_TI=y
+CONFIG_YENTA_ENE_TUNE=y
+CONFIG_YENTA_TOSHIBA=y
+CONFIG_PD6729=m
+CONFIG_I82092=m
+CONFIG_PCCARD_NONSTATIC=y
+CONFIG_HOTPLUG_PCI=y
+CONFIG_HOTPLUG_PCI_ACPI=y
+CONFIG_HOTPLUG_PCI_ACPI_IBM=m
+CONFIG_HOTPLUG_PCI_CPCI=y
+CONFIG_HOTPLUG_PCI_CPCI_ZT5550=m
+CONFIG_HOTPLUG_PCI_CPCI_GENERIC=m
+CONFIG_HOTPLUG_PCI_SHPC=m
+CONFIG_RAPIDIO=y
+CONFIG_RAPIDIO_TSI721=y
+CONFIG_RAPIDIO_DISC_TIMEOUT=30
+# CONFIG_RAPIDIO_ENABLE_RX_TX_PORTS is not set
+CONFIG_RAPIDIO_DMA_ENGINE=y
+CONFIG_RAPIDIO_DEBUG=y
+CONFIG_RAPIDIO_ENUM_BASIC=m
+
+#
+# RapidIO Switch drivers
+#
+CONFIG_RAPIDIO_TSI57X=y
+CONFIG_RAPIDIO_CPS_XX=y
+CONFIG_RAPIDIO_TSI568=y
+CONFIG_RAPIDIO_CPS_GEN2=y
+# CONFIG_X86_SYSFB is not set
+
+#
+# Executable file formats / Emulations
+#
+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_BINFMT_SCRIPT=y
+# CONFIG_HAVE_AOUT is not set
+CONFIG_BINFMT_MISC=y
+CONFIG_COREDUMP=y
+CONFIG_IA32_EMULATION=y
+CONFIG_IA32_AOUT=m
+CONFIG_X86_X32=y
+CONFIG_COMPAT=y
+CONFIG_COMPAT_FOR_U64_ALIGNMENT=y
+CONFIG_SYSVIPC_COMPAT=y
+CONFIG_KEYS_COMPAT=y
+CONFIG_X86_DEV_DMA_OPS=y
+CONFIG_NET=y
+CONFIG_COMPAT_NETLINK_MESSAGES=y
+
+#
+# Networking options
+#
+CONFIG_PACKET=y
+CONFIG_PACKET_DIAG=m
+CONFIG_UNIX=y
+CONFIG_UNIX_DIAG=m
+CONFIG_XFRM=y
+CONFIG_XFRM_ALGO=m
+CONFIG_XFRM_USER=m
+# CONFIG_XFRM_SUB_POLICY is not set
+# CONFIG_XFRM_MIGRATE is not set
+# CONFIG_XFRM_STATISTICS is not set
+CONFIG_XFRM_IPCOMP=m
+CONFIG_NET_KEY=m
+# CONFIG_NET_KEY_MIGRATE is not set
+CONFIG_INET=y
+CONFIG_IP_MULTICAST=y
+CONFIG_IP_ADVANCED_ROUTER=y
+CONFIG_IP_FIB_TRIE_STATS=y
+CONFIG_IP_MULTIPLE_TABLES=y
+CONFIG_IP_ROUTE_MULTIPATH=y
+CONFIG_IP_ROUTE_VERBOSE=y
+CONFIG_IP_ROUTE_CLASSID=y
+# CONFIG_IP_PNP is not set
+CONFIG_NET_IPIP=m
+CONFIG_NET_IPGRE_DEMUX=m
+CONFIG_NET_IP_TUNNEL=m
+CONFIG_NET_IPGRE=m
+# CONFIG_NET_IPGRE_BROADCAST is not set
+CONFIG_IP_MROUTE=y
+# CONFIG_IP_MROUTE_MULTIPLE_TABLES is not set
+CONFIG_IP_PIMSM_V1=y
+CONFIG_IP_PIMSM_V2=y
+CONFIG_SYN_COOKIES=y
+CONFIG_NET_IPVTI=m
+CONFIG_INET_AH=m
+CONFIG_INET_ESP=m
+CONFIG_INET_IPCOMP=m
+CONFIG_INET_XFRM_TUNNEL=m
+CONFIG_INET_TUNNEL=m
+CONFIG_INET_XFRM_MODE_TRANSPORT=m
+CONFIG_INET_XFRM_MODE_TUNNEL=m
+CONFIG_INET_XFRM_MODE_BEET=m
+CONFIG_INET_LRO=y
+CONFIG_INET_DIAG=m
+CONFIG_INET_TCP_DIAG=m
+CONFIG_INET_UDP_DIAG=m
+CONFIG_TCP_CONG_ADVANCED=y
+CONFIG_TCP_CONG_BIC=m
+CONFIG_TCP_CONG_CUBIC=y
+CONFIG_TCP_CONG_WESTWOOD=m
+CONFIG_TCP_CONG_HTCP=m
+CONFIG_TCP_CONG_HSTCP=m
+CONFIG_TCP_CONG_HYBLA=m
+CONFIG_TCP_CONG_VEGAS=m
+CONFIG_TCP_CONG_SCALABLE=m
+CONFIG_TCP_CONG_LP=m
+CONFIG_TCP_CONG_VENO=m
+CONFIG_TCP_CONG_YEAH=m
+CONFIG_TCP_CONG_ILLINOIS=m
+CONFIG_DEFAULT_CUBIC=y
+# CONFIG_DEFAULT_RENO is not set
+CONFIG_DEFAULT_TCP_CONG="cubic"
+# CONFIG_TCP_MD5SIG is not set
+CONFIG_IPV6=y
+CONFIG_IPV6_PRIVACY=y
+CONFIG_IPV6_ROUTER_PREF=y
+CONFIG_IPV6_ROUTE_INFO=y
+CONFIG_IPV6_OPTIMISTIC_DAD=y
+CONFIG_INET6_AH=m
+CONFIG_INET6_ESP=m
+CONFIG_INET6_IPCOMP=m
+CONFIG_IPV6_MIP6=m
+CONFIG_INET6_XFRM_TUNNEL=m
+CONFIG_INET6_TUNNEL=m
+CONFIG_INET6_XFRM_MODE_TRANSPORT=m
+CONFIG_INET6_XFRM_MODE_TUNNEL=m
+CONFIG_INET6_XFRM_MODE_BEET=m
+CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION=m
+CONFIG_IPV6_SIT=m
+CONFIG_IPV6_SIT_6RD=y
+CONFIG_IPV6_NDISC_NODETYPE=y
+CONFIG_IPV6_TUNNEL=m
+CONFIG_IPV6_GRE=m
+CONFIG_IPV6_MULTIPLE_TABLES=y
+CONFIG_IPV6_SUBTREES=y
+# CONFIG_IPV6_MROUTE is not set
+CONFIG_NETLABEL=y
+CONFIG_NETWORK_SECMARK=y
+CONFIG_NETWORK_PHY_TIMESTAMPING=y
+CONFIG_NETFILTER=y
+# CONFIG_NETFILTER_DEBUG is not set
+CONFIG_NETFILTER_ADVANCED=y
+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=y
+CONFIG_NF_CONNTRACK_EVENTS=y
+CONFIG_NF_CONNTRACK_TIMEOUT=y
+CONFIG_NF_CONNTRACK_TIMESTAMP=y
+CONFIG_NF_CONNTRACK_LABELS=y
+CONFIG_NF_CT_PROTO_DCCP=m
+CONFIG_NF_CT_PROTO_GRE=m
+CONFIG_NF_CT_PROTO_SCTP=m
+CONFIG_NF_CT_PROTO_UDPLITE=m
+CONFIG_NF_CONNTRACK_AMANDA=m
+CONFIG_NF_CONNTRACK_FTP=m
+CONFIG_NF_CONNTRACK_H323=m
+CONFIG_NF_CONNTRACK_IRC=m
+CONFIG_NF_CONNTRACK_BROADCAST=m
+CONFIG_NF_CONNTRACK_NETBIOS_NS=m
+CONFIG_NF_CONNTRACK_SNMP=m
+CONFIG_NF_CONNTRACK_PPTP=m
+CONFIG_NF_CONNTRACK_SANE=m
+CONFIG_NF_CONNTRACK_SIP=m
+CONFIG_NF_CONNTRACK_TFTP=m
+CONFIG_NF_CT_NETLINK=m
+CONFIG_NF_CT_NETLINK_TIMEOUT=m
+CONFIG_NF_CT_NETLINK_HELPER=m
+CONFIG_NETFILTER_NETLINK_QUEUE_CT=y
+CONFIG_NF_NAT=m
+CONFIG_NF_NAT_NEEDED=y
+CONFIG_NF_NAT_PROTO_DCCP=m
+CONFIG_NF_NAT_PROTO_UDPLITE=m
+CONFIG_NF_NAT_PROTO_SCTP=m
+CONFIG_NF_NAT_AMANDA=m
+CONFIG_NF_NAT_FTP=m
+CONFIG_NF_NAT_IRC=m
+CONFIG_NF_NAT_SIP=m
+CONFIG_NF_NAT_TFTP=m
+CONFIG_NETFILTER_SYNPROXY=m
+CONFIG_NETFILTER_XTABLES=m
+
+#
+# Xtables combined modules
+#
+CONFIG_NETFILTER_XT_MARK=m
+CONFIG_NETFILTER_XT_CONNMARK=m
+CONFIG_NETFILTER_XT_SET=m
+
+#
+# Xtables targets
+#
+CONFIG_NETFILTER_XT_TARGET_AUDIT=m
+CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m
+CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
+CONFIG_NETFILTER_XT_TARGET_CONNMARK=m
+CONFIG_NETFILTER_XT_TARGET_CONNSECMARK=m
+CONFIG_NETFILTER_XT_TARGET_CT=m
+CONFIG_NETFILTER_XT_TARGET_DSCP=m
+CONFIG_NETFILTER_XT_TARGET_HL=m
+CONFIG_NETFILTER_XT_TARGET_HMARK=m
+CONFIG_NETFILTER_XT_TARGET_IDLETIMER=m
+CONFIG_NETFILTER_XT_TARGET_LED=m
+CONFIG_NETFILTER_XT_TARGET_LOG=m
+CONFIG_NETFILTER_XT_TARGET_MARK=m
+CONFIG_NETFILTER_XT_TARGET_NETMAP=m
+CONFIG_NETFILTER_XT_TARGET_NFLOG=m
+CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
+CONFIG_NETFILTER_XT_TARGET_NOTRACK=m
+CONFIG_NETFILTER_XT_TARGET_RATEEST=m
+CONFIG_NETFILTER_XT_TARGET_REDIRECT=m
+CONFIG_NETFILTER_XT_TARGET_TEE=m
+CONFIG_NETFILTER_XT_TARGET_TPROXY=m
+CONFIG_NETFILTER_XT_TARGET_TRACE=m
+CONFIG_NETFILTER_XT_TARGET_SECMARK=m
+CONFIG_NETFILTER_XT_TARGET_TCPMSS=m
+CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m
+
+#
+# Xtables matches
+#
+CONFIG_NETFILTER_XT_MATCH_ADDRTYPE=m
+CONFIG_NETFILTER_XT_MATCH_BPF=m
+CONFIG_NETFILTER_XT_MATCH_CLUSTER=m
+CONFIG_NETFILTER_XT_MATCH_COMMENT=m
+CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m
+CONFIG_NETFILTER_XT_MATCH_CONNLABEL=m
+CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m
+CONFIG_NETFILTER_XT_MATCH_CONNMARK=m
+CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m
+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
+CONFIG_NETFILTER_XT_MATCH_HL=m
+CONFIG_NETFILTER_XT_MATCH_IPRANGE=m
+CONFIG_NETFILTER_XT_MATCH_IPVS=m
+CONFIG_NETFILTER_XT_MATCH_LENGTH=m
+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
+CONFIG_NETFILTER_XT_MATCH_PHYSDEV=m
+CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m
+CONFIG_NETFILTER_XT_MATCH_QUOTA=m
+CONFIG_NETFILTER_XT_MATCH_RATEEST=m
+CONFIG_NETFILTER_XT_MATCH_REALM=m
+CONFIG_NETFILTER_XT_MATCH_RECENT=m
+CONFIG_NETFILTER_XT_MATCH_SCTP=m
+CONFIG_NETFILTER_XT_MATCH_SOCKET=m
+CONFIG_NETFILTER_XT_MATCH_STATE=m
+CONFIG_NETFILTER_XT_MATCH_STATISTIC=m
+CONFIG_NETFILTER_XT_MATCH_STRING=m
+CONFIG_NETFILTER_XT_MATCH_TCPMSS=m
+CONFIG_NETFILTER_XT_MATCH_TIME=m
+CONFIG_NETFILTER_XT_MATCH_U32=m
+CONFIG_IP_SET=m
+CONFIG_IP_SET_MAX=256
+CONFIG_IP_SET_BITMAP_IP=m
+CONFIG_IP_SET_BITMAP_IPMAC=m
+CONFIG_IP_SET_BITMAP_PORT=m
+CONFIG_IP_SET_HASH_IP=m
+CONFIG_IP_SET_HASH_IPPORT=m
+CONFIG_IP_SET_HASH_IPPORTIP=m
+CONFIG_IP_SET_HASH_IPPORTNET=m
+CONFIG_IP_SET_HASH_NET=m
+CONFIG_IP_SET_HASH_NETPORT=m
+CONFIG_IP_SET_HASH_NETIFACE=m
+CONFIG_IP_SET_LIST_SET=m
+CONFIG_IP_VS=m
+# CONFIG_IP_VS_IPV6 is not set
+# CONFIG_IP_VS_DEBUG is not set
+CONFIG_IP_VS_TAB_BITS=12
+
+#
+# IPVS transport protocol load balancing support
+#
+CONFIG_IP_VS_PROTO_TCP=y
+CONFIG_IP_VS_PROTO_UDP=y
+CONFIG_IP_VS_PROTO_AH_ESP=y
+CONFIG_IP_VS_PROTO_ESP=y
+CONFIG_IP_VS_PROTO_AH=y
+CONFIG_IP_VS_PROTO_SCTP=y
+
+#
+# IPVS scheduler
+#
+CONFIG_IP_VS_RR=m
+CONFIG_IP_VS_WRR=m
+CONFIG_IP_VS_LC=m
+CONFIG_IP_VS_WLC=m
+CONFIG_IP_VS_LBLC=m
+CONFIG_IP_VS_LBLCR=m
+CONFIG_IP_VS_DH=m
+CONFIG_IP_VS_SH=m
+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
+CONFIG_IP_VS_NFCT=y
+CONFIG_IP_VS_PE_SIP=m
+
+#
+# IP: Netfilter Configuration
+#
+CONFIG_NF_DEFRAG_IPV4=m
+CONFIG_NF_CONNTRACK_IPV4=m
+# CONFIG_NF_CONNTRACK_PROC_COMPAT is not set
+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
+CONFIG_IP_NF_TARGET_SYNPROXY=m
+CONFIG_IP_NF_TARGET_ULOG=m
+CONFIG_NF_NAT_IPV4=m
+CONFIG_IP_NF_TARGET_MASQUERADE=m
+CONFIG_IP_NF_TARGET_NETMAP=m
+CONFIG_IP_NF_TARGET_REDIRECT=m
+CONFIG_NF_NAT_SNMP_BASIC=m
+CONFIG_NF_NAT_PROTO_GRE=m
+CONFIG_NF_NAT_PPTP=m
+CONFIG_NF_NAT_H323=m
+CONFIG_IP_NF_MANGLE=m
+CONFIG_IP_NF_TARGET_CLUSTERIP=m
+CONFIG_IP_NF_TARGET_ECN=m
+CONFIG_IP_NF_TARGET_TTL=m
+CONFIG_IP_NF_RAW=m
+CONFIG_IP_NF_SECURITY=m
+CONFIG_IP_NF_ARPTABLES=m
+CONFIG_IP_NF_ARPFILTER=m
+CONFIG_IP_NF_ARP_MANGLE=m
+
+#
+# IPv6: Netfilter Configuration
+#
+CONFIG_NF_DEFRAG_IPV6=m
+CONFIG_NF_CONNTRACK_IPV6=m
+CONFIG_IP6_NF_IPTABLES=m
+CONFIG_IP6_NF_MATCH_AH=m
+CONFIG_IP6_NF_MATCH_EUI64=m
+CONFIG_IP6_NF_MATCH_FRAG=m
+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_FILTER=m
+CONFIG_IP6_NF_TARGET_REJECT=m
+CONFIG_IP6_NF_TARGET_SYNPROXY=m
+CONFIG_IP6_NF_MANGLE=m
+CONFIG_IP6_NF_RAW=m
+CONFIG_IP6_NF_SECURITY=m
+CONFIG_NF_NAT_IPV6=m
+CONFIG_IP6_NF_TARGET_MASQUERADE=m
+CONFIG_IP6_NF_TARGET_NPT=m
+CONFIG_BRIDGE_NF_EBTABLES=m
+CONFIG_BRIDGE_EBT_BROUTE=m
+CONFIG_BRIDGE_EBT_T_FILTER=m
+CONFIG_BRIDGE_EBT_T_NAT=m
+CONFIG_BRIDGE_EBT_802_3=m
+CONFIG_BRIDGE_EBT_AMONG=m
+CONFIG_BRIDGE_EBT_ARP=m
+CONFIG_BRIDGE_EBT_IP=m
+CONFIG_BRIDGE_EBT_IP6=m
+CONFIG_BRIDGE_EBT_LIMIT=m
+CONFIG_BRIDGE_EBT_MARK=m
+CONFIG_BRIDGE_EBT_PKTTYPE=m
+CONFIG_BRIDGE_EBT_STP=m
+CONFIG_BRIDGE_EBT_VLAN=m
+CONFIG_BRIDGE_EBT_ARPREPLY=m
+CONFIG_BRIDGE_EBT_DNAT=m
+CONFIG_BRIDGE_EBT_MARK_T=m
+CONFIG_BRIDGE_EBT_REDIRECT=m
+CONFIG_BRIDGE_EBT_SNAT=m
+CONFIG_BRIDGE_EBT_LOG=m
+CONFIG_BRIDGE_EBT_ULOG=m
+CONFIG_BRIDGE_EBT_NFLOG=m
+CONFIG_IP_DCCP=m
+CONFIG_INET_DCCP_DIAG=m
+
+#
+# DCCP CCIDs Configuration
+#
+# CONFIG_IP_DCCP_CCID2_DEBUG is not set
+CONFIG_IP_DCCP_CCID3=y
+# CONFIG_IP_DCCP_CCID3_DEBUG is not set
+CONFIG_IP_DCCP_TFRC_LIB=y
+
+#
+# DCCP Kernel Hacking
+#
+# CONFIG_IP_DCCP_DEBUG is not set
+CONFIG_NET_DCCPPROBE=m
+CONFIG_IP_SCTP=m
+CONFIG_NET_SCTPPROBE=m
+# CONFIG_SCTP_DBG_OBJCNT is not set
+# CONFIG_SCTP_DEFAULT_COOKIE_HMAC_MD5 is not set
+CONFIG_SCTP_DEFAULT_COOKIE_HMAC_SHA1=y
+# CONFIG_SCTP_DEFAULT_COOKIE_HMAC_NONE is not set
+CONFIG_SCTP_COOKIE_HMAC_MD5=y
+CONFIG_SCTP_COOKIE_HMAC_SHA1=y
+# CONFIG_RDS is not set
+# CONFIG_TIPC is not set
+CONFIG_ATM=m
+CONFIG_ATM_CLIP=m
+# CONFIG_ATM_CLIP_NO_ICMP is not set
+CONFIG_ATM_LANE=m
+CONFIG_ATM_MPOA=m
+CONFIG_ATM_BR2684=m
+# CONFIG_ATM_BR2684_IPFILTER is not set
+CONFIG_L2TP=m
+# CONFIG_L2TP_DEBUGFS is not set
+CONFIG_L2TP_V3=y
+CONFIG_L2TP_IP=m
+CONFIG_L2TP_ETH=m
+CONFIG_STP=m
+CONFIG_MRP=m
+CONFIG_BRIDGE=m
+CONFIG_BRIDGE_IGMP_SNOOPING=y
+CONFIG_BRIDGE_VLAN_FILTERING=y
+CONFIG_HAVE_NET_DSA=y
+CONFIG_NET_DSA=m
+CONFIG_NET_DSA_TAG_DSA=y
+CONFIG_NET_DSA_TAG_EDSA=y
+CONFIG_NET_DSA_TAG_TRAILER=y
+CONFIG_VLAN_8021Q=m
+# CONFIG_VLAN_8021Q_GVRP is not set
+CONFIG_VLAN_8021Q_MVRP=y
+# CONFIG_DECNET is not set
+CONFIG_LLC=m
+CONFIG_LLC2=m
+CONFIG_IPX=m
+# CONFIG_IPX_INTERN is not set
+CONFIG_ATALK=m
+CONFIG_DEV_APPLETALK=m
+CONFIG_IPDDP=m
+CONFIG_IPDDP_ENCAP=y
+# CONFIG_X25 is not set
+# CONFIG_LAPB is not set
+CONFIG_PHONET=m
+CONFIG_IEEE802154=m
+CONFIG_IEEE802154_6LOWPAN=m
+CONFIG_MAC802154=m
+CONFIG_NET_SCHED=y
+
+#
+# Queueing/Scheduling
+#
+CONFIG_NET_SCH_CBQ=m
+CONFIG_NET_SCH_HTB=m
+CONFIG_NET_SCH_HFSC=m
+CONFIG_NET_SCH_ATM=m
+CONFIG_NET_SCH_PRIO=m
+CONFIG_NET_SCH_MULTIQ=m
+CONFIG_NET_SCH_RED=m
+CONFIG_NET_SCH_SFB=m
+CONFIG_NET_SCH_SFQ=m
+CONFIG_NET_SCH_TEQL=m
+CONFIG_NET_SCH_TBF=m
+CONFIG_NET_SCH_GRED=m
+CONFIG_NET_SCH_DSMARK=m
+CONFIG_NET_SCH_NETEM=m
+CONFIG_NET_SCH_DRR=m
+CONFIG_NET_SCH_MQPRIO=m
+CONFIG_NET_SCH_CHOKE=m
+CONFIG_NET_SCH_QFQ=m
+CONFIG_NET_SCH_CODEL=m
+CONFIG_NET_SCH_FQ_CODEL=m
+CONFIG_NET_SCH_FQ=m
+CONFIG_NET_SCH_INGRESS=m
+CONFIG_NET_SCH_PLUG=m
+
+#
+# Classification
+#
+CONFIG_NET_CLS=y
+CONFIG_NET_CLS_BASIC=m
+CONFIG_NET_CLS_TCINDEX=m
+CONFIG_NET_CLS_ROUTE4=m
+CONFIG_NET_CLS_FW=m
+CONFIG_NET_CLS_U32=m
+# CONFIG_CLS_U32_PERF is not set
+# CONFIG_CLS_U32_MARK is not set
+CONFIG_NET_CLS_RSVP=m
+CONFIG_NET_CLS_RSVP6=m
+CONFIG_NET_CLS_FLOW=m
+CONFIG_NET_CLS_CGROUP=y
+# CONFIG_NET_EMATCH is not set
+CONFIG_NET_CLS_ACT=y
+CONFIG_NET_ACT_POLICE=m
+CONFIG_NET_ACT_GACT=m
+CONFIG_GACT_PROB=y
+CONFIG_NET_ACT_MIRRED=m
+CONFIG_NET_ACT_IPT=m
+CONFIG_NET_ACT_NAT=m
+CONFIG_NET_ACT_PEDIT=m
+CONFIG_NET_ACT_SIMP=m
+CONFIG_NET_ACT_SKBEDIT=m
+CONFIG_NET_ACT_CSUM=m
+CONFIG_NET_CLS_IND=y
+CONFIG_NET_SCH_FIFO=y
+# CONFIG_DCB is not set
+CONFIG_DNS_RESOLVER=y
+CONFIG_BATMAN_ADV=m
+CONFIG_BATMAN_ADV_BLA=y
+CONFIG_BATMAN_ADV_DAT=y
+CONFIG_BATMAN_ADV_NC=y
+# CONFIG_BATMAN_ADV_DEBUG is not set
+CONFIG_OPENVSWITCH=m
+CONFIG_OPENVSWITCH_GRE=y
+CONFIG_OPENVSWITCH_VXLAN=y
+CONFIG_VSOCKETS=m
+CONFIG_VMWARE_VMCI_VSOCKETS=m
+CONFIG_NETLINK_MMAP=y
+CONFIG_NETLINK_DIAG=m
+CONFIG_NET_MPLS_GSO=m
+CONFIG_RPS=y
+CONFIG_RFS_ACCEL=y
+CONFIG_XPS=y
+CONFIG_NETPRIO_CGROUP=m
+CONFIG_NET_RX_BUSY_POLL=y
+CONFIG_BQL=y
+CONFIG_BPF_JIT=y
+CONFIG_NET_FLOW_LIMIT=y
+
+#
+# Network testing
+#
+CONFIG_NET_PKTGEN=m
+CONFIG_NET_TCPPROBE=m
+CONFIG_NET_DROP_MONITOR=y
+CONFIG_HAMRADIO=y
+
+#
+# Packet Radio protocols
+#
+CONFIG_AX25=m
+CONFIG_AX25_DAMA_SLAVE=y
+CONFIG_NETROM=m
+CONFIG_ROSE=m
+
+#
+# AX.25 network device drivers
+#
+CONFIG_MKISS=m
+CONFIG_6PACK=m
+CONFIG_BPQETHER=m
+CONFIG_BAYCOM_SER_FDX=m
+CONFIG_BAYCOM_SER_HDX=m
+CONFIG_BAYCOM_PAR=m
+CONFIG_YAM=m
+# CONFIG_CAN is not set
+CONFIG_IRDA=m
+
+#
+# IrDA protocols
+#
+CONFIG_IRLAN=m
+CONFIG_IRNET=m
+CONFIG_IRCOMM=m
+CONFIG_IRDA_ULTRA=y
+
+#
+# IrDA options
+#
+CONFIG_IRDA_CACHE_LAST_LSAP=y
+CONFIG_IRDA_FAST_RR=y
+# CONFIG_IRDA_DEBUG is not set
+
+#
+# Infrared-port device drivers
+#
+
+#
+# SIR device drivers
+#
+CONFIG_IRTTY_SIR=m
+
+#
+# Dongle support
+#
+CONFIG_DONGLE=y
+CONFIG_ESI_DONGLE=m
+CONFIG_ACTISYS_DONGLE=m
+CONFIG_TEKRAM_DONGLE=m
+CONFIG_TOIM3232_DONGLE=m
+CONFIG_LITELINK_DONGLE=m
+CONFIG_MA600_DONGLE=m
+CONFIG_GIRBIL_DONGLE=m
+CONFIG_MCP2120_DONGLE=m
+CONFIG_OLD_BELKIN_DONGLE=m
+CONFIG_ACT200L_DONGLE=m
+CONFIG_KINGSUN_DONGLE=m
+CONFIG_KSDAZZLE_DONGLE=m
+CONFIG_KS959_DONGLE=m
+
+#
+# FIR device drivers
+#
+CONFIG_USB_IRDA=m
+CONFIG_SIGMATEL_FIR=m
+CONFIG_NSC_FIR=m
+CONFIG_WINBOND_FIR=m
+CONFIG_SMC_IRCC_FIR=m
+CONFIG_ALI_FIR=m
+CONFIG_VLSI_FIR=m
+CONFIG_VIA_FIR=m
+CONFIG_MCS_FIR=m
+CONFIG_BT=m
+CONFIG_BT_RFCOMM=m
+CONFIG_BT_RFCOMM_TTY=y
+CONFIG_BT_BNEP=m
+# CONFIG_BT_BNEP_MC_FILTER is not set
+# CONFIG_BT_BNEP_PROTO_FILTER is not set
+# CONFIG_BT_CMTP is not set
+CONFIG_BT_HIDP=m
+
+#
+# Bluetooth device drivers
+#
+CONFIG_BT_HCIBTUSB=m
+CONFIG_BT_HCIBTSDIO=m
+CONFIG_BT_HCIUART=m
+CONFIG_BT_HCIUART_H4=y
+CONFIG_BT_HCIUART_BCSP=y
+CONFIG_BT_HCIUART_ATH3K=y
+CONFIG_BT_HCIUART_LL=y
+CONFIG_BT_HCIUART_3WIRE=y
+CONFIG_BT_HCIBCM203X=m
+CONFIG_BT_HCIBPA10X=m
+CONFIG_BT_HCIBFUSB=m
+CONFIG_BT_HCIDTL1=m
+CONFIG_BT_HCIBT3C=m
+CONFIG_BT_HCIBLUECARD=m
+CONFIG_BT_HCIBTUART=m
+CONFIG_BT_HCIVHCI=m
+CONFIG_BT_MRVL=m
+CONFIG_BT_MRVL_SDIO=m
+CONFIG_BT_ATH3K=m
+CONFIG_BT_WILINK=m
+CONFIG_AF_RXRPC=m
+# CONFIG_AF_RXRPC_DEBUG is not set
+CONFIG_RXKAD=m
+CONFIG_FIB_RULES=y
+CONFIG_WIRELESS=y
+CONFIG_WIRELESS_EXT=y
+CONFIG_WEXT_CORE=y
+CONFIG_WEXT_PROC=y
+CONFIG_WEXT_SPY=y
+CONFIG_WEXT_PRIV=y
+CONFIG_CFG80211=m
+# CONFIG_NL80211_TESTMODE is not set
+# CONFIG_CFG80211_DEVELOPER_WARNINGS is not set
+# CONFIG_CFG80211_REG_DEBUG is not set
+CONFIG_CFG80211_DEFAULT_PS=y
+# CONFIG_CFG80211_DEBUGFS is not set
+# CONFIG_CFG80211_INTERNAL_REGDB is not set
+CONFIG_CFG80211_WEXT=y
+CONFIG_LIB80211=m
+CONFIG_LIB80211_CRYPT_WEP=m
+CONFIG_LIB80211_CRYPT_CCMP=m
+CONFIG_LIB80211_CRYPT_TKIP=m
+# CONFIG_LIB80211_DEBUG is not set
+CONFIG_MAC80211=m
+CONFIG_MAC80211_HAS_RC=y
+CONFIG_MAC80211_RC_MINSTREL=y
+CONFIG_MAC80211_RC_MINSTREL_HT=y
+CONFIG_MAC80211_RC_DEFAULT_MINSTREL=y
+CONFIG_MAC80211_RC_DEFAULT="minstrel_ht"
+CONFIG_MAC80211_MESH=y
+CONFIG_MAC80211_LEDS=y
+# CONFIG_MAC80211_DEBUGFS is not set
+# CONFIG_MAC80211_MESSAGE_TRACING is not set
+# CONFIG_MAC80211_DEBUG_MENU is not set
+CONFIG_WIMAX=m
+CONFIG_WIMAX_DEBUG_LEVEL=8
+CONFIG_RFKILL=m
+CONFIG_RFKILL_LEDS=y
+CONFIG_RFKILL_INPUT=y
+CONFIG_NET_9P=m
+CONFIG_NET_9P_VIRTIO=m
+# CONFIG_NET_9P_DEBUG is not set
+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_NCI_SPI is not set
+CONFIG_NFC_HCI=m
+# CONFIG_NFC_SHDLC is not set
+
+#
+# Near Field Communication (NFC) devices
+#
+CONFIG_NFC_PN533=m
+CONFIG_NFC_WILINK=m
+CONFIG_NFC_MEI_PHY=m
+CONFIG_NFC_SIM=m
+CONFIG_NFC_PN544=m
+CONFIG_NFC_PN544_MEI=m
+CONFIG_NFC_MICROREAD=m
+CONFIG_NFC_MICROREAD_MEI=m
+CONFIG_HAVE_BPF_JIT=y
+
+#
+# Device Drivers
+#
+
+#
+# Generic Driver Options
+#
+CONFIG_UEVENT_HELPER_PATH=""
+CONFIG_DEVTMPFS=y
+# CONFIG_DEVTMPFS_MOUNT is not set
+CONFIG_STANDALONE=y
+CONFIG_PREVENT_FIRMWARE_BUILD=y
+CONFIG_FW_LOADER=y
+CONFIG_FIRMWARE_IN_KERNEL=y
+CONFIG_EXTRA_FIRMWARE=""
+CONFIG_FW_LOADER_USER_HELPER=y
+# 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_MMIO=m
+CONFIG_REGMAP_IRQ=y
+CONFIG_DMA_SHARED_BUFFER=y
+
+#
+# Bus devices
+#
+CONFIG_CONNECTOR=y
+CONFIG_PROC_EVENTS=y
+CONFIG_MTD=m
+CONFIG_MTD_TESTS=m
+CONFIG_MTD_REDBOOT_PARTS=m
+CONFIG_MTD_REDBOOT_DIRECTORY_BLOCK=-1
+# CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED is not set
+# CONFIG_MTD_REDBOOT_PARTS_READONLY is not set
+CONFIG_MTD_CMDLINE_PARTS=m
+CONFIG_MTD_AR7_PARTS=m
+
+#
+# User Modules And Translation Layers
+#
+CONFIG_MTD_BLKDEVS=m
+CONFIG_MTD_BLOCK=m
+CONFIG_MTD_BLOCK_RO=m
+CONFIG_FTL=m
+CONFIG_NFTL=m
+CONFIG_NFTL_RW=y
+CONFIG_INFTL=m
+CONFIG_RFD_FTL=m
+CONFIG_SSFDC=m
+# CONFIG_SM_FTL is not set
+CONFIG_MTD_OOPS=m
+CONFIG_MTD_SWAP=m
+
+#
+# RAM/ROM/Flash chip drivers
+#
+CONFIG_MTD_CFI=m
+CONFIG_MTD_JEDECPROBE=m
+CONFIG_MTD_GEN_PROBE=m
+# CONFIG_MTD_CFI_ADV_OPTIONS is not set
+CONFIG_MTD_MAP_BANK_WIDTH_1=y
+CONFIG_MTD_MAP_BANK_WIDTH_2=y
+CONFIG_MTD_MAP_BANK_WIDTH_4=y
+# CONFIG_MTD_MAP_BANK_WIDTH_8 is not set
+# CONFIG_MTD_MAP_BANK_WIDTH_16 is not set
+# CONFIG_MTD_MAP_BANK_WIDTH_32 is not set
+CONFIG_MTD_CFI_I1=y
+CONFIG_MTD_CFI_I2=y
+# CONFIG_MTD_CFI_I4 is not set
+# CONFIG_MTD_CFI_I8 is not set
+CONFIG_MTD_CFI_INTELEXT=m
+CONFIG_MTD_CFI_AMDSTD=m
+CONFIG_MTD_CFI_STAA=m
+CONFIG_MTD_CFI_UTIL=m
+CONFIG_MTD_RAM=m
+CONFIG_MTD_ROM=m
+CONFIG_MTD_ABSENT=m
+
+#
+# Mapping drivers for chip access
+#
+CONFIG_MTD_COMPLEX_MAPPINGS=y
+# CONFIG_MTD_PHYSMAP is not set
+CONFIG_MTD_SC520CDP=m
+CONFIG_MTD_NETSC520=m
+CONFIG_MTD_TS5500=m
+# CONFIG_MTD_SBC_GXX is not set
+# CONFIG_MTD_AMD76XROM is not set
+# CONFIG_MTD_ICHXROM is not set
+# CONFIG_MTD_ESB2ROM is not set
+# CONFIG_MTD_CK804XROM is not set
+CONFIG_MTD_SCB2_FLASH=m
+# CONFIG_MTD_NETtel is not set
+# CONFIG_MTD_L440GX is not set
+CONFIG_MTD_PCI=m
+# CONFIG_MTD_PCMCIA is not set
+# CONFIG_MTD_GPIO_ADDR is not set
+# CONFIG_MTD_INTEL_VR_NOR is not set
+CONFIG_MTD_PLATRAM=m
+# CONFIG_MTD_LATCH_ADDR is not set
+
+#
+# Self-contained MTD device drivers
+#
+CONFIG_MTD_PMC551=m
+# CONFIG_MTD_PMC551_BUGFIX is not set
+# CONFIG_MTD_PMC551_DEBUG is not set
+# CONFIG_MTD_DATAFLASH is not set
+# CONFIG_MTD_M25P80 is not set
+# CONFIG_MTD_SST25L is not set
+# CONFIG_MTD_SLRAM is not set
+CONFIG_MTD_PHRAM=m
+CONFIG_MTD_MTDRAM=m
+CONFIG_MTDRAM_TOTAL_SIZE=4096
+CONFIG_MTDRAM_ERASE_SIZE=128
+CONFIG_MTD_BLOCK2MTD=m
+
+#
+# Disk-On-Chip Device Drivers
+#
+CONFIG_MTD_DOCG3=m
+CONFIG_BCH_CONST_M=14
+CONFIG_BCH_CONST_T=4
+# CONFIG_MTD_NAND is not set
+# CONFIG_MTD_ONENAND is not set
+
+#
+# LPDDR flash memory drivers
+#
+CONFIG_MTD_LPDDR=m
+CONFIG_MTD_QINFO_PROBE=m
+CONFIG_MTD_UBI=m
+CONFIG_MTD_UBI_WL_THRESHOLD=4096
+CONFIG_MTD_UBI_BEB_LIMIT=20
+# CONFIG_MTD_UBI_FASTMAP is not set
+# CONFIG_MTD_UBI_GLUEBI is not set
+CONFIG_PARPORT=m
+CONFIG_PARPORT_PC=m
+CONFIG_PARPORT_SERIAL=m
+# CONFIG_PARPORT_PC_FIFO is not set
+# CONFIG_PARPORT_PC_SUPERIO is not set
+CONFIG_PARPORT_PC_PCMCIA=m
+# CONFIG_PARPORT_GSC is not set
+CONFIG_PARPORT_AX88796=m
+CONFIG_PARPORT_1284=y
+CONFIG_PARPORT_NOT_PC=y
+CONFIG_PNP=y
+# CONFIG_PNP_DEBUG_MESSAGES is not set
+
+#
+# Protocols
+#
+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
+CONFIG_BLK_DEV_DAC960=m
+# CONFIG_BLK_DEV_UMEM is not set
+# CONFIG_BLK_DEV_COW_COMMON is not set
+CONFIG_BLK_DEV_LOOP=m
+CONFIG_BLK_DEV_LOOP_MIN_COUNT=8
+CONFIG_BLK_DEV_CRYPTOLOOP=m
+CONFIG_BLK_DEV_DRBD=m
+# CONFIG_DRBD_FAULT_INJECTION is not set
+CONFIG_BLK_DEV_NBD=m
+CONFIG_BLK_DEV_NVME=m
+CONFIG_BLK_DEV_OSD=m
+CONFIG_BLK_DEV_SX8=m
+CONFIG_BLK_DEV_RAM=m
+CONFIG_BLK_DEV_RAM_COUNT=16
+CONFIG_BLK_DEV_RAM_SIZE=16384
+# CONFIG_BLK_DEV_XIP is not set
+CONFIG_CDROM_PKTCDVD=m
+CONFIG_CDROM_PKTCDVD_BUFFERS=8
+# CONFIG_CDROM_PKTCDVD_WCACHE is not set
+CONFIG_ATA_OVER_ETH=m
+CONFIG_XEN_BLKDEV_FRONTEND=m
+CONFIG_XEN_BLKDEV_BACKEND=m
+CONFIG_VIRTIO_BLK=m
+# CONFIG_BLK_DEV_HD is not set
+CONFIG_BLK_DEV_RBD=m
+CONFIG_BLK_DEV_RSXX=m
+
+#
+# Misc devices
+#
+CONFIG_SENSORS_LIS3LV02D=m
+CONFIG_AD525X_DPOT=m
+CONFIG_AD525X_DPOT_I2C=m
+# CONFIG_AD525X_DPOT_SPI is not set
+# CONFIG_DUMMY_IRQ is not set
+# CONFIG_IBM_ASM is not set
+CONFIG_PHANTOM=m
+CONFIG_SGI_IOC4=m
+CONFIG_TIFM_CORE=m
+CONFIG_TIFM_7XX1=m
+CONFIG_ICS932S401=m
+# CONFIG_ATMEL_SSC is not set
+CONFIG_ENCLOSURE_SERVICES=m
+CONFIG_CS5535_MFGPT=m
+CONFIG_CS5535_MFGPT_DEFAULT_IRQ=7
+CONFIG_CS5535_CLOCK_EVENT_SRC=m
+CONFIG_HP_ILO=m
+CONFIG_APDS9802ALS=m
+CONFIG_ISL29003=m
+CONFIG_ISL29020=m
+CONFIG_SENSORS_TSL2550=m
+CONFIG_SENSORS_BH1780=m
+CONFIG_SENSORS_BH1770=m
+CONFIG_SENSORS_APDS990X=m
+CONFIG_HMC6352=m
+CONFIG_DS1682=m
+# CONFIG_TI_DAC7512 is not set
+CONFIG_VMWARE_BALLOON=m
+CONFIG_BMP085=y
+CONFIG_BMP085_I2C=m
+# CONFIG_BMP085_SPI is not set
+CONFIG_PCH_PHUB=m
+CONFIG_USB_SWITCH_FSA9480=m
+# CONFIG_LATTICE_ECP3_CONFIG is not set
+# CONFIG_SRAM is not set
+CONFIG_C2PORT=m
+CONFIG_C2PORT_DURAMAR_2150=m
+
+#
+# EEPROM support
+#
+CONFIG_EEPROM_AT24=m
+# CONFIG_EEPROM_AT25 is not set
+CONFIG_EEPROM_LEGACY=m
+CONFIG_EEPROM_MAX6875=m
+CONFIG_EEPROM_93CX6=m
+# CONFIG_EEPROM_93XX46 is not set
+CONFIG_CB710_CORE=m
+# CONFIG_CB710_DEBUG is not set
+CONFIG_CB710_DEBUG_ASSUMPTIONS=y
+
+#
+# Texas Instruments shared transport line discipline
+#
+CONFIG_TI_ST=m
+CONFIG_SENSORS_LIS3_I2C=m
+
+#
+# Altera FPGA firmware download module
+#
+CONFIG_ALTERA_STAPL=m
+CONFIG_INTEL_MEI=m
+CONFIG_INTEL_MEI_ME=m
+CONFIG_VMWARE_VMCI=m
+CONFIG_HAVE_IDE=y
+# CONFIG_IDE is not set
+
+#
+# SCSI device support
+#
+CONFIG_SCSI_MOD=m
+CONFIG_RAID_ATTRS=m
+CONFIG_SCSI=m
+CONFIG_SCSI_DMA=y
+CONFIG_SCSI_TGT=m
+CONFIG_SCSI_NETLINK=y
+CONFIG_SCSI_PROC_FS=y
+
+#
+# SCSI support type (disk, tape, CD-ROM)
+#
+CONFIG_BLK_DEV_SD=m
+CONFIG_CHR_DEV_ST=m
+CONFIG_CHR_DEV_OSST=m
+CONFIG_BLK_DEV_SR=m
+CONFIG_BLK_DEV_SR_VENDOR=y
+CONFIG_CHR_DEV_SG=m
+CONFIG_CHR_DEV_SCH=m
+CONFIG_SCSI_ENCLOSURE=m
+CONFIG_SCSI_MULTI_LUN=y
+# CONFIG_SCSI_CONSTANTS is not set
+# CONFIG_SCSI_LOGGING is not set
+CONFIG_SCSI_SCAN_ASYNC=y 
+
+#
+# SCSI Transports
+#
+CONFIG_SCSI_SPI_ATTRS=m
+CONFIG_SCSI_FC_ATTRS=m
+# CONFIG_SCSI_FC_TGT_ATTRS is not set
+CONFIG_SCSI_ISCSI_ATTRS=m
+CONFIG_SCSI_SAS_ATTRS=m
+CONFIG_SCSI_SAS_LIBSAS=m
+CONFIG_SCSI_SAS_ATA=y
+CONFIG_SCSI_SAS_HOST_SMP=y
+CONFIG_SCSI_SRP_ATTRS=m
+CONFIG_SCSI_SRP_TGT_ATTRS=y
+CONFIG_SCSI_LOWLEVEL=y
+CONFIG_ISCSI_TCP=m
+CONFIG_ISCSI_BOOT_SYSFS=m
+CONFIG_SCSI_CXGB3_ISCSI=m
+CONFIG_SCSI_CXGB4_ISCSI=m
+CONFIG_SCSI_BNX2_ISCSI=m
+CONFIG_SCSI_BNX2X_FCOE=m
+CONFIG_BE2ISCSI=m
+CONFIG_BLK_DEV_3W_XXXX_RAID=m
+CONFIG_SCSI_HPSA=m
+CONFIG_SCSI_3W_9XXX=m
+CONFIG_SCSI_3W_SAS=m
+CONFIG_SCSI_ACARD=m
+CONFIG_SCSI_AACRAID=m
+CONFIG_SCSI_AIC7XXX=m
+CONFIG_AIC7XXX_CMDS_PER_DEVICE=32
+CONFIG_AIC7XXX_RESET_DELAY_MS=15000
+# CONFIG_AIC7XXX_DEBUG_ENABLE is not set
+CONFIG_AIC7XXX_DEBUG_MASK=0
+CONFIG_AIC7XXX_REG_PRETTY_PRINT=y
+# CONFIG_SCSI_AIC7XXX_OLD is not set
+CONFIG_SCSI_AIC79XX=m
+CONFIG_AIC79XX_CMDS_PER_DEVICE=32
+CONFIG_AIC79XX_RESET_DELAY_MS=15000
+# CONFIG_AIC79XX_DEBUG_ENABLE is not set
+CONFIG_AIC79XX_DEBUG_MASK=0
+CONFIG_AIC79XX_REG_PRETTY_PRINT=y
+CONFIG_SCSI_AIC94XX=m
+# CONFIG_AIC94XX_DEBUG is not set
+CONFIG_SCSI_MVSAS=m
+# CONFIG_SCSI_MVSAS_DEBUG is not set
+CONFIG_SCSI_MVSAS_TASKLET=y
+CONFIG_SCSI_MVUMI=m
+CONFIG_SCSI_DPT_I2O=m
+CONFIG_SCSI_ADVANSYS=m
+CONFIG_SCSI_ARCMSR=m
+CONFIG_SCSI_ESAS2R=m
+CONFIG_MEGARAID_NEWGEN=y
+CONFIG_MEGARAID_MM=m
+CONFIG_MEGARAID_MAILBOX=m
+CONFIG_MEGARAID_LEGACY=m
+CONFIG_MEGARAID_SAS=m
+CONFIG_SCSI_MPT2SAS=m
+CONFIG_SCSI_MPT2SAS_MAX_SGE=128
+# CONFIG_SCSI_MPT2SAS_LOGGING is not set
+CONFIG_SCSI_MPT3SAS=m
+CONFIG_SCSI_MPT3SAS_MAX_SGE=128
+CONFIG_SCSI_MPT3SAS_LOGGING=y
+CONFIG_SCSI_UFSHCD=m
+CONFIG_SCSI_UFSHCD_PCI=m
+CONFIG_SCSI_UFSHCD_PLATFORM=m
+CONFIG_SCSI_HPTIOP=m
+CONFIG_SCSI_BUSLOGIC=m
+CONFIG_SCSI_FLASHPOINT=y
+CONFIG_VMWARE_PVSCSI=m
+CONFIG_HYPERV_STORAGE=m
+CONFIG_LIBFC=m
+CONFIG_LIBFCOE=m
+CONFIG_FCOE=m
+CONFIG_FCOE_FNIC=m
+CONFIG_SCSI_DMX3191D=m
+CONFIG_SCSI_EATA=m
+# CONFIG_SCSI_EATA_TAGGED_QUEUE is not set
+# CONFIG_SCSI_EATA_LINKED_COMMANDS is not set
+CONFIG_SCSI_EATA_MAX_TAGS=16
+CONFIG_SCSI_FUTURE_DOMAIN=m
+CONFIG_SCSI_GDTH=m
+CONFIG_SCSI_ISCI=m
+CONFIG_SCSI_IPS=m
+CONFIG_SCSI_INITIO=m
+CONFIG_SCSI_INIA100=m
+CONFIG_SCSI_PPA=m
+CONFIG_SCSI_IMM=m
+# CONFIG_SCSI_IZIP_EPP16 is not set
+# CONFIG_SCSI_IZIP_SLOW_CTR is not set
+CONFIG_SCSI_STEX=m
+CONFIG_SCSI_SYM53C8XX_2=m
+CONFIG_SCSI_SYM53C8XX_DMA_ADDRESSING_MODE=1
+CONFIG_SCSI_SYM53C8XX_DEFAULT_TAGS=16
+CONFIG_SCSI_SYM53C8XX_MAX_TAGS=64
+CONFIG_SCSI_SYM53C8XX_MMIO=y
+CONFIG_SCSI_IPR=m
+# CONFIG_SCSI_IPR_TRACE is not set
+# CONFIG_SCSI_IPR_DUMP is not set
+CONFIG_SCSI_QLOGIC_1280=m
+CONFIG_SCSI_QLA_FC=m
+CONFIG_TCM_QLA2XXX=m
+CONFIG_SCSI_QLA_ISCSI=m
+CONFIG_SCSI_LPFC=m
+# CONFIG_SCSI_LPFC_DEBUG_FS is not set
+CONFIG_SCSI_DC395x=m
+CONFIG_SCSI_DC390T=m
+# CONFIG_SCSI_DEBUG is not set
+CONFIG_SCSI_PMCRAID=m
+CONFIG_SCSI_PM8001=m
+CONFIG_SCSI_SRP=m
+CONFIG_SCSI_BFA_FC=m
+CONFIG_SCSI_VIRTIO=m
+CONFIG_SCSI_CHELSIO_FCOE=m
+CONFIG_SCSI_LOWLEVEL_PCMCIA=y
+CONFIG_PCMCIA_AHA152X=m
+CONFIG_PCMCIA_FDOMAIN=m
+CONFIG_PCMCIA_QLOGIC=m
+CONFIG_PCMCIA_SYM53C500=m
+CONFIG_SCSI_DH=m
+CONFIG_SCSI_DH_RDAC=m
+CONFIG_SCSI_DH_HP_SW=m
+CONFIG_SCSI_DH_EMC=m
+CONFIG_SCSI_DH_ALUA=m
+CONFIG_SCSI_OSD_INITIATOR=m
+CONFIG_SCSI_OSD_ULD=m
+CONFIG_SCSI_OSD_DPRINT_SENSE=0
+# CONFIG_SCSI_OSD_DEBUG is not set
+CONFIG_ATA=m
+# CONFIG_ATA_NONSTANDARD is not set
+CONFIG_ATA_VERBOSE_ERROR=y
+CONFIG_ATA_ACPI=y
+CONFIG_SATA_ZPODD=y
+CONFIG_SATA_PMP=y
+
+#
+# Controllers with non-SFF native interface
+#
+CONFIG_SATA_AHCI=m
+CONFIG_SATA_AHCI_PLATFORM=m
+CONFIG_SATA_INIC162X=m
+CONFIG_SATA_ACARD_AHCI=m
+CONFIG_SATA_SIL24=m
+CONFIG_ATA_SFF=y
+
+#
+# SFF controllers with custom DMA interface
+#
+CONFIG_PDC_ADMA=m
+CONFIG_SATA_QSTOR=m
+CONFIG_SATA_SX4=m
+CONFIG_ATA_BMDMA=y
+
+#
+# SATA SFF controllers with BMDMA
+#
+CONFIG_ATA_PIIX=m
+CONFIG_SATA_HIGHBANK=m
+CONFIG_SATA_MV=m
+CONFIG_SATA_NV=m
+CONFIG_SATA_PROMISE=m
+CONFIG_SATA_RCAR=m
+CONFIG_SATA_SIL=m
+CONFIG_SATA_SIS=m
+CONFIG_SATA_SVW=m
+CONFIG_SATA_ULI=m
+CONFIG_SATA_VIA=m
+CONFIG_SATA_VITESSE=m
+
+#
+# PATA SFF controllers with BMDMA
+#
+CONFIG_PATA_ALI=m
+CONFIG_PATA_AMD=m
+CONFIG_PATA_ARASAN_CF=m
+CONFIG_PATA_ARTOP=m
+CONFIG_PATA_ATIIXP=m
+CONFIG_PATA_ATP867X=m
+CONFIG_PATA_CMD64X=m
+CONFIG_PATA_CS5520=m
+CONFIG_PATA_CS5530=m
+CONFIG_PATA_CS5536=m
+CONFIG_PATA_CYPRESS=m
+CONFIG_PATA_EFAR=m
+CONFIG_PATA_HPT366=m
+CONFIG_PATA_HPT37X=m
+CONFIG_PATA_HPT3X2N=m
+CONFIG_PATA_HPT3X3=m
+# CONFIG_PATA_HPT3X3_DMA is not set
+CONFIG_PATA_IT8213=m
+CONFIG_PATA_IT821X=m
+CONFIG_PATA_JMICRON=m
+CONFIG_PATA_MARVELL=m
+CONFIG_PATA_NETCELL=m
+CONFIG_PATA_NINJA32=m
+CONFIG_PATA_NS87415=m
+CONFIG_PATA_OLDPIIX=m
+CONFIG_PATA_OPTIDMA=m
+CONFIG_PATA_PDC2027X=m
+CONFIG_PATA_PDC_OLD=m
+CONFIG_PATA_RADISYS=m
+CONFIG_PATA_RDC=m
+CONFIG_PATA_SC1200=m
+CONFIG_PATA_SCH=m
+CONFIG_PATA_SERVERWORKS=m
+CONFIG_PATA_SIL680=m
+CONFIG_PATA_SIS=m
+CONFIG_PATA_TOSHIBA=m
+CONFIG_PATA_TRIFLEX=m
+CONFIG_PATA_VIA=m
+CONFIG_PATA_WINBOND=m
+
+#
+# PIO-only SFF controllers
+#
+CONFIG_PATA_CMD640_PCI=m
+CONFIG_PATA_MPIIX=m
+CONFIG_PATA_NS87410=m
+CONFIG_PATA_OPTI=m
+CONFIG_PATA_PCMCIA=m
+CONFIG_PATA_RZ1000=m
+
+#
+# Generic fallback / legacy drivers
+#
+CONFIG_PATA_ACPI=m
+CONFIG_ATA_GENERIC=m
+CONFIG_PATA_LEGACY=m
+CONFIG_MD=y
+CONFIG_BLK_DEV_MD=m
+CONFIG_MD_LINEAR=m
+CONFIG_MD_RAID0=m
+CONFIG_MD_RAID1=m
+CONFIG_MD_RAID10=m
+CONFIG_MD_RAID456=m
+CONFIG_MD_MULTIPATH=m
+CONFIG_MD_FAULTY=m
+CONFIG_BCACHE=m
+# CONFIG_BCACHE_DEBUG is not set
+# CONFIG_BCACHE_EDEBUG is not set
+# CONFIG_BCACHE_CLOSURES_DEBUG is not set
+CONFIG_BLK_DEV_DM=m
+# CONFIG_DM_DEBUG is not set
+CONFIG_DM_BUFIO=m
+CONFIG_DM_BIO_PRISON=m
+CONFIG_DM_PERSISTENT_DATA=m
+CONFIG_DM_CRYPT=m
+CONFIG_DM_SNAPSHOT=m
+CONFIG_DM_THIN_PROVISIONING=m
+# CONFIG_DM_DEBUG_BLOCK_STACK_TRACING is not set
+CONFIG_DM_CACHE=m
+CONFIG_DM_CACHE_MQ=m
+CONFIG_DM_CACHE_CLEANER=m
+CONFIG_DM_MIRROR=m
+CONFIG_DM_RAID=m
+CONFIG_DM_LOG_USERSPACE=m
+CONFIG_DM_ZERO=m
+CONFIG_DM_MULTIPATH=m
+CONFIG_DM_MULTIPATH_QL=m
+CONFIG_DM_MULTIPATH_ST=m
+CONFIG_DM_DELAY=m
+CONFIG_DM_UEVENT=y
+CONFIG_DM_FLAKEY=m
+CONFIG_DM_VERITY=m
+CONFIG_DM_SWITCH=m
+CONFIG_TARGET_CORE=m
+CONFIG_TCM_IBLOCK=m
+CONFIG_TCM_FILEIO=m
+CONFIG_TCM_PSCSI=m
+CONFIG_LOOPBACK_TARGET=m
+CONFIG_TCM_FC=m
+CONFIG_ISCSI_TARGET=m
+CONFIG_SBP_TARGET=m
+CONFIG_FUSION=y
+CONFIG_FUSION_SPI=m
+CONFIG_FUSION_FC=m
+CONFIG_FUSION_SAS=m
+CONFIG_FUSION_MAX_SGE=128
+CONFIG_FUSION_CTL=m
+# CONFIG_FUSION_LOGGING is not set
+
+#
+# IEEE 1394 (FireWire) support
+#
+CONFIG_FIREWIRE=m
+CONFIG_FIREWIRE_OHCI=m
+CONFIG_FIREWIRE_SBP2=m
+CONFIG_FIREWIRE_NET=m
+CONFIG_FIREWIRE_NOSY=m
+CONFIG_I2O=m
+CONFIG_I2O_LCT_NOTIFY_ON_CHANGES=y
+CONFIG_I2O_EXT_ADAPTEC=y
+CONFIG_I2O_EXT_ADAPTEC_DMA64=y
+CONFIG_I2O_CONFIG=m
+CONFIG_I2O_CONFIG_OLD_IOCTL=y
+CONFIG_I2O_BUS=m
+CONFIG_I2O_BLOCK=m
+CONFIG_I2O_SCSI=m
+CONFIG_I2O_PROC=m
+CONFIG_MACINTOSH_DRIVERS=y
+CONFIG_MAC_EMUMOUSEBTN=y
+CONFIG_NETDEVICES=y
+CONFIG_MII=m
+CONFIG_NET_CORE=y
+CONFIG_BONDING=m
+CONFIG_DUMMY=m
+CONFIG_EQUALIZER=m
+# CONFIG_NET_FC is not set
+CONFIG_IFB=m
+CONFIG_NET_TEAM=m
+CONFIG_NET_TEAM_MODE_BROADCAST=m
+CONFIG_NET_TEAM_MODE_ROUNDROBIN=m
+CONFIG_NET_TEAM_MODE_RANDOM=m
+CONFIG_NET_TEAM_MODE_ACTIVEBACKUP=m
+CONFIG_NET_TEAM_MODE_LOADBALANCE=m
+CONFIG_MACVLAN=m
+CONFIG_MACVTAP=m
+CONFIG_VXLAN=m
+CONFIG_NETCONSOLE=m
+CONFIG_NETCONSOLE_DYNAMIC=y
+CONFIG_NETPOLL=y
+# CONFIG_NETPOLL_TRAP is not set
+CONFIG_NET_POLL_CONTROLLER=y
+CONFIG_RIONET=m
+CONFIG_RIONET_TX_SIZE=128
+CONFIG_RIONET_RX_SIZE=128
+CONFIG_TUN=m
+CONFIG_VETH=m
+CONFIG_VIRTIO_NET=m
+CONFIG_NLMON=m
+CONFIG_SUNGEM_PHY=m
+# CONFIG_ARCNET is not set
+CONFIG_ATM_DRIVERS=y
+# CONFIG_ATM_DUMMY is not set
+CONFIG_ATM_TCP=m
+CONFIG_ATM_LANAI=m
+CONFIG_ATM_ENI=m
+# CONFIG_ATM_ENI_DEBUG is not set
+# CONFIG_ATM_ENI_TUNE_BURST is not set
+CONFIG_ATM_FIRESTREAM=m
+CONFIG_ATM_ZATM=m
+# CONFIG_ATM_ZATM_DEBUG is not set
+CONFIG_ATM_NICSTAR=m
+# CONFIG_ATM_NICSTAR_USE_SUNI is not set
+# CONFIG_ATM_NICSTAR_USE_IDT77105 is not set
+CONFIG_ATM_IDT77252=m
+# CONFIG_ATM_IDT77252_DEBUG is not set
+# CONFIG_ATM_IDT77252_RCV_ALL is not set
+CONFIG_ATM_IDT77252_USE_SUNI=y
+CONFIG_ATM_AMBASSADOR=m
+# CONFIG_ATM_AMBASSADOR_DEBUG is not set
+CONFIG_ATM_HORIZON=m
+# CONFIG_ATM_HORIZON_DEBUG is not set
+CONFIG_ATM_IA=m
+# CONFIG_ATM_IA_DEBUG is not set
+CONFIG_ATM_FORE200E=m
+# CONFIG_ATM_FORE200E_USE_TASKLET is not set
+CONFIG_ATM_FORE200E_TX_RETRY=16
+CONFIG_ATM_FORE200E_DEBUG=0
+CONFIG_ATM_HE=m
+# CONFIG_ATM_HE_USE_SUNI is not set
+CONFIG_ATM_SOLOS=m
+
+#
+# CAIF transport drivers
+#
+CONFIG_CAIF_TTY=m
+CONFIG_CAIF_SPI_SLAVE=m
+CONFIG_CAIF_SPI_SYNC=y
+CONFIG_CAIF_HSI=m
+CONFIG_CAIF_VIRTIO=m
+CONFIG_VHOST_NET=m
+CONFIG_VHOST_SCSI=m
+CONFIG_VHOST_RING=m
+CONFIG_VHOST=m
+
+#
+# Distributed Switch Architecture drivers
+#
+CONFIG_NET_DSA_MV88E6XXX=m
+CONFIG_NET_DSA_MV88E6060=m
+CONFIG_NET_DSA_MV88E6XXX_NEED_PPU=y
+CONFIG_NET_DSA_MV88E6131=m
+CONFIG_NET_DSA_MV88E6123_61_65=m
+CONFIG_ETHERNET=y
+CONFIG_MDIO=m
+CONFIG_NET_VENDOR_3COM=y
+CONFIG_PCMCIA_3C574=m
+CONFIG_PCMCIA_3C589=m
+CONFIG_VORTEX=m
+CONFIG_TYPHOON=m
+CONFIG_NET_VENDOR_ADAPTEC=y
+CONFIG_ADAPTEC_STARFIRE=m
+CONFIG_NET_VENDOR_ALTEON=y
+CONFIG_ACENIC=m
+# CONFIG_ACENIC_OMIT_TIGON_I is not set
+CONFIG_NET_VENDOR_AMD=y
+CONFIG_AMD8111_ETH=m
+CONFIG_PCNET32=m
+CONFIG_PCMCIA_NMCLAN=m
+CONFIG_NET_VENDOR_ARC=y
+CONFIG_NET_VENDOR_ATHEROS=y
+CONFIG_ATL2=m
+CONFIG_ATL1=m
+CONFIG_ATL1E=m
+CONFIG_ATL1C=m
+CONFIG_ALX=m
+CONFIG_NET_CADENCE=y
+CONFIG_ARM_AT91_ETHER=m
+CONFIG_MACB=m
+CONFIG_NET_VENDOR_BROADCOM=y
+CONFIG_B44=m
+CONFIG_B44_PCI_AUTOSELECT=y
+CONFIG_B44_PCICORE_AUTOSELECT=y
+CONFIG_B44_PCI=y
+CONFIG_BNX2=m
+CONFIG_CNIC=m
+CONFIG_TIGON3=m
+CONFIG_BNX2X=m
+CONFIG_BNX2X_SRIOV=y
+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
+CONFIG_CHELSIO_T3=m
+CONFIG_CHELSIO_T4=m
+CONFIG_CHELSIO_T4VF=m
+CONFIG_NET_VENDOR_CISCO=y
+CONFIG_ENIC=m
+CONFIG_DNET=m
+CONFIG_NET_VENDOR_DEC=y
+CONFIG_NET_TULIP=y
+CONFIG_DE2104X=m
+CONFIG_DE2104X_DSL=0
+CONFIG_TULIP=m
+# CONFIG_TULIP_MWI is not set
+# CONFIG_TULIP_MMIO is not set
+# CONFIG_TULIP_NAPI is not set
+CONFIG_DE4X5=m
+CONFIG_WINBOND_840=m
+CONFIG_DM9102=m
+CONFIG_ULI526X=m
+CONFIG_PCMCIA_XIRCOM=m
+CONFIG_NET_VENDOR_DLINK=y
+CONFIG_DL2K=m
+CONFIG_SUNDANCE=m
+# CONFIG_SUNDANCE_MMIO is not set
+CONFIG_NET_VENDOR_EMULEX=y
+CONFIG_BE2NET=m
+CONFIG_NET_VENDOR_EXAR=y
+CONFIG_S2IO=m
+CONFIG_VXGE=m
+# CONFIG_VXGE_DEBUG_TRACE_ALL is not set
+CONFIG_NET_VENDOR_FUJITSU=y
+CONFIG_PCMCIA_FMVJ18X=m
+CONFIG_NET_VENDOR_HP=y
+CONFIG_HP100=m
+CONFIG_NET_VENDOR_INTEL=y
+CONFIG_E100=m
+CONFIG_E1000=m
+CONFIG_E1000E=m
+CONFIG_IGB=m
+CONFIG_IGB_HWMON=y
+CONFIG_IGB_DCA=y
+CONFIG_IGBVF=m
+CONFIG_IXGB=m
+CONFIG_IXGBE=m
+CONFIG_IXGBE_HWMON=y
+CONFIG_IXGBE_DCA=y
+CONFIG_IXGBEVF=m
+CONFIG_I40E=m
+CONFIG_NET_VENDOR_I825XX=y
+CONFIG_IP1000=m
+CONFIG_JME=m
+CONFIG_NET_VENDOR_MARVELL=y
+CONFIG_MVMDIO=m
+CONFIG_SKGE=m
+# CONFIG_SKGE_DEBUG is not set
+CONFIG_SKGE_GENESIS=y
+CONFIG_SKY2=m
+# CONFIG_SKY2_DEBUG is not set
+CONFIG_NET_VENDOR_MELLANOX=y
+CONFIG_MLX4_EN=m
+CONFIG_MLX4_CORE=m
+CONFIG_MLX4_DEBUG=y
+# CONFIG_MLX5_CORE is not set
+CONFIG_NET_VENDOR_MICREL=y
+CONFIG_KS8842=m
+# CONFIG_KS8851 is not set
+CONFIG_KS8851_MLL=m
+CONFIG_KSZ884X_PCI=m
+CONFIG_NET_VENDOR_MICROCHIP=y
+# CONFIG_ENC28J60 is not set
+CONFIG_NET_VENDOR_MYRI=y
+CONFIG_MYRI10GE=m
+CONFIG_MYRI10GE_DCA=y
+CONFIG_FEALNX=m
+CONFIG_NET_VENDOR_NATSEMI=y
+CONFIG_NATSEMI=m
+CONFIG_NS83820=m
+CONFIG_NET_VENDOR_8390=y
+CONFIG_PCMCIA_AXNET=m
+CONFIG_NE2K_PCI=m
+CONFIG_PCMCIA_PCNET=m
+CONFIG_NET_VENDOR_NVIDIA=y
+CONFIG_FORCEDETH=m
+CONFIG_NET_VENDOR_OKI=y
+CONFIG_PCH_GBE=m
+CONFIG_ETHOC=m
+CONFIG_NET_PACKET_ENGINE=y
+CONFIG_HAMACHI=m
+CONFIG_YELLOWFIN=m
+CONFIG_NET_VENDOR_QLOGIC=y
+CONFIG_QLA3XXX=m
+CONFIG_QLCNIC=m
+CONFIG_QLCNIC_SRIOV=y
+CONFIG_QLGE=m
+CONFIG_NETXEN_NIC=m
+CONFIG_NET_VENDOR_REALTEK=y
+CONFIG_ATP=m
+CONFIG_8139CP=m
+CONFIG_8139TOO=m
+# CONFIG_8139TOO_PIO is not set
+CONFIG_8139TOO_TUNE_TWISTER=y
+CONFIG_8139TOO_8129=y
+# CONFIG_8139_OLD_RX_RESET is not set
+CONFIG_R8169=m
+CONFIG_SH_ETH=m
+CONFIG_NET_VENDOR_RDC=y
+CONFIG_R6040=m
+CONFIG_NET_VENDOR_SEEQ=y
+CONFIG_NET_VENDOR_SILAN=y
+CONFIG_SC92031=m
+CONFIG_NET_VENDOR_SIS=y
+CONFIG_SIS900=m
+CONFIG_SIS190=m
+CONFIG_SFC=m
+CONFIG_SFC_MTD=y
+CONFIG_SFC_MCDI_MON=y
+CONFIG_SFC_SRIOV=y
+CONFIG_NET_VENDOR_SMSC=y
+CONFIG_PCMCIA_SMC91C92=m
+CONFIG_EPIC100=m
+CONFIG_SMSC911X=m
+# CONFIG_SMSC911X_ARCH_HOOKS is not set
+CONFIG_SMSC9420=m
+CONFIG_NET_VENDOR_STMICRO=y
+CONFIG_STMMAC_ETH=m
+# CONFIG_STMMAC_PLATFORM is not set
+CONFIG_STMMAC_PCI=y
+# CONFIG_STMMAC_DEBUG_FS is not set
+# CONFIG_STMMAC_DA is not set
+CONFIG_NET_VENDOR_SUN=y
+CONFIG_HAPPYMEAL=m
+CONFIG_SUNGEM=m
+CONFIG_CASSINI=m
+CONFIG_NIU=m
+CONFIG_NET_VENDOR_TEHUTI=y
+CONFIG_TEHUTI=m
+CONFIG_NET_VENDOR_TI=y
+CONFIG_TLAN=m
+CONFIG_NET_VENDOR_VIA=y
+CONFIG_VIA_RHINE=m
+# CONFIG_VIA_RHINE_MMIO is not set
+CONFIG_VIA_VELOCITY=m
+CONFIG_NET_VENDOR_WIZNET=y
+CONFIG_WIZNET_W5100=m
+CONFIG_WIZNET_W5300=m
+# CONFIG_WIZNET_BUS_DIRECT is not set
+# CONFIG_WIZNET_BUS_INDIRECT is not set
+CONFIG_WIZNET_BUS_ANY=y
+CONFIG_NET_VENDOR_XIRCOM=y
+CONFIG_PCMCIA_XIRC2PS=m
+# CONFIG_FDDI is not set
+# CONFIG_HIPPI is not set
+CONFIG_NET_SB1000=m
+CONFIG_PHYLIB=m
+
+#
+# MII PHY device drivers
+#
+CONFIG_AT803X_PHY=m
+CONFIG_AMD_PHY=m
+CONFIG_MARVELL_PHY=m
+CONFIG_DAVICOM_PHY=m
+CONFIG_QSEMI_PHY=m
+CONFIG_LXT_PHY=m
+CONFIG_CICADA_PHY=m
+CONFIG_VITESSE_PHY=m
+CONFIG_SMSC_PHY=m
+CONFIG_BROADCOM_PHY=m
+CONFIG_BCM87XX_PHY=m
+CONFIG_ICPLUS_PHY=m
+CONFIG_REALTEK_PHY=m
+CONFIG_NATIONAL_PHY=m
+CONFIG_STE10XP=m
+CONFIG_LSI_ET1011C_PHY=m
+CONFIG_MICREL_PHY=m
+CONFIG_MDIO_BITBANG=m
+# CONFIG_MDIO_GPIO is not set
+# CONFIG_MICREL_KS8995MA is not set
+CONFIG_PLIP=m
+CONFIG_PPP=m
+CONFIG_PPP_BSDCOMP=m
+CONFIG_PPP_DEFLATE=m
+CONFIG_PPP_FILTER=y
+CONFIG_PPP_MPPE=m
+CONFIG_PPP_MULTILINK=y
+CONFIG_PPPOATM=m
+CONFIG_PPPOE=m
+CONFIG_PPTP=m
+CONFIG_PPPOL2TP=m
+CONFIG_PPP_ASYNC=m
+CONFIG_PPP_SYNC_TTY=m
+CONFIG_SLIP=m
+CONFIG_SLHC=m
+# CONFIG_SLIP_COMPRESSED is not set
+# CONFIG_SLIP_SMART is not set
+# CONFIG_SLIP_MODE_SLIP6 is not set
+
+#
+# USB Network Adapters
+#
+CONFIG_USB_CATC=m
+CONFIG_USB_KAWETH=m
+CONFIG_USB_PEGASUS=m
+CONFIG_USB_RTL8150=m
+CONFIG_USB_RTL8152=m
+CONFIG_USB_USBNET=m
+CONFIG_USB_NET_AX8817X=m
+CONFIG_USB_NET_AX88179_178A=m
+CONFIG_USB_NET_CDCETHER=m
+CONFIG_USB_NET_CDC_EEM=m
+CONFIG_USB_NET_CDC_NCM=m
+CONFIG_USB_NET_CDC_MBIM=m
+CONFIG_USB_NET_DM9601=m
+CONFIG_USB_NET_SR9700=m
+CONFIG_USB_NET_SMSC75XX=m
+CONFIG_USB_NET_SMSC95XX=m
+CONFIG_USB_NET_GL620A=m
+CONFIG_USB_NET_NET1080=m
+CONFIG_USB_NET_PLUSB=m
+CONFIG_USB_NET_MCS7830=m
+CONFIG_USB_NET_RNDIS_HOST=m
+CONFIG_USB_NET_CDC_SUBSET=m
+CONFIG_USB_ALI_M5632=y
+CONFIG_USB_AN2720=y
+CONFIG_USB_BELKIN=y
+CONFIG_USB_ARMLINUX=y
+CONFIG_USB_EPSON2888=y
+CONFIG_USB_KC2190=y
+CONFIG_USB_NET_ZAURUS=m
+CONFIG_USB_NET_CX82310_ETH=m
+CONFIG_USB_NET_KALMIA=m
+CONFIG_USB_NET_QMI_WWAN=m
+CONFIG_USB_HSO=m
+CONFIG_USB_NET_INT51X1=m
+CONFIG_USB_CDC_PHONET=m
+CONFIG_USB_IPHETH=m
+CONFIG_USB_SIERRA_NET=m
+CONFIG_USB_VL600=m
+CONFIG_WLAN=y
+CONFIG_PCMCIA_RAYCS=m
+CONFIG_LIBERTAS_THINFIRM=m
+# CONFIG_LIBERTAS_THINFIRM_DEBUG is not set
+CONFIG_LIBERTAS_THINFIRM_USB=m
+CONFIG_AIRO=m
+CONFIG_ATMEL=m
+CONFIG_PCI_ATMEL=m
+CONFIG_PCMCIA_ATMEL=m
+CONFIG_AT76C50X_USB=m
+CONFIG_AIRO_CS=m
+CONFIG_PCMCIA_WL3501=m
+CONFIG_PRISM54=m
+CONFIG_USB_ZD1201=m
+CONFIG_USB_NET_RNDIS_WLAN=m
+CONFIG_RTL8180=m
+CONFIG_RTL8187=m
+CONFIG_RTL8187_LEDS=y
+CONFIG_ADM8211=m
+# CONFIG_MAC80211_HWSIM is not set
+CONFIG_MWL8K=m
+CONFIG_ATH_COMMON=m
+CONFIG_ATH_CARDS=m
+# CONFIG_ATH_DEBUG is not set
+CONFIG_ATH5K=m
+# CONFIG_ATH5K_DEBUG is not set
+# CONFIG_ATH5K_TRACER is not set
+CONFIG_ATH5K_PCI=y
+CONFIG_ATH9K_HW=m
+CONFIG_ATH9K_COMMON=m
+CONFIG_ATH9K_BTCOEX_SUPPORT=y
+CONFIG_ATH9K=m
+CONFIG_ATH9K_PCI=y
+CONFIG_ATH9K_AHB=y
+# CONFIG_ATH9K_DEBUGFS is not set
+# CONFIG_ATH9K_LEGACY_RATE_CONTROL is not set
+CONFIG_ATH9K_RFKILL=y
+CONFIG_ATH9K_HTC=m
+# CONFIG_ATH9K_HTC_DEBUGFS is not set
+CONFIG_CARL9170=m
+CONFIG_CARL9170_LEDS=y
+CONFIG_CARL9170_WPC=y
+# CONFIG_CARL9170_HWRNG is not set
+CONFIG_ATH6KL=m
+CONFIG_ATH6KL_SDIO=m
+CONFIG_ATH6KL_USB=m
+# CONFIG_ATH6KL_DEBUG is not set
+# CONFIG_ATH6KL_TRACING is not set
+CONFIG_AR5523=m
+CONFIG_WIL6210=m
+CONFIG_WIL6210_ISR_COR=y
+# CONFIG_WIL6210_TRACING is not set
+CONFIG_ATH10K=m
+CONFIG_ATH10K_PCI=m
+# CONFIG_ATH10K_DEBUG is not set
+CONFIG_ATH10K_DEBUGFS=y
+# CONFIG_ATH10K_TRACING is not set
+CONFIG_B43=m
+CONFIG_B43_BCMA=y
+CONFIG_B43_SSB=y
+CONFIG_B43_PCI_AUTOSELECT=y
+CONFIG_B43_PCICORE_AUTOSELECT=y
+CONFIG_B43_PCMCIA=y
+CONFIG_B43_SDIO=y
+CONFIG_B43_BCMA_PIO=y
+CONFIG_B43_PIO=y
+CONFIG_B43_PHY_N=y
+CONFIG_B43_PHY_LP=y
+CONFIG_B43_PHY_HT=y
+CONFIG_B43_LEDS=y
+CONFIG_B43_HWRNG=y
+# CONFIG_B43_DEBUG is not set
+CONFIG_B43LEGACY=m
+CONFIG_B43LEGACY_PCI_AUTOSELECT=y
+CONFIG_B43LEGACY_PCICORE_AUTOSELECT=y
+CONFIG_B43LEGACY_LEDS=y
+CONFIG_B43LEGACY_HWRNG=y
+# CONFIG_B43LEGACY_DEBUG is not set
+CONFIG_B43LEGACY_DMA=y
+CONFIG_B43LEGACY_PIO=y
+CONFIG_B43LEGACY_DMA_AND_PIO_MODE=y
+# CONFIG_B43LEGACY_DMA_MODE is not set
+# CONFIG_B43LEGACY_PIO_MODE is not set
+CONFIG_BRCMUTIL=m
+CONFIG_BRCMSMAC=m
+CONFIG_BRCMFMAC=m
+CONFIG_BRCMFMAC_SDIO=y
+CONFIG_BRCMFMAC_USB=y
+# CONFIG_BRCM_TRACING is not set
+# CONFIG_BRCMDBG is not set
+CONFIG_HOSTAP=m
+CONFIG_HOSTAP_FIRMWARE=y
+# CONFIG_HOSTAP_FIRMWARE_NVRAM is not set
+CONFIG_HOSTAP_PLX=m
+CONFIG_HOSTAP_PCI=m
+CONFIG_HOSTAP_CS=m
+# CONFIG_IPW2100 is not set
+# CONFIG_IPW2200 is not set
+CONFIG_IWLWIFI=m
+CONFIG_IWLDVM=m
+CONFIG_IWLMVM=m
+CONFIG_IWLWIFI_OPMODE_MODULAR=y
+
+#
+# Debugging Options
+#
+# CONFIG_IWLWIFI_DEBUG is not set
+CONFIG_IWLWIFI_DEVICE_TRACING=y
+CONFIG_IWLEGACY=m
+CONFIG_IWL4965=m
+CONFIG_IWL3945=m
+
+#
+# iwl3945 / iwl4965 Debugging Options
+#
+# CONFIG_IWLEGACY_DEBUG is not set
+CONFIG_LIBERTAS=m
+CONFIG_LIBERTAS_USB=m
+CONFIG_LIBERTAS_CS=m
+CONFIG_LIBERTAS_SDIO=m
+# CONFIG_LIBERTAS_SPI is not set
+# CONFIG_LIBERTAS_DEBUG is not set
+CONFIG_LIBERTAS_MESH=y
+CONFIG_HERMES=m
+CONFIG_HERMES_PRISM=y
+CONFIG_HERMES_CACHE_FW_ON_INIT=y
+CONFIG_PLX_HERMES=m
+CONFIG_TMD_HERMES=m
+CONFIG_NORTEL_HERMES=m
+CONFIG_PCI_HERMES=m
+CONFIG_PCMCIA_HERMES=m
+CONFIG_PCMCIA_SPECTRUM=m
+CONFIG_ORINOCO_USB=m
+CONFIG_P54_COMMON=m
+CONFIG_P54_USB=m
+CONFIG_P54_PCI=m
+# CONFIG_P54_SPI is not set
+CONFIG_P54_LEDS=y
+CONFIG_RT2X00=m
+CONFIG_RT2400PCI=m
+CONFIG_RT2500PCI=m
+CONFIG_RT61PCI=m
+CONFIG_RT2800PCI=m
+CONFIG_RT2800PCI_RT33XX=y
+CONFIG_RT2800PCI_RT35XX=y
+CONFIG_RT2800PCI_RT53XX=y
+CONFIG_RT2800PCI_RT3290=y
+CONFIG_RT2500USB=m
+CONFIG_RT73USB=m
+CONFIG_RT2800USB=m
+CONFIG_RT2800USB_RT33XX=y
+CONFIG_RT2800USB_RT35XX=y
+CONFIG_RT2800USB_RT3573=y
+CONFIG_RT2800USB_RT53XX=y
+CONFIG_RT2800USB_RT55XX=y
+CONFIG_RT2800USB_UNKNOWN=y
+CONFIG_RT2800_LIB=m
+CONFIG_RT2X00_LIB_MMIO=m
+CONFIG_RT2X00_LIB_PCI=m
+CONFIG_RT2X00_LIB_USB=m
+CONFIG_RT2X00_LIB=m
+CONFIG_RT2X00_LIB_FIRMWARE=y
+CONFIG_RT2X00_LIB_CRYPTO=y
+CONFIG_RT2X00_LIB_LEDS=y
+# CONFIG_RT2X00_DEBUG is not set
+CONFIG_RTL_CARDS=m
+CONFIG_RTL8192CE=m
+CONFIG_RTL8192SE=m
+CONFIG_RTL8192DE=m
+CONFIG_RTL8723AE=m
+CONFIG_RTL8188EE=m
+CONFIG_RTL8192CU=m
+CONFIG_RTLWIFI=m
+CONFIG_RTLWIFI_PCI=m
+CONFIG_RTLWIFI_USB=m
+# CONFIG_RTLWIFI_DEBUG is not set
+CONFIG_RTL8192C_COMMON=m
+CONFIG_WL_TI=y
+CONFIG_WL1251=m
+# CONFIG_WL1251_SPI is not set
+CONFIG_WL1251_SDIO=m
+CONFIG_WL12XX=m
+CONFIG_WL18XX=m
+CONFIG_WLCORE=m
+# CONFIG_WLCORE_SPI is not set
+CONFIG_WLCORE_SDIO=m
+CONFIG_WILINK_PLATFORM_DATA=y
+CONFIG_ZD1211RW=m
+# CONFIG_ZD1211RW_DEBUG is not set
+CONFIG_MWIFIEX=m
+CONFIG_MWIFIEX_SDIO=m
+CONFIG_MWIFIEX_PCIE=m
+CONFIG_MWIFIEX_USB=m
+CONFIG_CW1200=m
+CONFIG_CW1200_WLAN_SDIO=m
+CONFIG_CW1200_WLAN_SPI=m
+
+#
+# WiMAX Wireless Broadband devices
+#
+CONFIG_WIMAX_I2400M=m
+CONFIG_WIMAX_I2400M_USB=m
+CONFIG_WIMAX_I2400M_DEBUG_LEVEL=8
+# CONFIG_WAN is not set
+CONFIG_IEEE802154_DRIVERS=m
+CONFIG_IEEE802154_FAKEHARD=m
+CONFIG_IEEE802154_FAKELB=m
+CONFIG_IEEE802154_AT86RF230=m
+# CONFIG_IEEE802154_MRF24J40 is not set
+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
+CONFIG_ISDN_PPP_VJ=y
+CONFIG_ISDN_MPP=y
+CONFIG_IPPP_FILTER=y
+CONFIG_ISDN_PPP_BSDCOMP=m
+CONFIG_ISDN_AUDIO=y
+CONFIG_ISDN_TTY_FAX=y
+
+#
+# ISDN feature submodules
+#
+CONFIG_ISDN_DIVERSION=m
+
+#
+# ISDN4Linux hardware drivers
+#
+
+#
+# Passive cards
+#
+CONFIG_ISDN_DRV_HISAX=m
+
+#
+# D-channel protocol features
+#
+CONFIG_HISAX_EURO=y
+CONFIG_DE_AOC=y
+# CONFIG_HISAX_NO_SENDCOMPLETE is not set
+# CONFIG_HISAX_NO_LLC is not set
+# CONFIG_HISAX_NO_KEYPAD is not set
+CONFIG_HISAX_1TR6=y
+CONFIG_HISAX_NI1=y
+CONFIG_HISAX_MAX_CARDS=8
+
+#
+# HiSax supported cards
+#
+CONFIG_HISAX_16_3=y
+CONFIG_HISAX_TELESPCI=y
+CONFIG_HISAX_S0BOX=y
+CONFIG_HISAX_FRITZPCI=y
+CONFIG_HISAX_AVM_A1_PCMCIA=y
+CONFIG_HISAX_ELSA=y
+CONFIG_HISAX_DIEHLDIVA=y
+CONFIG_HISAX_SEDLBAUER=y
+CONFIG_HISAX_NETJET=y
+CONFIG_HISAX_NETJET_U=y
+CONFIG_HISAX_NICCY=y
+CONFIG_HISAX_BKM_A4T=y
+CONFIG_HISAX_SCT_QUADRO=y
+CONFIG_HISAX_GAZEL=y
+CONFIG_HISAX_HFC_PCI=y
+CONFIG_HISAX_W6692=y
+CONFIG_HISAX_HFC_SX=y
+CONFIG_HISAX_ENTERNOW_PCI=y
+# CONFIG_HISAX_DEBUG is not set
+
+#
+# HiSax PCMCIA card service modules
+#
+CONFIG_HISAX_SEDLBAUER_CS=m
+CONFIG_HISAX_ELSA_CS=m
+CONFIG_HISAX_AVM_A1_CS=m
+CONFIG_HISAX_TELES_CS=m
+
+#
+# HiSax sub driver modules
+#
+CONFIG_HISAX_ST5481=m
+CONFIG_HISAX_HFCUSB=m
+CONFIG_HISAX_HFC4S8S=m
+CONFIG_HISAX_FRITZ_PCIPNP=m
+
+#
+# Active cards
+#
+CONFIG_ISDN_CAPI=m
+CONFIG_ISDN_DRV_AVMB1_VERBOSE_REASON=y
+CONFIG_CAPI_TRACE=y
+CONFIG_ISDN_CAPI_MIDDLEWARE=y
+CONFIG_ISDN_CAPI_CAPI20=m
+CONFIG_ISDN_CAPI_CAPIDRV=m
+
+#
+# CAPI hardware drivers
+#
+CONFIG_CAPI_AVM=y
+CONFIG_ISDN_DRV_AVMB1_B1PCI=m
+CONFIG_ISDN_DRV_AVMB1_B1PCIV4=y
+CONFIG_ISDN_DRV_AVMB1_B1PCMCIA=m
+CONFIG_ISDN_DRV_AVMB1_AVM_CS=m
+CONFIG_ISDN_DRV_AVMB1_T1PCI=m
+CONFIG_ISDN_DRV_AVMB1_C4=m
+CONFIG_CAPI_EICON=y
+CONFIG_ISDN_DIVAS=m
+CONFIG_ISDN_DIVAS_BRIPCI=y
+CONFIG_ISDN_DIVAS_PRIPCI=y
+CONFIG_ISDN_DIVAS_DIVACAPI=m
+CONFIG_ISDN_DIVAS_USERIDI=m
+CONFIG_ISDN_DIVAS_MAINT=m
+CONFIG_ISDN_DRV_GIGASET=m
+CONFIG_GIGASET_CAPI=y
+# CONFIG_GIGASET_I4L is not set
+# CONFIG_GIGASET_DUMMYLL is not set
+CONFIG_GIGASET_BASE=m
+CONFIG_GIGASET_M105=m
+CONFIG_GIGASET_M101=m
+# CONFIG_GIGASET_DEBUG is not set
+CONFIG_HYSDN=m
+CONFIG_HYSDN_CAPI=y
+CONFIG_MISDN=m
+CONFIG_MISDN_DSP=m
+CONFIG_MISDN_L1OIP=m
+
+#
+# mISDN hardware drivers
+#
+CONFIG_MISDN_HFCPCI=m
+CONFIG_MISDN_HFCMULTI=m
+CONFIG_MISDN_HFCUSB=m
+CONFIG_MISDN_AVMFRITZ=m
+CONFIG_MISDN_SPEEDFAX=m
+CONFIG_MISDN_INFINEON=m
+CONFIG_MISDN_W6692=m
+CONFIG_MISDN_NETJET=m
+CONFIG_MISDN_IPAC=m
+CONFIG_MISDN_ISAR=m
+CONFIG_ISDN_HDLC=m
+
+#
+# Input device support
+#
+CONFIG_INPUT=y
+CONFIG_INPUT_FF_MEMLESS=m
+CONFIG_INPUT_POLLDEV=m
+CONFIG_INPUT_SPARSEKMAP=m
+CONFIG_INPUT_MATRIXKMAP=m
+
+#
+# Userland interfaces
+#
+CONFIG_INPUT_MOUSEDEV=y
+CONFIG_INPUT_MOUSEDEV_PSAUX=y
+CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024
+CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
+CONFIG_INPUT_JOYDEV=m
+CONFIG_INPUT_EVDEV=m
+# CONFIG_INPUT_EVBUG is not set
+
+#
+# Input Device Drivers
+#
+CONFIG_INPUT_KEYBOARD=y
+CONFIG_KEYBOARD_ADP5588=m
+CONFIG_KEYBOARD_ADP5589=m
+CONFIG_KEYBOARD_ATKBD=y
+CONFIG_KEYBOARD_QT1070=m
+CONFIG_KEYBOARD_QT2160=m
+# CONFIG_KEYBOARD_LKKBD is not set
+# CONFIG_KEYBOARD_GPIO is not set
+# CONFIG_KEYBOARD_GPIO_POLLED is not set
+CONFIG_KEYBOARD_TCA6416=m
+CONFIG_KEYBOARD_TCA8418=m
+CONFIG_KEYBOARD_MATRIX=m
+# CONFIG_KEYBOARD_LM8323 is not set
+CONFIG_KEYBOARD_LM8333=m
+# CONFIG_KEYBOARD_MAX7359 is not set
+CONFIG_KEYBOARD_MCS=m
+CONFIG_KEYBOARD_MPR121=m
+# CONFIG_KEYBOARD_NEWTON is not set
+# CONFIG_KEYBOARD_OPENCORES is not set
+# CONFIG_KEYBOARD_STOWAWAY is not set
+# CONFIG_KEYBOARD_SUNKBD is not set
+# CONFIG_KEYBOARD_XTKBD is not set
+CONFIG_INPUT_MOUSE=y
+CONFIG_MOUSE_PS2=m
+CONFIG_MOUSE_PS2_ALPS=y
+CONFIG_MOUSE_PS2_LOGIPS2PP=y
+CONFIG_MOUSE_PS2_SYNAPTICS=y
+CONFIG_MOUSE_PS2_CYPRESS=y
+CONFIG_MOUSE_PS2_LIFEBOOK=y
+CONFIG_MOUSE_PS2_TRACKPOINT=y
+CONFIG_MOUSE_PS2_ELANTECH=y
+CONFIG_MOUSE_PS2_SENTELIC=y
+# CONFIG_MOUSE_PS2_TOUCHKIT is not set
+CONFIG_MOUSE_SERIAL=y
+CONFIG_MOUSE_APPLETOUCH=m
+CONFIG_MOUSE_BCM5974=m
+CONFIG_MOUSE_CYAPA=m
+CONFIG_MOUSE_VSXXXAA=m
+# CONFIG_MOUSE_GPIO is not set
+CONFIG_MOUSE_SYNAPTICS_I2C=m
+CONFIG_MOUSE_SYNAPTICS_USB=m
+CONFIG_INPUT_JOYSTICK=y
+CONFIG_JOYSTICK_ANALOG=m
+CONFIG_JOYSTICK_A3D=m
+CONFIG_JOYSTICK_ADI=m
+CONFIG_JOYSTICK_COBRA=m
+CONFIG_JOYSTICK_GF2K=m
+CONFIG_JOYSTICK_GRIP=m
+CONFIG_JOYSTICK_GRIP_MP=m
+CONFIG_JOYSTICK_GUILLEMOT=m
+CONFIG_JOYSTICK_INTERACT=m
+CONFIG_JOYSTICK_SIDEWINDER=m
+CONFIG_JOYSTICK_TMDC=m
+CONFIG_JOYSTICK_IFORCE=m
+CONFIG_JOYSTICK_IFORCE_USB=y
+CONFIG_JOYSTICK_IFORCE_232=y
+CONFIG_JOYSTICK_WARRIOR=m
+CONFIG_JOYSTICK_MAGELLAN=m
+CONFIG_JOYSTICK_SPACEORB=m
+CONFIG_JOYSTICK_SPACEBALL=m
+CONFIG_JOYSTICK_STINGER=m
+CONFIG_JOYSTICK_TWIDJOY=m
+CONFIG_JOYSTICK_ZHENHUA=m
+CONFIG_JOYSTICK_DB9=m
+CONFIG_JOYSTICK_GAMECON=m
+CONFIG_JOYSTICK_TURBOGRAFX=m
+CONFIG_JOYSTICK_AS5011=m
+CONFIG_JOYSTICK_JOYDUMP=m
+CONFIG_JOYSTICK_XPAD=m
+CONFIG_JOYSTICK_XPAD_FF=y
+CONFIG_JOYSTICK_XPAD_LEDS=y
+CONFIG_JOYSTICK_WALKERA0701=m
+CONFIG_INPUT_TABLET=y
+CONFIG_TABLET_USB_ACECAD=m
+CONFIG_TABLET_USB_AIPTEK=m
+CONFIG_TABLET_USB_GTCO=m
+CONFIG_TABLET_USB_HANWANG=m
+CONFIG_TABLET_USB_KBTAB=m
+CONFIG_TABLET_USB_WACOM=m
+CONFIG_INPUT_TOUCHSCREEN=y
+# CONFIG_TOUCHSCREEN_ADS7846 is not set
+# CONFIG_TOUCHSCREEN_AD7877 is not set
+CONFIG_TOUCHSCREEN_AD7879=m
+CONFIG_TOUCHSCREEN_AD7879_I2C=m
+# CONFIG_TOUCHSCREEN_AD7879_SPI is not set
+CONFIG_TOUCHSCREEN_ATMEL_MXT=m
+CONFIG_TOUCHSCREEN_AUO_PIXCIR=m
+CONFIG_TOUCHSCREEN_BU21013=m
+CONFIG_TOUCHSCREEN_CY8CTMG110=m
+CONFIG_TOUCHSCREEN_CYTTSP_CORE=m
+CONFIG_TOUCHSCREEN_CYTTSP_I2C=m
+# CONFIG_TOUCHSCREEN_CYTTSP_SPI is not set
+CONFIG_TOUCHSCREEN_CYTTSP4_CORE=m
+CONFIG_TOUCHSCREEN_CYTTSP4_I2C=m
+CONFIG_TOUCHSCREEN_CYTTSP4_SPI=m
+CONFIG_TOUCHSCREEN_DYNAPRO=m
+CONFIG_TOUCHSCREEN_HAMPSHIRE=m
+CONFIG_TOUCHSCREEN_EETI=m
+CONFIG_TOUCHSCREEN_FUJITSU=m
+CONFIG_TOUCHSCREEN_ILI210X=m
+CONFIG_TOUCHSCREEN_GUNZE=m
+CONFIG_TOUCHSCREEN_ELO=m
+CONFIG_TOUCHSCREEN_WACOM_W8001=m
+CONFIG_TOUCHSCREEN_WACOM_I2C=m
+CONFIG_TOUCHSCREEN_MAX11801=m
+CONFIG_TOUCHSCREEN_MCS5000=m
+CONFIG_TOUCHSCREEN_MMS114=m
+CONFIG_TOUCHSCREEN_MTOUCH=m
+CONFIG_TOUCHSCREEN_INEXIO=m
+CONFIG_TOUCHSCREEN_MK712=m
+CONFIG_TOUCHSCREEN_PENMOUNT=m
+CONFIG_TOUCHSCREEN_EDT_FT5X06=m
+CONFIG_TOUCHSCREEN_TOUCHRIGHT=m
+CONFIG_TOUCHSCREEN_TOUCHWIN=m
+CONFIG_TOUCHSCREEN_TI_AM335X_TSC=m
+CONFIG_TOUCHSCREEN_UCB1400=m
+CONFIG_TOUCHSCREEN_PIXCIR=m
+CONFIG_TOUCHSCREEN_WM97XX=m
+CONFIG_TOUCHSCREEN_WM9705=y
+CONFIG_TOUCHSCREEN_WM9712=y
+CONFIG_TOUCHSCREEN_WM9713=y
+CONFIG_TOUCHSCREEN_USB_COMPOSITE=m
+CONFIG_TOUCHSCREEN_MC13783=m
+CONFIG_TOUCHSCREEN_USB_EGALAX=y
+CONFIG_TOUCHSCREEN_USB_PANJIT=y
+CONFIG_TOUCHSCREEN_USB_3M=y
+CONFIG_TOUCHSCREEN_USB_ITM=y
+CONFIG_TOUCHSCREEN_USB_ETURBO=y
+CONFIG_TOUCHSCREEN_USB_GUNZE=y
+CONFIG_TOUCHSCREEN_USB_DMC_TSC10=y
+CONFIG_TOUCHSCREEN_USB_IRTOUCH=y
+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
+CONFIG_TOUCHSCREEN_USB_NEXIO=y
+CONFIG_TOUCHSCREEN_USB_EASYTOUCH=y
+CONFIG_TOUCHSCREEN_TOUCHIT213=m
+CONFIG_TOUCHSCREEN_TSC_SERIO=m
+# CONFIG_TOUCHSCREEN_TSC2005 is not set
+CONFIG_TOUCHSCREEN_TSC2007=m
+CONFIG_TOUCHSCREEN_ST1232=m
+CONFIG_TOUCHSCREEN_TPS6507X=m
+CONFIG_INPUT_MISC=y
+CONFIG_INPUT_AD714X=m
+CONFIG_INPUT_AD714X_I2C=m
+CONFIG_INPUT_AD714X_SPI=m
+CONFIG_INPUT_BMA150=m
+CONFIG_INPUT_PCSPKR=m
+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 is not set
+CONFIG_INPUT_ATLAS_BTNS=m
+CONFIG_INPUT_ATI_REMOTE2=m
+CONFIG_INPUT_KEYSPAN_REMOTE=m
+CONFIG_INPUT_KXTJ9=m
+# CONFIG_INPUT_KXTJ9_POLLED_MODE is not set
+CONFIG_INPUT_POWERMATE=m
+CONFIG_INPUT_YEALINK=m
+CONFIG_INPUT_CM109=m
+CONFIG_INPUT_RETU_PWRBUTTON=m
+CONFIG_INPUT_UINPUT=m
+CONFIG_INPUT_PCF50633_PMU=m
+CONFIG_INPUT_PCF8574=m
+CONFIG_INPUT_GPIO_ROTARY_ENCODER=m
+CONFIG_INPUT_ADXL34X=m
+CONFIG_INPUT_ADXL34X_I2C=m
+CONFIG_INPUT_ADXL34X_SPI=m
+# CONFIG_INPUT_IMS_PCU is not set
+CONFIG_INPUT_CMA3000=m
+CONFIG_INPUT_CMA3000_I2C=m
+CONFIG_INPUT_XEN_KBDDEV_FRONTEND=m
+CONFIG_INPUT_IDEAPAD_SLIDEBAR=m
+
+#
+# Hardware I/O ports
+#
+CONFIG_SERIO=y
+CONFIG_SERIO_I8042=y
+CONFIG_SERIO_SERPORT=m
+CONFIG_SERIO_CT82C710=m
+CONFIG_SERIO_PARKBD=m
+CONFIG_SERIO_PCIPS2=m
+CONFIG_SERIO_LIBPS2=y
+CONFIG_SERIO_RAW=m
+CONFIG_SERIO_ALTERA_PS2=m
+CONFIG_SERIO_PS2MULT=m
+CONFIG_SERIO_ARC_PS2=m
+CONFIG_GAMEPORT=m
+CONFIG_GAMEPORT_NS558=m
+CONFIG_GAMEPORT_L4=m
+CONFIG_GAMEPORT_EMU10K1=m
+CONFIG_GAMEPORT_FM801=m
+
+#
+# Character devices
+#
+CONFIG_TTY=y
+CONFIG_VT=y
+CONFIG_CONSOLE_TRANSLATIONS=y
+CONFIG_VT_CONSOLE=y
+CONFIG_VT_CONSOLE_SLEEP=y
+CONFIG_HW_CONSOLE=y
+CONFIG_VT_HW_CONSOLE_BINDING=y
+CONFIG_UNIX98_PTYS=y
+CONFIG_DEVPTS_MULTIPLE_INSTANCES=y
+# CONFIG_LEGACY_PTYS is not set
+CONFIG_SERIAL_NONSTANDARD=y
+CONFIG_ROCKETPORT=m
+CONFIG_CYCLADES=m
+# CONFIG_CYZ_INTR is not set
+# CONFIG_MOXA_INTELLIO is not set
+# CONFIG_MOXA_SMARTIO is not set
+CONFIG_SYNCLINK=m
+CONFIG_SYNCLINKMP=m
+# CONFIG_SYNCLINK_GT is not set
+CONFIG_NOZOMI=m
+# CONFIG_ISI is not set
+CONFIG_N_HDLC=m
+CONFIG_N_GSM=m
+CONFIG_TRACE_ROUTER=m
+CONFIG_TRACE_SINK=m
+# CONFIG_DEVKMEM is not set
+
+#
+# Serial drivers
+#
+CONFIG_SERIAL_8250=y
+# CONFIG_SERIAL_8250_DEPRECATED_OPTIONS is not set
+CONFIG_SERIAL_8250_PNP=y
+CONFIG_SERIAL_8250_CONSOLE=y
+CONFIG_FIX_EARLYCON_MEM=y
+CONFIG_SERIAL_8250_DMA=y
+CONFIG_SERIAL_8250_PCI=y
+CONFIG_SERIAL_8250_CS=m
+CONFIG_SERIAL_8250_NR_UARTS=32
+CONFIG_SERIAL_8250_RUNTIME_UARTS=4
+# CONFIG_SERIAL_8250_EXTENDED is not set
+CONFIG_SERIAL_8250_DW=m
+
+#
+# Non-8250 serial port support
+#
+# CONFIG_SERIAL_MAX3100 is not set
+# CONFIG_SERIAL_MAX310X is not set
+CONFIG_SERIAL_MFD_HSU=m
+CONFIG_SERIAL_CORE=y
+CONFIG_SERIAL_CORE_CONSOLE=y
+CONFIG_SERIAL_JSM=m
+CONFIG_SERIAL_SCCNXP=m
+# CONFIG_SERIAL_TIMBERDALE is not set
+CONFIG_SERIAL_ALTERA_JTAGUART=m
+CONFIG_SERIAL_ALTERA_UART=m
+CONFIG_SERIAL_ALTERA_UART_MAXPORTS=4
+CONFIG_SERIAL_ALTERA_UART_BAUDRATE=115200
+# CONFIG_SERIAL_IFX6X60 is not set
+CONFIG_SERIAL_PCH_UART=m
+CONFIG_SERIAL_ARC=m
+CONFIG_SERIAL_ARC_NR_PORTS=1
+CONFIG_SERIAL_RP2=m
+CONFIG_SERIAL_RP2_NR_UARTS=32
+CONFIG_SERIAL_FSL_LPUART=m
+CONFIG_SERIAL_ST_ASC=m
+CONFIG_PRINTER=m
+# CONFIG_LP_CONSOLE is not set
+CONFIG_PPDEV=m
+CONFIG_HVC_DRIVER=y
+CONFIG_HVC_IRQ=y
+CONFIG_HVC_XEN=y
+CONFIG_HVC_XEN_FRONTEND=y
+CONFIG_VIRTIO_CONSOLE=m
+CONFIG_IPMI_HANDLER=m
+# CONFIG_IPMI_PANIC_EVENT is not set
+CONFIG_IPMI_DEVICE_INTERFACE=m
+CONFIG_IPMI_SI=m
+CONFIG_IPMI_WATCHDOG=m
+CONFIG_IPMI_POWEROFF=m
+CONFIG_HW_RANDOM=y
+CONFIG_HW_RANDOM_TIMERIOMEM=m
+CONFIG_HW_RANDOM_INTEL=m
+CONFIG_HW_RANDOM_AMD=m
+CONFIG_HW_RANDOM_VIA=m
+CONFIG_HW_RANDOM_VIRTIO=m
+CONFIG_HW_RANDOM_TPM=m
+CONFIG_NVRAM=m
+CONFIG_R3964=m
+CONFIG_APPLICOM=m
+
+#
+# PCMCIA character devices
+#
+CONFIG_SYNCLINK_CS=m
+CONFIG_CARDMAN_4000=m
+CONFIG_CARDMAN_4040=m
+CONFIG_IPWIRELESS=m
+CONFIG_MWAVE=m
+# CONFIG_RAW_DRIVER is not set
+CONFIG_HPET=y
+CONFIG_HPET_MMAP=y
+CONFIG_HANGCHECK_TIMER=m
+CONFIG_TCG_TPM=m
+CONFIG_TCG_TIS=m
+CONFIG_TCG_TIS_I2C_INFINEON=m
+CONFIG_TCG_NSC=m
+CONFIG_TCG_ATMEL=m
+CONFIG_TCG_INFINEON=m
+CONFIG_TCG_ST33_I2C=m
+# CONFIG_TCG_XEN is not set
+CONFIG_TELCLOCK=m
+CONFIG_DEVPORT=y
+CONFIG_I2C=m
+CONFIG_I2C_BOARDINFO=y
+CONFIG_I2C_COMPAT=y
+CONFIG_I2C_CHARDEV=m
+# CONFIG_I2C_MUX is not set
+CONFIG_I2C_HELPER_AUTO=y
+CONFIG_I2C_SMBUS=m
+CONFIG_I2C_ALGOBIT=m
+CONFIG_I2C_ALGOPCA=m
+
+#
+# I2C Hardware Bus support
+#
+
+#
+# PC SMBus host controller drivers
+#
+CONFIG_I2C_ALI1535=m
+CONFIG_I2C_ALI1563=m
+CONFIG_I2C_ALI15X3=m
+CONFIG_I2C_AMD756=m
+CONFIG_I2C_AMD756_S4882=m
+CONFIG_I2C_AMD8111=m
+CONFIG_I2C_I801=m
+CONFIG_I2C_ISCH=m
+CONFIG_I2C_ISMT=m
+CONFIG_I2C_PIIX4=m
+CONFIG_I2C_NFORCE2=m
+CONFIG_I2C_NFORCE2_S4985=m
+CONFIG_I2C_SIS5595=m
+CONFIG_I2C_SIS630=m
+CONFIG_I2C_SIS96X=m
+CONFIG_I2C_VIA=m
+CONFIG_I2C_VIAPRO=m
+
+#
+# ACPI drivers
+#
+CONFIG_I2C_SCMI=m
+
+#
+# I2C system bus drivers (mostly embedded / system-on-chip)
+#
+# CONFIG_I2C_CBUS_GPIO is not set
+CONFIG_I2C_DESIGNWARE_CORE=m
+CONFIG_I2C_DESIGNWARE_PCI=m
+CONFIG_I2C_EG20T=m
+# CONFIG_I2C_GPIO is not set
+CONFIG_I2C_OCORES=m
+CONFIG_I2C_PCA_PLATFORM=m
+# CONFIG_I2C_PXA_PCI is not set
+CONFIG_I2C_SIMTEC=m
+CONFIG_I2C_XILINX=m
+
+#
+# External I2C/SMBus adapter drivers
+#
+CONFIG_I2C_DIOLAN_U2C=m
+CONFIG_I2C_PARPORT=m
+CONFIG_I2C_PARPORT_LIGHT=m
+CONFIG_I2C_TAOS_EVM=m
+CONFIG_I2C_TINY_USB=m
+CONFIG_I2C_VIPERBOARD=m
+
+#
+# Other I2C/SMBus bus drivers
+#
+# CONFIG_I2C_STUB is not set
+# CONFIG_I2C_DEBUG_CORE is not set
+# CONFIG_I2C_DEBUG_ALGO is not set
+# CONFIG_I2C_DEBUG_BUS is not set
+CONFIG_SPI=y
+# CONFIG_SPI_DEBUG is not set
+CONFIG_SPI_MASTER=y
+
+#
+# SPI Master Controller Drivers
+#
+# CONFIG_SPI_ALTERA is not set
+# CONFIG_SPI_BITBANG is not set
+# CONFIG_SPI_BUTTERFLY is not set
+# CONFIG_SPI_GPIO is not set
+# CONFIG_SPI_LM70_LLP is not set
+# CONFIG_SPI_FSL_DSPI is not set
+# CONFIG_SPI_OC_TINY is not set
+CONFIG_SPI_PXA2XX_DMA=y
+CONFIG_SPI_PXA2XX=m
+CONFIG_SPI_PXA2XX_PCI=m
+# CONFIG_SPI_SC18IS602 is not set
+# CONFIG_SPI_TOPCLIFF_PCH is not set
+# CONFIG_SPI_XCOMM is not set
+# CONFIG_SPI_XILINX is not set
+# CONFIG_SPI_DESIGNWARE is not set
+
+#
+# SPI Protocol Masters
+#
+# CONFIG_SPI_SPIDEV is not set
+# CONFIG_SPI_TLE62X0 is not set
+# CONFIG_HSI is not set
+
+#
+# PPS support
+#
+CONFIG_PPS=m
+# CONFIG_PPS_DEBUG is not set
+
+#
+# PPS clients support
+#
+CONFIG_PPS_CLIENT_KTIMER=m
+CONFIG_PPS_CLIENT_LDISC=m
+CONFIG_PPS_CLIENT_PARPORT=m
+CONFIG_PPS_CLIENT_GPIO=m
+
+#
+# PPS generators support
+#
+
+#
+# PTP clock support
+#
+CONFIG_PTP_1588_CLOCK=m
+CONFIG_DP83640_PHY=m
+CONFIG_PTP_1588_CLOCK_PCH=m
+CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y
+CONFIG_GPIO_DEVRES=y
+CONFIG_GPIOLIB=y
+CONFIG_GPIO_ACPI=y
+# CONFIG_DEBUG_GPIO is not set
+CONFIG_GPIO_SYSFS=y
+
+#
+# Memory mapped GPIO drivers:
+#
+# CONFIG_GPIO_GENERIC_PLATFORM is not set
+# CONFIG_GPIO_IT8761E is not set
+# CONFIG_GPIO_F7188X is not set
+# CONFIG_GPIO_TS5500 is not set
+CONFIG_GPIO_SCH=m
+CONFIG_GPIO_ICH=m
+# CONFIG_GPIO_VX855 is not set
+# CONFIG_GPIO_LYNXPOINT is not set
+
+#
+# I2C GPIO expanders:
+#
+CONFIG_GPIO_ARIZONA=m
+# CONFIG_GPIO_MAX7300 is not set
+# CONFIG_GPIO_MAX732X is not set
+# CONFIG_GPIO_PCA953X is not set
+# CONFIG_GPIO_PCF857X is not set
+# CONFIG_GPIO_ADP5588 is not set
+
+#
+# PCI GPIO expanders:
+#
+CONFIG_GPIO_CS5535=m
+CONFIG_GPIO_AMD8111=m
+CONFIG_GPIO_LANGWELL=y
+# CONFIG_GPIO_PCH is not set
+# CONFIG_GPIO_ML_IOH is not set
+# CONFIG_GPIO_RDC321X is not set
+
+#
+# SPI GPIO expanders:
+#
+# CONFIG_GPIO_MAX7301 is not set
+# CONFIG_GPIO_MCP23S08 is not set
+# CONFIG_GPIO_MC33880 is not set
+# CONFIG_GPIO_74X164 is not set
+
+#
+# AC97 GPIO expanders:
+#
+CONFIG_GPIO_UCB1400=y
+
+#
+# LPC GPIO expanders:
+#
+
+#
+# MODULbus GPIO expanders:
+#
+
+#
+# USB GPIO expanders:
+#
+CONFIG_GPIO_VIPERBOARD=m
+# CONFIG_W1 is not set
+CONFIG_POWER_SUPPLY=y
+# CONFIG_POWER_SUPPLY_DEBUG is not set
+CONFIG_PDA_POWER=m
+CONFIG_TEST_POWER=m
+# CONFIG_BATTERY_DS2780 is not set
+# CONFIG_BATTERY_DS2781 is not set
+# CONFIG_BATTERY_DS2782 is not set
+# CONFIG_BATTERY_SBS is not set
+# CONFIG_BATTERY_BQ27x00 is not set
+# CONFIG_BATTERY_MAX17040 is not set
+# CONFIG_BATTERY_MAX17042 is not set
+# CONFIG_CHARGER_PCF50633 is not set
+# CONFIG_CHARGER_ISP1704 is not set
+# CONFIG_CHARGER_MAX8903 is not set
+# CONFIG_CHARGER_LP8727 is not set
+# CONFIG_CHARGER_GPIO is not set
+# CONFIG_CHARGER_BQ2415X is not set
+# CONFIG_CHARGER_BQ24190 is not set
+# CONFIG_CHARGER_SMB347 is not set
+CONFIG_POWER_RESET=y
+CONFIG_POWER_AVS=y
+CONFIG_HWMON=y
+CONFIG_HWMON_VID=m
+# CONFIG_HWMON_DEBUG_CHIP is not set
+
+#
+# Native drivers
+#
+CONFIG_SENSORS_ABITUGURU=m
+CONFIG_SENSORS_ABITUGURU3=m
+# CONFIG_SENSORS_AD7314 is not set
+CONFIG_SENSORS_AD7414=m
+CONFIG_SENSORS_AD7418=m
+# CONFIG_SENSORS_ADCXX is not set
+CONFIG_SENSORS_ADM1021=m
+CONFIG_SENSORS_ADM1025=m
+CONFIG_SENSORS_ADM1026=m
+CONFIG_SENSORS_ADM1029=m
+CONFIG_SENSORS_ADM1031=m
+CONFIG_SENSORS_ADM9240=m
+CONFIG_SENSORS_ADT7X10=m
+CONFIG_SENSORS_ADT7310=m
+CONFIG_SENSORS_ADT7410=m
+CONFIG_SENSORS_ADT7411=m
+CONFIG_SENSORS_ADT7462=m
+CONFIG_SENSORS_ADT7470=m
+CONFIG_SENSORS_ADT7475=m
+CONFIG_SENSORS_ASC7621=m
+CONFIG_SENSORS_K8TEMP=m
+CONFIG_SENSORS_K10TEMP=m
+CONFIG_SENSORS_FAM15H_POWER=m
+CONFIG_SENSORS_ASB100=m
+CONFIG_SENSORS_ATXP1=m
+CONFIG_SENSORS_DS620=m
+CONFIG_SENSORS_DS1621=m
+CONFIG_SENSORS_I5K_AMB=m
+CONFIG_SENSORS_F71805F=m
+CONFIG_SENSORS_F71882FG=m
+CONFIG_SENSORS_F75375S=m
+CONFIG_SENSORS_FSCHMD=m
+CONFIG_SENSORS_G760A=m
+CONFIG_SENSORS_G762=m
+CONFIG_SENSORS_GL518SM=m
+CONFIG_SENSORS_GL520SM=m
+# CONFIG_SENSORS_GPIO_FAN is not set
+CONFIG_SENSORS_HIH6130=m
+CONFIG_SENSORS_HTU21=m
+CONFIG_SENSORS_CORETEMP=m
+CONFIG_SENSORS_IBMAEM=m
+CONFIG_SENSORS_IBMPEX=m
+CONFIG_SENSORS_IT87=m
+CONFIG_SENSORS_JC42=m
+CONFIG_SENSORS_LINEAGE=m
+CONFIG_SENSORS_LM63=m
+# CONFIG_SENSORS_LM70 is not set
+CONFIG_SENSORS_LM73=m
+CONFIG_SENSORS_LM75=m
+CONFIG_SENSORS_LM77=m
+CONFIG_SENSORS_LM78=m
+CONFIG_SENSORS_LM80=m
+CONFIG_SENSORS_LM83=m
+CONFIG_SENSORS_LM85=m
+CONFIG_SENSORS_LM87=m
+CONFIG_SENSORS_LM90=m
+CONFIG_SENSORS_LM92=m
+CONFIG_SENSORS_LM93=m
+CONFIG_SENSORS_LTC4151=m
+CONFIG_SENSORS_LTC4215=m
+CONFIG_SENSORS_LTC4245=m
+CONFIG_SENSORS_LTC4261=m
+CONFIG_SENSORS_LM95234=m
+CONFIG_SENSORS_LM95241=m
+CONFIG_SENSORS_LM95245=m
+# CONFIG_SENSORS_MAX1111 is not set
+CONFIG_SENSORS_MAX16065=m
+CONFIG_SENSORS_MAX1619=m
+CONFIG_SENSORS_MAX1668=m
+CONFIG_SENSORS_MAX197=m
+CONFIG_SENSORS_MAX6639=m
+CONFIG_SENSORS_MAX6642=m
+CONFIG_SENSORS_MAX6650=m
+CONFIG_SENSORS_MAX6697=m
+CONFIG_SENSORS_MCP3021=m
+CONFIG_SENSORS_NCT6775=m
+CONFIG_SENSORS_NTC_THERMISTOR=m
+CONFIG_SENSORS_PC87360=m
+CONFIG_SENSORS_PC87427=m
+CONFIG_SENSORS_PCF8591=m
+CONFIG_PMBUS=m
+CONFIG_SENSORS_PMBUS=m
+CONFIG_SENSORS_ADM1275=m
+CONFIG_SENSORS_LM25066=m
+CONFIG_SENSORS_LTC2978=m
+CONFIG_SENSORS_MAX16064=m
+CONFIG_SENSORS_MAX34440=m
+CONFIG_SENSORS_MAX8688=m
+CONFIG_SENSORS_UCD9000=m
+CONFIG_SENSORS_UCD9200=m
+CONFIG_SENSORS_ZL6100=m
+CONFIG_SENSORS_SHT15=m
+CONFIG_SENSORS_SHT21=m
+CONFIG_SENSORS_SIS5595=m
+CONFIG_SENSORS_SMM665=m
+CONFIG_SENSORS_DME1737=m
+CONFIG_SENSORS_EMC1403=m
+CONFIG_SENSORS_EMC2103=m
+CONFIG_SENSORS_EMC6W201=m
+CONFIG_SENSORS_SMSC47M1=m
+CONFIG_SENSORS_SMSC47M192=m
+CONFIG_SENSORS_SMSC47B397=m
+CONFIG_SENSORS_SCH56XX_COMMON=m
+CONFIG_SENSORS_SCH5627=m
+CONFIG_SENSORS_SCH5636=m
+CONFIG_SENSORS_ADS1015=m
+CONFIG_SENSORS_ADS7828=m
+# CONFIG_SENSORS_ADS7871 is not set
+CONFIG_SENSORS_AMC6821=m
+CONFIG_SENSORS_INA209=m
+CONFIG_SENSORS_INA2XX=m
+CONFIG_SENSORS_THMC50=m
+CONFIG_SENSORS_TMP102=m
+CONFIG_SENSORS_TMP401=m
+CONFIG_SENSORS_TMP421=m
+CONFIG_SENSORS_VIA_CPUTEMP=m
+CONFIG_SENSORS_VIA686A=m
+CONFIG_SENSORS_VT1211=m
+CONFIG_SENSORS_VT8231=m
+CONFIG_SENSORS_W83781D=m
+CONFIG_SENSORS_W83791D=m
+CONFIG_SENSORS_W83792D=m
+CONFIG_SENSORS_W83793=m
+CONFIG_SENSORS_W83795=m
+# CONFIG_SENSORS_W83795_FANCTRL is not set
+CONFIG_SENSORS_W83L785TS=m
+CONFIG_SENSORS_W83L786NG=m
+CONFIG_SENSORS_W83627HF=m
+CONFIG_SENSORS_W83627EHF=m
+CONFIG_SENSORS_APPLESMC=m
+CONFIG_SENSORS_MC13783_ADC=m
+
+#
+# ACPI drivers
+#
+CONFIG_SENSORS_ACPI_POWER=m
+CONFIG_SENSORS_ATK0110=m
+CONFIG_THERMAL=y
+CONFIG_THERMAL_HWMON=y
+CONFIG_THERMAL_DEFAULT_GOV_STEP_WISE=y
+# CONFIG_THERMAL_DEFAULT_GOV_FAIR_SHARE is not set
+# CONFIG_THERMAL_DEFAULT_GOV_USER_SPACE is not set
+CONFIG_THERMAL_GOV_FAIR_SHARE=y
+CONFIG_THERMAL_GOV_STEP_WISE=y
+CONFIG_THERMAL_GOV_USER_SPACE=y
+# CONFIG_CPU_THERMAL is not set
+# CONFIG_THERMAL_EMULATION is not set
+CONFIG_INTEL_POWERCLAMP=m
+CONFIG_X86_PKG_TEMP_THERMAL=m
+
+#
+# Texas Instruments thermal drivers
+#
+CONFIG_WATCHDOG=y
+CONFIG_WATCHDOG_CORE=y
+# CONFIG_WATCHDOG_NOWAYOUT is not set
+
+#
+# Watchdog Device Drivers
+#
+CONFIG_SOFT_WATCHDOG=m
+CONFIG_RETU_WATCHDOG=m
+CONFIG_ACQUIRE_WDT=m
+CONFIG_ADVANTECH_WDT=m
+CONFIG_ALIM1535_WDT=m
+CONFIG_ALIM7101_WDT=m
+CONFIG_F71808E_WDT=m
+CONFIG_SP5100_TCO=m
+CONFIG_GEODE_WDT=m
+CONFIG_SC520_WDT=m
+CONFIG_SBC_FITPC2_WATCHDOG=m
+CONFIG_EUROTECH_WDT=m
+CONFIG_IB700_WDT=m
+CONFIG_IBMASR=m
+CONFIG_WAFER_WDT=m
+CONFIG_I6300ESB_WDT=m
+CONFIG_IE6XX_WDT=m
+CONFIG_ITCO_WDT=m
+CONFIG_ITCO_VENDOR_SUPPORT=y
+CONFIG_IT8712F_WDT=m
+CONFIG_IT87_WDT=m
+CONFIG_HP_WATCHDOG=m
+CONFIG_HPWDT_NMI_DECODING=y
+CONFIG_SC1200_WDT=m
+CONFIG_PC87413_WDT=m
+CONFIG_NV_TCO=m
+CONFIG_60XX_WDT=m
+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
+CONFIG_W83877F_WDT=m
+CONFIG_W83977F_WDT=m
+CONFIG_MACHZ_WDT=m
+CONFIG_SBC_EPX_C3_WATCHDOG=m
+CONFIG_MEN_A21_WDT=m
+CONFIG_XEN_WDT=m
+
+#
+# PCI-based Watchdog Cards
+#
+CONFIG_PCIPCWATCHDOG=m
+CONFIG_WDTPCI=m
+
+#
+# USB-based Watchdog Cards
+#
+CONFIG_USBPCWATCHDOG=m
+CONFIG_SSB_POSSIBLE=y
+
+#
+# Sonics Silicon Backplane
+#
+CONFIG_SSB=m
+CONFIG_SSB_SPROM=y
+CONFIG_SSB_BLOCKIO=y
+CONFIG_SSB_PCIHOST_POSSIBLE=y
+CONFIG_SSB_PCIHOST=y
+CONFIG_SSB_B43_PCI_BRIDGE=y
+CONFIG_SSB_PCMCIAHOST_POSSIBLE=y
+CONFIG_SSB_PCMCIAHOST=y
+CONFIG_SSB_SDIOHOST_POSSIBLE=y
+CONFIG_SSB_SDIOHOST=y
+# CONFIG_SSB_DEBUG is not set
+CONFIG_SSB_DRIVER_PCICORE_POSSIBLE=y
+CONFIG_SSB_DRIVER_PCICORE=y
+CONFIG_SSB_DRIVER_GPIO=y
+CONFIG_BCMA_POSSIBLE=y
+
+#
+# Broadcom specific AMBA
+#
+CONFIG_BCMA=m
+CONFIG_BCMA_BLOCKIO=y
+CONFIG_BCMA_HOST_PCI_POSSIBLE=y
+CONFIG_BCMA_HOST_PCI=y
+# CONFIG_BCMA_HOST_SOC is not set
+CONFIG_BCMA_DRIVER_GMAC_CMN=y
+CONFIG_BCMA_DRIVER_GPIO=y
+# CONFIG_BCMA_DEBUG is not set
+
+#
+# Multifunction device drivers
+#
+CONFIG_MFD_CORE=y
+CONFIG_MFD_CS5535=m
+# CONFIG_MFD_CROS_EC is not set
+# CONFIG_MFD_DA9052_SPI is not set
+CONFIG_MFD_MC13783=m
+CONFIG_MFD_MC13XXX=m
+# CONFIG_MFD_MC13XXX_SPI is not set
+CONFIG_MFD_MC13XXX_I2C=m
+CONFIG_HTC_PASIC3=m
+CONFIG_LPC_ICH=m
+CONFIG_LPC_SCH=m
+# CONFIG_MFD_JANZ_CMODIO is not set
+# CONFIG_MFD_KEMPLD is not set
+# CONFIG_EZX_PCAP is not set
+CONFIG_MFD_VIPERBOARD=m
+CONFIG_MFD_RETU=m
+CONFIG_MFD_PCF50633=m
+CONFIG_PCF50633_ADC=m
+CONFIG_PCF50633_GPIO=m
+CONFIG_UCB1400_CORE=m
+CONFIG_MFD_RDC321X=m
+CONFIG_MFD_RTSX_PCI=m
+CONFIG_MFD_SI476X_CORE=m
+CONFIG_MFD_SM501=m
+CONFIG_MFD_SM501_GPIO=y
+CONFIG_ABX500_CORE=y
+# CONFIG_MFD_STMPE is not set
+# CONFIG_MFD_SYSCON is not set
+CONFIG_MFD_TI_AM335X_TSCADC=m
+# CONFIG_TPS6105X is not set
+CONFIG_TPS65010=m
+CONFIG_TPS6507X=m
+CONFIG_MFD_TPS65217=m
+# CONFIG_MFD_TPS65912 is not set
+# CONFIG_MFD_TPS65912_SPI is not set
+CONFIG_MFD_WL1273_CORE=m
+CONFIG_MFD_LM3533=m
+# CONFIG_MFD_TIMBERDALE is not set
+# CONFIG_MFD_TMIO is not set
+CONFIG_MFD_VX855=m
+CONFIG_MFD_ARIZONA=y
+CONFIG_MFD_ARIZONA_I2C=m
+# CONFIG_MFD_ARIZONA_SPI is not set
+CONFIG_MFD_WM5102=y
+CONFIG_MFD_WM5110=y
+# CONFIG_MFD_WM8997 is not set
+# CONFIG_MFD_WM831X_SPI is not set
+# CONFIG_REGULATOR is not set
+CONFIG_MEDIA_SUPPORT=m
+
+#
+# Multimedia core support
+#
+CONFIG_MEDIA_CAMERA_SUPPORT=y
+CONFIG_MEDIA_ANALOG_TV_SUPPORT=y
+CONFIG_MEDIA_DIGITAL_TV_SUPPORT=y
+CONFIG_MEDIA_RADIO_SUPPORT=y
+CONFIG_MEDIA_RC_SUPPORT=y
+CONFIG_MEDIA_CONTROLLER=y
+CONFIG_VIDEO_DEV=m
+CONFIG_VIDEO_V4L2_SUBDEV_API=y
+CONFIG_VIDEO_V4L2=m
+# CONFIG_VIDEO_ADV_DEBUG is not set
+# CONFIG_VIDEO_FIXED_MINOR_RANGES is not set
+CONFIG_VIDEO_TUNER=m
+CONFIG_V4L2_MEM2MEM_DEV=m
+CONFIG_VIDEOBUF_GEN=m
+CONFIG_VIDEOBUF_DMA_SG=m
+CONFIG_VIDEOBUF_VMALLOC=m
+CONFIG_VIDEOBUF_DVB=m
+CONFIG_VIDEOBUF2_CORE=m
+CONFIG_VIDEOBUF2_MEMOPS=m
+CONFIG_VIDEOBUF2_DMA_CONTIG=m
+CONFIG_VIDEOBUF2_VMALLOC=m
+CONFIG_VIDEOBUF2_DMA_SG=m
+# CONFIG_VIDEO_V4L2_INT_DEVICE is not set
+CONFIG_DVB_CORE=m
+CONFIG_DVB_NET=y
+CONFIG_TTPCI_EEPROM=m
+CONFIG_DVB_MAX_ADAPTERS=8
+# CONFIG_DVB_DYNAMIC_MINORS is not set
+
+#
+# Media drivers
+#
+CONFIG_RC_CORE=m
+CONFIG_RC_MAP=m
+CONFIG_RC_DECODERS=y
+CONFIG_LIRC=m
+CONFIG_IR_LIRC_CODEC=m
+CONFIG_IR_NEC_DECODER=m
+CONFIG_IR_RC5_DECODER=m
+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_RC_DEVICES=y
+CONFIG_RC_ATI_REMOTE=m
+CONFIG_IR_ENE=m
+CONFIG_IR_IMON=m
+CONFIG_IR_MCEUSB=m
+CONFIG_IR_ITE_CIR=m
+CONFIG_IR_FINTEK=m
+CONFIG_IR_NUVOTON=m
+CONFIG_IR_REDRAT3=m
+CONFIG_IR_STREAMZAP=m
+CONFIG_IR_WINBOND_CIR=m
+CONFIG_IR_IGUANA=m
+CONFIG_IR_TTUSBIR=m
+CONFIG_RC_LOOPBACK=m
+CONFIG_IR_GPIO_CIR=m
+CONFIG_MEDIA_USB_SUPPORT=y
+
+#
+# Webcam devices
+#
+CONFIG_USB_VIDEO_CLASS=m
+CONFIG_USB_VIDEO_CLASS_INPUT_EVDEV=y
+CONFIG_USB_GSPCA=m
+CONFIG_USB_M5602=m
+CONFIG_USB_STV06XX=m
+CONFIG_USB_GL860=m
+CONFIG_USB_GSPCA_BENQ=m
+CONFIG_USB_GSPCA_CONEX=m
+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
+CONFIG_USB_GSPCA_MR97310A=m
+CONFIG_USB_GSPCA_NW80X=m
+CONFIG_USB_GSPCA_OV519=m
+CONFIG_USB_GSPCA_OV534=m
+CONFIG_USB_GSPCA_OV534_9=m
+CONFIG_USB_GSPCA_PAC207=m
+CONFIG_USB_GSPCA_PAC7302=m
+CONFIG_USB_GSPCA_PAC7311=m
+CONFIG_USB_GSPCA_SE401=m
+CONFIG_USB_GSPCA_SN9C2028=m
+CONFIG_USB_GSPCA_SN9C20X=m
+CONFIG_USB_GSPCA_SONIXB=m
+CONFIG_USB_GSPCA_SONIXJ=m
+CONFIG_USB_GSPCA_SPCA500=m
+CONFIG_USB_GSPCA_SPCA501=m
+CONFIG_USB_GSPCA_SPCA505=m
+CONFIG_USB_GSPCA_SPCA506=m
+CONFIG_USB_GSPCA_SPCA508=m
+CONFIG_USB_GSPCA_SPCA561=m
+CONFIG_USB_GSPCA_SPCA1528=m
+CONFIG_USB_GSPCA_SQ905=m
+CONFIG_USB_GSPCA_SQ905C=m
+CONFIG_USB_GSPCA_SQ930X=m
+CONFIG_USB_GSPCA_STK014=m
+CONFIG_USB_GSPCA_STK1135=m
+CONFIG_USB_GSPCA_STV0680=m
+CONFIG_USB_GSPCA_SUNPLUS=m
+CONFIG_USB_GSPCA_T613=m
+CONFIG_USB_GSPCA_TOPRO=m
+CONFIG_USB_GSPCA_TV8532=m
+CONFIG_USB_GSPCA_VC032X=m
+CONFIG_USB_GSPCA_VICAM=m
+CONFIG_USB_GSPCA_XIRLINK_CIT=m
+CONFIG_USB_GSPCA_ZC3XX=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_USB_SN9C102=m
+CONFIG_VIDEO_USBTV=m
+
+#
+# Analog TV USB devices
+#
+CONFIG_VIDEO_PVRUSB2=m
+CONFIG_VIDEO_PVRUSB2_SYSFS=y
+CONFIG_VIDEO_PVRUSB2_DVB=y
+# CONFIG_VIDEO_PVRUSB2_DEBUGIFC is not set
+CONFIG_VIDEO_HDPVR=m
+CONFIG_VIDEO_TLG2300=m
+CONFIG_VIDEO_USBVISION=m
+CONFIG_VIDEO_STK1160_COMMON=m
+CONFIG_VIDEO_STK1160_AC97=y
+CONFIG_VIDEO_STK1160=m
+
+#
+# Analog/digital TV USB devices
+#
+CONFIG_VIDEO_AU0828=m
+CONFIG_VIDEO_AU0828_V4L2=y
+CONFIG_VIDEO_CX231XX=m
+CONFIG_VIDEO_CX231XX_RC=y
+CONFIG_VIDEO_CX231XX_ALSA=m
+CONFIG_VIDEO_CX231XX_DVB=m
+CONFIG_VIDEO_TM6000=m
+CONFIG_VIDEO_TM6000_ALSA=m
+CONFIG_VIDEO_TM6000_DVB=m
+
+#
+# Digital TV USB devices
+#
+CONFIG_DVB_USB=m
+# CONFIG_DVB_USB_DEBUG is not set
+CONFIG_DVB_USB_A800=m
+CONFIG_DVB_USB_DIBUSB_MB=m
+CONFIG_DVB_USB_DIBUSB_MB_FAULTY=y
+CONFIG_DVB_USB_DIBUSB_MC=m
+CONFIG_DVB_USB_DIB0700=m
+CONFIG_DVB_USB_UMT_010=m
+CONFIG_DVB_USB_CXUSB=m
+CONFIG_DVB_USB_M920X=m
+CONFIG_DVB_USB_DIGITV=m
+CONFIG_DVB_USB_VP7045=m
+CONFIG_DVB_USB_VP702X=m
+CONFIG_DVB_USB_GP8PSK=m
+CONFIG_DVB_USB_NOVA_T_USB2=m
+CONFIG_DVB_USB_TTUSB2=m
+CONFIG_DVB_USB_DTT200U=m
+CONFIG_DVB_USB_OPERA1=m
+CONFIG_DVB_USB_AF9005=m
+CONFIG_DVB_USB_AF9005_REMOTE=m
+CONFIG_DVB_USB_PCTV452E=m
+CONFIG_DVB_USB_DW2102=m
+CONFIG_DVB_USB_CINERGY_T2=m
+CONFIG_DVB_USB_DTV5100=m
+CONFIG_DVB_USB_FRIIO=m
+CONFIG_DVB_USB_AZ6027=m
+CONFIG_DVB_USB_TECHNISAT_USB2=m
+CONFIG_DVB_USB_V2=m
+CONFIG_DVB_USB_AF9015=m
+CONFIG_DVB_USB_AF9035=m
+CONFIG_DVB_USB_ANYSEE=m
+CONFIG_DVB_USB_AU6610=m
+CONFIG_DVB_USB_AZ6007=m
+CONFIG_DVB_USB_CE6230=m
+CONFIG_DVB_USB_EC168=m
+CONFIG_DVB_USB_GL861=m
+CONFIG_DVB_USB_IT913X=m
+CONFIG_DVB_USB_LME2510=m
+CONFIG_DVB_USB_MXL111SF=m
+CONFIG_DVB_USB_RTL28XXU=m
+CONFIG_DVB_TTUSB_BUDGET=m
+CONFIG_DVB_TTUSB_DEC=m
+CONFIG_SMS_USB_DRV=m
+CONFIG_DVB_B2C2_FLEXCOP_USB=m
+# CONFIG_DVB_B2C2_FLEXCOP_USB_DEBUG is not set
+
+#
+# Webcam, TV (analog/digital) USB devices
+#
+CONFIG_VIDEO_EM28XX=m
+CONFIG_VIDEO_EM28XX_ALSA=m
+CONFIG_VIDEO_EM28XX_DVB=m
+CONFIG_VIDEO_EM28XX_RC=m
+CONFIG_MEDIA_PCI_SUPPORT=y
+
+#
+# Media capture support
+#
+CONFIG_VIDEO_MEYE=m
+
+#
+# Media capture/analog TV support
+#
+CONFIG_VIDEO_IVTV=m
+CONFIG_VIDEO_IVTV_ALSA=m
+CONFIG_VIDEO_FB_IVTV=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_HEXIUM_GEMINI=m
+CONFIG_VIDEO_HEXIUM_ORION=m
+CONFIG_VIDEO_MXB=m
+
+#
+# Media capture/analog/hybrid TV support
+#
+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_ENABLE_VP3054=y
+CONFIG_VIDEO_CX88_VP3054=m
+CONFIG_VIDEO_CX88_MPEG=m
+CONFIG_VIDEO_BT848=m
+CONFIG_DVB_BT8XX=m
+CONFIG_VIDEO_SAA7134=m
+CONFIG_VIDEO_SAA7134_ALSA=m
+CONFIG_VIDEO_SAA7134_RC=y
+CONFIG_VIDEO_SAA7134_DVB=m
+CONFIG_VIDEO_SAA7164=m
+
+#
+# Media digital TV PCI Adapters
+#
+CONFIG_DVB_AV7110=m
+CONFIG_DVB_AV7110_OSD=y
+CONFIG_DVB_BUDGET_CORE=m
+CONFIG_DVB_BUDGET=m
+CONFIG_DVB_BUDGET_CI=m
+CONFIG_DVB_BUDGET_AV=m
+CONFIG_DVB_BUDGET_PATCH=m
+CONFIG_DVB_B2C2_FLEXCOP_PCI=m
+# CONFIG_DVB_B2C2_FLEXCOP_PCI_DEBUG is not set
+CONFIG_DVB_PLUTO2=m
+CONFIG_DVB_DM1105=m
+CONFIG_DVB_PT1=m
+CONFIG_MANTIS_CORE=m
+CONFIG_DVB_MANTIS=m
+CONFIG_DVB_HOPPER=m
+CONFIG_DVB_NGENE=m
+CONFIG_DVB_DDBRIDGE=m
+# CONFIG_V4L_PLATFORM_DRIVERS is not set
+CONFIG_V4L_MEM2MEM_DRIVERS=y
+CONFIG_VIDEO_MEM2MEM_DEINTERLACE=m
+CONFIG_VIDEO_SH_VEU=m
+CONFIG_VIDEO_RENESAS_VSP1=m
+# CONFIG_V4L_TEST_DRIVERS is not set
+
+#
+# Supported MMC/SDIO adapters
+#
+CONFIG_SMS_SDIO_DRV=m
+CONFIG_MEDIA_PARPORT_SUPPORT=y
+CONFIG_VIDEO_BWQCAM=m
+CONFIG_VIDEO_CQCAM=m
+CONFIG_VIDEO_W9966=m
+CONFIG_RADIO_ADAPTERS=y
+CONFIG_RADIO_TEA575X=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_RADIO_SHARK=m
+CONFIG_RADIO_SHARK2=m
+CONFIG_I2C_SI4713=m
+CONFIG_RADIO_SI4713=m
+CONFIG_USB_KEENE=m
+CONFIG_USB_MA901=m
+CONFIG_RADIO_TEA5764=m
+CONFIG_RADIO_SAA7706H=m
+CONFIG_RADIO_TEF6862=m
+CONFIG_RADIO_WL1273=m
+
+#
+# Texas Instruments WL128x FM driver (ST based)
+#
+CONFIG_RADIO_WL128X=m
+
+#
+# Supported FireWire (IEEE 1394) Adapters
+#
+CONFIG_DVB_FIREDTV=m
+CONFIG_DVB_FIREDTV_INPUT=y
+CONFIG_MEDIA_COMMON_OPTIONS=y
+
+#
+# common driver options
+#
+CONFIG_VIDEO_CX2341X=m
+CONFIG_VIDEO_BTCX=m
+CONFIG_VIDEO_TVEEPROM=m
+CONFIG_CYPRESS_FIRMWARE=m
+CONFIG_DVB_B2C2_FLEXCOP=m
+CONFIG_VIDEO_SAA7146=m
+CONFIG_VIDEO_SAA7146_VV=m
+CONFIG_SMS_SIANO_MDTV=m
+CONFIG_SMS_SIANO_RC=y
+
+#
+# Media ancillary drivers (tuners, sensors, i2c, frontends)
+#
+CONFIG_MEDIA_SUBDRV_AUTOSELECT=y
+CONFIG_MEDIA_ATTACH=y
+CONFIG_VIDEO_IR_I2C=m
+
+#
+# Audio decoders, processors and mixers
+#
+CONFIG_VIDEO_TVAUDIO=m
+CONFIG_VIDEO_TDA7432=m
+CONFIG_VIDEO_TDA9840=m
+CONFIG_VIDEO_TEA6415C=m
+CONFIG_VIDEO_TEA6420=m
+CONFIG_VIDEO_MSP3400=m
+CONFIG_VIDEO_CS5345=m
+CONFIG_VIDEO_CS53L32A=m
+CONFIG_VIDEO_UDA1342=m
+CONFIG_VIDEO_WM8775=m
+CONFIG_VIDEO_WM8739=m
+CONFIG_VIDEO_VP27SMPX=m
+CONFIG_VIDEO_SONY_BTF_MPX=m
+
+#
+# RDS decoders
+#
+CONFIG_VIDEO_SAA6588=m
+
+#
+# Video decoders
+#
+CONFIG_VIDEO_BT819=m
+CONFIG_VIDEO_BT856=m
+CONFIG_VIDEO_BT866=m
+CONFIG_VIDEO_KS0127=m
+CONFIG_VIDEO_SAA7110=m
+CONFIG_VIDEO_SAA711X=m
+CONFIG_VIDEO_TVP5150=m
+CONFIG_VIDEO_TW2804=m
+CONFIG_VIDEO_TW9903=m
+CONFIG_VIDEO_TW9906=m
+CONFIG_VIDEO_VPX3220=m
+
+#
+# Video and audio decoders
+#
+CONFIG_VIDEO_SAA717X=m
+CONFIG_VIDEO_CX25840=m
+
+#
+# Video encoders
+#
+CONFIG_VIDEO_SAA7127=m
+CONFIG_VIDEO_SAA7185=m
+CONFIG_VIDEO_ADV7170=m
+CONFIG_VIDEO_ADV7175=m
+
+#
+# Camera sensor devices
+#
+CONFIG_VIDEO_OV7640=m
+CONFIG_VIDEO_MT9V011=m
+
+#
+# Flash devices
+#
+
+#
+# Video improvement chips
+#
+CONFIG_VIDEO_UPD64031A=m
+CONFIG_VIDEO_UPD64083=m
+
+#
+# Miscelaneous helper chips
+#
+CONFIG_VIDEO_M52790=m
+
+#
+# Sensors used on soc_camera driver
+#
+CONFIG_MEDIA_TUNER=m
+CONFIG_MEDIA_TUNER_SIMPLE=m
+CONFIG_MEDIA_TUNER_TDA8290=m
+CONFIG_MEDIA_TUNER_TDA827X=m
+CONFIG_MEDIA_TUNER_TDA18271=m
+CONFIG_MEDIA_TUNER_TDA9887=m
+CONFIG_MEDIA_TUNER_TEA5761=m
+CONFIG_MEDIA_TUNER_TEA5767=m
+CONFIG_MEDIA_TUNER_MT20XX=m
+CONFIG_MEDIA_TUNER_MT2060=m
+CONFIG_MEDIA_TUNER_MT2063=m
+CONFIG_MEDIA_TUNER_MT2266=m
+CONFIG_MEDIA_TUNER_MT2131=m
+CONFIG_MEDIA_TUNER_QT1010=m
+CONFIG_MEDIA_TUNER_XC2028=m
+CONFIG_MEDIA_TUNER_XC5000=m
+CONFIG_MEDIA_TUNER_XC4000=m
+CONFIG_MEDIA_TUNER_MXL5005S=m
+CONFIG_MEDIA_TUNER_MXL5007T=m
+CONFIG_MEDIA_TUNER_MC44S803=m
+CONFIG_MEDIA_TUNER_MAX2165=m
+CONFIG_MEDIA_TUNER_TDA18218=m
+CONFIG_MEDIA_TUNER_FC0011=m
+CONFIG_MEDIA_TUNER_FC0012=m
+CONFIG_MEDIA_TUNER_FC0013=m
+CONFIG_MEDIA_TUNER_TDA18212=m
+CONFIG_MEDIA_TUNER_E4000=m
+CONFIG_MEDIA_TUNER_FC2580=m
+CONFIG_MEDIA_TUNER_TUA9001=m
+CONFIG_MEDIA_TUNER_IT913X=m
+CONFIG_MEDIA_TUNER_R820T=m
+
+#
+# Multistandard (satellite) frontends
+#
+CONFIG_DVB_STB0899=m
+CONFIG_DVB_STB6100=m
+CONFIG_DVB_STV090x=m
+CONFIG_DVB_STV6110x=m
+
+#
+# Multistandard (cable + terrestrial) frontends
+#
+CONFIG_DVB_DRXK=m
+CONFIG_DVB_TDA18271C2DD=m
+
+#
+# DVB-S (satellite) frontends
+#
+CONFIG_DVB_CX24110=m
+CONFIG_DVB_CX24123=m
+CONFIG_DVB_MT312=m
+CONFIG_DVB_ZL10036=m
+CONFIG_DVB_ZL10039=m
+CONFIG_DVB_S5H1420=m
+CONFIG_DVB_STV0288=m
+CONFIG_DVB_STB6000=m
+CONFIG_DVB_STV0299=m
+CONFIG_DVB_STV6110=m
+CONFIG_DVB_STV0900=m
+CONFIG_DVB_TDA8083=m
+CONFIG_DVB_TDA10086=m
+CONFIG_DVB_TDA8261=m
+CONFIG_DVB_VES1X93=m
+CONFIG_DVB_TUNER_ITD1000=m
+CONFIG_DVB_TUNER_CX24113=m
+CONFIG_DVB_TDA826X=m
+CONFIG_DVB_TUA6100=m
+CONFIG_DVB_CX24116=m
+CONFIG_DVB_SI21XX=m
+CONFIG_DVB_TS2020=m
+CONFIG_DVB_DS3000=m
+CONFIG_DVB_MB86A16=m
+CONFIG_DVB_TDA10071=m
+
+#
+# DVB-T (terrestrial) frontends
+#
+CONFIG_DVB_SP8870=m
+CONFIG_DVB_SP887X=m
+CONFIG_DVB_CX22700=m
+CONFIG_DVB_CX22702=m
+CONFIG_DVB_DRXD=m
+CONFIG_DVB_L64781=m
+CONFIG_DVB_TDA1004X=m
+CONFIG_DVB_NXT6000=m
+CONFIG_DVB_MT352=m
+CONFIG_DVB_ZL10353=m
+CONFIG_DVB_DIB3000MB=m
+CONFIG_DVB_DIB3000MC=m
+CONFIG_DVB_DIB7000M=m
+CONFIG_DVB_DIB7000P=m
+CONFIG_DVB_TDA10048=m
+CONFIG_DVB_AF9013=m
+CONFIG_DVB_EC100=m
+CONFIG_DVB_STV0367=m
+CONFIG_DVB_CXD2820R=m
+CONFIG_DVB_RTL2830=m
+CONFIG_DVB_RTL2832=m
+
+#
+# DVB-C (cable) frontends
+#
+CONFIG_DVB_VES1820=m
+CONFIG_DVB_TDA10021=m
+CONFIG_DVB_TDA10023=m
+CONFIG_DVB_STV0297=m
+
+#
+# ATSC (North American/Korean Terrestrial/Cable DTV) frontends
+#
+CONFIG_DVB_NXT200X=m
+CONFIG_DVB_OR51211=m
+CONFIG_DVB_OR51132=m
+CONFIG_DVB_BCM3510=m
+CONFIG_DVB_LGDT330X=m
+CONFIG_DVB_LGDT3305=m
+CONFIG_DVB_LG2160=m
+CONFIG_DVB_S5H1409=m
+CONFIG_DVB_AU8522=m
+CONFIG_DVB_AU8522_DTV=m
+CONFIG_DVB_AU8522_V4L=m
+CONFIG_DVB_S5H1411=m
+
+#
+# ISDB-T (terrestrial) frontends
+#
+CONFIG_DVB_S921=m
+CONFIG_DVB_DIB8000=m
+CONFIG_DVB_MB86A20S=m
+
+#
+# Digital terrestrial only tuners/PLL
+#
+CONFIG_DVB_PLL=m
+CONFIG_DVB_TUNER_DIB0070=m
+CONFIG_DVB_TUNER_DIB0090=m
+
+#
+# SEC control devices for DVB-S
+#
+CONFIG_DVB_LNBP21=m
+CONFIG_DVB_LNBP22=m
+CONFIG_DVB_ISL6405=m
+CONFIG_DVB_ISL6421=m
+CONFIG_DVB_ISL6423=m
+CONFIG_DVB_A8293=m
+CONFIG_DVB_LGS8GXX=m
+CONFIG_DVB_ATBM8830=m
+CONFIG_DVB_TDA665x=m
+CONFIG_DVB_IX2505V=m
+CONFIG_DVB_IT913X_FE=m
+CONFIG_DVB_M88RS2000=m
+CONFIG_DVB_AF9033=m
+
+#
+# Tools to develop new frontends
+#
+# CONFIG_DVB_DUMMY_FE is not set
+
+#
+# Graphics support
+#
+CONFIG_AGP=y
+CONFIG_AGP_AMD64=y
+CONFIG_AGP_INTEL=m
+CONFIG_AGP_SIS=m
+CONFIG_AGP_VIA=m
+CONFIG_VGA_ARB=y
+CONFIG_VGA_ARB_MAX_GPUS=16
+CONFIG_VGA_SWITCHEROO=y
+CONFIG_DRM=m
+CONFIG_DRM_USB=m
+CONFIG_DRM_KMS_HELPER=m
+CONFIG_DRM_LOAD_EDID_FIRMWARE=y
+CONFIG_DRM_TTM=m
+
+#
+# I2C encoder or helper chips
+#
+CONFIG_DRM_I2C_CH7006=m
+CONFIG_DRM_I2C_SIL164=m
+CONFIG_DRM_I2C_NXP_TDA998X=m
+CONFIG_DRM_TDFX=m
+CONFIG_DRM_R128=m
+CONFIG_DRM_RADEON=m
+# CONFIG_DRM_RADEON_UMS is not set
+CONFIG_DRM_NOUVEAU=m
+CONFIG_NOUVEAU_DEBUG=5
+CONFIG_NOUVEAU_DEBUG_DEFAULT=3
+CONFIG_DRM_NOUVEAU_BACKLIGHT=y
+CONFIG_DRM_I915=m
+CONFIG_DRM_I915_KMS=y
+# CONFIG_DRM_I915_PRELIMINARY_HW_SUPPORT is not set
+CONFIG_DRM_MGA=m
+CONFIG_DRM_SIS=m
+CONFIG_DRM_VIA=m
+CONFIG_DRM_SAVAGE=m
+CONFIG_DRM_VMWGFX=m
+CONFIG_DRM_VMWGFX_FBCON=y
+CONFIG_DRM_GMA500=m
+CONFIG_DRM_GMA600=y
+CONFIG_DRM_GMA3600=y
+CONFIG_DRM_UDL=m
+CONFIG_DRM_AST=m
+CONFIG_DRM_MGAG200=m
+CONFIG_DRM_CIRRUS_QEMU=m
+CONFIG_DRM_QXL=m
+CONFIG_VGASTATE=m
+CONFIG_VIDEO_OUTPUT_CONTROL=m
+CONFIG_HDMI=y
+CONFIG_FB=y
+CONFIG_FIRMWARE_EDID=y
+# CONFIG_FB_DDC is not set
+CONFIG_FB_BOOT_VESA_SUPPORT=y
+CONFIG_FB_CFB_FILLRECT=y
+CONFIG_FB_CFB_COPYAREA=y
+CONFIG_FB_CFB_IMAGEBLIT=y
+# CONFIG_FB_CFB_REV_PIXELS_IN_BYTE is not set
+CONFIG_FB_SYS_FILLRECT=m
+CONFIG_FB_SYS_COPYAREA=m
+CONFIG_FB_SYS_IMAGEBLIT=m
+# CONFIG_FB_FOREIGN_ENDIAN is not set
+CONFIG_FB_SYS_FOPS=m
+CONFIG_FB_DEFERRED_IO=y
+# CONFIG_FB_SVGALIB is not set
+# CONFIG_FB_MACMODES is not set
+CONFIG_FB_BACKLIGHT=y
+CONFIG_FB_MODE_HELPERS=y
+CONFIG_FB_TILEBLITTING=y
+
+#
+# Frame buffer hardware drivers
+#
+# CONFIG_FB_CIRRUS is not set
+# CONFIG_FB_PM2 is not set
+# CONFIG_FB_CYBER2000 is not set
+# CONFIG_FB_ARC is not set
+# CONFIG_FB_ASILIANT is not set
+# CONFIG_FB_IMSTT is not set
+CONFIG_FB_VGA16=m
+CONFIG_FB_UVESA=m
+CONFIG_FB_VESA=y
+CONFIG_FB_EFI=y
+# CONFIG_FB_N411 is not set
+# CONFIG_FB_HGA is not set
+# CONFIG_FB_S1D13XXX is not set
+# CONFIG_FB_NVIDIA is not set
+# CONFIG_FB_RIVA is not set
+# CONFIG_FB_I740 is not set
+# CONFIG_FB_LE80578 is not set
+# CONFIG_FB_MATROX is not set
+# CONFIG_FB_RADEON is not set
+# CONFIG_FB_ATY128 is not set
+# CONFIG_FB_ATY is not set
+# CONFIG_FB_S3 is not set
+# CONFIG_FB_SAVAGE is not set
+# CONFIG_FB_SIS is not set
+CONFIG_FB_VIA=m
+CONFIG_FB_VIA_DIRECT_PROCFS=y
+CONFIG_FB_VIA_X_COMPATIBILITY=y
+# CONFIG_FB_NEOMAGIC is not set
+# CONFIG_FB_KYRO is not set
+# CONFIG_FB_3DFX is not set
+CONFIG_FB_VOODOO1=m
+CONFIG_FB_VT8623=m
+# CONFIG_FB_TRIDENT is not set
+# CONFIG_FB_ARK is not set
+# CONFIG_FB_PM3 is not set
+# CONFIG_FB_CARMINE is not set
+# CONFIG_FB_TMIO is not set
+# CONFIG_FB_SM501 is not set
+# CONFIG_FB_SMSCUFX is not set
+CONFIG_FB_UDL=m
+# CONFIG_FB_GOLDFISH is not set
+CONFIG_FB_VIRTUAL=m
+CONFIG_XEN_FBDEV_FRONTEND=m
+# CONFIG_FB_METRONOME is not set
+# CONFIG_FB_MB862XX is not set
+# CONFIG_FB_BROADSHEET is not set
+# CONFIG_FB_AUO_K190X is not set
+CONFIG_FB_HYPERV=m
+# CONFIG_FB_SIMPLE is not set
+# CONFIG_EXYNOS_VIDEO is not set
+CONFIG_BACKLIGHT_LCD_SUPPORT=y
+CONFIG_LCD_CLASS_DEVICE=m
+# CONFIG_LCD_L4F00242T03 is not set
+# CONFIG_LCD_LMS283GF05 is not set
+# CONFIG_LCD_LTV350QV is not set
+# CONFIG_LCD_ILI922X is not set
+# CONFIG_LCD_ILI9320 is not set
+# CONFIG_LCD_TDO24M is not set
+# CONFIG_LCD_VGG2432A4 is not set
+CONFIG_LCD_PLATFORM=m
+# CONFIG_LCD_S6E63M0 is not set
+# CONFIG_LCD_LD9040 is not set
+# CONFIG_LCD_AMS369FG06 is not set
+# CONFIG_LCD_LMS501KF03 is not set
+# CONFIG_LCD_HX8357 is not set
+CONFIG_BACKLIGHT_CLASS_DEVICE=y
+# CONFIG_BACKLIGHT_GENERIC is not set
+CONFIG_BACKLIGHT_LM3533=m
+CONFIG_BACKLIGHT_APPLE=m
+# CONFIG_BACKLIGHT_SAHARA is not set
+# CONFIG_BACKLIGHT_ADP8860 is not set
+# CONFIG_BACKLIGHT_ADP8870 is not set
+CONFIG_BACKLIGHT_PCF50633=m
+# CONFIG_BACKLIGHT_LM3630 is not set
+# CONFIG_BACKLIGHT_LM3639 is not set
+# CONFIG_BACKLIGHT_LP855X is not set
+# CONFIG_BACKLIGHT_OT200 is not set
+# CONFIG_BACKLIGHT_TPS65217 is not set
+# CONFIG_BACKLIGHT_GPIO is not set
+# CONFIG_BACKLIGHT_LV5207LP is not set
+# CONFIG_BACKLIGHT_BD6107 is not set
+
+#
+# Console display driver support
+#
+CONFIG_VGA_CONSOLE=y
+# CONFIG_VGACON_SOFT_SCROLLBACK is not set
+CONFIG_DUMMY_CONSOLE=y
+CONFIG_FRAMEBUFFER_CONSOLE=y
+CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y
+CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y
+# CONFIG_LOGO is not set
+CONFIG_SOUND=m
+CONFIG_SOUND_OSS_CORE=y
+# CONFIG_SOUND_OSS_CORE_PRECLAIM is not set
+CONFIG_SND=m
+CONFIG_SND_TIMER=m
+CONFIG_SND_PCM=m
+CONFIG_SND_HWDEP=m
+CONFIG_SND_RAWMIDI=m
+CONFIG_SND_JACK=y
+CONFIG_SND_SEQUENCER=m
+CONFIG_SND_SEQ_DUMMY=m
+CONFIG_SND_OSSEMUL=y
+CONFIG_SND_MIXER_OSS=m
+CONFIG_SND_PCM_OSS=m
+CONFIG_SND_PCM_OSS_PLUGINS=y
+CONFIG_SND_SEQUENCER_OSS=y
+CONFIG_SND_HRTIMER=m
+CONFIG_SND_SEQ_HRTIMER_DEFAULT=y
+CONFIG_SND_DYNAMIC_MINORS=y
+CONFIG_SND_MAX_CARDS=32
+CONFIG_SND_SUPPORT_OLD_API=y
+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
+# CONFIG_SND_OPL4_LIB_SEQ is not set
+# CONFIG_SND_SBAWE_SEQ is not set
+CONFIG_SND_EMU10K1_SEQ=m
+CONFIG_SND_MPU401_UART=m
+CONFIG_SND_OPL3_LIB=m
+CONFIG_SND_VX_LIB=m
+CONFIG_SND_AC97_CODEC=m
+CONFIG_SND_DRIVERS=y
+# CONFIG_SND_PCSP is not set
+CONFIG_SND_DUMMY=m
+CONFIG_SND_ALOOP=m
+CONFIG_SND_VIRMIDI=m
+CONFIG_SND_MTPAV=m
+CONFIG_SND_MTS64=m
+CONFIG_SND_SERIAL_U16550=m
+CONFIG_SND_MPU401=m
+CONFIG_SND_PORTMAN2X4=m
+CONFIG_SND_AC97_POWER_SAVE=y
+CONFIG_SND_AC97_POWER_SAVE_DEFAULT=0
+CONFIG_SND_SB_COMMON=m
+CONFIG_SND_SB16_DSP=m
+CONFIG_SND_PCI=y
+CONFIG_SND_AD1889=m
+CONFIG_SND_ALS300=m
+CONFIG_SND_ALS4000=m
+CONFIG_SND_ALI5451=m
+CONFIG_SND_ASIHPI=m
+CONFIG_SND_ATIIXP=m
+CONFIG_SND_ATIIXP_MODEM=m
+CONFIG_SND_AU8810=m
+CONFIG_SND_AU8820=m
+CONFIG_SND_AU8830=m
+CONFIG_SND_AW2=m
+CONFIG_SND_AZT3328=m
+CONFIG_SND_BT87X=m
+# CONFIG_SND_BT87X_OVERCLOCK is not set
+CONFIG_SND_CA0106=m
+CONFIG_SND_CMIPCI=m
+CONFIG_SND_OXYGEN_LIB=m
+CONFIG_SND_OXYGEN=m
+CONFIG_SND_CS4281=m
+CONFIG_SND_CS46XX=m
+CONFIG_SND_CS46XX_NEW_DSP=y
+CONFIG_SND_CS5530=m
+CONFIG_SND_CS5535AUDIO=m
+CONFIG_SND_CTXFI=m
+CONFIG_SND_DARLA20=m
+CONFIG_SND_GINA20=m
+CONFIG_SND_LAYLA20=m
+CONFIG_SND_DARLA24=m
+CONFIG_SND_GINA24=m
+CONFIG_SND_LAYLA24=m
+CONFIG_SND_MONA=m
+CONFIG_SND_MIA=m
+CONFIG_SND_ECHO3G=m
+CONFIG_SND_INDIGO=m
+CONFIG_SND_INDIGOIO=m
+CONFIG_SND_INDIGODJ=m
+CONFIG_SND_INDIGOIOX=m
+CONFIG_SND_INDIGODJX=m
+CONFIG_SND_EMU10K1=m
+CONFIG_SND_EMU10K1X=m
+CONFIG_SND_ENS1370=m
+CONFIG_SND_ENS1371=m
+CONFIG_SND_ES1938=m
+CONFIG_SND_ES1968=m
+CONFIG_SND_ES1968_INPUT=y
+CONFIG_SND_ES1968_RADIO=y
+CONFIG_SND_FM801=m
+CONFIG_SND_FM801_TEA575X_BOOL=y
+CONFIG_SND_HDA_INTEL=m
+CONFIG_SND_HDA_DSP_LOADER=y
+CONFIG_SND_HDA_PREALLOC_SIZE=4096
+CONFIG_SND_HDA_HWDEP=y
+CONFIG_SND_HDA_RECONFIG=y
+CONFIG_SND_HDA_INPUT_BEEP=y
+CONFIG_SND_HDA_INPUT_BEEP_MODE=1
+CONFIG_SND_HDA_INPUT_JACK=y
+CONFIG_SND_HDA_PATCH_LOADER=y
+CONFIG_SND_HDA_CODEC_REALTEK=y
+CONFIG_SND_HDA_CODEC_ANALOG=y
+CONFIG_SND_HDA_CODEC_SIGMATEL=y
+CONFIG_SND_HDA_CODEC_VIA=y
+CONFIG_SND_HDA_CODEC_HDMI=y
+CONFIG_SND_HDA_I915=y
+CONFIG_SND_HDA_CODEC_CIRRUS=y
+CONFIG_SND_HDA_CODEC_CONEXANT=y
+CONFIG_SND_HDA_CODEC_CA0110=y
+CONFIG_SND_HDA_CODEC_CA0132=y
+CONFIG_SND_HDA_CODEC_CA0132_DSP=y
+CONFIG_SND_HDA_CODEC_CMEDIA=y
+CONFIG_SND_HDA_CODEC_SI3054=y
+CONFIG_SND_HDA_GENERIC=y
+CONFIG_SND_HDA_POWER_SAVE_DEFAULT=0
+CONFIG_SND_HDSP=m
+CONFIG_SND_HDSPM=m
+CONFIG_SND_ICE1712=m
+CONFIG_SND_ICE1724=m
+CONFIG_SND_INTEL8X0=m
+CONFIG_SND_INTEL8X0M=m
+CONFIG_SND_KORG1212=m
+CONFIG_SND_LOLA=m
+CONFIG_SND_LX6464ES=m
+CONFIG_SND_MAESTRO3=m
+CONFIG_SND_MAESTRO3_INPUT=y
+CONFIG_SND_MIXART=m
+CONFIG_SND_NM256=m
+CONFIG_SND_PCXHR=m
+CONFIG_SND_RIPTIDE=m
+CONFIG_SND_RME32=m
+CONFIG_SND_RME96=m
+CONFIG_SND_RME9652=m
+CONFIG_SND_SONICVIBES=m
+CONFIG_SND_TRIDENT=m
+CONFIG_SND_VIA82XX=m
+CONFIG_SND_VIA82XX_MODEM=m
+CONFIG_SND_VIRTUOSO=m
+CONFIG_SND_VX222=m
+CONFIG_SND_YMFPCI=m
+CONFIG_SND_SPI=y
+CONFIG_SND_USB=y
+CONFIG_SND_USB_AUDIO=m
+CONFIG_SND_USB_UA101=m
+CONFIG_SND_USB_USX2Y=m
+CONFIG_SND_USB_CAIAQ=m
+CONFIG_SND_USB_CAIAQ_INPUT=y
+CONFIG_SND_USB_US122L=m
+CONFIG_SND_USB_6FIRE=m
+CONFIG_SND_USB_HIFACE=m
+CONFIG_SND_FIREWIRE=y
+CONFIG_SND_FIREWIRE_LIB=m
+CONFIG_SND_FIREWIRE_SPEAKERS=m
+CONFIG_SND_ISIGHT=m
+CONFIG_SND_SCS1X=m
+CONFIG_SND_PCMCIA=y
+CONFIG_SND_VXPOCKET=m
+CONFIG_SND_PDAUDIOCF=m
+# CONFIG_SND_SOC is not set
+# CONFIG_SOUND_PRIME is not set
+CONFIG_AC97_BUS=m
+
+#
+# HID support
+#
+CONFIG_HID=m
+CONFIG_HIDRAW=y
+CONFIG_UHID=m
+CONFIG_HID_GENERIC=m
+
+#
+# Special HID drivers
+#
+CONFIG_HID_A4TECH=m
+CONFIG_HID_ACRUX=m
+CONFIG_HID_ACRUX_FF=y
+CONFIG_HID_APPLE=m
+CONFIG_HID_APPLEIR=m
+CONFIG_HID_AUREAL=m
+CONFIG_HID_BELKIN=m
+CONFIG_HID_CHERRY=m
+CONFIG_HID_CHICONY=m
+CONFIG_HID_PRODIKEYS=m
+CONFIG_HID_CYPRESS=m
+CONFIG_HID_DRAGONRISE=m
+CONFIG_DRAGONRISE_FF=y
+CONFIG_HID_EMS_FF=m
+CONFIG_HID_ELECOM=m
+CONFIG_HID_ELO=m
+CONFIG_HID_EZKEY=m
+CONFIG_HID_HOLTEK=m
+CONFIG_HOLTEK_FF=y
+CONFIG_HID_HUION=m
+CONFIG_HID_KEYTOUCH=m
+CONFIG_HID_KYE=m
+CONFIG_HID_UCLOGIC=m
+CONFIG_HID_WALTOP=m
+CONFIG_HID_GYRATION=m
+CONFIG_HID_ICADE=m
+CONFIG_HID_TWINHAN=m
+CONFIG_HID_KENSINGTON=m
+CONFIG_HID_LCPOWER=m
+CONFIG_HID_LENOVO_TPKBD=m
+CONFIG_HID_LOGITECH=m
+CONFIG_HID_LOGITECH_DJ=m
+CONFIG_LOGITECH_FF=y
+CONFIG_LOGIRUMBLEPAD2_FF=y
+CONFIG_LOGIG940_FF=y
+CONFIG_LOGIWHEELS_FF=y
+CONFIG_HID_MAGICMOUSE=m
+CONFIG_HID_MICROSOFT=m
+CONFIG_HID_MONTEREY=m
+CONFIG_HID_MULTITOUCH=m
+CONFIG_HID_NTRIG=m
+CONFIG_HID_ORTEK=m
+CONFIG_HID_PANTHERLORD=m
+CONFIG_PANTHERLORD_FF=y
+CONFIG_HID_PETALYNX=m
+CONFIG_HID_PICOLCD=m
+CONFIG_HID_PICOLCD_FB=y
+CONFIG_HID_PICOLCD_BACKLIGHT=y
+CONFIG_HID_PICOLCD_LCD=y
+CONFIG_HID_PICOLCD_LEDS=y
+CONFIG_HID_PICOLCD_CIR=y
+CONFIG_HID_PRIMAX=m
+CONFIG_HID_ROCCAT=m
+CONFIG_HID_SAITEK=m
+CONFIG_HID_SAMSUNG=m
+CONFIG_HID_SONY=m
+CONFIG_HID_SPEEDLINK=m
+CONFIG_HID_STEELSERIES=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_TIVO=m
+CONFIG_HID_TOPSEED=m
+CONFIG_HID_THINGM=m
+CONFIG_HID_THRUSTMASTER=m
+CONFIG_THRUSTMASTER_FF=y
+CONFIG_HID_WACOM=m
+CONFIG_HID_WIIMOTE=m
+CONFIG_HID_XINMO=m
+CONFIG_HID_ZEROPLUS=m
+CONFIG_ZEROPLUS_FF=y
+CONFIG_HID_ZYDACRON=m
+CONFIG_HID_SENSOR_HUB=m
+
+#
+# USB HID support
+#
+CONFIG_USB_HID=m
+CONFIG_HID_PID=y
+CONFIG_USB_HIDDEV=y
+
+#
+# I2C HID support
+#
+CONFIG_I2C_HID=m
+CONFIG_USB_OHCI_LITTLE_ENDIAN=y
+CONFIG_USB_SUPPORT=y
+CONFIG_USB_COMMON=m
+CONFIG_USB_ARCH_HAS_HCD=y
+CONFIG_USB=m
+# CONFIG_USB_DEBUG is not set
+# CONFIG_USB_ANNOUNCE_NEW_DEVICES is not set
+
+#
+# Miscellaneous USB options
+#
+CONFIG_USB_DEFAULT_PERSIST=y
+CONFIG_USB_DYNAMIC_MINORS=y
+# CONFIG_USB_OTG is not set
+CONFIG_USB_MON=m
+CONFIG_USB_WUSB=m
+CONFIG_USB_WUSB_CBAF=m
+# CONFIG_USB_WUSB_CBAF_DEBUG is not set
+
+#
+# USB Host Controller Drivers
+#
+CONFIG_USB_C67X00_HCD=m
+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_PCI=m
+# CONFIG_USB_EHCI_HCD_PLATFORM is not set
+CONFIG_USB_OXU210HP_HCD=m
+CONFIG_USB_ISP116X_HCD=m
+CONFIG_USB_ISP1760_HCD=m
+CONFIG_USB_ISP1362_HCD=m
+CONFIG_USB_FUSBH200_HCD=m
+CONFIG_USB_FOTG210_HCD=m
+CONFIG_USB_OHCI_HCD=m
+CONFIG_USB_OHCI_HCD_PCI=m
+# CONFIG_USB_OHCI_HCD_SSB is not set
+# CONFIG_USB_OHCI_HCD_PLATFORM is not set
+CONFIG_USB_UHCI_HCD=m
+CONFIG_USB_U132_HCD=m
+CONFIG_USB_SL811_HCD=m
+# CONFIG_USB_SL811_HCD_ISO is not set
+CONFIG_USB_SL811_CS=m
+CONFIG_USB_R8A66597_HCD=m
+CONFIG_USB_RENESAS_USBHS_HCD=m
+CONFIG_USB_WHCI_HCD=m
+CONFIG_USB_HWA_HCD=m
+# CONFIG_USB_HCD_BCMA is not set
+# CONFIG_USB_HCD_SSB is not set
+# CONFIG_USB_HCD_TEST_MODE is not set
+CONFIG_USB_MUSB_HDRC=m
+# CONFIG_USB_MUSB_HOST is not set
+# CONFIG_USB_MUSB_GADGET is not set
+CONFIG_USB_MUSB_DUAL_ROLE=y
+CONFIG_USB_MUSB_TUSB6010=m
+CONFIG_USB_MUSB_UX500=m
+# CONFIG_USB_UX500_DMA is not set
+CONFIG_MUSB_PIO_ONLY=y
+CONFIG_USB_RENESAS_USBHS=m
+
+#
+# USB Device Class drivers
+#
+CONFIG_USB_ACM=m
+CONFIG_USB_PRINTER=m
+CONFIG_USB_WDM=m
+CONFIG_USB_TMC=m
+
+#
+# NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may
+#
+
+#
+# also be needed; see USB_STORAGE Help for more info
+#
+CONFIG_USB_STORAGE=m
+# CONFIG_USB_STORAGE_DEBUG is not set
+CONFIG_USB_STORAGE_REALTEK=m
+CONFIG_REALTEK_AUTOPM=y
+CONFIG_USB_STORAGE_DATAFAB=m
+CONFIG_USB_STORAGE_FREECOM=m
+CONFIG_USB_STORAGE_ISD200=m
+CONFIG_USB_STORAGE_USBAT=m
+CONFIG_USB_STORAGE_SDDR09=m
+CONFIG_USB_STORAGE_SDDR55=m
+CONFIG_USB_STORAGE_JUMPSHOT=m
+CONFIG_USB_STORAGE_ALAUDA=m
+CONFIG_USB_STORAGE_ONETOUCH=m
+CONFIG_USB_STORAGE_KARMA=m
+CONFIG_USB_STORAGE_CYPRESS_ATACB=m
+CONFIG_USB_STORAGE_ENE_UB6250=m
+
+#
+# USB Imaging devices
+#
+CONFIG_USB_MDC800=m
+CONFIG_USB_MICROTEK=m
+# CONFIG_USB_DWC3 is not set
+# CONFIG_USB_CHIPIDEA is not set
+
+#
+# USB port drivers
+#
+CONFIG_USB_USS720=m
+CONFIG_USB_SERIAL=m
+CONFIG_USB_SERIAL_GENERIC=y
+CONFIG_USB_SERIAL_SIMPLE=m
+CONFIG_USB_SERIAL_AIRCABLE=m
+CONFIG_USB_SERIAL_ARK3116=m
+CONFIG_USB_SERIAL_BELKIN=m
+CONFIG_USB_SERIAL_CH341=m
+CONFIG_USB_SERIAL_WHITEHEAT=m
+CONFIG_USB_SERIAL_DIGI_ACCELEPORT=m
+CONFIG_USB_SERIAL_CP210X=m
+CONFIG_USB_SERIAL_CYPRESS_M8=m
+CONFIG_USB_SERIAL_EMPEG=m
+CONFIG_USB_SERIAL_FTDI_SIO=m
+CONFIG_USB_SERIAL_VISOR=m
+CONFIG_USB_SERIAL_IPAQ=m
+CONFIG_USB_SERIAL_IR=m
+CONFIG_USB_SERIAL_EDGEPORT=m
+CONFIG_USB_SERIAL_EDGEPORT_TI=m
+CONFIG_USB_SERIAL_F81232=m
+CONFIG_USB_SERIAL_GARMIN=m
+CONFIG_USB_SERIAL_IPW=m
+CONFIG_USB_SERIAL_IUU=m
+CONFIG_USB_SERIAL_KEYSPAN_PDA=m
+CONFIG_USB_SERIAL_KEYSPAN=m
+CONFIG_USB_SERIAL_KEYSPAN_MPR=y
+CONFIG_USB_SERIAL_KEYSPAN_USA28=y
+CONFIG_USB_SERIAL_KEYSPAN_USA28X=y
+CONFIG_USB_SERIAL_KEYSPAN_USA28XA=y
+CONFIG_USB_SERIAL_KEYSPAN_USA28XB=y
+CONFIG_USB_SERIAL_KEYSPAN_USA19=y
+CONFIG_USB_SERIAL_KEYSPAN_USA18X=y
+CONFIG_USB_SERIAL_KEYSPAN_USA19W=y
+CONFIG_USB_SERIAL_KEYSPAN_USA19QW=y
+CONFIG_USB_SERIAL_KEYSPAN_USA19QI=y
+CONFIG_USB_SERIAL_KEYSPAN_USA49W=y
+CONFIG_USB_SERIAL_KEYSPAN_USA49WLC=y
+CONFIG_USB_SERIAL_KLSI=m
+CONFIG_USB_SERIAL_KOBIL_SCT=m
+CONFIG_USB_SERIAL_MCT_U232=m
+CONFIG_USB_SERIAL_METRO=m
+CONFIG_USB_SERIAL_MOS7720=m
+CONFIG_USB_SERIAL_MOS7715_PARPORT=y
+CONFIG_USB_SERIAL_MOS7840=m
+CONFIG_USB_SERIAL_NAVMAN=m
+CONFIG_USB_SERIAL_PL2303=m
+CONFIG_USB_SERIAL_OTI6858=m
+CONFIG_USB_SERIAL_QCAUX=m
+CONFIG_USB_SERIAL_QUALCOMM=m
+CONFIG_USB_SERIAL_SPCP8X5=m
+CONFIG_USB_SERIAL_SAFE=m
+# CONFIG_USB_SERIAL_SAFE_PADDED is not set
+CONFIG_USB_SERIAL_SIERRAWIRELESS=m
+CONFIG_USB_SERIAL_SYMBOL=m
+CONFIG_USB_SERIAL_TI=m
+CONFIG_USB_SERIAL_CYBERJACK=m
+CONFIG_USB_SERIAL_XIRCOM=m
+CONFIG_USB_SERIAL_WWAN=m
+CONFIG_USB_SERIAL_OPTION=m
+CONFIG_USB_SERIAL_OMNINET=m
+CONFIG_USB_SERIAL_OPTICON=m
+CONFIG_USB_SERIAL_XSENS_MT=m
+CONFIG_USB_SERIAL_WISHBONE=m
+CONFIG_USB_SERIAL_ZTE=m
+CONFIG_USB_SERIAL_SSU100=m
+CONFIG_USB_SERIAL_QT2=m
+# CONFIG_USB_SERIAL_DEBUG is not set
+
+#
+# USB Miscellaneous drivers
+#
+CONFIG_USB_EMI62=m
+CONFIG_USB_EMI26=m
+CONFIG_USB_ADUTUX=m
+CONFIG_USB_SEVSEG=m
+CONFIG_USB_RIO500=m
+CONFIG_USB_LEGOTOWER=m
+CONFIG_USB_LCD=m
+CONFIG_USB_LED=m
+CONFIG_USB_CYPRESS_CY7C63=m
+CONFIG_USB_CYTHERM=m
+CONFIG_USB_IDMOUSE=m
+CONFIG_USB_FTDI_ELAN=m
+CONFIG_USB_APPLEDISPLAY=m
+CONFIG_USB_SISUSBVGA=m
+# CONFIG_USB_SISUSBVGA_CON is not set
+CONFIG_USB_LD=m
+CONFIG_USB_TRANCEVIBRATOR=m
+CONFIG_USB_IOWARRIOR=m
+CONFIG_USB_TEST=m
+# CONFIG_USB_EHSET_TEST_FIXTURE is not set
+CONFIG_USB_ISIGHTFW=m
+CONFIG_USB_YUREX=m
+CONFIG_USB_EZUSB_FX2=m
+CONFIG_USB_HSIC_USB3503=m
+CONFIG_USB_ATM=m
+CONFIG_USB_SPEEDTOUCH=m
+CONFIG_USB_CXACRU=m
+CONFIG_USB_UEAGLEATM=m
+CONFIG_USB_XUSBATM=m
+
+#
+# USB Physical Layer drivers
+#
+CONFIG_USB_PHY=y
+CONFIG_NOP_USB_XCEIV=m
+# CONFIG_AM335X_PHY_USB is not set
+CONFIG_SAMSUNG_USBPHY=m
+CONFIG_SAMSUNG_USB2PHY=m
+CONFIG_SAMSUNG_USB3PHY=m
+# CONFIG_USB_GPIO_VBUS is not set
+CONFIG_USB_ISP1301=m
+CONFIG_USB_RCAR_PHY=m
+CONFIG_USB_GADGET=m
+# CONFIG_USB_GADGET_DEBUG is not set
+# CONFIG_USB_GADGET_DEBUG_FILES is not set
+# CONFIG_USB_GADGET_DEBUG_FS is not set
+CONFIG_USB_GADGET_VBUS_DRAW=2
+CONFIG_USB_GADGET_STORAGE_NUM_BUFFERS=2
+
+#
+# USB Peripheral Controller
+#
+CONFIG_USB_FOTG210_UDC=m
+CONFIG_USB_R8A66597=m
+CONFIG_USB_RENESAS_USBHS_UDC=m
+CONFIG_USB_PXA27X=m
+CONFIG_USB_MV_UDC=m
+CONFIG_USB_MV_U3D=m
+CONFIG_USB_M66592=m
+CONFIG_USB_AMD5536UDC=m
+CONFIG_USB_NET2272=m
+CONFIG_USB_NET2272_DMA=y
+CONFIG_USB_NET2280=m
+CONFIG_USB_GOKU=m
+CONFIG_USB_EG20T=m
+CONFIG_USB_DUMMY_HCD=m
+CONFIG_USB_LIBCOMPOSITE=m
+CONFIG_USB_F_ACM=m
+CONFIG_USB_U_SERIAL=m
+CONFIG_USB_U_ETHER=m
+CONFIG_USB_U_RNDIS=m
+CONFIG_USB_F_SERIAL=m
+CONFIG_USB_F_OBEX=m
+CONFIG_USB_F_NCM=m
+CONFIG_USB_F_ECM=m
+CONFIG_USB_F_SUBSET=m
+CONFIG_USB_F_RNDIS=m
+# CONFIG_USB_CONFIGFS is not set
+# CONFIG_USB_ZERO is not set
+CONFIG_USB_AUDIO=m
+# CONFIG_GADGET_UAC1 is not set
+CONFIG_USB_ETH=m
+CONFIG_USB_ETH_RNDIS=y
+# CONFIG_USB_ETH_EEM is not set
+CONFIG_USB_G_NCM=m
+CONFIG_USB_GADGETFS=m
+CONFIG_USB_FUNCTIONFS=m
+CONFIG_USB_FUNCTIONFS_ETH=y
+CONFIG_USB_FUNCTIONFS_RNDIS=y
+CONFIG_USB_FUNCTIONFS_GENERIC=y
+CONFIG_USB_MASS_STORAGE=m
+CONFIG_USB_GADGET_TARGET=m
+CONFIG_USB_G_SERIAL=m
+CONFIG_USB_MIDI_GADGET=m
+CONFIG_USB_G_PRINTER=m
+# CONFIG_USB_CDC_COMPOSITE is not set
+# CONFIG_USB_G_NOKIA is not set
+# CONFIG_USB_G_ACM_MS is not set
+# CONFIG_USB_G_MULTI is not set
+CONFIG_USB_G_HID=m
+CONFIG_USB_G_DBGP=m
+# CONFIG_USB_G_DBGP_PRINTK is not set
+CONFIG_USB_G_DBGP_SERIAL=y
+CONFIG_USB_G_WEBCAM=m
+CONFIG_UWB=m
+CONFIG_UWB_HWA=m
+CONFIG_UWB_WHCI=m
+CONFIG_UWB_I1480U=m
+CONFIG_MMC=m
+# CONFIG_MMC_DEBUG is not set
+# CONFIG_MMC_UNSAFE_RESUME is not set
+# CONFIG_MMC_CLKGATE is not set
+
+#
+# MMC/SD/SDIO Card Drivers
+#
+CONFIG_MMC_BLOCK=m
+CONFIG_MMC_BLOCK_MINORS=8
+CONFIG_MMC_BLOCK_BOUNCE=y
+CONFIG_SDIO_UART=m
+# CONFIG_MMC_TEST is not set
+
+#
+# MMC/SD/SDIO Host Controller Drivers
+#
+CONFIG_MMC_SDHCI=m
+CONFIG_MMC_SDHCI_PCI=m
+CONFIG_MMC_RICOH_MMC=y
+CONFIG_MMC_SDHCI_ACPI=m
+CONFIG_MMC_SDHCI_PLTFM=m
+CONFIG_MMC_WBSD=m
+CONFIG_MMC_TIFM_SD=m
+# CONFIG_MMC_SPI is not set
+CONFIG_MMC_SDRICOH_CS=m
+CONFIG_MMC_CB710=m
+CONFIG_MMC_VIA_SDMMC=m
+CONFIG_MMC_VUB300=m
+CONFIG_MMC_USHC=m
+CONFIG_MMC_REALTEK_PCI=m
+CONFIG_MEMSTICK=m
+# CONFIG_MEMSTICK_DEBUG is not set
+
+#
+# MemoryStick drivers
+#
+# CONFIG_MEMSTICK_UNSAFE_RESUME is not set
+CONFIG_MSPRO_BLOCK=m
+# CONFIG_MS_BLOCK is not set
+
+#
+# MemoryStick Host Controller Drivers
+#
+CONFIG_MEMSTICK_TIFM_MS=m
+CONFIG_MEMSTICK_JMICRON_38X=m
+CONFIG_MEMSTICK_R592=m
+CONFIG_MEMSTICK_REALTEK_PCI=m
+CONFIG_NEW_LEDS=y
+CONFIG_LEDS_CLASS=y
+
+#
+# LED drivers
+#
+CONFIG_LEDS_LM3530=m
+CONFIG_LEDS_LM3533=m
+CONFIG_LEDS_LM3642=m
+CONFIG_LEDS_PCA9532=m
+# CONFIG_LEDS_PCA9532_GPIO is not set
+# CONFIG_LEDS_GPIO is not set
+CONFIG_LEDS_LP3944=m
+CONFIG_LEDS_LP55XX_COMMON=m
+CONFIG_LEDS_LP5521=m
+CONFIG_LEDS_LP5523=m
+CONFIG_LEDS_LP5562=m
+# CONFIG_LEDS_LP8501 is not set
+CONFIG_LEDS_CLEVO_MAIL=m
+CONFIG_LEDS_PCA955X=m
+# CONFIG_LEDS_PCA963X is not set
+# CONFIG_LEDS_DAC124S085 is not set
+CONFIG_LEDS_BD2802=m
+CONFIG_LEDS_INTEL_SS4200=m
+CONFIG_LEDS_LT3593=m
+CONFIG_LEDS_DELL_NETBOOKS=m
+CONFIG_LEDS_MC13783=m
+CONFIG_LEDS_TCA6507=m
+CONFIG_LEDS_LM355x=m
+CONFIG_LEDS_OT200=m
+CONFIG_LEDS_BLINKM=m
+
+#
+# LED Triggers
+#
+CONFIG_LEDS_TRIGGERS=y
+CONFIG_LEDS_TRIGGER_TIMER=m
+CONFIG_LEDS_TRIGGER_ONESHOT=m
+CONFIG_LEDS_TRIGGER_HEARTBEAT=m
+CONFIG_LEDS_TRIGGER_BACKLIGHT=m
+# CONFIG_LEDS_TRIGGER_CPU is not set
+CONFIG_LEDS_TRIGGER_GPIO=m
+CONFIG_LEDS_TRIGGER_DEFAULT_ON=m
+
+#
+# iptables trigger is under Netfilter config (LED target)
+#
+CONFIG_LEDS_TRIGGER_TRANSIENT=m
+CONFIG_LEDS_TRIGGER_CAMERA=m
+CONFIG_ACCESSIBILITY=y
+CONFIG_A11Y_BRAILLE_CONSOLE=y
+# CONFIG_INFINIBAND is not set
+CONFIG_EDAC=y
+CONFIG_EDAC_LEGACY_SYSFS=y
+# CONFIG_EDAC_DEBUG is not set
+CONFIG_EDAC_DECODE_MCE=m
+CONFIG_EDAC_MCE_INJ=m
+CONFIG_EDAC_MM_EDAC=m
+CONFIG_EDAC_AMD64=m
+# CONFIG_EDAC_AMD64_ERROR_INJECTION is not set
+CONFIG_EDAC_E752X=m
+CONFIG_EDAC_I82975X=m
+CONFIG_EDAC_I3000=m
+CONFIG_EDAC_I3200=m
+CONFIG_EDAC_X38=m
+CONFIG_EDAC_I5400=m
+CONFIG_EDAC_I7CORE=m
+CONFIG_EDAC_I5000=m
+CONFIG_EDAC_I5100=m
+CONFIG_EDAC_I7300=m
+CONFIG_EDAC_SBRIDGE=m
+CONFIG_RTC_LIB=y
+CONFIG_RTC_CLASS=y
+CONFIG_RTC_HCTOSYS=y
+CONFIG_RTC_SYSTOHC=y
+CONFIG_RTC_HCTOSYS_DEVICE="rtc0"
+# CONFIG_RTC_DEBUG is not set
+
+#
+# RTC interfaces
+#
+CONFIG_RTC_INTF_SYSFS=y
+CONFIG_RTC_INTF_PROC=y
+CONFIG_RTC_INTF_DEV=y
+CONFIG_RTC_INTF_DEV_UIE_EMUL=y
+CONFIG_RTC_DRV_TEST=m
+
+#
+# I2C RTC drivers
+#
+CONFIG_RTC_DRV_DS1307=m
+CONFIG_RTC_DRV_DS1374=m
+CONFIG_RTC_DRV_DS1672=m
+CONFIG_RTC_DRV_DS3232=m
+CONFIG_RTC_DRV_MAX6900=m
+CONFIG_RTC_DRV_RS5C372=m
+CONFIG_RTC_DRV_ISL1208=m
+CONFIG_RTC_DRV_ISL12022=m
+CONFIG_RTC_DRV_X1205=m
+CONFIG_RTC_DRV_PCF2127=m
+CONFIG_RTC_DRV_PCF8523=m
+CONFIG_RTC_DRV_PCF8563=m
+CONFIG_RTC_DRV_PCF8583=m
+CONFIG_RTC_DRV_M41T80=m
+CONFIG_RTC_DRV_M41T80_WDT=y
+CONFIG_RTC_DRV_BQ32K=m
+CONFIG_RTC_DRV_S35390A=m
+CONFIG_RTC_DRV_FM3130=m
+CONFIG_RTC_DRV_RX8581=m
+CONFIG_RTC_DRV_RX8025=m
+CONFIG_RTC_DRV_EM3027=m
+CONFIG_RTC_DRV_RV3029C2=m
+
+#
+# SPI RTC drivers
+#
+# CONFIG_RTC_DRV_M41T93 is not set
+# CONFIG_RTC_DRV_M41T94 is not set
+# CONFIG_RTC_DRV_DS1305 is not set
+# CONFIG_RTC_DRV_DS1390 is not set
+# CONFIG_RTC_DRV_MAX6902 is not set
+# CONFIG_RTC_DRV_R9701 is not set
+# CONFIG_RTC_DRV_RS5C348 is not set
+# CONFIG_RTC_DRV_DS3234 is not set
+# CONFIG_RTC_DRV_PCF2123 is not set
+# CONFIG_RTC_DRV_RX4581 is not set
+
+#
+# Platform RTC drivers
+#
+CONFIG_RTC_DRV_CMOS=y
+CONFIG_RTC_DRV_DS1286=m
+CONFIG_RTC_DRV_DS1511=m
+CONFIG_RTC_DRV_DS1553=m
+CONFIG_RTC_DRV_DS1742=m
+CONFIG_RTC_DRV_STK17TA8=m
+CONFIG_RTC_DRV_M48T86=m
+CONFIG_RTC_DRV_M48T35=m
+CONFIG_RTC_DRV_M48T59=m
+CONFIG_RTC_DRV_MSM6242=m
+CONFIG_RTC_DRV_BQ4802=m
+CONFIG_RTC_DRV_RP5C01=m
+CONFIG_RTC_DRV_V3020=m
+CONFIG_RTC_DRV_DS2404=m
+CONFIG_RTC_DRV_PCF50633=m
+
+#
+# on-CPU RTC drivers
+#
+CONFIG_RTC_DRV_MC13XXX=m
+# CONFIG_RTC_DRV_MOXART is not set
+
+#
+# HID Sensor RTC drivers
+#
+# CONFIG_RTC_DRV_HID_SENSOR_TIME is not set
+CONFIG_DMADEVICES=y
+# CONFIG_DMADEVICES_DEBUG is not set
+
+#
+# DMA Devices
+#
+CONFIG_INTEL_MID_DMAC=m
+CONFIG_INTEL_IOATDMA=m
+CONFIG_DW_DMAC_CORE=m
+CONFIG_DW_DMAC=m
+CONFIG_DW_DMAC_PCI=m
+CONFIG_TIMB_DMA=m
+CONFIG_PCH_DMA=m
+CONFIG_DMA_ENGINE=y
+CONFIG_DMA_ACPI=y
+
+#
+# DMA Clients
+#
+CONFIG_NET_DMA=y
+CONFIG_ASYNC_TX_DMA=y
+# CONFIG_DMATEST is not set
+CONFIG_DCA=m
+CONFIG_AUXDISPLAY=y
+CONFIG_KS0108=m
+CONFIG_KS0108_PORT=0x378
+CONFIG_KS0108_DELAY=2
+CONFIG_CFAG12864B=m
+CONFIG_CFAG12864B_RATE=20
+CONFIG_UIO=m
+CONFIG_UIO_CIF=m
+CONFIG_UIO_PDRV_GENIRQ=m
+# CONFIG_UIO_DMEM_GENIRQ is not set
+CONFIG_UIO_AEC=m
+CONFIG_UIO_SERCOS3=m
+CONFIG_UIO_PCI_GENERIC=m
+CONFIG_UIO_NETX=m
+# CONFIG_UIO_MF624 is not set
+CONFIG_VFIO_IOMMU_TYPE1=m
+CONFIG_VFIO=m
+CONFIG_VFIO_PCI=m
+CONFIG_VFIO_PCI_VGA=y
+CONFIG_VIRT_DRIVERS=y
+CONFIG_VIRTIO=m
+
+#
+# Virtio drivers
+#
+CONFIG_VIRTIO_PCI=m
+CONFIG_VIRTIO_BALLOON=m
+CONFIG_VIRTIO_MMIO=m
+CONFIG_VIRTIO_MMIO_CMDLINE_DEVICES=y
+
+#
+# Microsoft Hyper-V guest support
+#
+CONFIG_HYPERV=m
+CONFIG_HYPERV_UTILS=m
+CONFIG_HYPERV_BALLOON=m
+
+#
+# Xen driver support
+#
+CONFIG_XEN_BALLOON=y
+# CONFIG_XEN_SELFBALLOONING is not set
+CONFIG_XEN_BALLOON_MEMORY_HOTPLUG=y
+CONFIG_XEN_SCRUB_PAGES=y
+CONFIG_XEN_DEV_EVTCHN=m
+CONFIG_XEN_BACKEND=y
+CONFIG_XENFS=m
+CONFIG_XEN_COMPAT_XENFS=y
+CONFIG_XEN_SYS_HYPERVISOR=y
+CONFIG_XEN_XENBUS_FRONTEND=y
+CONFIG_XEN_GNTDEV=m
+CONFIG_XEN_GRANT_DEV_ALLOC=m
+CONFIG_SWIOTLB_XEN=y
+CONFIG_XEN_TMEM=m
+CONFIG_XEN_PCIDEV_BACKEND=m
+CONFIG_XEN_PRIVCMD=m
+CONFIG_XEN_ACPI_PROCESSOR=m
+# CONFIG_XEN_MCE_LOG is not set
+CONFIG_XEN_HAVE_PVMMU=y
+CONFIG_STAGING=y
+CONFIG_ET131X=m
+CONFIG_SLICOSS=m
+CONFIG_USBIP_CORE=m
+CONFIG_USBIP_VHCI_HCD=m
+CONFIG_USBIP_HOST=m
+# CONFIG_USBIP_DEBUG is not set
+CONFIG_W35UND=m
+CONFIG_PRISM2_USB=m
+CONFIG_ECHO=m
+CONFIG_COMEDI=m
+# CONFIG_COMEDI_DEBUG is not set
+CONFIG_COMEDI_DEFAULT_BUF_SIZE_KB=2048
+CONFIG_COMEDI_DEFAULT_BUF_MAXSIZE_KB=20480
+CONFIG_COMEDI_MISC_DRIVERS=y
+CONFIG_COMEDI_KCOMEDILIB=m
+CONFIG_COMEDI_BOND=m
+CONFIG_COMEDI_TEST=m
+CONFIG_COMEDI_PARPORT=m
+CONFIG_COMEDI_SERIAL2002=m
+CONFIG_COMEDI_SKEL=m
+# CONFIG_COMEDI_ISA_DRIVERS is not set
+CONFIG_COMEDI_PCI_DRIVERS=y
+CONFIG_COMEDI_8255_PCI=m
+CONFIG_COMEDI_ADDI_WATCHDOG=m
+CONFIG_COMEDI_ADDI_APCI_035=m
+CONFIG_COMEDI_ADDI_APCI_1032=m
+CONFIG_COMEDI_ADDI_APCI_1500=m
+CONFIG_COMEDI_ADDI_APCI_1516=m
+CONFIG_COMEDI_ADDI_APCI_1564=m
+CONFIG_COMEDI_ADDI_APCI_16XX=m
+CONFIG_COMEDI_ADDI_APCI_2032=m
+CONFIG_COMEDI_ADDI_APCI_2200=m
+CONFIG_COMEDI_ADDI_APCI_3120=m
+CONFIG_COMEDI_ADDI_APCI_3501=m
+CONFIG_COMEDI_ADDI_APCI_3XXX=m
+CONFIG_COMEDI_ADL_PCI6208=m
+CONFIG_COMEDI_ADL_PCI7X3X=m
+CONFIG_COMEDI_ADL_PCI8164=m
+CONFIG_COMEDI_ADL_PCI9111=m
+CONFIG_COMEDI_ADL_PCI9118=m
+CONFIG_COMEDI_ADV_PCI1710=m
+CONFIG_COMEDI_ADV_PCI1723=m
+CONFIG_COMEDI_ADV_PCI1724=m
+CONFIG_COMEDI_ADV_PCI_DIO=m
+CONFIG_COMEDI_AMPLC_DIO200_PCI=m
+CONFIG_COMEDI_AMPLC_PC236_PCI=m
+CONFIG_COMEDI_AMPLC_PC263_PCI=m
+CONFIG_COMEDI_AMPLC_PCI224=m
+CONFIG_COMEDI_AMPLC_PCI230=m
+CONFIG_COMEDI_CONTEC_PCI_DIO=m
+CONFIG_COMEDI_DAS08_PCI=m
+CONFIG_COMEDI_DT3000=m
+CONFIG_COMEDI_DYNA_PCI10XX=m
+CONFIG_COMEDI_GSC_HPDI=m
+CONFIG_COMEDI_ICP_MULTI=m
+CONFIG_COMEDI_DAQBOARD2000=m
+CONFIG_COMEDI_JR3_PCI=m
+CONFIG_COMEDI_KE_COUNTER=m
+CONFIG_COMEDI_CB_PCIDAS64=m
+CONFIG_COMEDI_CB_PCIDAS=m
+CONFIG_COMEDI_CB_PCIDDA=m
+CONFIG_COMEDI_CB_PCIMDAS=m
+CONFIG_COMEDI_CB_PCIMDDA=m
+CONFIG_COMEDI_ME4000=m
+CONFIG_COMEDI_ME_DAQ=m
+CONFIG_COMEDI_NI_6527=m
+CONFIG_COMEDI_NI_65XX=m
+CONFIG_COMEDI_NI_660X=m
+CONFIG_COMEDI_NI_670X=m
+CONFIG_COMEDI_NI_LABPC_PCI=m
+CONFIG_COMEDI_NI_PCIDIO=m
+CONFIG_COMEDI_NI_PCIMIO=m
+CONFIG_COMEDI_RTD520=m
+CONFIG_COMEDI_S626=m
+CONFIG_COMEDI_MITE=m
+CONFIG_COMEDI_NI_TIOCMD=m
+CONFIG_COMEDI_PCMCIA_DRIVERS=y
+CONFIG_COMEDI_CB_DAS16_CS=m
+CONFIG_COMEDI_DAS08_CS=m
+CONFIG_COMEDI_NI_DAQ_700_CS=m
+CONFIG_COMEDI_NI_DAQ_DIO24_CS=m
+CONFIG_COMEDI_NI_LABPC_CS=m
+CONFIG_COMEDI_NI_MIO_CS=m
+CONFIG_COMEDI_QUATECH_DAQP_CS=m
+CONFIG_COMEDI_USB_DRIVERS=y
+CONFIG_COMEDI_DT9812=m
+CONFIG_COMEDI_USBDUX=m
+CONFIG_COMEDI_USBDUXFAST=m
+CONFIG_COMEDI_USBDUXSIGMA=m
+CONFIG_COMEDI_VMK80XX=m
+CONFIG_COMEDI_8255=m
+CONFIG_COMEDI_FC=m
+CONFIG_COMEDI_AMPLC_DIO200=m
+CONFIG_COMEDI_AMPLC_PC236=m
+CONFIG_COMEDI_DAS08=m
+CONFIG_COMEDI_NI_LABPC=m
+CONFIG_COMEDI_NI_TIO=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_R8188EU=m
+CONFIG_88EU_AP_MODE=y
+CONFIG_88EU_P2P=y
+CONFIG_RTS5139=m
+# CONFIG_RTS5139_DEBUG is not set
+# CONFIG_TRANZPORT is not set
+CONFIG_IDE_PHISON=m
+CONFIG_LINE6_USB=m
+# CONFIG_LINE6_USB_IMPULSE_RESPONSE is not set
+CONFIG_USB_SERIAL_QUATECH2=m
+CONFIG_VT6655=m
+CONFIG_VT6656=m
+CONFIG_DX_SEP=m
+CONFIG_ZSMALLOC=y
+CONFIG_ZRAM=m
+# CONFIG_ZRAM_DEBUG is not set
+CONFIG_WLAGS49_H2=m
+CONFIG_WLAGS49_H25=m
+CONFIG_FB_SM7XX=m
+CONFIG_CRYSTALHD=m
+CONFIG_FB_XGI=m
+CONFIG_ACPI_QUICKSTART=m
+CONFIG_USB_ENESTORAGE=m
+CONFIG_BCM_WIMAX=m
+CONFIG_FT1000=m
+CONFIG_FT1000_USB=m
+CONFIG_FT1000_PCMCIA=m
+
+#
+# Speakup console speech
+#
+CONFIG_SPEAKUP=m
+CONFIG_SPEAKUP_SYNTH_ACNTSA=m
+CONFIG_SPEAKUP_SYNTH_ACNTPC=m
+CONFIG_SPEAKUP_SYNTH_APOLLO=m
+CONFIG_SPEAKUP_SYNTH_AUDPTR=m
+CONFIG_SPEAKUP_SYNTH_BNS=m
+CONFIG_SPEAKUP_SYNTH_DECTLK=m
+CONFIG_SPEAKUP_SYNTH_DECEXT=m
+CONFIG_SPEAKUP_SYNTH_DECPC=m
+CONFIG_SPEAKUP_SYNTH_DTLK=m
+CONFIG_SPEAKUP_SYNTH_KEYPC=m
+CONFIG_SPEAKUP_SYNTH_LTLK=m
+CONFIG_SPEAKUP_SYNTH_SOFT=m
+CONFIG_SPEAKUP_SYNTH_SPKOUT=m
+CONFIG_SPEAKUP_SYNTH_TXPRT=m
+CONFIG_SPEAKUP_SYNTH_DUMMY=m
+CONFIG_TOUCHSCREEN_CLEARPAD_TM1217=m
+CONFIG_TOUCHSCREEN_SYNAPTICS_I2C_RMI4=m
+CONFIG_STAGING_MEDIA=y
+CONFIG_DVB_AS102=m
+CONFIG_DVB_CXD2099=m
+CONFIG_VIDEO_DT3155=m
+CONFIG_DT3155_CCIR=y
+CONFIG_DT3155_STREAMING=y
+CONFIG_VIDEO_GO7007=m
+CONFIG_VIDEO_GO7007_USB=m
+CONFIG_VIDEO_GO7007_LOADER=m
+# CONFIG_VIDEO_GO7007_USB_S2250_BOARD is not set
+# CONFIG_USB_MSI3101 is not set
+CONFIG_SOLO6X10=m
+CONFIG_LIRC_STAGING=y
+CONFIG_LIRC_BT829=m
+CONFIG_LIRC_IGORPLUGUSB=m
+CONFIG_LIRC_IMON=m
+CONFIG_LIRC_PARALLEL=m
+CONFIG_LIRC_SASEM=m
+CONFIG_LIRC_SERIAL=m
+CONFIG_LIRC_SERIAL_TRANSMITTER=y
+CONFIG_LIRC_SIR=m
+CONFIG_LIRC_ZILOG=m
+
+#
+# Android
+#
+# CONFIG_ANDROID is not set
+CONFIG_USB_WPAN_HCD=m
+CONFIG_WIMAX_GDM72XX=m
+CONFIG_WIMAX_GDM72XX_QOS=y
+CONFIG_WIMAX_GDM72XX_K_MODE=y
+CONFIG_WIMAX_GDM72XX_WIMAX2=y
+CONFIG_WIMAX_GDM72XX_USB=y
+# CONFIG_WIMAX_GDM72XX_SDIO is not set
+CONFIG_WIMAX_GDM72XX_USB_PM=y
+# CONFIG_LTE_GDM724X is not set
+CONFIG_NET_VENDOR_SILICOM=y
+CONFIG_SBYPASS=m
+CONFIG_BPCTL=m
+CONFIG_CED1401=m
+CONFIG_DGRP=m
+CONFIG_FIREWIRE_SERIAL=m
+# CONFIG_USB_DWC2 is not set
+CONFIG_LUSTRE_FS=m 
+CONFIG_USB_BTMTK=m
+# CONFIG_XILLYBUS is not set
+CONFIG_DGNC=m
+CONFIG_DGAP=m
+CONFIG_X86_PLATFORM_DEVICES=y
+CONFIG_ACER_WMI=m
+CONFIG_ACERHDF=m
+CONFIG_ASUS_LAPTOP=m
+CONFIG_CHROMEOS_LAPTOP=m
+CONFIG_DELL_LAPTOP=m
+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
+CONFIG_PANASONIC_LAPTOP=m
+CONFIG_COMPAL_LAPTOP=m
+CONFIG_SONY_LAPTOP=m
+# CONFIG_SONYPI_COMPAT is not set
+CONFIG_IDEAPAD_LAPTOP=m
+CONFIG_THINKPAD_ACPI=m
+CONFIG_THINKPAD_ACPI_ALSA_SUPPORT=y
+# CONFIG_THINKPAD_ACPI_DEBUGFACILITIES is not set
+# CONFIG_THINKPAD_ACPI_DEBUG is not set
+# CONFIG_THINKPAD_ACPI_UNSAFE_LEDS is not set
+CONFIG_THINKPAD_ACPI_VIDEO=y
+CONFIG_THINKPAD_ACPI_HOTKEY_POLL=y
+CONFIG_SENSORS_HDAPS=m
+CONFIG_INTEL_MENLOW=m
+CONFIG_EEEPC_LAPTOP=m
+CONFIG_ASUS_WMI=m
+CONFIG_ASUS_NB_WMI=m
+CONFIG_EEEPC_WMI=m
+CONFIG_ACPI_WMI=m
+CONFIG_MSI_WMI=m
+CONFIG_TOPSTAR_LAPTOP=m
+CONFIG_ACPI_TOSHIBA=m
+CONFIG_TOSHIBA_BT_RFKILL=m
+CONFIG_ACPI_CMPC=m
+CONFIG_INTEL_IPS=m
+CONFIG_IBM_RTL=m
+CONFIG_XO15_EBOOK=m
+CONFIG_SAMSUNG_LAPTOP=m
+CONFIG_MXM_WMI=m
+CONFIG_INTEL_OAKTRAIL=m
+CONFIG_SAMSUNG_Q10=m
+CONFIG_APPLE_GMUX=m
+CONFIG_INTEL_RST=m
+CONFIG_INTEL_SMARTCONNECT=y
+CONFIG_PVPANIC=m
+
+#
+# Hardware Spinlock drivers
+#
+CONFIG_CLKEVT_I8253=y
+CONFIG_I8253_LOCK=y
+CONFIG_CLKBLD_I8253=y
+# CONFIG_MAILBOX is not set
+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
+
+#
+# Remoteproc drivers
+#
+CONFIG_REMOTEPROC=m
+CONFIG_STE_MODEM_RPROC=m
+
+#
+# Rpmsg drivers
+#
+# CONFIG_PM_DEVFREQ is not set
+CONFIG_EXTCON=m
+
+#
+# Extcon Device Drivers
+#
+CONFIG_EXTCON_GPIO=m
+CONFIG_MEMORY=y
+# CONFIG_IIO is not set
+# CONFIG_NTB is not set
+# CONFIG_VME_BUS is not set
+# CONFIG_PWM is not set
+CONFIG_IPACK_BUS=m
+CONFIG_BOARD_TPCI200=m
+CONFIG_SERIAL_IPOCTAL=m
+# CONFIG_RESET_CONTROLLER is not set
+CONFIG_FMC=m
+CONFIG_FMC_FAKEDEV=m
+CONFIG_FMC_TRIVIAL=m
+CONFIG_FMC_WRITE_EEPROM=m
+CONFIG_FMC_CHARDEV=m
+
+#
+# Firmware Drivers
+#
+CONFIG_EDD=m
+# CONFIG_EDD_OFF is not set
+CONFIG_FIRMWARE_MEMMAP=y
+CONFIG_DELL_RBU=m
+CONFIG_DCDBAS=m
+CONFIG_DMIID=y
+CONFIG_DMI_SYSFS=m
+CONFIG_ISCSI_IBFT_FIND=y
+CONFIG_ISCSI_IBFT=m
+# CONFIG_GOOGLE_FIRMWARE is not set
+
+#
+# EFI (Extensible Firmware Interface) Support
+#
+# CONFIG_EFI_VARS is not set
+
+#
+# File systems
+#
+CONFIG_DCACHE_WORD_ACCESS=y
+# CONFIG_EXT2_FS is not set
+# CONFIG_EXT3_FS is not set
+CONFIG_EXT4_FS=m
+CONFIG_EXT4_USE_FOR_EXT23=y
+CONFIG_EXT4_FS_POSIX_ACL=y
+CONFIG_EXT4_FS_SECURITY=y
+# CONFIG_EXT4_DEBUG is not set
+CONFIG_JBD2=m
+# CONFIG_JBD2_DEBUG is not set
+CONFIG_FS_MBCACHE=m
+CONFIG_REISERFS_FS=m
+# CONFIG_REISERFS_CHECK is not set
+CONFIG_REISERFS_PROC_INFO=y
+CONFIG_REISERFS_FS_XATTR=y
+CONFIG_REISERFS_FS_POSIX_ACL=y
+CONFIG_REISERFS_FS_SECURITY=y
+CONFIG_JFS_FS=m
+CONFIG_JFS_POSIX_ACL=y
+CONFIG_JFS_SECURITY=y
+# CONFIG_JFS_DEBUG is not set
+CONFIG_JFS_STATISTICS=y
+CONFIG_XFS_FS=m
+CONFIG_XFS_QUOTA=y
+CONFIG_XFS_POSIX_ACL=y
+CONFIG_XFS_RT=y
+# CONFIG_XFS_WARN is not set
+# CONFIG_XFS_DEBUG is not set
+CONFIG_GFS2_FS=m
+CONFIG_GFS2_FS_LOCKING_DLM=y
+CONFIG_OCFS2_FS=m
+CONFIG_OCFS2_FS_O2CB=m
+CONFIG_OCFS2_FS_USERSPACE_CLUSTER=m
+CONFIG_OCFS2_FS_STATS=y
+# CONFIG_OCFS2_DEBUG_MASKLOG is not set
+# 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_BTRFS_FS_RUN_SANITY_TESTS is not set
+# CONFIG_BTRFS_DEBUG is not set
+# CONFIG_BTRFS_ASSERT is not set
+CONFIG_NILFS2_FS=m
+CONFIG_FS_POSIX_ACL=y
+CONFIG_EXPORTFS=y
+CONFIG_FILE_LOCKING=y
+CONFIG_FSNOTIFY=y
+CONFIG_DNOTIFY=y
+CONFIG_INOTIFY_USER=y
+CONFIG_FANOTIFY=y
+CONFIG_FANOTIFY_ACCESS_PERMISSIONS=y
+CONFIG_QUOTA=y
+CONFIG_QUOTA_NETLINK_INTERFACE=y
+# CONFIG_PRINT_QUOTA_WARNING is not set
+# CONFIG_QUOTA_DEBUG is not set
+CONFIG_QUOTA_TREE=m
+CONFIG_QFMT_V1=m
+CONFIG_QFMT_V2=m
+CONFIG_QUOTACTL=y
+CONFIG_QUOTACTL_COMPAT=y
+CONFIG_AUTOFS4_FS=y
+CONFIG_FUSE_FS=m
+CONFIG_CUSE=m
+CONFIG_GENERIC_ACL=y
+
+#
+# Caches
+#
+CONFIG_FSCACHE=m
+CONFIG_FSCACHE_STATS=y
+CONFIG_FSCACHE_HISTOGRAM=y
+# CONFIG_FSCACHE_DEBUG is not set
+# CONFIG_FSCACHE_OBJECT_LIST is not set
+CONFIG_CACHEFILES=m
+# CONFIG_CACHEFILES_DEBUG is not set
+# CONFIG_CACHEFILES_HISTOGRAM is not set
+
+#
+# CD-ROM/DVD Filesystems
+#
+CONFIG_ISO9660_FS=m
+CONFIG_JOLIET=y
+CONFIG_ZISOFS=y
+CONFIG_UDF_FS=m
+CONFIG_UDF_NLS=y
+
+#
+# DOS/FAT/NT Filesystems
+#
+CONFIG_FAT_FS=m
+CONFIG_MSDOS_FS=m
+CONFIG_VFAT_FS=m
+CONFIG_FAT_DEFAULT_CODEPAGE=437
+CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
+CONFIG_NTFS_FS=m
+# CONFIG_NTFS_DEBUG is not set
+CONFIG_NTFS_RW=y
+
+#
+# Pseudo filesystems
+#
+CONFIG_PROC_FS=y
+CONFIG_PROC_KCORE=y
+CONFIG_PROC_SYSCTL=y
+CONFIG_PROC_PAGE_MONITOR=y
+CONFIG_SYSFS=y
+CONFIG_TMPFS=y
+CONFIG_TMPFS_POSIX_ACL=y
+CONFIG_TMPFS_XATTR=y
+CONFIG_HUGETLBFS=y
+CONFIG_HUGETLB_PAGE=y
+CONFIG_CONFIGFS_FS=y
+CONFIG_MISC_FILESYSTEMS=y
+# CONFIG_ADFS_FS is not set
+CONFIG_AFFS_FS=m
+CONFIG_ECRYPT_FS=m
+# CONFIG_ECRYPT_FS_MESSAGING is not set
+CONFIG_HFS_FS=m
+CONFIG_HFSPLUS_FS=m
+CONFIG_HFSPLUS_FS_POSIX_ACL=y
+CONFIG_BEFS_FS=m
+# CONFIG_BEFS_DEBUG is not set
+# CONFIG_BFS_FS is not set
+# CONFIG_EFS_FS is not set
+CONFIG_JFFS2_FS=m
+CONFIG_JFFS2_FS_DEBUG=0
+CONFIG_JFFS2_FS_WRITEBUFFER=y
+# CONFIG_JFFS2_FS_WBUF_VERIFY is not set
+# CONFIG_JFFS2_SUMMARY is not set
+# CONFIG_JFFS2_FS_XATTR is not set
+# CONFIG_JFFS2_COMPRESSION_OPTIONS is not set
+CONFIG_JFFS2_ZLIB=y
+# CONFIG_JFFS2_LZO is not set
+CONFIG_JFFS2_RTIME=y
+# CONFIG_JFFS2_RUBIN is not set
+CONFIG_UBIFS_FS=m
+# CONFIG_UBIFS_FS_ADVANCED_COMPR is not set
+CONFIG_UBIFS_FS_LZO=y
+CONFIG_UBIFS_FS_ZLIB=y
+CONFIG_LOGFS=m
+CONFIG_CRAMFS=m
+CONFIG_SQUASHFS=m
+CONFIG_SQUASHFS_XATTR=y
+CONFIG_SQUASHFS_ZLIB=y
+CONFIG_SQUASHFS_LZO=y
+CONFIG_SQUASHFS_XZ=y
+# CONFIG_SQUASHFS_4K_DEVBLK_SIZE is not set
+# CONFIG_SQUASHFS_EMBEDDED is not set
+CONFIG_SQUASHFS_FRAGMENT_CACHE_SIZE=3
+# CONFIG_VXFS_FS is not set
+CONFIG_MINIX_FS=m
+CONFIG_OMFS_FS=m
+# CONFIG_HPFS_FS is not set
+# CONFIG_QNX4FS_FS is not set
+# CONFIG_QNX6FS_FS is not set
+# CONFIG_ROMFS_FS is not set
+CONFIG_PSTORE=y
+# CONFIG_PSTORE_CONSOLE is not set
+# CONFIG_PSTORE_FTRACE is not set
+CONFIG_PSTORE_RAM=m
+# CONFIG_SYSV_FS is not set
+CONFIG_UFS_FS=m
+# CONFIG_UFS_FS_WRITE is not set
+# CONFIG_UFS_DEBUG is not set
+CONFIG_EXOFS_FS=m
+# CONFIG_EXOFS_DEBUG is not set
+CONFIG_F2FS_FS=m
+CONFIG_F2FS_STAT_FS=y
+CONFIG_F2FS_FS_XATTR=y
+CONFIG_F2FS_FS_POSIX_ACL=y
+CONFIG_F2FS_FS_SECURITY=y
+CONFIG_EFIVAR_FS=y
+CONFIG_ORE=m
+CONFIG_NETWORK_FILESYSTEMS=y
+CONFIG_NFS_FS=m
+CONFIG_NFS_V2=m
+CONFIG_NFS_V3=m
+CONFIG_NFS_V3_ACL=y
+CONFIG_NFS_V4=m
+CONFIG_NFS_SWAP=y
+CONFIG_NFS_V4_1=y
+CONFIG_NFS_V4_2=y
+CONFIG_PNFS_FILE_LAYOUT=m
+CONFIG_PNFS_BLOCK=m
+CONFIG_PNFS_OBJLAYOUT=m
+CONFIG_NFS_V4_1_IMPLEMENTATION_ID_DOMAIN="linux-libre.fsfla.org"
+CONFIG_NFS_V4_SECURITY_LABEL=y
+CONFIG_NFS_FSCACHE=y
+# CONFIG_NFS_USE_LEGACY_DNS is not set
+CONFIG_NFS_USE_KERNEL_DNS=y
+CONFIG_NFS_DEBUG=y
+CONFIG_NFSD=m
+CONFIG_NFSD_V2_ACL=y
+CONFIG_NFSD_V3=y
+CONFIG_NFSD_V3_ACL=y
+CONFIG_NFSD_V4=y
+CONFIG_NFSD_V4_SECURITY_LABEL=y
+# CONFIG_NFSD_FAULT_INJECTION is not set
+CONFIG_LOCKD=m
+CONFIG_LOCKD_V4=y
+CONFIG_NFS_ACL_SUPPORT=m
+CONFIG_NFS_COMMON=y
+CONFIG_SUNRPC=m
+CONFIG_SUNRPC_GSS=m
+CONFIG_SUNRPC_BACKCHANNEL=y
+CONFIG_SUNRPC_SWAP=y
+CONFIG_RPCSEC_GSS_KRB5=m
+CONFIG_SUNRPC_DEBUG=y
+CONFIG_CEPH_FS=m
+CONFIG_CEPH_FSCACHE=y
+CONFIG_CIFS=m
+CONFIG_CIFS_STATS=y
+# CONFIG_CIFS_STATS2 is not set
+CONFIG_CIFS_WEAK_PW_HASH=y
+CONFIG_CIFS_UPCALL=y
+CONFIG_CIFS_XATTR=y
+CONFIG_CIFS_POSIX=y
+CONFIG_CIFS_ACL=y
+# CONFIG_CIFS_DEBUG is not set
+CONFIG_CIFS_DFS_UPCALL=y
+CONFIG_CIFS_SMB2=y
+CONFIG_CIFS_FSCACHE=y
+CONFIG_NCP_FS=m
+# CONFIG_NCPFS_PACKET_SIGNING is not set
+# CONFIG_NCPFS_IOCTL_LOCKING is not set
+# CONFIG_NCPFS_STRONG is not set
+CONFIG_NCPFS_NFS_NS=y
+CONFIG_NCPFS_OS2_NS=y
+CONFIG_NCPFS_SMALLDOS=y
+CONFIG_NCPFS_NLS=y
+# CONFIG_NCPFS_EXTRAS is not set
+CONFIG_CODA_FS=m
+CONFIG_AFS_FS=m
+# CONFIG_AFS_DEBUG is not set
+CONFIG_AFS_FSCACHE=y
+CONFIG_9P_FS=m
+CONFIG_9P_FSCACHE=y
+CONFIG_9P_FS_POSIX_ACL=y
+CONFIG_9P_FS_SECURITY=y
+CONFIG_NLS=y
+CONFIG_NLS_DEFAULT="utf8"
+CONFIG_NLS_CODEPAGE_437=m
+CONFIG_NLS_CODEPAGE_737=m
+CONFIG_NLS_CODEPAGE_775=m
+CONFIG_NLS_CODEPAGE_850=m
+CONFIG_NLS_CODEPAGE_852=m
+CONFIG_NLS_CODEPAGE_855=m
+CONFIG_NLS_CODEPAGE_857=m
+CONFIG_NLS_CODEPAGE_860=m
+CONFIG_NLS_CODEPAGE_861=m
+CONFIG_NLS_CODEPAGE_862=m
+CONFIG_NLS_CODEPAGE_863=m
+CONFIG_NLS_CODEPAGE_864=m
+CONFIG_NLS_CODEPAGE_865=m
+CONFIG_NLS_CODEPAGE_866=m
+CONFIG_NLS_CODEPAGE_869=m
+CONFIG_NLS_CODEPAGE_936=m
+CONFIG_NLS_CODEPAGE_950=m
+CONFIG_NLS_CODEPAGE_932=m
+CONFIG_NLS_CODEPAGE_949=m
+CONFIG_NLS_CODEPAGE_874=m
+CONFIG_NLS_ISO8859_8=m
+CONFIG_NLS_CODEPAGE_1250=m
+CONFIG_NLS_CODEPAGE_1251=m
+CONFIG_NLS_ASCII=m
+CONFIG_NLS_ISO8859_1=y
+CONFIG_NLS_ISO8859_2=m
+CONFIG_NLS_ISO8859_3=m
+CONFIG_NLS_ISO8859_4=m
+CONFIG_NLS_ISO8859_5=m
+CONFIG_NLS_ISO8859_6=m
+CONFIG_NLS_ISO8859_7=m
+CONFIG_NLS_ISO8859_9=m
+CONFIG_NLS_ISO8859_13=m
+CONFIG_NLS_ISO8859_14=m
+CONFIG_NLS_ISO8859_15=m
+CONFIG_NLS_KOI8_R=m
+CONFIG_NLS_KOI8_U=m
+CONFIG_NLS_MAC_ROMAN=m
+CONFIG_NLS_MAC_CELTIC=m
+CONFIG_NLS_MAC_CENTEURO=m
+CONFIG_NLS_MAC_CROATIAN=m
+CONFIG_NLS_MAC_CYRILLIC=m
+CONFIG_NLS_MAC_GAELIC=m
+CONFIG_NLS_MAC_GREEK=m
+CONFIG_NLS_MAC_ICELAND=m
+CONFIG_NLS_MAC_INUIT=m
+CONFIG_NLS_MAC_ROMANIAN=m
+CONFIG_NLS_MAC_TURKISH=m
+CONFIG_NLS_UTF8=m
+CONFIG_DLM=m
+# CONFIG_DLM_DEBUG is not set
+
+#
+# Kernel hacking
+#
+CONFIG_TRACE_IRQFLAGS_SUPPORT=y
+
+#
+# printk and dmesg options
+#
+CONFIG_PRINTK_TIME=y
+CONFIG_DEFAULT_MESSAGE_LOGLEVEL=4
+# CONFIG_BOOT_PRINTK_DELAY is not set
+CONFIG_DYNAMIC_DEBUG=y
+
+#
+# Compile-time checks and compiler options
+#
+# CONFIG_DEBUG_INFO is not set
+CONFIG_ENABLE_WARN_DEPRECATED=y
+# CONFIG_ENABLE_MUST_CHECK is not set
+CONFIG_FRAME_WARN=2048
+CONFIG_STRIP_ASM_SYMS=y
+# CONFIG_READABLE_ASM is not set
+CONFIG_UNUSED_SYMBOLS=y
+CONFIG_DEBUG_FS=y
+# CONFIG_HEADERS_CHECK is not set
+# CONFIG_DEBUG_SECTION_MISMATCH is not set
+CONFIG_ARCH_WANT_FRAME_POINTERS=y
+CONFIG_FRAME_POINTER=y
+# CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set
+CONFIG_MAGIC_SYSRQ=y
+CONFIG_DEBUG_KERNEL=y
+
+#
+# Memory Debugging
+#
+# CONFIG_DEBUG_PAGEALLOC is not set
+# CONFIG_DEBUG_OBJECTS is not set
+# CONFIG_SLUB_DEBUG_ON is not set
+# CONFIG_SLUB_STATS is not set
+CONFIG_HAVE_DEBUG_KMEMLEAK=y
+# CONFIG_DEBUG_KMEMLEAK is not set
+# CONFIG_DEBUG_STACK_USAGE is not set
+# CONFIG_DEBUG_VM is not set
+# CONFIG_DEBUG_VIRTUAL is not set
+CONFIG_DEBUG_MEMORY_INIT=y
+# CONFIG_DEBUG_PER_CPU_MAPS is not set
+CONFIG_HAVE_DEBUG_STACKOVERFLOW=y
+# CONFIG_DEBUG_STACKOVERFLOW is not set
+CONFIG_HAVE_ARCH_KMEMCHECK=y
+# CONFIG_DEBUG_SHIRQ is not set
+
+#
+# Debug Lockups and Hangs
+#
+CONFIG_LOCKUP_DETECTOR=y
+CONFIG_HARDLOCKUP_DETECTOR=y
+# CONFIG_BOOTPARAM_HARDLOCKUP_PANIC is not set
+CONFIG_BOOTPARAM_HARDLOCKUP_PANIC_VALUE=0
+# CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set
+CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0
+CONFIG_DETECT_HUNG_TASK=y
+CONFIG_DEFAULT_HUNG_TASK_TIMEOUT=120
+# CONFIG_BOOTPARAM_HUNG_TASK_PANIC is not set
+CONFIG_BOOTPARAM_HUNG_TASK_PANIC_VALUE=0
+# CONFIG_PANIC_ON_OOPS is not set
+CONFIG_PANIC_ON_OOPS_VALUE=0
+CONFIG_SCHED_DEBUG=y
+CONFIG_SCHEDSTATS=y
+CONFIG_TIMER_STATS=y
+# CONFIG_DEBUG_PREEMPT is not set
+
+#
+# Lock Debugging (spinlocks, mutexes, etc...)
+#
+# CONFIG_DEBUG_RT_MUTEXES is not set
+# CONFIG_RT_MUTEX_TESTER is not set
+# CONFIG_DEBUG_SPINLOCK is not set
+CONFIG_DEBUG_MUTEXES=y
+# CONFIG_DEBUG_WW_MUTEX_SLOWPATH is not set
+# CONFIG_DEBUG_LOCK_ALLOC is not set
+# CONFIG_PROVE_LOCKING is not set
+# CONFIG_LOCK_STAT is not set
+# CONFIG_DEBUG_ATOMIC_SLEEP is not set
+# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
+CONFIG_STACKTRACE=y
+# CONFIG_DEBUG_KOBJECT is not set
+# CONFIG_DEBUG_KOBJECT_RELEASE is not set
+CONFIG_DEBUG_BUGVERBOSE=y
+# CONFIG_DEBUG_WRITECOUNT is not set
+# CONFIG_DEBUG_LIST is not set
+# CONFIG_DEBUG_SG is not set
+# CONFIG_DEBUG_NOTIFIERS is not set
+# CONFIG_DEBUG_CREDENTIALS is not set
+
+#
+# RCU Debugging
+#
+# CONFIG_PROVE_RCU_DELAY is not set
+# CONFIG_SPARSE_RCU_POINTER is not set
+# CONFIG_RCU_TORTURE_TEST is not set
+CONFIG_RCU_CPU_STALL_TIMEOUT=60
+# CONFIG_RCU_CPU_STALL_VERBOSE is not set
+# CONFIG_RCU_CPU_STALL_INFO is not set
+# CONFIG_RCU_TRACE is not set
+# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set
+# CONFIG_NOTIFIER_ERROR_INJECTION is not set
+# CONFIG_FAULT_INJECTION is not set
+# CONFIG_LATENCYTOP is not set
+CONFIG_ARCH_HAS_DEBUG_STRICT_USER_COPY_CHECKS=y
+# CONFIG_DEBUG_STRICT_USER_COPY_CHECKS is not set
+CONFIG_USER_STACKTRACE_SUPPORT=y
+CONFIG_NOP_TRACER=y
+CONFIG_HAVE_FUNCTION_TRACER=y
+CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y
+CONFIG_HAVE_FUNCTION_GRAPH_FP_TEST=y
+CONFIG_HAVE_FUNCTION_TRACE_MCOUNT_TEST=y
+CONFIG_HAVE_DYNAMIC_FTRACE=y
+CONFIG_HAVE_DYNAMIC_FTRACE_WITH_REGS=y
+CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
+CONFIG_HAVE_SYSCALL_TRACEPOINTS=y
+CONFIG_HAVE_FENTRY=y
+CONFIG_HAVE_C_RECORDMCOUNT=y
+CONFIG_TRACER_MAX_TRACE=y
+CONFIG_TRACE_CLOCK=y
+CONFIG_RING_BUFFER=y
+CONFIG_EVENT_TRACING=y
+CONFIG_CONTEXT_SWITCH_TRACER=y
+CONFIG_RING_BUFFER_ALLOW_SWAP=y
+CONFIG_TRACING=y
+CONFIG_GENERIC_TRACER=y
+CONFIG_TRACING_SUPPORT=y
+CONFIG_FTRACE=y
+CONFIG_FUNCTION_TRACER=y
+CONFIG_FUNCTION_GRAPH_TRACER=y
+# CONFIG_IRQSOFF_TRACER is not set
+# CONFIG_PREEMPT_TRACER is not set
+CONFIG_SCHED_TRACER=y
+CONFIG_FTRACE_SYSCALLS=y
+CONFIG_TRACER_SNAPSHOT=y
+# CONFIG_TRACER_SNAPSHOT_PER_CPU_SWAP is not set
+CONFIG_BRANCH_PROFILE_NONE=y
+# CONFIG_PROFILE_ANNOTATED_BRANCHES is not set
+# CONFIG_PROFILE_ALL_BRANCHES is not set
+CONFIG_STACK_TRACER=y
+CONFIG_BLK_DEV_IO_TRACE=y
+CONFIG_KPROBE_EVENT=y
+CONFIG_UPROBE_EVENT=y
+CONFIG_PROBE_EVENTS=y
+CONFIG_DYNAMIC_FTRACE=y
+CONFIG_DYNAMIC_FTRACE_WITH_REGS=y
+CONFIG_FUNCTION_PROFILER=y
+CONFIG_FTRACE_MCOUNT_RECORD=y
+# CONFIG_FTRACE_STARTUP_TEST is not set
+CONFIG_MMIOTRACE=y
+# CONFIG_MMIOTRACE_TEST is not set
+CONFIG_RING_BUFFER_BENCHMARK=m
+# CONFIG_RING_BUFFER_STARTUP_TEST is not set
+
+#
+# Runtime Testing
+#
+CONFIG_LKDTM=m
+# CONFIG_TEST_LIST_SORT is not set
+# CONFIG_KPROBES_SANITY_TEST is not set
+# CONFIG_BACKTRACE_SELF_TEST is not set
+# CONFIG_RBTREE_TEST is not set
+# CONFIG_INTERVAL_TREE_TEST is not set
+# CONFIG_ATOMIC64_SELFTEST is not set
+CONFIG_ASYNC_RAID6_TEST=m
+# CONFIG_TEST_STRING_HELPERS is not set
+CONFIG_TEST_KSTRTOX=m
+# CONFIG_PROVIDE_OHCI1394_DMA_INIT is not set
+# CONFIG_FIREWIRE_OHCI_REMOTE_DMA is not set
+# CONFIG_DMA_API_DEBUG is not set
+# CONFIG_SAMPLES is not set
+CONFIG_HAVE_ARCH_KGDB=y
+# CONFIG_KGDB is not set
+CONFIG_STRICT_DEVMEM=y
+CONFIG_X86_VERBOSE_BOOTUP=y
+CONFIG_EARLY_PRINTK=y
+# CONFIG_EARLY_PRINTK_DBGP is not set
+# CONFIG_X86_PTDUMP is not set
+CONFIG_DEBUG_RODATA=y
+# CONFIG_DEBUG_RODATA_TEST is not set
+# CONFIG_DEBUG_SET_MODULE_RONX is not set
+# CONFIG_DEBUG_NX_TEST is not set
+CONFIG_DOUBLEFAULT=y
+# CONFIG_DEBUG_TLBFLUSH is not set
+# CONFIG_IOMMU_DEBUG is not set
+# CONFIG_IOMMU_STRESS is not set
+CONFIG_HAVE_MMIOTRACE_SUPPORT=y
+# CONFIG_X86_DECODER_SELFTEST is not set
+CONFIG_IO_DELAY_TYPE_0X80=0
+CONFIG_IO_DELAY_TYPE_0XED=1
+CONFIG_IO_DELAY_TYPE_UDELAY=2
+CONFIG_IO_DELAY_TYPE_NONE=3
+CONFIG_IO_DELAY_0X80=y
+# CONFIG_IO_DELAY_0XED is not set
+# CONFIG_IO_DELAY_UDELAY is not set
+# CONFIG_IO_DELAY_NONE is not set
+CONFIG_DEFAULT_IO_DELAY_TYPE=0
+# CONFIG_DEBUG_BOOT_PARAMS is not set
+# CONFIG_CPA_DEBUG is not set
+# CONFIG_OPTIMIZE_INLINING is not set
+# CONFIG_DEBUG_NMI_SELFTEST is not set
+# CONFIG_X86_DEBUG_STATIC_CPU_HAS is not set
+
+#
+# Security options
+#
+CONFIG_KEYS=y
+CONFIG_TRUSTED_KEYS=m
+CONFIG_ENCRYPTED_KEYS=m
+# CONFIG_KEYS_DEBUG_PROC_KEYS is not set
+# CONFIG_SECURITY_DMESG_RESTRICT is not set
+CONFIG_SECURITY=y
+CONFIG_SECURITYFS=y
+CONFIG_SECURITY_NETWORK=y
+# CONFIG_SECURITY_NETWORK_XFRM is not set
+CONFIG_SECURITY_PATH=y
+# CONFIG_INTEL_TXT is not set
+# CONFIG_SECURITY_SELINUX is not set
+# CONFIG_SECURITY_SMACK is not set
+CONFIG_SECURITY_TOMOYO=y
+CONFIG_SECURITY_TOMOYO_MAX_ACCEPT_ENTRY=2048
+CONFIG_SECURITY_TOMOYO_MAX_AUDIT_LOG=1024
+# CONFIG_SECURITY_TOMOYO_OMIT_USERSPACE_LOADER is not set
+CONFIG_SECURITY_TOMOYO_POLICY_LOADER="/usr/bin/tomoyo-init"
+CONFIG_SECURITY_TOMOYO_ACTIVATION_TRIGGER="/usr/lib/systemd/systemd"
+CONFIG_SECURITY_APPARMOR=y
+CONFIG_SECURITY_APPARMOR_BOOTPARAM_VALUE=0
+CONFIG_SECURITY_APPARMOR_HASH=y
+CONFIG_SECURITY_YAMA=y
+CONFIG_SECURITY_YAMA_STACKED=y
+# CONFIG_IMA is not set
+# CONFIG_DEFAULT_SECURITY_TOMOYO is not set
+# CONFIG_DEFAULT_SECURITY_APPARMOR is not set
+# CONFIG_DEFAULT_SECURITY_YAMA is not set
+CONFIG_DEFAULT_SECURITY_DAC=y
+CONFIG_DEFAULT_SECURITY=""
+CONFIG_XOR_BLOCKS=m
+CONFIG_ASYNC_CORE=m
+CONFIG_ASYNC_MEMCPY=m
+CONFIG_ASYNC_XOR=m
+CONFIG_ASYNC_PQ=m
+CONFIG_ASYNC_RAID6_RECOV=m
+CONFIG_CRYPTO=y
+
+#
+# Crypto core or helper
+#
+CONFIG_CRYPTO_ALGAPI=y
+CONFIG_CRYPTO_ALGAPI2=y
+CONFIG_CRYPTO_AEAD=m
+CONFIG_CRYPTO_AEAD2=y
+CONFIG_CRYPTO_BLKCIPHER=m
+CONFIG_CRYPTO_BLKCIPHER2=y
+CONFIG_CRYPTO_HASH=y
+CONFIG_CRYPTO_HASH2=y
+CONFIG_CRYPTO_RNG=m
+CONFIG_CRYPTO_RNG2=y
+CONFIG_CRYPTO_PCOMP=m
+CONFIG_CRYPTO_PCOMP2=y
+CONFIG_CRYPTO_MANAGER=y
+CONFIG_CRYPTO_MANAGER2=y
+CONFIG_CRYPTO_USER=m
+CONFIG_CRYPTO_MANAGER_DISABLE_TESTS=y
+CONFIG_CRYPTO_GF128MUL=m
+CONFIG_CRYPTO_NULL=m
+CONFIG_CRYPTO_PCRYPT=m
+CONFIG_CRYPTO_WORKQUEUE=y
+CONFIG_CRYPTO_CRYPTD=m
+CONFIG_CRYPTO_AUTHENC=m
+CONFIG_CRYPTO_TEST=m
+CONFIG_CRYPTO_ABLK_HELPER_X86=m
+CONFIG_CRYPTO_GLUE_HELPER_X86=m
+
+#
+# Authenticated Encryption with Associated Data
+#
+CONFIG_CRYPTO_CCM=m
+CONFIG_CRYPTO_GCM=m
+CONFIG_CRYPTO_SEQIV=m
+
+#
+# Block modes
+#
+CONFIG_CRYPTO_CBC=m
+CONFIG_CRYPTO_CTR=m
+CONFIG_CRYPTO_CTS=m
+CONFIG_CRYPTO_ECB=m
+CONFIG_CRYPTO_LRW=m
+CONFIG_CRYPTO_PCBC=m
+CONFIG_CRYPTO_XTS=m
+
+#
+# Hash modes
+#
+CONFIG_CRYPTO_CMAC=m
+CONFIG_CRYPTO_HMAC=m
+CONFIG_CRYPTO_XCBC=m
+CONFIG_CRYPTO_VMAC=m
+
+#
+# Digest
+#
+CONFIG_CRYPTO_CRC32C=m
+CONFIG_CRYPTO_CRC32C_INTEL=m
+CONFIG_CRYPTO_CRC32=m
+CONFIG_CRYPTO_CRC32_PCLMUL=m
+CONFIG_CRYPTO_CRCT10DIF=m
+CONFIG_CRYPTO_CRCT10DIF_PCLMUL=m
+CONFIG_CRYPTO_GHASH=m
+CONFIG_CRYPTO_MD4=m
+CONFIG_CRYPTO_MD5=m
+CONFIG_CRYPTO_MICHAEL_MIC=m
+CONFIG_CRYPTO_RMD128=m
+CONFIG_CRYPTO_RMD160=m
+CONFIG_CRYPTO_RMD256=m
+CONFIG_CRYPTO_RMD320=m
+CONFIG_CRYPTO_SHA1=y
+CONFIG_CRYPTO_SHA1_SSSE3=m
+CONFIG_CRYPTO_SHA256_SSSE3=m
+CONFIG_CRYPTO_SHA512_SSSE3=m
+CONFIG_CRYPTO_SHA256=m
+CONFIG_CRYPTO_SHA512=m
+CONFIG_CRYPTO_TGR192=m
+CONFIG_CRYPTO_WP512=m
+CONFIG_CRYPTO_GHASH_CLMUL_NI_INTEL=m
+
+#
+# Ciphers
+#
+CONFIG_CRYPTO_AES=y
+CONFIG_CRYPTO_AES_X86_64=m
+CONFIG_CRYPTO_AES_NI_INTEL=m
+CONFIG_CRYPTO_ANUBIS=m
+CONFIG_CRYPTO_ARC4=m
+CONFIG_CRYPTO_BLOWFISH=m
+CONFIG_CRYPTO_BLOWFISH_COMMON=m
+CONFIG_CRYPTO_BLOWFISH_X86_64=m
+CONFIG_CRYPTO_CAMELLIA=m
+CONFIG_CRYPTO_CAMELLIA_X86_64=m
+CONFIG_CRYPTO_CAMELLIA_AESNI_AVX_X86_64=m
+CONFIG_CRYPTO_CAMELLIA_AESNI_AVX2_X86_64=m
+CONFIG_CRYPTO_CAST_COMMON=m
+CONFIG_CRYPTO_CAST5=m
+CONFIG_CRYPTO_CAST5_AVX_X86_64=m
+CONFIG_CRYPTO_CAST6=m
+CONFIG_CRYPTO_CAST6_AVX_X86_64=m
+CONFIG_CRYPTO_DES=m
+CONFIG_CRYPTO_FCRYPT=m
+CONFIG_CRYPTO_KHAZAD=m
+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_SERPENT_AVX_X86_64=m
+CONFIG_CRYPTO_SERPENT_AVX2_X86_64=m
+CONFIG_CRYPTO_TEA=m
+CONFIG_CRYPTO_TWOFISH=m
+CONFIG_CRYPTO_TWOFISH_COMMON=m
+CONFIG_CRYPTO_TWOFISH_X86_64=m
+CONFIG_CRYPTO_TWOFISH_X86_64_3WAY=m
+CONFIG_CRYPTO_TWOFISH_AVX_X86_64=m
+
+#
+# Compression
+#
+CONFIG_CRYPTO_DEFLATE=m
+CONFIG_CRYPTO_ZLIB=m
+CONFIG_CRYPTO_LZO=y
+CONFIG_CRYPTO_LZ4=m
+CONFIG_CRYPTO_LZ4HC=m
+
+#
+# Random Number Generation
+#
+CONFIG_CRYPTO_ANSI_CPRNG=m
+CONFIG_CRYPTO_USER_API=m
+CONFIG_CRYPTO_USER_API_HASH=m
+CONFIG_CRYPTO_USER_API_SKCIPHER=m
+CONFIG_CRYPTO_HW=y
+CONFIG_CRYPTO_DEV_PADLOCK=m
+CONFIG_CRYPTO_DEV_PADLOCK_AES=m
+CONFIG_CRYPTO_DEV_PADLOCK_SHA=m
+CONFIG_ASYMMETRIC_KEY_TYPE=m
+CONFIG_ASYMMETRIC_PUBLIC_KEY_SUBTYPE=m
+CONFIG_PUBLIC_KEY_ALGO_RSA=m
+CONFIG_X509_CERTIFICATE_PARSER=m
+CONFIG_HAVE_KVM=y
+CONFIG_HAVE_KVM_IRQCHIP=y
+CONFIG_HAVE_KVM_IRQ_ROUTING=y
+CONFIG_HAVE_KVM_EVENTFD=y
+CONFIG_KVM_APIC_ARCHITECTURE=y
+CONFIG_KVM_MMIO=y
+CONFIG_KVM_ASYNC_PF=y
+CONFIG_HAVE_KVM_MSI=y
+CONFIG_HAVE_KVM_CPU_RELAX_INTERCEPT=y
+CONFIG_VIRTUALIZATION=y
+CONFIG_KVM=m
+CONFIG_KVM_INTEL=m
+CONFIG_KVM_AMD=m
+CONFIG_KVM_MMU_AUDIT=y
+CONFIG_KVM_DEVICE_ASSIGNMENT=y
+CONFIG_BINARY_PRINTF=y
+
+#
+# Library routines
+#
+CONFIG_RAID6_PQ=m
+CONFIG_BITREVERSE=y
+CONFIG_GENERIC_STRNCPY_FROM_USER=y
+CONFIG_GENERIC_STRNLEN_USER=y
+CONFIG_GENERIC_NET_UTILS=y
+CONFIG_GENERIC_FIND_FIRST_BIT=y
+CONFIG_GENERIC_PCI_IOMAP=y
+CONFIG_GENERIC_IOMAP=y
+CONFIG_GENERIC_IO=y
+CONFIG_PERCPU_RWSEM=y
+CONFIG_ARCH_USE_CMPXCHG_LOCKREF=y
+CONFIG_CMPXCHG_LOCKREF=y
+CONFIG_CRC_CCITT=m
+CONFIG_CRC16=m
+CONFIG_CRC_T10DIF=m
+CONFIG_CRC_ITU_T=m
+CONFIG_CRC32=y
+# CONFIG_CRC32_SELFTEST is not set
+CONFIG_CRC32_SLICEBY8=y
+# CONFIG_CRC32_SLICEBY4 is not set
+# CONFIG_CRC32_SARWATE is not set
+# CONFIG_CRC32_BIT is not set
+CONFIG_CRC7=m
+CONFIG_LIBCRC32C=m
+CONFIG_CRC8=m
+CONFIG_ZLIB_INFLATE=y
+CONFIG_ZLIB_DEFLATE=y
+CONFIG_LZO_COMPRESS=y
+CONFIG_LZO_DECOMPRESS=y
+CONFIG_LZ4_COMPRESS=m
+CONFIG_LZ4HC_COMPRESS=m
+CONFIG_LZ4_DECOMPRESS=y
+CONFIG_XZ_DEC=y
+CONFIG_XZ_DEC_X86=y
+CONFIG_XZ_DEC_POWERPC=y
+CONFIG_XZ_DEC_IA64=y
+CONFIG_XZ_DEC_ARM=y
+CONFIG_XZ_DEC_ARMTHUMB=y
+CONFIG_XZ_DEC_SPARC=y
+CONFIG_XZ_DEC_BCJ=y
+# CONFIG_XZ_DEC_TEST is not set
+CONFIG_DECOMPRESS_GZIP=y
+CONFIG_DECOMPRESS_BZIP2=y
+CONFIG_DECOMPRESS_LZMA=y
+CONFIG_DECOMPRESS_XZ=y
+CONFIG_DECOMPRESS_LZO=y
+CONFIG_DECOMPRESS_LZ4=y
+CONFIG_GENERIC_ALLOCATOR=y
+CONFIG_REED_SOLOMON=m
+CONFIG_REED_SOLOMON_ENC8=y
+CONFIG_REED_SOLOMON_DEC8=y
+CONFIG_BCH=m
+CONFIG_BCH_CONST_PARAMS=y
+CONFIG_TEXTSEARCH=y
+CONFIG_TEXTSEARCH_KMP=m
+CONFIG_TEXTSEARCH_BM=m
+CONFIG_TEXTSEARCH_FSM=m
+CONFIG_BTREE=y
+CONFIG_HAS_IOMEM=y
+CONFIG_HAS_IOPORT=y
+CONFIG_HAS_DMA=y
+CONFIG_CHECK_SIGNATURE=y
+CONFIG_CPU_RMAP=y
+CONFIG_DQL=y
+CONFIG_NLATTR=y
+CONFIG_ARCH_HAS_ATOMIC64_DEC_IF_POSITIVE=y
+CONFIG_LRU_CACHE=m
+CONFIG_AVERAGE=y
+CONFIG_CLZ_TAB=y
+CONFIG_CORDIC=m
+CONFIG_DDR=y
+CONFIG_MPILIB=m
+CONFIG_OID_REGISTRY=m
+CONFIG_UCS2_STRING=y
+CONFIG_FONT_SUPPORT=y
+CONFIG_FONTS=y
+# CONFIG_FONT_8x8 is not set
+CONFIG_FONT_8x16=y
+# CONFIG_FONT_6x11 is not set
+# CONFIG_FONT_7x14 is not set
+# CONFIG_FONT_PEARL_8x8 is not set
+# CONFIG_FONT_ACORN_8x8 is not set
+# CONFIG_FONT_MINI_4x6 is not set
+# CONFIG_FONT_SUN8x16 is not set
+# CONFIG_FONT_SUN12x22 is not set
+# CONFIG_FONT_10x18 is not set
+CONFIG_FONT_AUTOSELECT=y
diff --git a/libre/lirc-libre/PKGBUILD b/libre/lirc-libre/PKGBUILD
index 8b896d031..47c271c60 100644
--- a/libre/lirc-libre/PKGBUILD
+++ b/libre/lirc-libre/PKGBUILD
@@ -1,12 +1,12 @@
-# $Id: PKGBUILD 196212 2013-10-08 14:19:09Z tpowa $
+# $Id: PKGBUILD 196465 2013-10-14 07:07:38Z tpowa $
 # Maintainer: Paul Mattal <paul@archlinux.org>
-# Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
+# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
 
 _pkgbase=lirc
 pkgbase=lirc-libre
 pkgname=('lirc-libre' 'lirc-utils-libre')
 pkgver=0.9.0
-pkgrel=63
+pkgrel=64
 epoch=1
 _extramodules=extramodules-3.11-LIBRE
 arch=('i686' 'x86_64' 'mips64el')
diff --git a/libre/lsb-release/PKGBUILD b/libre/lsb-release/PKGBUILD
index adf9c4774..1d073c356 100644
--- a/libre/lsb-release/PKGBUILD
+++ b/libre/lsb-release/PKGBUILD
@@ -3,7 +3,7 @@
 # Contributor: Malte Rabenseifner <malte@zearan.de>
 # Contributor: John Gerritse <reaphsharc@gmail.com>
 # Maintainer (Parabola): Michał Masłowski <mtjm@mtjm.eu>
-# Contributor (Parabola): André Silva emulatorman@lavabit.com>
+# Contributor (Parabola): André Silva emulatorman@parabola.nu>
 
 pkgname=lsb-release
 pkgver=1.4
diff --git a/libre/luxrender-libre/PKGBUILD b/libre/luxrender-libre/PKGBUILD
index 0c109a5d1..89119a29b 100644
--- a/libre/luxrender-libre/PKGBUILD
+++ b/libre/luxrender-libre/PKGBUILD
@@ -5,14 +5,14 @@
 # Maintainer (Parabola): Márcio Silva <coadde@lavabit.com>
 _pkgname=luxrender
 pkgname=$_pkgname-libre
-pkgver=1.2.1
-_pkgver=3066b2161439
-pkgrel=5
+pkgver=1.3
+_pkgver=523432614aa5
+pkgrel=1.1
 pkgdesc="Rendering system for physically correct, unbiased image synthesis, without nonfree OpenCL recommendation"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.$_pkgname.net/"
 license=('GPL')
-depends=('boost-libs' 'freeimage' 'openexr' 'libcl-libre' 'mesa-libgl')
+depends=('boost-libs' 'freeimage' 'openexr' 'mesa-libcl' 'mesa-libgl' 'fftw')
 optdepends=('blender-addon-luxrender: Blender for renderer and exporter' 'qt4: Qt GUI' \
             'python: Python interface (pylux)')
 makedepends=('cmake' 'boost' 'mesa' 'qt4' "luxrays=$pkgver" 'python' 'opencl-headers')
@@ -20,28 +20,13 @@ makedepends+=('gcc-lts')
 provides=($_pkgname=$pkgver)
 conflicts=$_pkgname
 replaces=$_pkgname
-source=(https://bitbucket.org/$_pkgname/lux/get/$_pkgver.tar.bz2
-        boost-1.53-shared_array_constructor.diff)
-md5sums=(
-  '87958798c164ad14f92fb4af2595d332'
-  'dd19c7ac2ba8c9b703018a176ef77f98')
-
-prepare() {
-  cd "$srcdir"/$_pkgname-lux-$_pkgver
-
-  # fix the installation
-  sed -i '/.*wxgui.*/ d
-          s|-ftree-vectorize ||
-         ' CMakeLists.txt
-  # fix for boost 1.53
-  patch -Np1 < "$srcdir/boost-1.53-shared_array_constructor.diff" || true
-
-  export CXXFLAGS="$CXXFLAGS -lpthread"
-}
+source=(https://bitbucket.org/$_pkgname/lux/get/$_pkgver.tar.bz2)
+md5sums=('fad0fae0866e578ca6f5b3f3903d0c9f')
 
 build() {
   cd "$srcdir"/$_pkgname-lux-$_pkgver
 
+  export CXXFLAGS="$CXXFLAGS -lpthread"
   cmake . -DCMAKE_INSTALL_PREFIX=/usr \
     -DLUXRAYS_DISABLE_OPENCL=OFF \
     -DPYTHON_CUSTOM=ON \
@@ -52,7 +37,7 @@ build() {
 
 package() {
   cd "$srcdir"/$_pkgname-lux-$_pkgver
-  setarch $CARCH make DESTDIR="$pkgdir" install
+  make DESTDIR="$pkgdir" install
 
   # fix library path on 64bit
   [[ $CARCH == x86_64 ]] && mv "$pkgdir"/usr/lib64 "$pkgdir"/usr/lib
diff --git a/libre/luxrender-libre/boost-1.53-shared_array_constructor.diff b/libre/luxrender-libre/boost-1.53-shared_array_constructor.diff
deleted file mode 100644
index a6a8d532b..000000000
--- a/libre/luxrender-libre/boost-1.53-shared_array_constructor.diff
+++ /dev/null
@@ -1,62 +0,0 @@
-diff -rup luxrender-lux-3066b2161439/cmake/luxrender.cmake luxrender-lux-3066b2161439.new/cmake/luxrender.cmake
---- luxrender-lux-3066b2161439/cmake/luxrender.cmake	2013-03-16 19:32:24.000000000 +0000
-+++ luxrender-lux-3066b2161439.new/cmake/luxrender.cmake	2013-03-26 18:26:46.194520697 +0000
-@@ -98,7 +98,7 @@ IF(QT4_FOUND)
- 
- 	QT4_ADD_RESOURCES( LUXQTGUI_RC_SRCS ${LUXQTGUI_RCS})
- 	QT4_WRAP_UI( LUXQTGUI_UI_HDRS ${LUXQTGUI_UIS} )
--	QT4_WRAP_CPP( LUXQTGUI_MOC_SRCS ${LUXQTGUI_MOC} )
-+	QT4_WRAP_CPP( LUXQTGUI_MOC_SRCS ${LUXQTGUI_MOC} OPTIONS -DBOOST_TT_HAS_OPERATOR_HPP_INCLUDED -DBOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION )
- 
- 	#file (GLOB TRANSLATIONS_FILES qtgui/translations/*.ts)
- 	#qt4_create_translation(QM_FILES ${FILES_TO_TRANSLATE} ${TRANSLATIONS_FILES})
-diff -rup luxrender-lux-3066b2161439/core/film.cpp luxrender-lux-3066b2161439.new/core/film.cpp
---- luxrender-lux-3066b2161439/core/film.cpp	2013-03-16 19:32:24.000000000 +0000
-+++ luxrender-lux-3066b2161439.new/core/film.cpp	2013-03-26 18:03:02.828222310 +0000
-@@ -890,8 +890,8 @@ Film::Film(u_int xres, u_int yres, Filte
- 	filename(filename1),
- 	colorSpace(0.63f, 0.34f, 0.31f, 0.595f, 0.155f, 0.07f, 0.314275f, 0.329411f), // default is SMPTE
- 	convTest(NULL), varianceBuffer(NULL),
--	noiseAwareMap(NULL), noiseAwareMapVersion(0),
--	userSamplingMapFileName(samplingmapfilename), userSamplingMap(NULL), userSamplingMapVersion(0),
-+	noiseAwareMapVersion(0),
-+	userSamplingMapFileName(samplingmapfilename), userSamplingMapVersion(0),
- 	ZBuffer(NULL), use_Zbuf(useZbuffer),
- 	debug_mode(debugmode), premultiplyAlpha(premult),
- 	writeResumeFlm(w_resume_FLM), restartResumeFlm(restart_resume_FLM), writeFlmDirect(write_FLM_direct),
-diff -rup luxrender-lux-3066b2161439/samplers/lowdiscrepancy.cpp luxrender-lux-3066b2161439.new/samplers/lowdiscrepancy.cpp
---- luxrender-lux-3066b2161439/samplers/lowdiscrepancy.cpp	2013-03-16 19:32:24.000000000 +0000
-+++ luxrender-lux-3066b2161439.new/samplers/lowdiscrepancy.cpp	2013-03-26 18:03:02.828222310 +0000
-@@ -29,7 +29,7 @@
- using namespace lux;
- 
- LDSampler::LDData::LDData(const Sampler &sampler, int xPixelStart, int yPixelStart, u_int pixelSamples) :
--	samplingMap(NULL), noiseAwareMapVersion(0), userSamplingMapVersion(0) {
-+	noiseAwareMapVersion(0), userSamplingMapVersion(0) {
- 	xPos = xPixelStart - 1;
- 	yPos = yPixelStart;
- 	samplePos = pixelSamples - 1;
-diff -rup luxrender-lux-3066b2161439/samplers/metrosampler.cpp luxrender-lux-3066b2161439.new/samplers/metrosampler.cpp
---- luxrender-lux-3066b2161439/samplers/metrosampler.cpp	2013-03-16 19:32:24.000000000 +0000
-+++ luxrender-lux-3066b2161439.new/samplers/metrosampler.cpp	2013-03-26 18:13:13.146702871 +0000
-@@ -39,7 +39,7 @@ static const u_int rngA = 884;
- MetropolisSampler::MetropolisData::MetropolisData(const MetropolisSampler &sampler) :
- 	consecRejects(0), stamp(0), currentStamp(0), weight(0.f),
- 	LY(0.f), alpha(0.f), totalLY(0.f), sampleCount(0.f),
--	samplingMap(NULL), noiseAwareMapVersion(0), userSamplingMapVersion(0),
-+	noiseAwareMapVersion(0), userSamplingMapVersion(0),
- 	large(true), cooldown(sampler.cooldownTime > 0)
- {
- 	u_int i;
-diff -rup luxrender-lux-3066b2161439/samplers/random.cpp luxrender-lux-3066b2161439.new/samplers/random.cpp
---- luxrender-lux-3066b2161439/samplers/random.cpp	2013-03-16 19:32:24.000000000 +0000
-+++ luxrender-lux-3066b2161439.new/samplers/random.cpp	2013-03-26 18:12:34.378868365 +0000
-@@ -30,7 +30,7 @@ using namespace lux;
- 
- RandomSampler::RandomData::RandomData(const Sampler &sampler, int xPixelStart,
- 	int yPixelStart, u_int pixelSamples) :
--	samplingMap(NULL), noiseAwareMapVersion(0), userSamplingMapVersion(0)
-+	noiseAwareMapVersion(0), userSamplingMapVersion(0)
- {
- 	xPos = xPixelStart;
- 	yPos = yPixelStart;
diff --git a/libre/mcomix-libre/PKGBUILD b/libre/mcomix-libre/PKGBUILD
index 77baf60bc..d55f4c329 100644
--- a/libre/mcomix-libre/PKGBUILD
+++ b/libre/mcomix-libre/PKGBUILD
@@ -1,7 +1,7 @@
 # $Id: PKGBUILD 97188 2013-09-15 08:42:21Z schuay $
 # Maintainer: schuay <jakob.gruber@gmail.com>
 # Contributor: Ray Powell <ray_al@xphoniexx.net>
-# Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
+# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
 
 _pkgname=mcomix
 pkgname=mcomix-libre
diff --git a/libre/mesa-demos-libre/PKGBUILD b/libre/mesa-demos-libre/PKGBUILD
index 38949606d..36f2927b7 100644
--- a/libre/mesa-demos-libre/PKGBUILD
+++ b/libre/mesa-demos-libre/PKGBUILD
@@ -1,7 +1,7 @@
 # $Id: PKGBUILD 178740 2013-02-26 16:15:13Z andyrtr $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
-# Maintainer (Parabola): <emulatorman@lavabit.com>
+# Maintainer (Parabola): <emulatorman@parabola.nu>
 
 pkgname='mesa-demos-libre'
 pkgver=8.1.0
diff --git a/libre/mesa-libcl/PKGBUILD b/libre/mesa-libcl/PKGBUILD
index bf77c087d..411834c5d 100644
--- a/libre/mesa-libcl/PKGBUILD
+++ b/libre/mesa-libcl/PKGBUILD
@@ -4,7 +4,7 @@ pkgbase=mesa
 _pkgname=libcl
 pkgname=$pkgbase-$_pkgname
 _pkgflag=libre
-pkgver=9.2.1
+pkgver=9.2.2
 pkgrel=1
 pkgdesc='Mesa 3-D OpenCL library'
 url=http://${pkgbase}3d.sourceforge.net
@@ -28,7 +28,7 @@ conflicts=($_pkgname-$_pkgflag $_pkgname opencl-nvidia opencl-nvidia-304xx)
 replaces=($_pkgname-$_pkgflag $_pkgname opencl-nvidia opencl-nvidia-304xx)
 options=(!libtool)
 source=ftp://ftp.freedesktop.org/pub/$pkgbase/${pkgver%.0}/${pkgbase^}Lib-$pkgver.tar.bz2
-sha512sums=1dbc59b348618dde85e00b318fa5bbc58c29c3f56f8f77260569f155e5e787e56a2b5efff6b0e8cafedc915ccb465c547a10501f39e3d20a57c4e654968de62e
+sha512sums=6b1ac41f28a81bf920fd4ea80586192f6465863992ec13b718c61fb7d4a41ac3bbb146bfa4a81c48189092e7b59a9452d11d675d628a6098dd8fc48a5aa304ca
 
 build() {
   cd $srcdir/${pkgbase^}-$pkgver
diff --git a/libre/mkisolinux/boot.msg b/libre/mkisolinux/boot.msg
index e4109ea39..2725404e0 100644
--- a/libre/mkisolinux/boot.msg
+++ b/libre/mkisolinux/boot.msg
@@ -4,7 +4,7 @@
 Parabola GNU/Linux-libre
 ISOLINUX BOOT
 created with 'mkisolinux' written by Tobias Powalowski <tpowa@archlinux.org>
-rebranded for Parabola by André Silva <emulatorman@lavabit.com>
+rebranded for Parabola by André Silva <emulatorman@parabola.nu>
 
 Press ENTER or type 'parabola' to boot the CD.
 
diff --git a/libre/mkisolinux/mkisolinux b/libre/mkisolinux/mkisolinux
index ce1187d2a..048d925aa 100755
--- a/libre/mkisolinux/mkisolinux
+++ b/libre/mkisolinux/mkisolinux
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Created by Tobias Powalowski <tpowa@archlinux.org>
-# Rebranded for Parabola by André Silva <emulatorman@lavabit.com>
+# Rebranded for Parabola by André Silva <emulatorman@parabola.nu>
 # Settings
 APPNAME=$(basename "${0}")
 CONFIG="/etc/mkisolinux.conf"
diff --git a/libre/mkisolinux/mkisolinux.conf b/libre/mkisolinux/mkisolinux.conf
index 4af6f098c..e8b1e0df0 100644
--- a/libre/mkisolinux/mkisolinux.conf
+++ b/libre/mkisolinux/mkisolinux.conf
@@ -1,5 +1,5 @@
 # Created by Tobias Powalowski <tpowa@archlinux.org>
-# Rebranded for Parabola by André Silva <emulatorman@lavabit.com>
+# Rebranded for Parabola by André Silva <emulatorman@parabola.nu>
 # config file of mkisolinux
 
 # DEFAULT kernel boot options like root=/dev/sda3 etc.
diff --git a/libre/mkpxelinux/PKGBUILD b/libre/mkpxelinux/PKGBUILD
index 358e11709..b3a94547f 100644
--- a/libre/mkpxelinux/PKGBUILD
+++ b/libre/mkpxelinux/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 185735 2013-05-18 06:50:57Z tpowa $
+# $Id: PKGBUILD 197074 2013-10-21 15:42:46Z tpowa $
 # Maintainer : Tobias Powalowski <tpowa@archlinux.org>
 
 pkgname=mkpxelinux
-pkgver=2013.03
-pkgrel=2
+pkgver=2013.10
+pkgrel=1
 pkgdesc="Advanced, modular network pxe boot image creation utility (Parabola rebranded)"
 arch=(any)
 license=('GPL')
@@ -12,10 +12,6 @@ depends=('mkinitcpio' 'tftp-hpa' 'syslinux')
 backup=(etc/mkpxelinux.conf)
 optdepends=('dhcp: for dhcp server usage')
 source=('boot.msg' 'mkpxelinux' 'mkpxelinux.conf' 'options.msg')
-md5sums=('7225e73bfe717f97bd7ab52f5ab157f6'
-         '58dfd6b96e7faeb75b7e5753e1751f31'
-         'aad6a91bae077461c33c2db3844814f0'
-         'ae0007d6679b5a575b2a9e5ac3664baf')
 
 package()
 {
@@ -25,3 +21,7 @@ package()
   install -D -m644 boot.msg "$pkgdir/usr/share/mkpxelinux/boot.msg"
   install -D -m644 options.msg "$pkgdir/usr/share/mkpxelinux/options.msg"
 }
+md5sums=('7225e73bfe717f97bd7ab52f5ab157f6'
+         '44c6b9fa8ae668a432f26adb9e70bd3f'
+         '158dece3af889740b0f0ee397f9058ed'
+         'ae0007d6679b5a575b2a9e5ac3664baf')
diff --git a/libre/mkpxelinux/mkpxelinux b/libre/mkpxelinux/mkpxelinux
index bd173376c..35e946f82 100755
--- a/libre/mkpxelinux/mkpxelinux
+++ b/libre/mkpxelinux/mkpxelinux
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Created by Tobias Powalowski <tpowa@archlinux.org>
-# Rebranded for Parabola by André Silva <emulatorman@lavabit.com>
+# Rebranded for Parabola by André Silva <emulatorman@parabola.nu>
 # Settings
 APPNAME=$(basename "${0}")
 CONFIG="/etc/mkpxelinux.conf"
@@ -88,4 +88,4 @@ echo ":: Installing message files to ${INSTALLDIR} ..."
 	[ ! -s ${INSTALLDIR}/boot.msg ] && echo 'ERROR:no boot.msg found, aborting!' && exit 1
 	[ ! -s ${INSTALLDIR}/options.msg ] && echo 'ERROR:no options.msg found, aborting!' && exit 1
 echo ":: Installing PXELINUX to ${INSTALLDIR} ..."
-	install -m644 /usr/lib/syslinux/pxelinux.0 ${INSTALLDIR}/pxelinux.0 && echo "Installation completed."
+	install -m644 /usr/lib/syslinux/bios/pxelinux.0 ${INSTALLDIR}/pxelinux.0 && echo "Installation completed."
diff --git a/libre/mkpxelinux/mkpxelinux.conf b/libre/mkpxelinux/mkpxelinux.conf
index 4b8e7b0a8..55aba8247 100644
--- a/libre/mkpxelinux/mkpxelinux.conf
+++ b/libre/mkpxelinux/mkpxelinux.conf
@@ -1,5 +1,5 @@
 # Created by Tobias Powalowski <tpowa@archlinux.org>
-# Rebranded for Parabola by André Silva <emulatorman@lavabit.com>
+# Rebranded for Parabola by André Silva <emulatorman@parabola.nu>
 # config file of mkpxelinux
 
 # DEFAULT kernel boot options like ip=:::::eth0:dhcp etc.
diff --git a/libre/mksyslinux/boot.msg b/libre/mksyslinux/boot.msg
index 15476f2bd..2cfe24d42 100644
--- a/libre/mksyslinux/boot.msg
+++ b/libre/mksyslinux/boot.msg
@@ -4,7 +4,7 @@
 Parabola GNU/Linux-libre
 SYSLINUX BOOT
 created with 'mksyslinux' by Tobias Powalowski <tpowa@archlinux.org>
-rebranded for Parabola by André Silva <emulatorman@lavabit.com>
+rebranded for Parabola by André Silva <emulatorman@parabola.nu>
 
 Press ENTER or type 'parabola' to boot image.
 
diff --git a/libre/mksyslinux/mksyslinux.conf b/libre/mksyslinux/mksyslinux.conf
index cfbfc49d8..a7d032295 100644
--- a/libre/mksyslinux/mksyslinux.conf
+++ b/libre/mksyslinux/mksyslinux.conf
@@ -1,5 +1,5 @@
 # Created by Tobias Powalowski <tpowa@archlinux.org>
-# Rebranded for Parabola by André Silva <emulatorman@lavabit.com>
+# Rebranded for Parabola by André Silva <emulatorman@parabola.nu>
 # config file of mksyslinux
 
 # DEFAULT kernel boot options like root=/dev/sda3 etc.
diff --git a/libre/mplayer-libre/0001-demux_gif-declare-missing-PrintGifError.patch b/libre/mplayer-libre/0001-demux_gif-declare-missing-PrintGifError.patch
deleted file mode 100644
index c8a527cf3..000000000
--- a/libre/mplayer-libre/0001-demux_gif-declare-missing-PrintGifError.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 5194f95d39ffbb0a4a7b027d8f1b084436feb22c Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Bart=C5=82omiej=20Piotrowski?= <b@bpiotrowski.pl>
-Date: Sun, 14 Jul 2013 10:51:11 +0200
-Subject: [PATCH] demux_gif: declare missing PrintGifError
-
-Apparently it has been removed from newer Giflib releases.
----
- libmpdemux/demux_gif.c | 10 ++++++++++
- 1 file changed, 10 insertions(+)
-
-diff --git a/libmpdemux/demux_gif.c b/libmpdemux/demux_gif.c
-index eee7a85..3d761c0 100644
---- a/libmpdemux/demux_gif.c
-+++ b/libmpdemux/demux_gif.c
-@@ -44,6 +44,16 @@ typedef struct {
- 
- #define GIF_SIGNATURE (('G' << 16) | ('I' << 8) | 'F')
- 
-+static void PrintGifError(void)
-+{
-+  char *Err = GifErrorString();
-+
-+  if (Err != NULL)
-+    fprintf(stderr, "\nGIF-LIB error: %s.\n", Err);
-+  else
-+    fprintf(stderr, "\nGIF-LIB undefined error %d.\n", GifError());
-+}
-+
- #ifndef CONFIG_GIF_TVT_HACK
- // not supported by certain versions of the library
- static int my_read_gif(GifFileType *gif, uint8_t *buf, int len)
--- 
-1.8.3.2
-
diff --git a/libre/mplayer-libre/PKGBUILD b/libre/mplayer-libre/PKGBUILD
index a5bda5d85..3f8b45dfe 100644
--- a/libre/mplayer-libre/PKGBUILD
+++ b/libre/mplayer-libre/PKGBUILD
@@ -1,39 +1,47 @@
-# $Id: PKGBUILD 193127 2013-08-17 00:43:52Z eric $
+# $Id: PKGBUILD 198698 2013-11-02 08:09:59Z bpiotrowski $
 # Maintainer : Ionut Biru <ibiru@archlinux.org>
 # Contributor: Hugo Doria <hugo@archlinux.org>
-# Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
+# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
 # Contributor (Parabola): Márcio Silva <coadde@lavabit.com>
 
 _pkgbase=mplayer
 pkgbase=mplayer-libre
 pkgname=('mplayer-libre' 'mencoder-libre')
-pkgver=36285
-pkgrel=4
+pkgver=36498
+pkgrel=2
 arch=('i686' 'x86_64')
-makedepends=('libxxf86dga' 'libxxf86vm' 'libmad' 'libxinerama' 'sdl' 'lame' 'libtheora' 'xvidcore' 'libmng' 'libxss' 'libgl' 'smbclient'
-'aalib' 'jack' 'libcaca' 'x264' 'faad2' 'lirc-utils'  'libxvmc' 'enca' 'libvdpau' 'opencore-amr' 'libdca' 'a52dec' 'schroedinger' 'libvpx'
-'libpulse' 'fribidi' 'unzip' 'mesa' 'live-media' 'yasm' 'git' 'fontconfig' 'mpg123' 'ladspa' 'libass' 'libbluray' 'libcdio-paranoia' 'subversion')
+makedepends=(
+    'libxxf86dga' 'libxxf86vm' 'libmad' 'libxinerama' 'sdl' 'lame' 'libtheora'
+    'xvidcore' 'libmng' 'libxss' 'libgl' 'smbclient' 'aalib' 'jack' 'libcaca'
+    'x264' 'faad2' 'lirc-utils'  'libxvmc' 'enca' 'libvdpau' 'opencore-amr'
+    'libdca' 'a52dec' 'schroedinger' 'libvpx' 'libpulse' 'fribidi' 'unzip' 'mesa'
+    'live-media' 'yasm' 'git' 'fontconfig' 'mpg123' 'ladspa' 'libass' 'libbluray'
+    'libcdio-paranoia' 'opus'
+    )
 license=('GPL')
-url="http://www.mplayerhq.hu/"
+url='http://www.mplayerhq.hu/'
 options=('!buildflags' '!emptydirs')
 source=(ftp://ftp.archlinux.org/other/packages/$_pkgbase/$_pkgbase-$pkgver.tar.xz
+        http://ffmpeg.org/releases/ffmpeg-2.1.tar.bz2
         mplayer.desktop
         cdio-includes.patch
-        0001-demux_gif-declare-missing-PrintGifError.patch)
-md5sums=('5e4f0d4d039b0219514cf52ae6da831d'
-         'c0d6ef795cf6de48e3b87ff7c23f0319'
+        include-samba-4.0.patch)
+md5sums=('8b856e8833d910b6e38b04bb8453d0dc'
+         '4ec1cedd4c7753512462f70b347c338a'
+         '62f44a58f072b2b1a3c3d3e4976d64b3'
          '7b5be7191aafbea64218dc4916343bbc'
-         '12a2a5b79849d57eab60a1bfec2978c4')
+         '868a92bdef148df7f38bfa992b26ce9d')
 
 prepare() {
-    cd "$srcdir/$_pkgbase-$pkgver"
+    cd $_pkgbase-$pkgver
+    patch -p0 -i ../cdio-includes.patch
+    patch -p1 -i ../include-samba-4.0.patch
 
-    patch -Np0 -i ../cdio-includes.patch
-    patch -Np1 -i ../0001-demux_gif-declare-missing-PrintGifError.patch
+    mv ../ffmpeg-2.1 ./ffmpeg
 }
 
 build() {
-    cd "$srcdir/$_pkgbase-$pkgver"
+    cd $_pkgbase-$pkgver
 
     ./configure --prefix=/usr \
         --enable-runtime-cpudetection \
@@ -51,9 +59,10 @@ build() {
         --enable-xvmc \
         --enable-radio \
         --enable-radio-capture \
+        --enable-smb \
         --language=all \
         --confdir=/etc/mplayer 
-    [ "$CARCH" = "i686" ] &&  sed 's|-march=i486|-march=i686|g' -i config.mak
+    [[ "$CARCH" = "i686" ]] &&  sed 's|-march=i486|-march=i686|g' -i config.mak
 
     make
 }
@@ -62,34 +71,50 @@ package_mplayer-libre() {
     pkgdesc="A movie player for GNU/Linux, without nonfree faac support"
     install=mplayer.install
     backup=('etc/mplayer/codecs.conf' 'etc/mplayer/input.conf')
-    depends=('desktop-file-utils' 'ttf-dejavu' 'enca' 'libxss' 'a52dec' 'libvpx' 'lirc-utils' 'x264' 'libmng' 'libdca' 'aalib' 'lame' 'fontconfig'  'libgl'
-    'libxinerama' 'libvdpau' 'libpulse' 'smbclient' 'xvidcore' 'opencore-amr' 'jack' 'libmad' 'sdl' 'libtheora' 'libcaca' 'libxxf86dga' 'fribidi'
-    'libjpeg' 'faad2' 'libxvmc' 'schroedinger' 'mpg123' 'libass' 'libxxf86vm' 'libbluray' 'libcdio-paranoia')
+    depends=(
+        'desktop-file-utils' 'ttf-dejavu' 'enca' 'libxss' 'a52dec' 'libvpx'
+        'lirc-utils' 'x264' 'libmng' 'libdca' 'aalib' 'lame' 'fontconfig'
+        'libgl' 'libxinerama' 'libvdpau' 'libpulse' 'smbclient' 'xvidcore'
+        'opencore-amr' 'jack' 'libmad' 'sdl' 'libtheora' 'libcaca' 'libxxf86dga'
+        'fribidi' 'libjpeg' 'faad2' 'libxvmc' 'schroedinger' 'mpg123'
+        'libass' 'libxxf86vm' 'libbluray' 'libcdio-paranoia' 'opus'
+    )
     provides=("mplayer=$pkgver")
     replaces=('mplayer')
     conflicts=('mplayer')
 
-    cd "$srcdir/$_pkgbase-$pkgver"
-
+    cd $_pkgbase-$pkgver
     make DESTDIR="$pkgdir" install-mplayer install-mplayer-man
-    install -Dm644 etc/{codecs.conf,input.conf,example.conf} "$pkgdir/etc/mplayer/"
+
+    install -Dm644 etc/{codecs.conf,input.conf,example.conf} \
+        "$pkgdir/etc/mplayer/"
+
     install -dm755 "$pkgdir/usr/share/mplayer/"
-    ln -s /usr/share/fonts/TTF/DejaVuSans.ttf "$pkgdir/usr/share/mplayer/subfont.ttf"
+    ln -s /usr/share/fonts/TTF/DejaVuSans.ttf \
+        "$pkgdir/usr/share/mplayer/subfont.ttf"
     rm -rf "$pkgdir/usr/share/mplayer/font"
+
     #desktop file  FS#14770
-    install -Dm644 "$srcdir/mplayer.desktop" "$pkgdir/usr/share/applications/mplayer.desktop"
-    install -Dm644 etc/mplayer256x256.png "$pkgdir/usr/share/pixmaps/mplayer.png"
+    install -Dm644 "$srcdir/mplayer.desktop" \
+        "$pkgdir/usr/share/applications/mplayer.desktop"
+    install -Dm644 etc/mplayer256x256.png \
+        "$pkgdir/usr/share/pixmaps/mplayer.png"
 }
 
 package_mencoder-libre() {
     pkgdesc="Free command line video decoding, encoding and filtering tool, without nonfree faac support"
-    depends=('enca' 'a52dec' 'libvpx' 'x264' 'libmng' 'libdca' 'bzip2' 'lame' 'alsa-lib' 'fontconfig' 'giflib' 'libpng' 'smbclient' 'xvidcore' 'opencore-amr'
-    'libmad' 'libtheora' 'fribidi' 'libjpeg' 'faad2' 'schroedinger' 'mpg123' 'libass' 'libbluray' 'libcdio-paranoia' 'libvorbis')
+    depends=(
+        'enca' 'a52dec' 'libvpx' 'x264' 'libmng' 'libdca' 'bzip2' 'lame'
+        'alsa-lib' 'fontconfig' 'giflib' 'libpng' 'smbclient' 'xvidcore'
+        'opencore-amr' 'libmad' 'libtheora' 'fribidi' 'libjpeg' 'faad2'
+        'schroedinger' 'mpg123' 'libass' 'libbluray' 'libcdio-paranoia'
+        'libvorbis' 'opus'
+        )
     provides=("mencoder=$pkgver")
     replaces=('mencoder')
     conflicts=('mencoder')
 
-    cd "$srcdir/$_pkgbase-$pkgver"
+    cd $_pkgbase-$pkgver
     make DESTDIR="$pkgdir" install-mencoder install-mencoder-man
     find "$pkgdir/usr/share/man" -name mplayer.1 -exec rename mplayer.1 mencoder.1 {} +
 }
diff --git a/libre/mplayer-libre/include-samba-4.0.patch b/libre/mplayer-libre/include-samba-4.0.patch
new file mode 100644
index 000000000..2ed272b6a
--- /dev/null
+++ b/libre/mplayer-libre/include-samba-4.0.patch
@@ -0,0 +1,12 @@
+diff -rupN a/stream/stream_smb.c b/stream/stream_smb.c
+--- a/stream/stream_smb.c	2013-03-16 13:38:34.000000000 +0000
++++ b/stream/stream_smb.c	2013-10-31 20:05:32.473947926 +0000
+@@ -18,7 +18,7 @@
+ 
+ #include "config.h"
+ 
+-#include <libsmbclient.h>
++#include <samba-4.0/libsmbclient.h>
+ #include <unistd.h>
+ 
+ #include "mp_msg.h"
diff --git a/libre/mplayer-libre/mplayer.desktop b/libre/mplayer-libre/mplayer.desktop
index 07acea13f..946b8e345 100644
--- a/libre/mplayer-libre/mplayer.desktop
+++ b/libre/mplayer-libre/mplayer.desktop
@@ -19,3 +19,4 @@ Terminal=false
 NoDisplay=true
 Categories=GTK;AudioVideo;Audio;Video;Player;TV;
 MimeType=application/ogg;application/x-ogg;application/sdp;application/smil;application/x-smil;application/streamingmedia;application/x-streamingmedia;application/vnd.rn-realmedia;application/vnd.rn-realmedia-vbr;audio/aac;audio/x-aac;audio/m4a;audio/x-m4a;audio/mp1;audio/x-mp1;audio/mp2;audio/x-mp2;audio/mp3;audio/x-mp3;audio/mpeg;audio/x-mpeg;audio/mpegurl;audio/x-mpegurl;audio/mpg;audio/x-mpg;audio/rn-mpeg;audio/scpls;audio/x-scpls;audio/vnd.rn-realaudio;audio/wav;audio/x-pn-windows-pcm;audio/x-realaudio;audio/x-pn-realaudio;audio/x-ms-wma;audio/x-pls;audio/x-wav;video/mpeg;video/x-mpeg;video/x-mpeg2;video/mp4;video/msvideo;video/x-msvideo;video/quicktime;video/vnd.rn-realvideo;video/x-ms-afs;video/x-ms-asf;video/x-ms-wmv;video/x-ms-wmx;video/x-ms-wvxvideo;video/x-avi;video/x-fli;video/x-flv;video/x-theora;video/x-matroska;
+X-KDE-Protocols=http,ftp,smb
diff --git a/libre/mplayer-vaapi-libre/PKGBUILD b/libre/mplayer-vaapi-libre/PKGBUILD
index 71d158d17..a298033c4 100644
--- a/libre/mplayer-vaapi-libre/PKGBUILD
+++ b/libre/mplayer-vaapi-libre/PKGBUILD
@@ -1,15 +1,15 @@
-# $Id: PKGBUILD 95856 2013-08-17 15:21:03Z foutrelis $
+# $Id: PKGBUILD 99192 2013-10-25 12:40:52Z giovanni $
 # Maintainer: Evangelos Foutras <evangelos@foutrelis.com>
 # Contributor: Ionut Biru <ibiru@archlinux.org>
 # Contributor: Hugo Doria <hugo@archlinux.org>
-# Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
+# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
 # Contributor (Parabola): Nicolás Reynolds <fauno@kiwwwi.com.ar>
 # Contributor (Parabola): Márcio Silva <coadde@lavabit.com>
 
 _pkgname=mplayer-vaapi
 pkgname=mplayer-vaapi-libre
 pkgver=36265
-pkgrel=4
+pkgrel=5
 pkgdesc="A movie player, compiled with vaapi support, without nonfree faac support"
 arch=('i686' 'x86_64')
 url="http://gitorious.org/vaapi/mplayer"
diff --git a/libre/netsurf-libre/PKGBUILD b/libre/netsurf-libre/PKGBUILD
index d3c6463a2..bcb40c614 100644
--- a/libre/netsurf-libre/PKGBUILD
+++ b/libre/netsurf-libre/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 95886 2013-08-18 11:31:23Z arodseth $
+# $Id: PKGBUILD 100033 2013-10-31 10:58:22Z arodseth $
 # Maintainer: Alexander Rødseth <rodseth@gmail.com>
 # Contributor: Paulo Matias <matiasΘarchlinux-br·org>
 # Contributor: Georgij Kondratjev <smpuj@bk.ru>
@@ -8,7 +8,7 @@
 _pkgname=netsurf
 pkgname=netsurf-libre
 pkgver=3.0
-pkgrel=4
+pkgrel=5
 pkgdesc='Lightweight and fast web browser, without non-privacy search providers'
 arch=('x86_64' 'i686' 'mips64el')
 url='http://www.netsurf-browser.org/'
@@ -20,9 +20,11 @@ depends=('gtk2' 'libmng' 'curl' 'librsvg' 'desktop-file-utils' 'libnsbmp' 'libns
 makedepends=('js' 're2c' 'gendesk' 'netsurf-buildsystem' 'libglade' 'addinclude')
 install="$_pkgname.install"
 source=("netsurf.png::http://ubuntu.allmyapps.com/data/n/e/netsurf-netsurf-web-browser/icon_48x48_netsurf.png"
-        "http://download.$_pkgname-browser.org/$_pkgname/releases/source/$_pkgname-$pkgver-src.tar.gz")
+        "http://download.$_pkgname-browser.org/$_pkgname/releases/source/$_pkgname-$pkgver-src.tar.gz"
+        'netsurf.sh')
 sha256sums=('f0dbcc5d80bf03d706aa8b28a322aa7f169a40813848c2d1505691f6e2c7ef00'
-            '7c6a48d3cc3e9a3e3a51b532ddf60f7697e97bf8b61a6d3b2ced1a2e89fbccc6')
+            '7c6a48d3cc3e9a3e3a51b532ddf60f7697e97bf8b61a6d3b2ced1a2e89fbccc6'
+            '3efaf14b95c9aeb83caac488135bd5b6040d2ede382caa5589ff7ebd2bd506cc')
 
 prepare() {
   cd "$_pkgname-$pkgver"
@@ -115,6 +117,8 @@ package() {
   cd "$_pkgname-$pkgver"
 
   make install PREFIX=/usr DESTDIR="$pkgdir"
+  mv "$pkgdir/usr/bin/$_pkgname" "$pkgdir/usr/bin/$_pkgname.elf"
+  install -Dm755 "../$_pkgname.sh" "$pkgdir/usr/bin/$_pkgname"
   install -Dm644 "../$_pkgname.png" "$pkgdir/usr/share/pixmaps/$_pkgname.png"
   install -Dm644 "$_pkgname.desktop" \
     "$pkgdir/usr/share/applications/$_pkgname.desktop"
diff --git a/libre/netsurf-libre/netsurf.sh b/libre/netsurf-libre/netsurf.sh
new file mode 100644
index 000000000..49b1e161e
--- /dev/null
+++ b/libre/netsurf-libre/netsurf.sh
@@ -0,0 +1,7 @@
+#!/bin/sh
+shortname=`echo $LANG | cut -b1-2`
+if [[ -d /usr/share/netsurf/$shortname ]]; then
+	/usr/bin/netsurf.elf "$@"
+else
+	LANG=en_US /usr/bin/netsurf.elf "$@"
+fi
diff --git a/libre/newton-dynamics-libre/PKGBUILD b/libre/newton-dynamics-libre/PKGBUILD
index 1702cca70..58569aafc 100644
--- a/libre/newton-dynamics-libre/PKGBUILD
+++ b/libre/newton-dynamics-libre/PKGBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
 # Contributor: Josh Taylor (deficite) <joshtaylor.mail@gmail.com> 
 # Contributor: Christophe Robin (bombstrike) <crobin@php.net> 
-# Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
+# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
 _pkgname=newton-dynamics
 pkgname=newton-dynamics-libre
 pkgver=2.36
diff --git a/libre/ogmrip-libre/PKGBUILD b/libre/ogmrip-libre/PKGBUILD
index 6876f699f..a14f8d877 100644
--- a/libre/ogmrip-libre/PKGBUILD
+++ b/libre/ogmrip-libre/PKGBUILD
@@ -3,7 +3,7 @@
 # Contributor: Daenyth
 # Contributor: Allan McRae <allan@archlinux.org>
 # Contributor: Vrob (Markus Heuser) mheuser@mi.fu-berlin.de
-# Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
+# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
 
 _pkgname=ogmrip
 pkgname=ogmrip-libre
diff --git a/libre/ogmrip-libre/ogmrip.changelog b/libre/ogmrip-libre/ogmrip.changelog
index bf5d84482..27114b508 100644
--- a/libre/ogmrip-libre/ogmrip.changelog
+++ b/libre/ogmrip-libre/ogmrip.changelog
@@ -1,7 +1,7 @@
 2013-04-20 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
 	* ogmrip 1.0.0-1
 
-2013-03-13 André Silva <emulatorman@lavabit.com>
+2013-03-13 André Silva <emulatorman@parabola.nu>
 	* Remove nonfree faac support
 
 2012-06-07 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
diff --git a/libre/openexr-libre/PKGBUILD b/libre/openexr-libre/PKGBUILD
index 638d504b7..36eeb00ef 100644
--- a/libre/openexr-libre/PKGBUILD
+++ b/libre/openexr-libre/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 191713 2013-07-29 10:21:41Z tpowa $
+# $Id: PKGBUILD 196943 2013-10-21 10:31:44Z tpowa $
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
-# Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
+# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
 
 _pkgname=openexr
 pkgname=openexr-libre
 pkgver=2.0.1
-pkgrel=1
+pkgrel=2
 pkgdesc="An high dynamic-range image file format library, without embedded nonfree fonts in the documentation"
 url="http://www.openexr.com/"
 arch=('i686' 'x86_64' 'mips64el')
diff --git a/libre/openshot-libre/PKGBUILD b/libre/openshot-libre/PKGBUILD
index f5762f3e7..ca5b029e7 100644
--- a/libre/openshot-libre/PKGBUILD
+++ b/libre/openshot-libre/PKGBUILD
@@ -1,7 +1,7 @@
 # $Id: PKGBUILD 97284 2013-09-16 08:04:43Z bluewind $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Asa Marco <marcoasa90[at]gmail[.]com>
-# Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
+# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
 
 _pkgname=openshot
 pkgname=openshot-libre
diff --git a/libre/oss-libre/PKGBUILD b/libre/oss-libre/PKGBUILD
index 32ee9db2e..9efb5f0fe 100644
--- a/libre/oss-libre/PKGBUILD
+++ b/libre/oss-libre/PKGBUILD
@@ -3,7 +3,7 @@
 # Contributor: Florian Pritz <bluewind@xinu.at>
 # Contributor: Paulo Matias <matiasΘarchlinux-br·org>
 # Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
-# Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
+# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
 
 pkgname=oss-libre
 pkgver=4.2_2007
diff --git a/libre/pacman/PKGBUILD b/libre/pacman/PKGBUILD
index 1dec5dcc9..ab0f3fb57 100644
--- a/libre/pacman/PKGBUILD
+++ b/libre/pacman/PKGBUILD
@@ -1,11 +1,11 @@
 # vim: set ts=2 sw=2 et:
-# $Id: PKGBUILD 188692 2013-06-18 04:04:38Z allan $
+# $Id: PKGBUILD 197027 2013-10-21 14:05:24Z allan $
 # Maintainer: Dan McGee <dan@archlinux.org>
 # Maintainer: Dave Reisner <dreisner@archlinux.org>
 
 pkgname=pacman
 pkgver=4.1.2
-pkgrel=1
+pkgrel=4
 pkgdesc="A library-based package manager with dependency support"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.archlinux.org/pacman/"
@@ -19,8 +19,6 @@ provides=('pacman-contrib')
 conflicts=('pacman-contrib')
 replaces=('pacman-contrib')
 backup=(etc/pacman.conf etc/makepkg.conf)
-install=pacman.install
-options=(!libtool)
 source=(ftp://ftp.archlinux.org/other/pacman/$pkgname-$pkgver.tar.gz{,.sig}
         pacman.conf.i686
         pacman.conf.x86_64
@@ -31,7 +29,7 @@ md5sums=('063c8b0ff6bdf903dc235445525627cd'
          '688feb0a552f42643a76f72e7198bfe4'
          '765858b55d2112d948932fc645ea538b'
          '9e0c64937ef751ae4273fa4d73381484'
-         '7984963d89784d26b5c50218e2138467')
+         'f0f310df411f943dbc4e2dd376c88662')
 
 build() {
   cd $srcdir/$pkgname-$pkgver
diff --git a/libre/pacman/makepkg.conf b/libre/pacman/makepkg.conf
index a4e7ceada..758d7d029 100644
--- a/libre/pacman/makepkg.conf
+++ b/libre/pacman/makepkg.conf
@@ -67,7 +67,7 @@ BUILDENV=(fakeroot !distcc color !ccache check !sign)
 #   These are default values for the options=() settings
 #########################################################################
 #
-# Default: OPTIONS=(strip docs libtool staticlibs emptydirs zipman purge !upx !debug)
+# Default: OPTIONS=(strip docs !libtool !staticlibs emptydirs zipman purge !upx !debug)
 #  A negated option will do the opposite of the comments below.
 #
 #-- strip:      Strip symbols from binaries/libraries
@@ -80,7 +80,7 @@ BUILDENV=(fakeroot !distcc color !ccache check !sign)
 #-- upx:        Compress binary executable files using UPX
 #-- debug:      Add debugging flags as specified in DEBUG_* variables
 #
-OPTIONS=(strip docs libtool staticlibs emptydirs zipman purge !upx !debug)
+OPTIONS=(strip docs !libtool !staticlibs emptydirs zipman purge !upx !debug)
 
 #-- File integrity checks to use. Valid: md5, sha1, sha256, sha384, sha512
 INTEGRITY_CHECK=(md5)
diff --git a/libre/pacman/pacman.install b/libre/pacman/pacman.install
deleted file mode 100644
index 5dc55c0c2..000000000
--- a/libre/pacman/pacman.install
+++ /dev/null
@@ -1,76 +0,0 @@
-#!/bin/sh
-# arg 1:  the new package version
-# arg 2:  the old package version
-post_upgrade() {
-    # one time stuff for md5sum issue with older pacman versions
-    if [ "$(vercmp $2 3.0.2)" -lt 0 ]; then
-        _resetbackups
-    fi
-    if [ "$(vercmp $2 3.5.0)" -lt 0 ]; then
-        _warnupgrade
-    fi
-    if [ ! -f "etc/pacman.d/gnupg/pubring.gpg" ] || [ "$(vercmp $2 4.0.3-2)" -lt 0 ]; then
-        _check_pubring
-    fi
-}
-
-post_install() {
-    _check_pubring
-}
-
-_check_pubring() {
-    echo " >>> Run  \`pacman-key --init; pacman-key --populate archlinux\`"
-    echo " >>> And  \`pacman-key --populate parabola\`"
-    echo " >>> to import the data required by pacman for package verification."
-    echo " >>> See: https://www.archlinux.org/news/having-pacman-verify-packages"
-}
-
-_warnupgrade() {
-    echo ">>> The pacman database format has changed as of pacman 3.5.0."
-    echo ">>> You will need to run \`pacman-db-upgrade\` as root."
-    echo ">>>"
-}
-
-_resetbackups() {
-    echo ">>> Performing one-time reset of NoUpgrade md5sums. After this reset"
-    echo ">>> you are able to remove all NoUpgrade lines of already protected"
-    echo ">>> files from pacman.conf."
-    echo ">>>"
-
-    # path variables
-    pacconf="/etc/pacman.conf"
-    dbpath="/var/lib/pacman/local"
-
-    # get a list of NoUpgrade files from the user's pacman.conf
-    echo ">>> Retrieving pacman.conf NoUpgrade list..."
-    config=$(grep "^NoUpgrade" $pacconf | cut -d'=' -f2)
-    # add the standard list of files, even if they are already above
-    config="$config \
-    etc/passwd etc/group etc/shadow etc/sudoers \
-    etc/fstab etc/raidtab etc/ld.so.conf \
-    etc/rc.conf etc/rc.local \
-    etc/modprobe.conf etc/modules.conf \
-    etc/lilo.conf boot/grub/menu.lst"
-
-    # blank md5sum for use in sed expression
-    zeroes='00000000000000000000000000000000'
-
-    for file in $config; do
-        echo ">>> -> finding owner of /$file..."
-        line=$(LC_ALL=C LANG=C pacman -Qo /$file 2>/dev/null)
-        # if file is owned by a package, go find its incorrectly stored sum
-        if [ ! -z "$line" ]; then
-            # get the name and version of the package owning file
-            name=$(echo $line | awk '{print $5}')
-            version=$(echo $line | awk '{print $6}')
-            # set the path to the backup array holding the md5sum
-            path="$dbpath/$name-$version/files"
-            # run a sed on the path to reset the line containing $file
-            # NOTE: literal tab characters in sed expression after $file
-            echo ">>> -> resetting sum of /$file..."
-            sed -i "s#$file [0-9a-fA-F]*#$file  $zeroes#" $path
-        else
-            echo ">>> -> $file is unowned."
-        fi
-    done
-}
diff --git a/libre/parabola-keyring/PKGBUILD b/libre/parabola-keyring/PKGBUILD
index dd48634fd..78b27ad5e 100644
--- a/libre/parabola-keyring/PKGBUILD
+++ b/libre/parabola-keyring/PKGBUILD
@@ -1,4 +1,4 @@
-# Maintainer: André Silva <emulatorman@lavabit.com>
+# Maintainer: André Silva <emulatorman@parabola.nu>
 
 pkgname=parabola-keyring
 pkgver=$(LC_ALL=C date -u +%Y%m%d)
diff --git a/libre/parabola-xdg-menu/PKGBUILD b/libre/parabola-xdg-menu/PKGBUILD
index e601bcb41..e70c71b9b 100644
--- a/libre/parabola-xdg-menu/PKGBUILD
+++ b/libre/parabola-xdg-menu/PKGBUILD
@@ -1,7 +1,7 @@
 # $Id: PKGBUILD 91138 2013-05-20 09:52:33Z spupykin $
 # Maintainer: Sergej Pupykin <sergej@aur.archlinux.org>
 # Contributor: Sergej Pupykin <sergej@aur.archlinux.org>
-# Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
+# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
 
 pkgname=parabola-xdg-menu
 pkgver=0.7.6.1
diff --git a/libre/psi/PKGBUILD b/libre/psi/PKGBUILD
index 16c9e2b78..e37c37f05 100644
--- a/libre/psi/PKGBUILD
+++ b/libre/psi/PKGBUILD
@@ -1,10 +1,11 @@
-# $Id$
+# $Id: PKGBUILD 196956 2013-10-21 11:28:57Z pierre $
 # Maintainer: Pierre Schmitz <pierre@archlinux.de>
+# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
 
 pkgname=psi
 pkgver=0.15
-pkgrel=1.1
-pkgdesc='Instant messaging application designed for the Jabber IM, Parabola rebranded'
+pkgrel=2
+pkgdesc='Instant messaging application designed for the Jabber IM (Parabola rebranded)'
 url='http://psi-im.org/'
 license=('GPL')
 arch=('i686' 'x86_64' 'mips64el')
@@ -16,9 +17,13 @@ source=("http://downloads.sourceforge.net/psi/psi-${pkgver}.tar.bz2"
 md5sums=('aea15f17cf93e7cea52f305523f761be'
          'a641b77517c82c6e1f254d5595a25113')
 
-build() {
+prepare() {
 	cd ${srcdir}/psi-${pkgver}
 	patch -p0 -i ${srcdir}/parabola.patch
+}
+
+build() {
+	cd ${srcdir}/psi-${pkgver}
 	./configure --prefix=/usr --release --no-separate-debug-info
 	make
 }
diff --git a/libre/psutils-libre/PKGBUILD b/libre/psutils-libre/PKGBUILD
index 4a55ea38e..a9f697ae0 100644
--- a/libre/psutils-libre/PKGBUILD
+++ b/libre/psutils-libre/PKGBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Ronald van Haren <ronald.archlinux.org>
 # Contributor: eric <eric@archlinux.org>
 # Contributor: Tom Newsom <Jeepster@gmx.co.uk>
-# Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
+# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
 # Contributor (Parabola): xihh <hahj87@gmail.com>
 
 _pkgname=psutils
diff --git a/libre/python2-reportlab-libre/PKGBUILD b/libre/python2-reportlab-libre/PKGBUILD
index 85f367409..0fc667e51 100755
--- a/libre/python2-reportlab-libre/PKGBUILD
+++ b/libre/python2-reportlab-libre/PKGBUILD
@@ -4,7 +4,7 @@
 # Contributor: William Rea <sillywilly@gmail.com>
 # Maintainer (Parabola): fauno <fauno@kiwwwi.com.ar>
 # Contributor: borgo <nomail>
-# Contributor (Parabola): André Silva <emulatorman@lavabit.com>
+# Contributor (Parabola): André Silva <emulatorman@parabola.nu>
 
 pkgbase=python-reportlab-libre
 pkgname=python2-reportlab-libre
diff --git a/libre/rp-pppoe-libre/PKGBUILD b/libre/rp-pppoe-libre/PKGBUILD
index 1cb968c35..f7adb5b80 100644
--- a/libre/rp-pppoe-libre/PKGBUILD
+++ b/libre/rp-pppoe-libre/PKGBUILD
@@ -1,7 +1,7 @@
 # $Id: PKGBUILD 186154 2013-05-21 10:00:49Z tpowa $
 # Maintainer: Daniel Isenmann <daniel@archlinux.org>
 # Contributor: orelien <aurelien.foret@wanadoo.fr>
-# Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
+# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
 
 _pkgname=rp-pppoe
 pkgname=rp-pppoe-libre
diff --git a/libre/ruby-rdiscount/PKGBUILD b/libre/ruby-rdiscount/PKGBUILD
index 76e4b58bd..b6cbcc4cc 100644
--- a/libre/ruby-rdiscount/PKGBUILD
+++ b/libre/ruby-rdiscount/PKGBUILD
@@ -4,24 +4,18 @@
 
 _gemname=rdiscount
 pkgname=ruby-$_gemname
-pkgver=1.6.5
+pkgver=2.1.6
 pkgdesc="C implementation of John Gruber's Markdown."
 url="http://dafoster.net/projects/rdiscount/"
 
-# About the license: It is a 4-clause BSD license with the 3rd clause modified
-# to mention documentation instead of advertising.  Not to be confused with
-# "Modified BSD", which the FSF uses to refer to a 3-clause BSD license
-# (dropping the 3rd clause).  Because of the way it is modified, it doesn't have
-# the problems normally associated with the 4-clause BSD license.
-license=('custom:modified-BSD4')
+license=('BSD3')
 
-pkgrel=2
+pkgrel=1
 arch=('i686' 'x86_64')
 depends=('ruby')
 makedepends=('rubygems')
 source=(http://rubygems.org/downloads/$_gemname-$pkgver.gem)
 noextract=($_gemname-$pkgver.gem)
-md5sums=('2de321f1ba826f80b84fe45c0d013fcf')
 
 package() {
   cd "${srcdir}"
@@ -36,3 +30,5 @@ package() {
     install -Dm644 "$file" "$pkgdir"/usr/share/man/man${file##*.}/${file##*/}
   done
 }
+
+md5sums=('99c5a8f33f6796e766f0b8e73b0519c6')
diff --git a/libre/sdl-libre/PKGBUILD b/libre/sdl-libre/PKGBUILD
index d9bd4c63f..63b2b36f3 100644
--- a/libre/sdl-libre/PKGBUILD
+++ b/libre/sdl-libre/PKGBUILD
@@ -1,14 +1,14 @@
-# $Id: PKGBUILD 166672 2012-09-15 09:39:11Z heftig $
+# $Id: PKGBUILD 198628 2013-10-31 13:07:39Z heftig $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Contributor: Allan McRae <allan@archlinux.org>
 # Contributor: dorphell <dorphell@archlinux.org>
-# Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
+# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
 # Maintainer (Parabola): Márcio Silva <coadde@lavabit.com>
 # Maintainer (Connochaetos): Henry Jensen <hjensen@connochaetos.org>
 
 pkgname=sdl-libre
 pkgver=1.2.15
-pkgrel=3.1
+pkgrel=5
 pkgdesc="A library for portable low-level access to a video framebuffer, audio output, mouse, and keyboard"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.libsdl.org"
@@ -17,30 +17,37 @@ provides=("sdl=${pkgver}")
 conflicts=('sdl')
 replaces=('sdl')
 depends=('glibc' 'libxext' 'libxrender' 'libx11')
-makedepends=('alsa-lib' 'mesa' 'libpulse')
+makedepends=('alsa-lib' 'mesa' 'libpulse' 'glu')
 optdepends=('alsa-lib: ALSA audio driver'
             'libpulse: PulseAudio audio driver')
-options=('!libtool')
+options=('staticlibs')
 source=(http://www.libsdl.org/release/SDL-${pkgver}.tar.gz
         sdl-1.2.14-fix-mouse-clicking.patch
         sdl-1.2.14-disable-mmx.patch
         fix_joystick_misc_axes.diff
         libsdl-1.2.15-resizing.patch
+        sdl_x11sym.patch
         libre.patch)
 md5sums=('9d96df8417572a2afb781a7c4c811a85'
          '04d8c179f125e04bcd4c9d60e013c2d7'
          'e5c16b7611f62c7cb25f0534eff68852'
          '687586a108b597a2a6b73070c1d37e51'
          '3dd50347d8856160a9cbd7f80383a1f8'
+         '148b285bccee9d21bb96db807363b962'
          '5c665f72b8a2adc97a91f6db6f2da79a')
 
-build() {
+prepare() {
   cd SDL-$pkgver
   patch -Np1 -i ../sdl-1.2.14-fix-mouse-clicking.patch
   patch -Np1 -i ../sdl-1.2.14-disable-mmx.patch
   patch -Np1 -i ../fix_joystick_misc_axes.diff
   patch -Np1 -i ../libsdl-1.2.15-resizing.patch
+  patch -Np0 -i ../sdl_x11sym.patch
   patch -Np0 -i ../libre.patch
+}
+
+build() {
+  cd SDL-$pkgver
   ./configure --prefix=/usr --disable-nasm --enable-alsa \
               --with-x --disable-rpath --disable-static
   make
diff --git a/libre/sdl-libre/sdl_x11sym.patch b/libre/sdl-libre/sdl_x11sym.patch
new file mode 100644
index 000000000..9aaa2353b
--- /dev/null
+++ b/libre/sdl-libre/sdl_x11sym.patch
@@ -0,0 +1,12 @@
+--- src/video/x11/SDL_x11sym.h-orig	2013-07-16 23:56:46.718523385 -0600
++++ src/video/x11/SDL_x11sym.h	2013-07-16 23:58:27.025186485 -0600
+@@ -165,7 +165,8 @@
+  */
+ #ifdef LONG64
+ SDL_X11_MODULE(IO_32BIT)
+-SDL_X11_SYM(int,_XData32,(Display *dpy,register long *data,unsigned len),(dpy,data,len),return)
++
++SDL_X11_SYM(int,_XData32,(Display *dpy,register _Xconst long *data,unsigned len),(dpy,data,len),return)
+ SDL_X11_SYM(void,_XRead32,(Display *dpy,register long *data,long len),(dpy,data,len),)
+ #endif
+ 
diff --git a/libre/soundkonverter-libre/PKGBUILD b/libre/soundkonverter-libre/PKGBUILD
index 5e87a1e8c..80b19719e 100644
--- a/libre/soundkonverter-libre/PKGBUILD
+++ b/libre/soundkonverter-libre/PKGBUILD
@@ -3,7 +3,7 @@
 # Contributor: Mateusz Herych <heniekk@gmail.com>
 # Contributor: Eric Belanger <eric@archlinux.org>
 # Contributor: Darwin Bautista <djclue917@gmail.com>
-# Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
+# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
 
 _pkgname=soundkonverter
 pkgname=soundkonverter-libre
diff --git a/libre/stuntrally-data-libre/PKGBUILD b/libre/stuntrally-data-libre/PKGBUILD
index fd5d175be..31830f197 100644
--- a/libre/stuntrally-data-libre/PKGBUILD
+++ b/libre/stuntrally-data-libre/PKGBUILD
@@ -1,5 +1,5 @@
 # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
-# Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
+# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
 
 pkgname=stuntrally-data-libre
 _pkgname=stuntrally-data
diff --git a/libre/syslinux/PKGBUILD b/libre/syslinux/PKGBUILD
index 01505c5d2..ad30022df 100644
--- a/libre/syslinux/PKGBUILD
+++ b/libre/syslinux/PKGBUILD
@@ -1,57 +1,170 @@
-# Maintainer: Thomas Bächler <thomas@archlinux.org>
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
-# Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
+# Maintainer: Thomas Bächler <thomas@archlinux.org>
+# Contributor: Keshav Padram (the.ridikulus.rat) (aatt) (gemmaeiil) (ddoott) (ccoomm)>
+# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
 
-pkgname=syslinux
-pkgver=4.07
-pkgrel=1.1
-arch=('i686' 'x86_64')
+pkgname="syslinux"
+pkgver="6.02"
+pkgrel="4"
+arch=('x86_64' 'i686')
 pkgdesc="Collection of boot loaders that boot from FAT, ext2/3/4 and btrfs filesystems, from CDs and via PXE (Parabola rebranded)"
 url="http://syslinux.zytor.com/"
 license=('GPL2')
+options=('!makeflags' '!emptydirs')
+backup=('boot/syslinux/syslinux.cfg'
+        'boot/syslinux/splash.png')
+makedepends=('python2' 'nasm' 'gnu-efi-libs')
 depends=('perl' 'glibc')
 optdepends=('perl-passwd-md5:  For md5pass'
             'perl-digest-sha1: For sha1pass'
             'mtools:           For mkdiskimage and syslinux support'
             'gptfdisk:         For GPT support'
-            'util-linux:       For isohybrid')
-makedepends=('nasm')
-backup=('boot/syslinux/syslinux.cfg'
-        'boot/syslinux/splash.png')
-install=syslinux.install
-source=(http://www.kernel.org/pub/linux/utils/boot/syslinux/$pkgname-${pkgver}.tar.bz2
-        syslinux-dont-build-dos-windows-targets.patch
-        syslinux.cfg
-        syslinux-install_update
-        splash.png)
-md5sums=('9ff6e1b94efab931fb4717b600d88779'
-         '1528c376e43f0eaccaa80d8ad1bc13b4'
-         'a43bd903face611bcc148522265dfe6c'
-         '8559fb3daf3afa8688600d8a38118918'
+            'util-linux:       For isohybrid'
+            'efibootmgr:       For EFI support'
+            'dosfstools:       For EFI support')
+install="${pkgname}.install"
+source=("https://www.kernel.org/pub/linux/utils/boot/syslinux/${pkgname}-${pkgver}.tar.xz"
+        'syslinux.cfg'
+        'syslinux-install_update'
+        'syslinux-6.02-fix-chainloading.patch'
+        'splash.png')
+md5sums=('6f275813a1b08cf852e55c0a3f8fbc78'
+         'f048880b57e2c5a7017ff8804bfda327'
+         '9da2b8b25ea8d628887f11749dc3fffa'
+         '9dbede6b71a4de9e46aac4aad65334d7'
          'cb46ca47c6b6323127d908440057d98f')
 
+_build_syslinux_bios() {
+    
+    rm -rf "${srcdir}/${pkgname}-${pkgver}-bios/" || true
+    cp -r "${srcdir}/${pkgname}-${pkgver}" "${srcdir}/${pkgname}-${pkgver}-bios"
+    cd "${srcdir}/${pkgname}-${pkgver}-bios/"
+    
+    ## Do not try to build syslinux with our default LDFLAGS, it will fail
+    unset LDFLAGS
+    make PYTHON="python2" bios
+    make PYTHON="python2" bios installer 
+}
+
+_build_syslinux_efi64() {
+    
+    rm -rf "${srcdir}/${pkgname}-${pkgver}-efi64/" || true
+    cp -r "${srcdir}/${pkgname}-${pkgver}" "${srcdir}/${pkgname}-${pkgver}-efi64"
+    cd "${srcdir}/${pkgname}-${pkgver}-efi64/"
+    
+    ## Unset all compiler FLAGS for efi64 build
+    unset CFLAGS
+    unset CPPFLAGS
+    unset CXXFLAGS
+    unset LDFLAGS
+    unset MAKEFLAGS
+    
+    make PYTHON="python2" efi64
+    make PYTHON="python2" efi64 installer 
+}
+
+_build_syslinux_efi32() {
+    
+    rm -rf "${srcdir}/${pkgname}-${pkgver}-efi32/" || true
+    cp -r "${srcdir}/${pkgname}-${pkgver}" "${srcdir}/${pkgname}-${pkgver}-efi32"
+    cd "${srcdir}/${pkgname}-${pkgver}-efi32/"
+    
+    ## Unset all compiler FLAGS for efi32 build
+    unset CFLAGS
+    unset CPPFLAGS
+    unset CXXFLAGS
+    unset LDFLAGS
+    unset MAKEFLAGS
+    
+    make PYTHON="python2" efi32
+    make PYTHON="python2" efi32 installer 
+}
+
 build() {
-  # Do not try to build syslinux with our default LDFLAGS, it will fail
-  unset LDFLAGS
-  cd "$srcdir"/$pkgname-${pkgver}
-  # Do not try to build the Windows or DOS installers
-  patch -p1 -i "$srcdir"/syslinux-dont-build-dos-windows-targets.patch
-  # Fix FHS manpage path
-  sed 's|/usr/man|/usr/share/man|g' -i mk/syslinux.mk
-  make installer
-  make -C utils
-  make -C com32
+    
+    cd "${srcdir}/${pkgname}-${pkgver}/"
+    
+    ## Do not try to build the Windows or DOS installers and DIAG files
+    sed 's|diag libinstaller dos win32 win64 dosutil txt|libinstaller txt|g' -i "${srcdir}/${pkgname}-${pkgver}/Makefile" || true
+    sed 's|win32/syslinux.exe win64/syslinux64.exe||g' -i "${srcdir}/${pkgname}-${pkgver}/Makefile" || true
+    sed 's|dosutil/*.com dosutil/*.sys||g' -i "${srcdir}/${pkgname}-${pkgver}/Makefile" || true
+    sed 's|dos/syslinux.com||g' -i "${srcdir}/${pkgname}-${pkgver}/Makefile" || true
+    sed 's|INSTALLSUBDIRS = com32 utils dosutil|INSTALLSUBDIRS = com32 utils|g' -i "${srcdir}/${pkgname}-${pkgver}/Makefile" || true
+    sed 's|install -m 644 -c $(INSTALL_DIAG) $(INSTALLROOT)$(DIAGDIR)|# install -m 644 -c $(INSTALL_DIAG) $(INSTALLROOT)$(DIAGDIR)|g' -i "${srcdir}/${pkgname}-${pkgver}/Makefile" || true
+    
+    ## Fix FHS manpage path
+    sed 's|/usr/man|/usr/share/man|g' -i "${srcdir}/${pkgname}-${pkgver}/mk/syslinux.mk" || true
+    
+    # fix chainloading
+    # http://bugzilla.syslinux.org/show_bug.cgi?id=31
+    # http://www.syslinux.org/archives/2013-October/020971.html
+    patch -Np1 -i "${srcdir}/syslinux-6.02-fix-chainloading.patch"
+
+    ## Build syslinux-efi
+    if [[ "${CARCH}" == "x86_64" ]]; then
+        _build_syslinux_efi64
+    fi
+    
+    if [[ "${CARCH}" == "i686" ]]; then
+        _build_syslinux_efi32
+    fi
+    
+    ## Build syslinux-bios
+    _build_syslinux_bios
+    
+}
+
+_package_syslinux_bios() {
+    
+    cd "${srcdir}/${pkgname}-${pkgver}-bios/"
+    
+    ## Install Syslinux bios
+    make INSTALLROOT="${pkgdir}/" AUXDIR="/usr/lib/syslinux/bios/" bios install
+    
+    ## Remove syslinux.exe,syslinux64.exe,syslinux.com and dosutil dir
+    rm "${pkgdir}/usr/lib/syslinux/bios"/syslinux.{com,exe} || true
+    rm "${pkgdir}/usr/lib/syslinux/bios/syslinux64.exe" || true
+    rm -rf "${pkgdir}/usr/lib/syslinux/bios/dosutil/" || true
+    
+    ## Remove com32 and diag dirs
+    rm -rf "${pkgdir}/usr/lib/syslinux/bios/diag/" || true
+    rm -rf "${pkgdir}/usr/lib/syslinux/bios/com32/" || true
+    
+    ## Move extlinux binary to /usr/bin
+    install -d "${pkgdir}/usr/bin"
+    mv "${pkgdir}/sbin/extlinux" "${pkgdir}/usr/bin/extlinux"
+    rm -rf "${pkgdir}/sbin/"
+    
+    ## Install docs
+    install -d "${pkgdir}/usr/share/doc"
+    cp -ar "${srcdir}/${pkgname}-${pkgver}/doc" "${pkgdir}/usr/share/doc/syslinux"
+    
+    ## Install the default configuration
+    install -D -m0644 "${srcdir}/syslinux.cfg" "${pkgdir}/boot/syslinux/syslinux.cfg"
+    
+    ## Install the installation and update script
+    ## This script is maintained at git://gist.github.com/772138.git
+    ## Script not yet updated for syslinux-efi
+    install -D -m0755 "${srcdir}/syslinux-install_update" "${pkgdir}/usr/bin/syslinux-install_update"
+    
+    # Install Parabola splash
+    install -D -m644 "${srcdir}/splash.png" "${pkgdir}/boot/syslinux/splash.png"
 }
 
 package() {
-  cd "$srcdir"/$pkgname-${pkgver}
-  make INSTALLROOT="$pkgdir" SBINDIR=/usr/bin AUXDIR=/usr/lib/syslinux install
-
-  # Install the default configuration
-  install -D -m644 "$srcdir"/syslinux.cfg "$pkgdir"/boot/syslinux/syslinux.cfg
-  # Install Parabola splash
-  install -D -m644 "$srcdir"/splash.png "$pkgdir"/boot/syslinux/splash.png
-  # Install the installation and update script
-  # This script is maintained at git://gist.github.com/772138.git
-  install -D -m755 "$srcdir"/syslinux-install_update "$pkgdir"/usr/bin/syslinux-install_update
+    
+    cd "${srcdir}/${pkgname}-${pkgver}/"
+    
+    if [[ "${CARCH}" == "x86_64" ]]; then
+        cd "${srcdir}/${pkgname}-${pkgver}-efi64/"
+        make INSTALLROOT="${pkgdir}/" AUXDIR="/usr/lib/syslinux/" efi64 install
+    fi
+    
+    if [[ "${CARCH}" == "i686" ]]; then
+        cd "${srcdir}/${pkgname}-${pkgver}-efi32/"
+        make INSTALLROOT="${pkgdir}/" AUXDIR="/usr/lib/syslinux/" efi32 install
+    fi
+    
+    _package_syslinux_bios
+    
 }
diff --git a/libre-testing/syslinux/syslinux-6.00-efi-export-kbdmap.patch b/libre/syslinux/syslinux-6.00-efi-export-kbdmap.patch
index cbcd9a6da..cbcd9a6da 100644
--- a/libre-testing/syslinux/syslinux-6.00-efi-export-kbdmap.patch
+++ b/libre/syslinux/syslinux-6.00-efi-export-kbdmap.patch
diff --git a/libre-testing/syslinux/syslinux-6.00-efi-fix-libcom32.patch b/libre/syslinux/syslinux-6.00-efi-fix-libcom32.patch
index 7460cd195..7460cd195 100644
--- a/libre-testing/syslinux/syslinux-6.00-efi-fix-libcom32.patch
+++ b/libre/syslinux/syslinux-6.00-efi-fix-libcom32.patch
diff --git a/libre/syslinux/syslinux-6.02-fix-chainloading.patch b/libre/syslinux/syslinux-6.02-fix-chainloading.patch
new file mode 100644
index 000000000..6fd7ef4a8
--- /dev/null
+++ b/libre/syslinux/syslinux-6.02-fix-chainloading.patch
@@ -0,0 +1,47 @@
+Reported-by: Dark Raven <drdarkraven at gmail.com>
+Signed-off-by: Raphael S. Carvalho <raphael.scarv at gmail.com>
+---
+ com32/lib/syslinux/disk.c |   22 ++++++++++++++--------
+ 1 files changed, 14 insertions(+), 8 deletions(-)
+
+diff --git a/com32/lib/syslinux/disk.c b/com32/lib/syslinux/disk.c
+index 0b0c737..47ecb52 100644
+--- a/com32/lib/syslinux/disk.c
++++ b/com32/lib/syslinux/disk.c
+@@ -171,22 +171,28 @@ out:
+ static void *ebios_setup(const struct disk_info *const diskinfo, com32sys_t *inreg,
+ 			 uint64_t lba, uint8_t count, uint8_t op_code)
+ {
+-    static __lowmem struct disk_ebios_dapa dapa;
++    static struct disk_ebios_dapa *dapa = NULL;
+     void *buf;
+
++    if (!dapa) {
++	dapa = lmalloc(sizeof *dapa);
++	if (!dapa)
++	    return NULL;
++    }
++
+     buf = lmalloc(count * diskinfo->bps);
+     if (!buf)
+ 	return NULL;
+
+-    dapa.len = sizeof(dapa);
+-    dapa.count = count;
+-    dapa.off = OFFS(buf);
+-    dapa.seg = SEG(buf);
+-    dapa.lba = lba;
++    dapa->len = sizeof(*dapa);
++    dapa->count = count;
++    dapa->off = OFFS(buf);
++    dapa->seg = SEG(buf);
++    dapa->lba = lba;
+
+     inreg->eax.b[1] = op_code;
+-    inreg->esi.w[0] = OFFS(&dapa);
+-    inreg->ds = SEG(&dapa);
++    inreg->esi.w[0] = OFFS(dapa);
++    inreg->ds = SEG(dapa);
+     inreg->edx.b[0] = diskinfo->disk;
+
+     return buf;
diff --git a/libre/syslinux/syslinux-dont-build-dos-windows-targets.patch b/libre/syslinux/syslinux-dont-build-dos-windows-targets.patch
index 2b86ab828..54151ab87 100644
--- a/libre/syslinux/syslinux-dont-build-dos-windows-targets.patch
+++ b/libre/syslinux/syslinux-dont-build-dos-windows-targets.patch
@@ -4,9 +4,9 @@ diff -Nur syslinux-4.02.orig//Makefile syslinux-4.02//Makefile
 @@ -54,7 +54,7 @@
  # files that depend only on the B phase, but may have to be regenerated
  # for "make installer".
- BSUBDIRS = codepage com32 lzo core memdisk modules mbr memdump gpxe sample \
--	   diag libinstaller dos win32 win64 dosutil
-+	   libinstaller
+ BSUBDIRS = codepage com32 lzo core memdisk mbr memdump gpxe sample \
+-	   diag libinstaller dos win32 win64 dosutil txt
++	   libinstaller txt
  ITARGET  =
  IOBJECTS = $(ITARGET) \
  	utils/gethostip utils/isohybrid utils/mkdiskimage \
diff --git a/libre/syslinux/syslinux-install_update b/libre/syslinux/syslinux-install_update
index 34fe8e916..251b9c482 100644
--- a/libre/syslinux/syslinux-install_update
+++ b/libre/syslinux/syslinux-install_update
@@ -1,7 +1,8 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
-# Sylinux Installer / Updater Scripts
-# Copyright (C) 2011  Matthew Gyurgyik <pyther@pyther.net>
+# Syslinux Installer / Updater Script (for BIOS only)
+# Copyright (C) 2011-2013  Matthew Gyurgyik <pyther@pyther.net>
+# Copyright (C) 2013  Keshav Padram Amburay <(the) (ddoott) (ridikulus) (ddoott) (rat) (aatt) (gemmaeiil) (ddoott) (ccoomm)>
 #
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License
@@ -18,21 +19,25 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #
 #-----------------
+# ChangeLog:
+# 2013-10-23 : Keshav Padram Amburay : Updated script to work with Syslinux 6.02 Parabola GNU/Linux-libre pkg
+# 2013-10-30 : André Silva : Rebranded script for Parabola
+#-----------------
 # Exit Codes:
 #   1 - get_boot_device or other function failed
 #   2 - install/update failed
 #   3 - set_active failed
 #   4 - install_mbr failed
-#
+#-----------------
+
 shopt -s nullglob
 
-libpath="/usr/lib/syslinux"
-bootpath="/boot/syslinux"
-extlinux="/usr/bin/extlinux"
+bios_libpath="/usr/lib/syslinux/bios"
+bios_bootpath="/boot/syslinux"
+EXTLINUX="/usr/bin/extlinux"
 
-autoupdate_file=/boot/syslinux/SYSLINUX_AUTOUPDATE
-com32_files=(menu.c32 vesamenu.c32 chain.c32 hdt.c32 reboot.c32 poweroff.com)
-pciids_file=/usr/share/hwdata/pci.ids
+bios_autoupdate_file="/boot/syslinux/SYSLINUX_AUTOUPDATE"
+pciids_file="/usr/share/hwdata/pci.ids"
 
 ## Helper functions ##
 # Taken from libui-sh
@@ -120,7 +125,7 @@ usage() {
 cat << EOF
 usage: $0 options
 
-This script will install or upgrade Syslinux
+This script will install or upgrade Syslinux (for BIOS only)
 
 OPTIONS:
   -h    Show this message
@@ -133,16 +138,16 @@ OPTIONS:
  Arguments Required:
   -c    Chroot install (ex: -c /mnt)
 
-Example Usage: syslinux-install_update.sh -i -a -m (install, set boot flag, install mbr)
-               syslinux-install_update.sh -u (update)
+Example Usage: $0 -i -a -m     # (install, set boot flag, install mbr)
+               $0 -u           # (update)
 EOF
 }
 
 # Trys to find the partition that /boot resides on
 # This will either be on /boot or / (root)
 getBoot() {
-    if [[ ! -d "$bootpath" ]]; then
-        echo "Could not find $bootpath"
+    if [[ ! -d "$bios_bootpath" ]]; then
+        echo "Could not find $bios_bootpath"
         echo "Is boot mounted? Is Syslinux installed?"
         exit 1
     fi
@@ -278,9 +283,9 @@ install_mbr() {
         { echo "ABORT! MBR installation to partition ($disk)!"; exit 4;}
 
         if [[ "$ptb" = MBR ]]; then
-            mbrfile="$libpath/mbr.bin"
+            mbrfile="$bios_libpath/mbr.bin"
         elif [[ "$ptb" = GPT ]]; then
-            mbrfile="$libpath/gptmbr.bin"
+            mbrfile="$bios_libpath/gptmbr.bin"
         fi
 
         if dd bs=440 count=1 conv=notrunc if="$mbrfile" of="$disk" &> /dev/null; then
@@ -293,67 +298,53 @@ install_mbr() {
     return 0
 }
 
-_install() {
-    # Copy files to /boot
-    for file in "${com32_files[@]}"; do
-        # Symlink files even if links exist
-        if [[ "$boot" = root ]]; then
-            ln -s "${libpath#$CHROOT}/$file" "$bootpath/$file" &> /dev/null
-        elif [[ "$boot" = boot ]]; then
-            cp "$libpath/$file" "$bootpath/$file"
-        fi
-    done
+install_modules() {
+    # Copy all syslinux *.c32 modules to /boot
+    rm "$bios_bootpath"/*.c32 &> /dev/null
+    cp "$bios_libpath"/*.c32 "$bios_bootpath"/ &> /dev/null
 
-    # Copy / Symlink pci.ids if we copy the com32 module and if pci.ids exists in the FS
-    if check_is_in "hdt.c32" "${com32_files[@]}" && [[ -f $pciids_file ]]; then 
-        if [[ "$boot" = root ]]; then
-            ln -s "$pciids_file" "$bootpath/pci.ids" &> /dev/null
-        elif [[ "$boot" = boot ]]; then
-            cp "$pciids_file" "$bootpath/pci.ids" &> /dev/null
-        fi
+    # Copy / Symlink pci.ids if pci.ids exists on the FS
+    if [[ -f "$pciids_file" ]]; then
+        rm "$bios_bootpath/pci.ids" &> /dev/null
+        cp "$pciids_file" "$bios_bootpath/pci.ids" &> /dev/null
     fi
+}
 
-    if device_is_raid "$bootpart"; then
+_install() {
+    install_modules
+
+    if device_is_raid "$bootpart" ; then
         echo "Detected RAID on /boot - installing Syslinux with --raid"
-        "$extlinux" --install "$bootpath" -r > /dev/null 2>&1
+        "$EXTLINUX" --install "$bios_bootpath" --raid &> /dev/null
     else
-        "$extlinux" --install "$bootpath" > /dev/null 2>&1
+        "$EXTLINUX" --install "$bios_bootpath" &> /dev/null
     fi
 
     if (( $? )); then
-        echo "Syslinux install failed"
+        echo "Syslinux BIOS install failed"
         exit 2
     else
-        echo "Syslinux install successful"
+        echo "Syslinux BIOS install successful"
     fi
 
-    touch "$CHROOT/$autoupdate_file"
+    touch "$CHROOT/$bios_autoupdate_file"
 }
 
 update() {
-    # Update any com and c32 files in /boot
-    if [[ "$boot" = boot ]]; then
-        for file in "$bootpath"/*.{c32,com}; do
-            file=$(basename "$file")
-            cp "$libpath/$file" "$bootpath/$file" &> /dev/null
-        done
-        if [[ -f "$bootpath/pci.ids" ]]; then
-            cp "$pciids_file" "$bootpath/pci.ids" &> /dev/null
-        fi
-    fi
+    install_modules
 
-    if device_is_raid $bootpart; then
+    if device_is_raid "$bootpart" ; then
         echo "Detected RAID on /boot - installing Syslinux with --raid"
-        "$extlinux" --update "$bootpath" -r &> /dev/null
+        "$EXTLINUX" --update "$bios_bootpath" --raid &> /dev/null
     else
-        "$extlinux" --update "$bootpath" &> /dev/null
+        "$EXTLINUX" --update "$bios_bootpath" &> /dev/null
     fi
 
     if (($?)); then
-        echo "Syslinux update failed"
+        echo "Syslinux BIOS update failed"
         exit 2
     else
-        echo "Syslinux update successful"
+        echo "Syslinux BIOS update successful"
     fi
 }
 
@@ -388,7 +379,7 @@ while getopts "c:uihmas" opt; do
             ;;
         s)
             # If AUTOUPDATE_FILE does not exist exit the script
-            if [[ -f $autoupdate_file ]]; then
+            if [[ -f $bios_autoupdate_file ]]; then
                 UPDATE="True"
             else
                 exit 0
@@ -406,28 +397,28 @@ if [[ $USAGE ]]; then
     exit 0
 fi
 
-# Make sure only root can run our script
-if (( $(id -u) != 0 )); then
-    echo "This script must be run as root" 1>&2
-    exit 1
-fi
-
 # Display Usage Information if both Install and Update are passed
 if [[ $INSTALL && $UPDATE ]]; then
     usage
     exit 1
 fi
 
+# Make sure only root can run our script
+if (( $(id -u) != 0 )); then
+    echo "This script must be run as root" 1>&2
+    exit 1
+fi
+
 # If a chroot dir is path set variables to reflect chroot
 if [[ "$CHROOT" ]]; then
-    libpath="$CHROOT$libpath"
-    bootpath="$CHROOT$bootpath"
-    extlinux="$CHROOT$extlinux"
+    bios_libpath="$CHROOT$bios_libpath"
+    bios_bootpath="$CHROOT$bios_bootpath"
+    EXTLINUX="$CHROOT$EXTLINUX"
 fi
 
 # Exit if no /boot path exists
-if ( f=("$bootpath"/*); (( ! ${#f[@]} )) ); then
-    echo "Error: $bootpath is empty!"
+if ( f=("$bios_bootpath"/*); (( ! ${#f[@]} )) ); then
+    echo "Error: $bios_bootpath is empty!"
     echo "Is /boot mounted?"
     exit 1
 fi
diff --git a/libre/syslinux/syslinux.cfg b/libre/syslinux/syslinux.cfg
index e7199438f..0c0c6339a 100644
--- a/libre/syslinux/syslinux.cfg
+++ b/libre/syslinux/syslinux.cfg
@@ -7,7 +7,6 @@
 #   * chain.c32 - chainload MBRs, partition boot sectors, Windows bootloaders
 #   * hdt.c32 - hardware detection tool
 #   * reboot.c32 - reboots the system
-#   * poweroff.com - shutdown the system
 #
 # To Use: Copy the respective files from /usr/lib/syslinux to /boot/syslinux.
 # If /usr and /boot are on the same file system, symlink the files instead
@@ -50,21 +49,21 @@ MENU COLOR tabmsg       35;40   #ff777caa #00000000 std
 #-*
 
 LABEL parabola
-	MENU LABEL Parabola GNU/Linux-libre
-	LINUX ../vmlinuz-linux-libre
-	APPEND root=/dev/sda3 rw
-	INITRD ../initramfs-linux-libre.img
+    MENU LABEL Parabola GNU/Linux-libre
+    LINUX ../vmlinuz-linux-libre
+    APPEND root=/dev/sda3 rw
+    INITRD ../initramfs-linux-libre.img
 
 LABEL parabolafallback
-	MENU LABEL Parabola GNU/Linux-libre Fallback
-	LINUX ../vmlinuz-linux-libre
-	APPEND root=/dev/sda3 rw
-	INITRD ../initramfs-linux-libre-fallback.img
+    MENU LABEL Parabola GNU/Linux-libre Fallback
+    LINUX ../vmlinuz-linux-libre
+    APPEND root=/dev/sda3 rw
+    INITRD ../initramfs-linux-libre-fallback.img
 
 # If you want Memtest on syslinux, use this LABEL section to launch it (install the memtest86+ package)
-#	LABEL memtest
-#	MENU LABEL Memtest86+
-#	LINUX ../memtest86+/memtest.bin
+#    LABEL memtest
+#    MENU LABEL Memtest86+
+#    LINUX ../memtest86+/memtest.bin
 
 LABEL hdt
         MENU LABEL HDT (Hardware Detection Tool)
@@ -73,7 +72,7 @@ LABEL hdt
 LABEL reboot
         MENU LABEL Reboot
         COM32 reboot.c32
- 
-LABEL off
-        MENU LABEL Power Off
-        COMBOOT poweroff.com
+
+LABEL poweroff
+        MENU LABEL Poweroff
+        COM32 poweroff.c32
diff --git a/libre/syslinux/syslinux.install b/libre/syslinux/syslinux.install
index 89dbf4e86..7dc7a43c1 100644
--- a/libre/syslinux/syslinux.install
+++ b/libre/syslinux/syslinux.install
@@ -1,13 +1,36 @@
 post_install() {
-  echo "==> If you want to use syslinux as your bootloader"
+  echo "==> If you want to use syslinux as your BIOS bootloader"
   echo "==> edit /boot/syslinux/syslinux.cfg and run"
   echo "==>   # /usr/bin/syslinux-install_update -i -a -m"
   echo "==> to install it."
+  
+  cat << EOF
+Syslinux efi64 and efi32 files have been installed at
+/usr/lib/syslinux/{efi64,efi32}/ respectively.
+
+To install, copy /usr/lib/syslinux/efi64 to (ESP)/EFI/syslinux and
+syslinux.cfg to (ESP)/EFI/syslinux/syslinux.cfg and add a boot entry
+using efibootmgr for (ESP)/EFI/syslinux/syslinux.efi
+EOF
+
 }
 
 post_upgrade() {
   # auto-update syslinux if /boot/syslinux/SYSLINUX_AUTOUPDATE exists
   /usr/bin/syslinux-install_update -s
+  # update to 5.01 message
+  if [ "$(vercmp $2 5.01)" -lt 0 ]; then
+      echo "If you used syslinux-install_update to install syslinux:"
+      echo "==> If you want to use syslinux with menu and all modules please rerun" 
+      echo "==>   # /usr/bin/syslinux-install_update -i -a -m"
+      echo ""
+      echo "If you manually installed syslinux:"
+      echo "==> Please copy or symlink all .c32 modules to your /boot/syslinux directory."
+      echo "==> If (/ and /boot on separate fs):"
+      echo "==>   # cp /usr/lib/syslinux/bios/*.c32 /boot/syslinux"
+      echo "==> If (/ and /boot on same fs):"
+      echo "==>   # ln -s /usr/lib/syslinux/bios/*.c32 /boot/syslinux"
+  fi
 }
 
 # vim:set ts=2 sw=2 et:
diff --git a/libre/texlive-bin-libre/PKGBUILD b/libre/texlive-bin-libre/PKGBUILD
index b35911f2c..e43f8e70f 100644
--- a/libre/texlive-bin-libre/PKGBUILD
+++ b/libre/texlive-bin-libre/PKGBUILD
@@ -1,12 +1,12 @@
-# $Id: PKGBUILD 193968 2013-09-09 10:10:47Z remy $
+# $Id: PKGBUILD 197649 2013-10-27 17:39:24Z remy $
 # Maintainer: Rémy Oudompheng <remy@archlinux.org>
 # Contributor: francois <francois.archlinux.org>
 # Maintainer (Parabola): Michał Masłowski <mtjm@mtjm.eu>
-# Contributor (Parabola): André Silva <emulatorman@lavabit.com>
+# Contributor (Parabola): André Silva <emulatorman@parabola.nu>
 
 pkgname=texlive-bin-libre
 pkgver=2013.30973
-pkgrel=4
+pkgrel=6
 pkgdesc="TeX Live binaries, without biber binaries (Parabola rebranded)"
 license=('GPL')
 arch=('i686' 'x86_64' 'mips64el')
@@ -63,6 +63,8 @@ build() {
      --disable-t1utils \
      --disable-bibtexu \
      --disable-xz \
+     --enable-shared \
+     --disable-static \
      --with-system-zlib \
      --with-system-zziplib \
      --with-system-pnglib \
diff --git a/libre/texlive-core-libre/PKGBUILD b/libre/texlive-core-libre/PKGBUILD
index 3c51d57cd..6bd33d769 100644
--- a/libre/texlive-core-libre/PKGBUILD
+++ b/libre/texlive-core-libre/PKGBUILD
@@ -1,6 +1,6 @@
 # Maintainer: Rémy Oudompheng <remy@archlinux.org>
 # Maintainer (Parabola): Michał Masłowski <mtjm@mtjm.eu>
-# Contributor (Parabola): André Silva <emulatorman@lavabit.com>
+# Contributor (Parabola): André Silva <emulatorman@parabola.nu>
 
 pkgname=texlive-core-libre
 _pkgname=texlive-core
diff --git a/libre/texlive-fontsextra-libre/PKGBUILD b/libre/texlive-fontsextra-libre/PKGBUILD
index 816556575..7d3fc7d20 100644
--- a/libre/texlive-fontsextra-libre/PKGBUILD
+++ b/libre/texlive-fontsextra-libre/PKGBUILD
@@ -1,6 +1,6 @@
 # Maintainer: Rémy Oudompheng <remy.archlinux.org>
 # Maintainer (Parabola): Michał Masłowski <mtjm@mtjm.eu>
-# Contributor (Parabola): André Silva <emulatorman@lavabit.com>
+# Contributor (Parabola): André Silva <emulatorman@parabola.nu>
 
 pkgname=texlive-fontsextra-libre
 _pkgname=texlive-fontsextra
diff --git a/libre/texlive-latexextra-libre/PKGBUILD b/libre/texlive-latexextra-libre/PKGBUILD
index 8e1f0998f..ba22b53be 100644
--- a/libre/texlive-latexextra-libre/PKGBUILD
+++ b/libre/texlive-latexextra-libre/PKGBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Firmicus <firmicus āt gmx dōt net>
 # Maintainer: Rémy Oudompheng <remy@archlinux.org>
 # Maintainer (Parabola): Michał Masłowski <mtjm@mtjm.eu>
-# Contributor (Parabola): André Silva <emulatorman@lavabit.com>
+# Contributor (Parabola): André Silva <emulatorman@parabola.nu>
 
 pkgname=texlive-latexextra-libre
 _pkgname=texlive-latexextra
diff --git a/libre/tomoyo-tools-libre/PKGBUILD b/libre/tomoyo-tools-libre/PKGBUILD
index c3f65109b..ad0306918 100644
--- a/libre/tomoyo-tools-libre/PKGBUILD
+++ b/libre/tomoyo-tools-libre/PKGBUILD
@@ -1,7 +1,7 @@
 # $Id: PKGBUILD 96508 2013-08-30 20:31:24Z foutrelis $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: Jamie Nguyen <jamie AT tomoyolinux.co.uk>
-# Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
+# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
 
 _pkgname=tomoyo-tools
 pkgname=tomoyo-tools-libre
diff --git a/libre/tp_smapi-libre-lts/PKGBUILD b/libre/tp_smapi-libre-lts/PKGBUILD
index 8283b6b66..4c0dd0dd4 100644
--- a/libre/tp_smapi-libre-lts/PKGBUILD
+++ b/libre/tp_smapi-libre-lts/PKGBUILD
@@ -6,13 +6,13 @@
 # Contributor: Christof Musik <christof ð senfdax đ de>
 # Contributor: Stefan Rupp <archlinux ð stefanrupp đ de>
 # Contributor: Ignas Anikevicius <anikevicius ð gmail đ com>
-# Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
+# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
 
 pkgname=tp_smapi-libre-lts
 _pkgname=tp_smapi
 _extramodules=/usr/lib/modules/extramodules-3.10-LIBRE-LTS
 pkgver=0.41
-pkgrel=16
+pkgrel=17
 pkgdesc="Modules for ThinkPad's SMAPI functionality (built for the linux-libre-lts kernel package)"
 arch=('i686' 'x86_64' 'mips64el')
 url='https://github.com/evgeni/tp_smapi'
diff --git a/libre/tp_smapi-libre/PKGBUILD b/libre/tp_smapi-libre/PKGBUILD
index 9d226780d..05deae4a7 100644
--- a/libre/tp_smapi-libre/PKGBUILD
+++ b/libre/tp_smapi-libre/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 98084 2013-10-05 19:51:13Z tpowa $
+# $Id: PKGBUILD 98569 2013-10-14 07:06:56Z tpowa $
 # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de>
 # Contributor: xduugu
 # Contributor: nh2
@@ -7,12 +7,12 @@
 # Contributor: Christof Musik <christof ð senfdax đ de>
 # Contributor: Stefan Rupp <archlinux ð stefanrupp đ de>
 # Contributor: Ignas Anikevicius <anikevicius ð gmail đ com>
-# Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
+# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
 
 _pkgname=tp_smapi
 pkgname=tp_smapi-libre
 pkgver=0.41
-pkgrel=37
+pkgrel=38
 pkgdesc="Modules for ThinkPad's SMAPI functionality (built for the linux-libre kernel package)"
 arch=('i686' 'x86_64' 'mips64el')
 url='https://github.com/evgeni/tp_smapi'
diff --git a/libre/unar/PKGBUILD b/libre/unar/PKGBUILD
index 3479ffefe..c400fc16b 100755
--- a/libre/unar/PKGBUILD
+++ b/libre/unar/PKGBUILD
@@ -1,18 +1,18 @@
 # Maintainer: Cedric Girard <girard.cedric@gmail.com>
 # Contributor: N30N <archlinux@alunamation.com>
-# Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
+# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
 
 pkgname=unar
 pkgver=1.8
-pkgrel=1
+pkgrel=3
 pkgdesc="An Objective-C application for uncompressing archive files"
 arch=('x86_64' 'i686' 'mips64el')
 url="http://unarchiver.c3.cx/"
 license=('LGPL2.1')
-depends=('gnustep-base' 'openssl' 'bzip2' 'icu' 'gcc-libs' 'zlib')
+depends=('gnustep-base' 'openssl' 'bzip2' 'icu>=52.1' 'icu<52.2' 'gcc-libs' 'zlib')
 makedepends=('gcc-objc')
 replaces=('unarchiver' 'unrar')
-conflicts=('unarchiver' 'unrar' 'icu<51')
+conflicts=('unarchiver' 'unrar')
 provides=('unarchiver' 'unrar')
 source=("http://theunarchiver.googlecode.com/files/${pkgname}${pkgver}_src.zip"
         "native_obj_exceptions.patch")
diff --git a/libre/vhba-module-libre/PKGBUILD b/libre/vhba-module-libre/PKGBUILD
index 209b5e773..01b8878d7 100644
--- a/libre/vhba-module-libre/PKGBUILD
+++ b/libre/vhba-module-libre/PKGBUILD
@@ -1,14 +1,14 @@
-# $Id: PKGBUILD 98086 2013-10-05 19:51:42Z tpowa $
+# $Id: PKGBUILD 98572 2013-10-14 07:17:54Z tpowa $
 # Maintainer: Ray Rashif <schiv@archlinux.org>
 # Contributor: Mateusz Herych <heniekk@gmail.com>
 # Contributor: Charles Lindsay <charles@chaoslizard.org>
-# Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
+# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
 
 _pkgname=vhba-module
 pkgname=vhba-module-libre
 pkgver=20130607
 _extramodules=extramodules-3.11-LIBRE
-pkgrel=16
+pkgrel=17
 pkgdesc="Kernel module that emulates SCSI devices (built for the linux-libre kernel package)"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://cdemu.sourceforge.net/"
diff --git a/libre/vim-runtime/PKGBUILD b/libre/vim-runtime/PKGBUILD
new file mode 100644
index 000000000..93ac38edd
--- /dev/null
+++ b/libre/vim-runtime/PKGBUILD
@@ -0,0 +1,104 @@
+# Maintainer: Thomas Dziedzic <gostrc@gmail.com>
+# Contributor: Jan "heftig" Steffens <jan.steffens@gmail.com>
+# Contributor: tobias [ tobias at archlinux org ]
+# Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
+# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
+
+pkgbase=vim
+pkgname=vim-runtime
+_topver=7.4
+_patchlevel=16
+__hgrev=d17ef148ada4
+_versiondir="vim${_topver//./}"
+pkgver=${_topver}.${_patchlevel}
+pkgrel=2
+arch=('i686' 'x86_64' 'mips64el')
+license=('custom:vim')
+url="http://www.vim.org"
+makedepends=('gpm' 'python2' 'ruby' 'libxt' 'desktop-file-utils' 'gtk2' 'lua')
+source=("ftp://ftp.archlinux.org/other/vim/vim-${pkgver}.tar.xz"
+        "ftp://ftp.archlinux.org/other/vim/vim-${pkgver}.tar.xz.sig"
+        'vimrc'
+        'parabola.vim')
+md5sums=('733cce44a08ea953ad0e1f9d574670e0'
+         'SKIP'
+         '27820c2bdc34624674c561ae6476bc6a'
+         'a8c21928eefd766e211f987879a9199c')
+
+build() {
+  cp -a ${pkgbase}-${pkgver} vim-build
+
+  # define the place for the global (g)vimrc file (set to /etc/vimrc)
+  sed -i 's|^.*\(#define SYS_.*VIMRC_FILE.*"\) .*$|\1|' \
+    vim-build/src/feature.h
+  sed -i 's|^.*\(#define VIMRC_FILE.*"\) .*$|\1|' \
+    vim-build/src/feature.h
+
+  (cd vim-build/src && autoconf)
+
+  cd "${srcdir}"/vim-build
+
+  ./configure \
+    --prefix=/usr \
+    --localstatedir=/var/lib/vim \
+    --with-features=huge \
+    --with-compiledby='Parabola GNU/Linux-libre' \
+    --enable-gpm \
+    --enable-acl \
+    --with-x=yes \
+    --enable-gui=gtk2 \
+    --enable-multibyte \
+    --enable-cscope \
+    --enable-netbeans \
+    --enable-perlinterp \
+    --enable-pythoninterp \
+    --disable-python3interp \
+    --enable-rubyinterp \
+    --enable-luainterp
+
+  make
+}
+
+package_vim-runtime() {
+  pkgdesc='Runtime for vim and gvim (Parabola rebranded)'
+  depends=('perl' 'gawk')
+  backup=('etc/vimrc')
+
+  cd "${srcdir}"/vim-build
+
+  make -j1 VIMRCLOC=/etc DESTDIR="${pkgdir}" install
+
+  # delete binaries and manuals files
+  rm -vr "${pkgdir}"/usr/bin
+  rm -vr "${pkgdir}"/usr/share/man
+
+  # Don't forget logtalk.dict
+  install -Dm644 "${srcdir}"/vim-build/runtime/ftplugin/logtalk.dict \
+    "${pkgdir}"/usr/share/vim/${_versiondir}/ftplugin/logtalk.dict
+
+  # fix FS#17216
+  sed -i 's|messages,/var|messages,/var/log/messages.log,/var|' \
+    "${pkgdir}"/usr/share/vim/${_versiondir}/filetype.vim
+
+  # patch filetype.vim for better handling of pacman related files
+  sed -i "s/rpmsave/pacsave/;s/rpmnew/pacnew/;s/,\*\.ebuild/\0,PKGBUILD*,*.install/" \
+    "${pkgdir}"/usr/share/vim/${_versiondir}/filetype.vim
+  sed -i "/find the end/,+3{s/changelog_date_entry_search/changelog_date_end_entry_search/}" \
+    "${pkgdir}"/usr/share/vim/${_versiondir}/ftplugin/changelog.vim
+
+  # rc files
+  install -Dm644 "${srcdir}"/vimrc "${pkgdir}"/etc/vimrc
+  install -Dm644 "${srcdir}"/parabola.vim \
+    "${pkgdir}"/usr/share/vim/vimfiles/parabola.vim
+
+  # rgb.txt file
+  install -Dm644 "${srcdir}"/vim-${pkgver}/runtime/rgb.txt \
+    "${pkgdir}"/usr/share/vim/${_versiondir}/rgb.txt
+
+  # license
+  install -dm755 "${pkgdir}"/usr/share/licenses/vim-runtime
+  ln -s /usr/share/vim/${_versiondir}/doc/uganda.txt \
+    "${pkgdir}"/usr/share/licenses/vim-runtime/license.txt
+}
+
+# vim:set sw=2 sts=2 et:
diff --git a/libre/vim-runtime/parabola.vim b/libre/vim-runtime/parabola.vim
new file mode 100644
index 000000000..bc3c1f82e
--- /dev/null
+++ b/libre/vim-runtime/parabola.vim
@@ -0,0 +1,27 @@
+" The Parabola GNU/Linux-libre global vimrc - setting only a few sane defaults
+"
+" Maintainer:                              Tobias Kieslich [tobias funnychar archlinux dot org]
+" Maintainer for Parabola rebranding:      André Silva [emulatorman funnychar parabola dot nu]
+"
+" NEVER EDIT THIS FILE, IT'S OVERWRITTEN UPON UPGRADES, GLOBAL CONFIGURATION
+" SHALL BE DONE IN /etc/vimrc, USER SPECIFIC CONFIGURATION IN ~/.vimrc
+
+" Normally we use vim-extensions. If you want true vi-compatibility
+" remove change the following statements
+set nocompatible                " Use Vim defaults instead of 100% vi compatibility
+set backspace=indent,eol,start  " more powerful backspacing
+
+" Now we set some defaults for the editor
+set history=50                  " keep 50 lines of command line history
+set ruler                       " show the cursor position all the time
+
+" Suffixes that get lower priority when doing tab completion for filenames.
+" These are files we are not likely to want to edit or read.
+set suffixes=.bak,~,.swp,.o,.info,.aux,.log,.dvi,.bbl,.blg,.brf,.cb,.ind,.idx,.ilg,.inx,.out,.toc
+
+
+if has('gui_running')
+  " Make shift-insert work like in Xterm
+  map <S-Insert> <MiddleMouse>
+  map! <S-Insert> <MiddleMouse>
+endif
diff --git a/libre/vim-runtime/vimrc b/libre/vim-runtime/vimrc
new file mode 100644
index 000000000..fc67e7eb0
--- /dev/null
+++ b/libre/vim-runtime/vimrc
@@ -0,0 +1,16 @@
+" All system-wide defaults are set in $VIMRUNTIME/parabola.vim (usually just
+" /usr/share/vim/vimfiles/parabola.vim) and sourced by the call to :runtime
+" you can find below.  If you wish to change any of those settings, you should
+" do it in this file (/etc/vimrc), since parabola.vim will be overwritten
+" everytime an upgrade of the vim packages is performed.  It is recommended to
+" make changes after sourcing parabola.vim since it alters the value of the
+" 'compatible' option.
+
+" This line should not be removed as it ensures that various options are
+" properly set to work with the Vim-related packages.
+runtime! parabola.vim
+
+" If you prefer the old-style vim functionalty, add 'runtime! vimrc_example.vim'
+" Or better yet, read /usr/share/vim/vim74/vimrc_example.vim or the vim manual
+" and configure vim to your own liking!
+
diff --git a/libre/virtualbox-libre-modules-lts/PKGBUILD b/libre/virtualbox-libre-modules-lts/PKGBUILD
index 1d985f296..6a5f9eff8 100644
--- a/libre/virtualbox-libre-modules-lts/PKGBUILD
+++ b/libre/virtualbox-libre-modules-lts/PKGBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl>
 # Contributor: Ionut Biru <ibiru@archlinux.org>
 # Contributor: Sébastien Luttringer <seblu@aur.archlinux.org>
-# Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
+# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
 # Contributor (Parabola): Jorge López <jorginho@lavabit.com>
 
 pkgbase=virtualbox-libre-modules-lts
diff --git a/libre/virtualbox-libre-modules/PKGBUILD b/libre/virtualbox-libre-modules/PKGBUILD
index e7278298b..cc0d6741d 100644
--- a/libre/virtualbox-libre-modules/PKGBUILD
+++ b/libre/virtualbox-libre-modules/PKGBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 # Maintainer: Sébastien Luttringer
 # Maintainer (Parabola): Jorge López <jorginho@lavabit.com>
-# Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
+# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
 
 pkgbase=virtualbox-libre-modules
 pkgname=('virtualbox-libre-host-modules' 'virtualbox-libre-guest-modules')
diff --git a/libre/virtualbox-libre/PKGBUILD b/libre/virtualbox-libre/PKGBUILD
index cab223c30..b53a9f61e 100644
--- a/libre/virtualbox-libre/PKGBUILD
+++ b/libre/virtualbox-libre/PKGBUILD
@@ -1,7 +1,7 @@
 # $Id: PKGBUILD 93521 2013-07-05 00:32:42Z seblu $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 # Maintainer: Sébastien Luttringer <seblu@aur.archlinux.org>
-# Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
+# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
 # Contributor (Parabola): Nicolas Reynolds <fauno@kiwwwi.com.ar>
 # Contributor (Parabola): Márcio Silva <coadde@lavabit.com>
 # Contributor (Parabola): Jorge López <jorginho@lavabit.com>
diff --git a/libre/xbmc-libre/PKGBUILD b/libre/xbmc-libre/PKGBUILD
index cb48c5d90..23d389d52 100644
--- a/libre/xbmc-libre/PKGBUILD
+++ b/libre/xbmc-libre/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 94534 2013-07-26 12:25:32Z spupykin $
+# $Id: PKGBUILD 100487 2013-11-05 08:57:03Z bpiotrowski $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Brad Fanella <bradfanella@archlinux.us>
 # Contributor: [vEX] <niechift.dot.vex.at.gmail.dot.com>
@@ -10,7 +10,7 @@ _prefix=/usr
 _pkgname=xbmc
 pkgname=xbmc-libre
 pkgver=12.2
-pkgrel=5
+pkgrel=6
 pkgdesc="A software media player and entertainment hub for digital media, with libarchive recommendation"
 arch=('i686' 'x86_64')
 url="http://xbmc.org"
diff --git a/libre/xchat-libre/PKGBUILD b/libre/xchat-libre/PKGBUILD
index cc50fb44c..4f962dcb3 100644
--- a/libre/xchat-libre/PKGBUILD
+++ b/libre/xchat-libre/PKGBUILD
@@ -1,7 +1,7 @@
 # $Id: PKGBUILD 186065 2013-05-20 20:17:32Z eric $
 # Maintainer: Eric Bélanger <eric@archlinux.org>
 # Maintainer (ConnochaetOS): Henry Jensen <hjensen@connochaetos.org>
-# Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
+# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
 
 _pkgname=xchat
 pkgname=xchat-libre
diff --git a/libre/xscreensaver-libre/PKGBUILD b/libre/xscreensaver-libre/PKGBUILD
index 1dc040d92..2e10b72b2 100644
--- a/libre/xscreensaver-libre/PKGBUILD
+++ b/libre/xscreensaver-libre/PKGBUILD
@@ -1,6 +1,6 @@
 # $Id: PKGBUILD 190799 2013-07-16 22:56:09Z eric $
 # Maintainer: Eric Bélanger <eric@archlinux.org>
-# Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
+# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
 
 _pkgname=xscreensaver
 pkgname=xscreensaver-libre
diff --git a/nonprism/banshee-nonprism/PKGBUILD b/nonprism/banshee-nonprism/PKGBUILD
new file mode 100644
index 000000000..883c7beaf
--- /dev/null
+++ b/nonprism/banshee-nonprism/PKGBUILD
@@ -0,0 +1,61 @@
+# $Id: PKGBUILD 141668 2011-11-02 03:17:12Z eric $
+# Maintainer: Daniel Isenmann <daniel@archlinux.org>
+# Contributor: György Balló <ballogy@freestart.hu>
+# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
+
+_pkgname=banshee
+pkgname=banshee-nonprism
+pkgver=2.6.1
+pkgrel=2
+pkgdesc="Music management and playback for GNOME, without gdata-sharp support"
+arch=('i686' 'x86_64')
+url="http://banshee.fm/"
+license=('MIT')
+depends=(libxxf86vm gstreamer0.10-base-plugins mono-addins dbus-sharp-glib webkitgtk2 libsoup-gnome taglib-sharp gudev-sharp gkeyfile-sharp gconf-sharp libmtp libgpod mono-zeroconf desktop-file-utils hicolor-icon-theme media-player-info gstreamer0.10-bad-plugins mono-upnp)
+makedepends=('intltool' 'gnome-doc-utils' 'gtk-sharp-beans' 'gnome-common')
+optdepends=('gstreamer0.10-good-plugins: Extra media codecs'
+            'gstreamer0.10-ugly-plugins: Extra media codecs'
+            'gstreamer0.10-ffmpeg: Extra media codecs'
+            'brasero: CD burning')
+options=('!libtool')
+replaces=$_pkgname
+conflicts=$_pkgname
+provides=$_pkgname=$pkgver
+install=$_pkgname.install
+source=(http://download.gnome.org/sources/$_pkgname/2.6/$_pkgname-$pkgver.tar.xz
+        git-fixes.patch)
+sha256sums=('53b8990cd439963edbfa776b3029bd73809e413bec302e3b6cf3914c6e74fb64'
+            '57bac0eff43426044385c3650a677fb546f6e3e74a59b4b44dcd000a03e97fa6')
+
+prepare() {
+  cd $_pkgname-$pkgver
+  patch -Np1 -i ../git-fixes.patch
+}
+  
+build() {
+  export MONO_SHARED_DIR="$srcdir/.wabi"
+  mkdir -p "$MONO_SHARED_DIR"
+
+  cd $_pkgname-$pkgver
+
+  # Disable youtube extension because it needs gdata-sharp to works
+  MCS=/usr/bin/dmcs ./autogen.sh --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
+              --disable-docs \
+              --disable-static \
+              --disable-scrollkeeper \
+              --disable-schemas-install \
+              --disable-boo \
+              --disable-youtube \
+              --with-vendor-build-id=Parabola
+  make
+}
+
+package() {
+  export MONO_SHARED_DIR="$srcdir/.wabi"
+  mkdir -p "$MONO_SHARED_DIR"
+
+  cd "$srcdir/$_pkgname-$pkgver"
+  make DESTDIR="$pkgdir" install
+
+  install -D -m644 COPYING "$pkgdir/usr/share/licenses/$_pkgname/COPYING"
+}
diff --git a/nonprism/banshee-nonprism/banshee.install b/nonprism/banshee-nonprism/banshee.install
new file mode 100644
index 000000000..079ac953d
--- /dev/null
+++ b/nonprism/banshee-nonprism/banshee.install
@@ -0,0 +1,15 @@
+pkgname=banshee
+
+post_install() {
+  update-desktop-database -q
+  update-mime-database usr/share/mime &> /dev/null
+  gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor
+}
+
+post_upgrade() {
+  post_install $1
+}
+
+post_remove() {
+  post_install $1
+}
diff --git a/nonprism/banshee-nonprism/git-fixes.patch b/nonprism/banshee-nonprism/git-fixes.patch
new file mode 100644
index 000000000..af83ee39e
--- /dev/null
+++ b/nonprism/banshee-nonprism/git-fixes.patch
@@ -0,0 +1,8347 @@
+diff --git a/configure.ac b/configure.ac
+index f36063e..2b25142 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -145,6 +145,7 @@ if test "x$enable_gnome" = "xyes"; then
+ 	AM_CONDITIONAL(ENABLE_GNOME, true)
+ else
+ 	AM_CONDITIONAL(GCONF_SCHEMAS_INSTALL, false)
++	AM_CONDITIONAL(HAVE_DBUS_GLIB, false)
+ 	AM_CONDITIONAL(ENABLE_GNOME, false)
+ fi
+ 
+diff --git a/data/Makefile.am b/data/Makefile.am
+index 8c84cc4..d48f6b4 100644
+--- a/data/Makefile.am
++++ b/data/Makefile.am
+@@ -16,11 +16,20 @@ addin-xml-strings.cs: $(ADDIN_XML_FILES) $(top_srcdir)/build/addin-xml-string-ex
+ 	@echo "  GEN   $@"
+ 	$(MONO) $(top_srcdir)/build/addin-xml-string-extractor.exe $(ADDIN_XML_FILES) > $@
+ 
++@INTLTOOL_XML_RULE@
++appdatadir = $(datadir)/appdata
++appdata_DATA = $(appdata_in_files:.xml.in=.xml)
++appdata_in_files = banshee.appdata.xml.in
++
+ all: addin-xml-strings.cs
+ 
+ EXTRA_DIST = \
+ 	$(dbusservice_in_files) \
+-	addin-xml-strings.cs
++	addin-xml-strings.cs \
++	$(appdata_in_files)
++
++CLEANFILES = \
++        $(appdata_DATA)
+ 
+ DISTCLEANFILES = \
+ 	$(dbusservice_DATA)
+diff --git a/data/banshee.appdata.xml.in b/data/banshee.appdata.xml.in
+new file mode 100644
+index 0000000..e19c5d1
+--- /dev/null
++++ b/data/banshee.appdata.xml.in
+@@ -0,0 +1,25 @@
++<?xml version="1.0" encoding="UTF-8"?>
++<!-- Copyright 2013 Banshee Contributors <banshee-list@gnome.org> -->
++<application>
++  <id type="desktop">banshee.desktop</id>
++  <licence>CC0</licence><!-- licence of this file, not the program -->
++  <description>
++    <!-- Writing GNOME below, instead of just "Linux", is inclusive of *BSD OSs -->
++    <_p>
++      Banshee is an open source multimedia management and playback application
++      for GNOME, Mac and Windows.
++    </_p>
++
++    <_p>
++      Play your music and videos. Stay entertained and up to date with podcasts
++      and video podcasts.  Sync your Android, iPod, and other devices. We think
++      you'll love Banshee!
++    </_p>
++  </description>
++  <screenshots>
++    <screenshot type="default" width="450" height="335">http://banshee.fm/theme/images/slides/scaled/music-450.png</screenshot>
++    <screenshot width="600" height="432">http://download.banshee.fm/shots/banshee-190-track-actions.png</screenshot>
++  </screenshots>
++  <url type="homepage">http://banshee.fm/</url>
++  <updatecontact>banshee-list_at_gnome.org</updatecontact>
++</application>
+diff --git a/help/cs/cs.po b/help/cs/cs.po
+index ac3c8b4..6174e11 100644
+--- a/help/cs/cs.po
++++ b/help/cs/cs.po
+@@ -2,24 +2,25 @@
+ # Copyright (C) 2011 banshee's COPYRIGHT HOLDER
+ # This file is distributed under the same license as the banshee package.
+ #
+-# Marek Černocký <marek@manet.cz>, 2011, 2012.
++# Marek Černocký <marek@manet.cz>, 2011, 2012, 2013.
+ #
+ msgid ""
+ msgstr ""
+-"Project-Id-Version: banshee master\n"
+-"POT-Creation-Date: 2012-02-09 05:55+0000\n"
+-"PO-Revision-Date: 2012-03-26 09:54+0200\n"
++"Project-Id-Version: banshee banshee-2.6\n"
++"POT-Creation-Date: 2013-04-07 13:45+0000\n"
++"PO-Revision-Date: 2013-05-29 01:17+0200\n"
+ "Last-Translator: Marek Černocký <marek@manet.cz>\n"
+ "Language-Team: Czech <gnome-cs-list@gnome.org>\n"
++"Language: cs\n"
+ "MIME-Version: 1.0\n"
+ "Content-Type: text/plain; charset=UTF-8\n"
+ "Content-Transfer-Encoding: 8bit\n"
+-"Language: cs\n"
+ "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
++"X-Generator: Gtranslator 2.91.6\n"
+ 
+ #. When image changes, this message will be marked fuzzy or untranslated for you.
+ #. It doesn't matter what you translate it to: it's not used at all.
+-#: C/ui.page:29(None) C/introduction.page:45(None)
++#: C/ui.page:29(None)
+ msgid "@@image: 'figures/banshee.png'; md5=THIS FILE DOESN'T EXIST"
+ msgstr "@@image: 'figures/banshee.png'; md5=THIS FILE DOESN'T EXIST"
+ 
+@@ -32,7 +33,7 @@ msgstr "Přehled uživatelského rozhraní přehrávače <app>Banshee</app>."
+ #: C/manage-tags.page:13(name) C/manage-playlists.page:13(name)
+ #: C/manage-coverart.page:12(name) C/lastfm.page:12(name)
+ #: C/keyboardshortcuts.page:10(name) C/introduction.page:12(name)
+-#: C/index.page:9(name) C/import.page:11(name) C/extensions.page:11(name)
++#: C/index.page:10(name) C/import.page:11(name) C/extensions.page:11(name)
+ #: C/amazon.page:12(name) C/advanced.page:11(name) C/add-radio.page:14(name)
+ #: C/add-podcast.page:14(name)
+ msgid "Paul Cutler"
+@@ -43,7 +44,7 @@ msgstr "Paul Cutler"
+ #: C/manage-tags.page:14(email) C/manage-playlists.page:14(email)
+ #: C/manage-coverart.page:13(email) C/lastfm.page:13(email)
+ #: C/keyboardshortcuts.page:11(email) C/introduction.page:13(email)
+-#: C/index.page:10(email) C/import.page:12(email) C/extensions.page:12(email)
++#: C/index.page:11(email) C/import.page:12(email) C/extensions.page:12(email)
+ #: C/amazon.page:13(email) C/advanced.page:12(email)
+ #: C/add-radio.page:15(email) C/add-podcast.page:15(email)
+ msgid "pcutler@gnome.org"
+@@ -53,15 +54,15 @@ msgstr "pcutler@gnome.org"
+ msgid "Introduction to the Banshee User Interface"
+ msgstr "Úvod do uživatelského rozhraní Banshee"
+ 
+-#: C/ui.page:27(title) C/introduction.page:43(title)
++#: C/ui.page:27(title)
+ msgid "<gui>Banshee Media Player</gui> window"
+ msgstr "Okno <gui>Multimediálního přehrávače Banshee</gui>"
+ 
+-#: C/ui.page:28(app) C/introduction.page:44(app) C/index.page:21(title)
++#: C/ui.page:28(app) C/index.page:26(title)
+ msgid "Banshee Media Player"
+ msgstr "Multimediální přehrávač Banshee"
+ 
+-#: C/ui.page:30(p) C/introduction.page:46(p)
++#: C/ui.page:30(p)
+ msgid "<app>Banshee</app> library interface"
+ msgstr "Rozhraní kolekce <app>Banshee</app>"
+ 
+@@ -1332,8 +1333,8 @@ msgstr ""
+ "čímž celou akci završíte."
+ 
+ #: C/lastfm.page:58(title)
+-msgid "Enable Last.fm Song Reporting"
+-msgstr "Povolení oznamování skladeb z Last.fm"
++msgid "Enable Last.fm Song Reporting From Banshee"
++msgstr "Povolení oznamování skladeb Last.fm z Banshee"
+ 
+ #: C/lastfm.page:59(p)
+ msgid ""
+@@ -1341,31 +1342,88 @@ msgid ""
+ "ensure that you have enabled Banshee to report your songs. To enable Banshee "
+ "to report the songs to your Last.fm profile go to Banshee's preferences, "
+ "select the <gui>Source Specific</gui> tab, select <gui>Last.fm</gui> from "
+-"the dropdown, and press the <gui>Enable Song Reporting</gui> checkbox. If "
+-"you have an active internet connection Banshee will now send Last.fm "
+-"information regarding the songs you play. To view your play history visit "
+-"your profile on the Last.fm website. Last.fm will automatically update your "
+-"music metadata if any of your artist, song title, or album information is "
+-"incorrect (although we recommend that you use the Metadata Fixer extension "
+-"to correct your files instead)."
++"the dropdown, and press the <gui>Enable Song Reporting From Banshee</gui> "
++"checkbox. If you have an active internet connection Banshee will now send "
++"Last.fm information regarding the songs you play. To view your play history "
++"visit your profile on the Last.fm website. Last.fm will automatically update "
++"your music metadata if any of your artist, song title, or album information "
++"is incorrect (although we recommend that you use the Metadata Fixer "
++"extension to correct your files instead)."
+ msgstr ""
+ "Když máte přehrávač Banshee úspěšně propojený s profilem Last.fm, ujistěte "
+-"se, že jste v Banshee povolili oznamování svých skladeb.\n"
+-"Pro oznamování skladeb do svého profilu Last.fm přejděte v předvolbách na "
+-"kartu <gui>Dané zdrojem</gui>, v rozbalovacím seznamu vyberte <gui>Last.fm</"
+-"gui> a zaškrtněte políčko <gui>Povolit oznamování skladeb</gui>. V případě, "
+-"že máte aktivní internetové připojení, bude od teď přehrávač Banshee zasílat "
+-"na Last.fm informace o skladbách, které přehráváte. Pokud si chcete historii "
+-"přehrávání prohlédnout, navštivte svůj profil na webových stránkách Last.fm. "
+-"Když bude některý umělec, název skladby nebo název alba nesprávný, Last.fm "
+-"vaše hudební metadata automaticky aktualizuje (místo toho ale pro opravy "
+-"souborů spíše doporučujeme rozšíření Opravář metadat)."
++"se, že jste v Banshee povolili oznamování svých skladeb. Pro oznamování "
++"skladeb do svého profilu Last.fm přejděte v předvolbách na kartu <gui style="
++"\"tab\">Dané zdrojem</gui>, v rozbalovacím seznamu vyberte <gui style="
++"\"menuitem\">Last.fm</gui> a zaškrtněte políčko <gui style=\"checkbox"
++"\">Povolit oznamování skladeb</gui>. V případě, že máte funkční internetové "
++"připojení, bude od teď přehrávač Banshee zasílat na Last.fm informace o "
++"skladbách, které přehráváte. Pokud si chcete historii přehrávání "
++"prohlédnout, navštivte svůj profil na webových stránkách Last.fm. Když bude "
++"některý umělec, název skladby nebo název alba nesprávný, Last.fm vaše "
++"hudební metadata automaticky aktualizuje (místo toho ale pro opravy souborů "
++"spíše doporučujeme rozšíření Opravář metadat)."
+ 
+ #: C/lastfm.page:75(title)
++msgid "Enable Last.fm Song Reporting From Your Device"
++msgstr "Povolení oznamování skladeb Last.fm z vašeho zařízení"
++
++#: C/lastfm.page:76(p)
++msgid ""
++"After successfully linking Banshee to your Last.fm profile and enabling "
++"Banshee to report songs to Last.fm you can also enable scrobbling from a "
++"connected device. Banshee will, upon connection of your device, attempt to "
++"scrobble the songs you have played since the device was last connected and "
++"submit them to Last.fm."
++msgstr ""
++"Po úspěšném propojení Banshee s vaším profilem na Last.fm a po povolení "
++"Banshee oznamovat skladby na Last.fm, můžete povolit také sdílení seznamů "
++"skladeb (scrobbling) z připojených zařízení. Po připojení vašeho zařízení se "
++"Banshee pokusí zjistit, které skladby jste přehrávali od posledního "
++"připojení zařízení, a odešle je na Last.fm."
++
++#: C/lastfm.page:82(p)
++msgid ""
++"To enable scrobbling of a connected device go to Banshee's preferences, "
++"select the <gui>Source Specific</gui> tab, select <gui>Last.fm</gui> from "
++"the dropdown, and press the <gui>Enable Song Reporting From Device</gui> "
++"checkbox. If you have an active internet connection Banshee will, upon "
++"connection of your device, now attempt to gather information regarding the "
++"songs that you have played since it was last connected."
++msgstr ""
++"Jestli chcete sdílení seznamů skladeb z připojených zařízení zapnout, jděte "
++"do předvoleb Banshee, vyberte <gui>Dané zdrojem</gui>, v rozbalovacím "
++"seznamu vyberte <gui>Last.fm</gui> a zaškrtněte políčko <gui>Povolit "
++"oznamování skladeb ze zařízení</gui>. Pokud máte funkční internetové "
++"připojení, bude se Banshee po připojení vašeho zařízení pokoušet sesbírat "
++"informace týkající se skladeb, které jste přehrávali od doby, kdy bylo "
++"zařízení naposledy připojeno."
++
++#: C/lastfm.page:89(p)
++msgid ""
++"As with regular Banshee scrobbling submissions Last.fm will automatically "
++"update your music metadata if any of your artist, title, or album "
++"information is incorrect (although we again recommend that you use the "
++"Metadata Fixer extension to correct your files instead)."
++msgstr ""
++"Současně s pravidelným zasíláním seznamů skladem z Banshee na Last.fm se "
++"budou aktualizovat vaše hudbení metadata a to v situaci, kdy je údaj o "
++"umělci, názvu nebo albu uveden nesprávně (ačkoliv místo této funkce vám "
++"doporučujeme používat rozšíření Opravář metadat, které opravuje vaše "
++"soubory)."
++
++#: C/lastfm.page:94(p)
++msgid ""
++"Please note that currently Banshee only supports this feature with Apple "
++"products that are supported by the AppleDevice extension."
++msgstr ""
++"Vezměte prosím na vědomí, že v současnosti Banshee podporuje tuto funkci jen "
++"u produktů společnosti Apple, které jsou podporovány rozšířením AppleDevice."
++
++#: C/lastfm.page:101(title)
+ msgid "Listen to Last.fm Radio"
+ msgstr "Poslech rádia Last.fm"
+ 
+-#: C/lastfm.page:76(p)
++#: C/lastfm.page:102(p)
+ msgid ""
+ "Last.fm radio is free for residents of the United States, United Kingdom and "
+ "Germany. Residents of other countries will have to pay for a premium account "
+@@ -1379,7 +1437,7 @@ msgstr ""
+ "prémiovým funkcím: poslech seznamů skladeb a stanic hudby, kterou mají rádi "
+ "nebo si ji označili."
+ 
+-#: C/lastfm.page:83(p)
++#: C/lastfm.page:109(p)
+ msgid ""
+ "In Banshee's sources pane on the left hand side, you will now have a Last.fm "
+ "section, including your Last.fm radio stations. You will need an active "
+@@ -1611,30 +1669,34 @@ msgstr ""
+ "Banshee podporuje populární zařízení včetně většiny přehrávačů MP3 iPod, "
+ "Sandisk a Creative a telefonů se systémem Android."
+ 
+-#: C/index.page:24(title)
++#: C/index.page:14(name)
++msgid "Sindhu S"
++msgstr "Sindhu S"
++
++#: C/index.page:15(email)
++msgid "sindhus@live.in"
++msgstr "sindhus@live.in"
++
++#: C/index.page:29(title)
+ msgid "Add, Remove &amp; Play"
+ msgstr "Přidávání, odebírání a přehrávání"
+ 
+-#: C/index.page:28(title)
++#: C/index.page:33(title)
+ msgid "Manage &amp; Sort"
+ msgstr "Správa a řazení"
+ 
+-#: C/index.page:32(title)
++#: C/index.page:37(title)
+ msgid "Sync your media with a portable music player"
+ msgstr "Synchronizace vašich médií s přenosnými hudebními přehrávači"
+ 
+-#: C/index.page:36(title)
++#: C/index.page:41(title)
+ msgid "Add additional functionality to Banshee"
+ msgstr "Přidávání dalších funkcí do Banshee"
+ 
+-#: C/index.page:40(title)
++#: C/index.page:45(title)
+ msgid "Advanced options and help"
+ msgstr "Pokročilé volby a nápověda"
+ 
+-#: C/index.page:44(title)
+-msgid "Common Problems"
+-msgstr "Obvyklé problémy"
+-
+ #: C/import.page:8(desc)
+ msgid "Add music and videos from your computer to your Banshee library."
+ msgstr "Přidávejte hudbu a videa ze svého počítače do své kolekce Banshee."
+diff --git a/help/el/el.po b/help/el/el.po
+index 8fc97f8..da97e6f 100644
+--- a/help/el/el.po
++++ b/help/el/el.po
+@@ -1,38 +1,39 @@
+ # Copyright (C) 2010 banshee's COPYRIGHT HOLDER
+ # This file is distributed under the same license as the banshee package.
+ # Michael Kotsarinis <mk73628@gmail.com>, 2010, 2011.
++# Dimitris Spingos (Δημήτρης Σπίγγος) <dmtrs32@gmail.com>, 2013.
+ msgid ""
+ msgstr ""
+ "Project-Id-Version: banshee master\n"
+-"POT-Creation-Date: 2011-01-02 12:09+0000\n"
+-"PO-Revision-Date: 2011-01-15 09:12+0300\n"
+-"Last-Translator: Michael Kotsarinis <mk73628@gmail.com>\n"
+-"Language-Team: Greek team\n"
++"POT-Creation-Date: 2013-07-28 06:59+0000\n"
++"PO-Revision-Date: 2013-08-04 09:43+0300\n"
++"Last-Translator: Dimitris Spingos (Δημήτρης Σπίγγος) <dmtrs32@gmail.com>\n"
++"Language-Team: team@gnome.gr\n"
+ "Language: el\n"
+ "MIME-Version: 1.0\n"
+ "Content-Type: text/plain; charset=UTF-8\n"
+ "Content-Transfer-Encoding: 8bit\n"
+ "Plural-Forms: nplurals=2; plural=(n != 1);\n"
+-"X-Generator: Virtaal 0.5.2\n"
++"X-Generator: Virtaal 0.7.1\n"
+ "X-Poedit-Language: Greek\n"
+ "X-Poedit-Country: GREECE\n"
+ 
+ #. When image changes, this message will be marked fuzzy or untranslated for you.
+ #. It doesn't matter what you translate it to: it's not used at all.
+-#: C/ui.page:29(None) C/introduction.page:45(None)
++#: C/ui.page:29(None)
+ msgid "@@image: 'figures/banshee.png'; md5=THIS FILE DOESN'T EXIST"
+ msgstr "@@image: 'figures/banshee.png'; md5=THIS FILE DOESN'T EXIST"
+ 
+ #: C/ui.page:8(desc)
+ msgid "An overview of <app>Banshee's</app> user interface."
+-msgstr "Μια επισκόπηση της διεπαφής χρήστη του <app>Banshee</app>"
++msgstr "Μια επισκόπηση της διεπαφής χρήστη του <app>Banshee</app>."
+ 
+ #: C/ui.page:12(name) C/sync.page:12(name) C/sort.page:12(name)
+ #: C/search.page:12(name) C/play.page:12(name) C/play-queue.page:12(name)
+ #: C/manage-tags.page:13(name) C/manage-playlists.page:13(name)
+ #: C/manage-coverart.page:12(name) C/lastfm.page:12(name)
+ #: C/keyboardshortcuts.page:10(name) C/introduction.page:12(name)
+-#: C/index.page:9(name) C/import.page:11(name) C/extensions.page:11(name)
++#: C/index.page:10(name) C/import.page:11(name) C/extensions.page:11(name)
+ #: C/amazon.page:12(name) C/advanced.page:11(name) C/add-radio.page:14(name)
+ #: C/add-podcast.page:14(name)
+ msgid "Paul Cutler"
+@@ -43,7 +44,7 @@ msgstr "Paul Cutler"
+ #: C/manage-tags.page:14(email) C/manage-playlists.page:14(email)
+ #: C/manage-coverart.page:13(email) C/lastfm.page:13(email)
+ #: C/keyboardshortcuts.page:11(email) C/introduction.page:13(email)
+-#: C/index.page:10(email) C/import.page:12(email) C/extensions.page:12(email)
++#: C/index.page:11(email) C/import.page:12(email) C/extensions.page:12(email)
+ #: C/amazon.page:13(email) C/advanced.page:12(email)
+ #: C/add-radio.page:15(email) C/add-podcast.page:15(email)
+ msgid "pcutler@gnome.org"
+@@ -53,15 +54,15 @@ msgstr "pcutler@gnome.org"
+ msgid "Introduction to the Banshee User Interface"
+ msgstr "Εισαγωγή στη διεπαφή χρήστη του Banshee"
+ 
+-#: C/ui.page:27(title) C/introduction.page:43(title)
++#: C/ui.page:27(title)
+ msgid "<gui>Banshee Media Player</gui> window"
+ msgstr "Παράθυρο <gui>Αναπαραγωγή πολυμέσων Banshee</gui>"
+ 
+-#: C/ui.page:28(app) C/introduction.page:44(app) C/index.page:21(title)
++#: C/ui.page:28(app) C/index.page:26(title)
+ msgid "Banshee Media Player"
+ msgstr "Αναπαραγωγή πολυμέσων Banshee"
+ 
+-#: C/ui.page:30(p) C/introduction.page:46(p)
++#: C/ui.page:30(p)
+ msgid "<app>Banshee</app> library interface"
+ msgstr "Διεπαφή βιβλιοθήκης <app>Banshee</app>"
+ 
+@@ -130,11 +131,6 @@ msgstr ""
+ "βίντεο το Banshee θα εμφανίσει το βίντεο."
+ 
+ #: C/ui.page:65(p)
+-#| msgid ""
+-#| "To change Now Playing to hide the Banshee user interface and use the full "
+-#| "screen mode, you can press the <key>F</key>, press the <gui>Fullscreen</"
+-#| "gui> button in the upper right hand corner of Banshee, or choose "
+-#| "<guiseq>View<gui/>Fullscreen<gui/></guiseq> to start Fullscreen mode."
+ msgid ""
+ "To change Now Playing to hide the Banshee user interface and use the full "
+ "screen mode, you can press the <key>F</key>, press the <gui>Fullscreen</gui> "
+@@ -145,8 +141,8 @@ msgstr ""
+ "Για να αλλάξετε την τρέχουσα αναπαραγωγή για να αποκρυφτεί η διεπαφή χρήστη "
+ "του Banshee και να χρησιμοποιηθεί η κατάσταση πλήρους οθόνης, πατήστε το "
+ "<key>F</key> ή το κουμπί <gui>Πλήρης οθόνη</gui> στην πάνω δεξιά γωνία του "
+-"Banshee ή επιλέξτε <guiseq>Προβολή<gui/>Πλήρης οθόνη<gui/></guiseq> για να "
+-"αρχίσετε την κατάσταση πλήρους οθόνης."
++"Banshee ή επιλέξτε <guiseq><gui>Προβολή</gui><gui>Πλήρης "
++"οθόνη</gui></guiseq> για να αρχίσετε την κατάσταση πλήρους οθόνης."
+ 
+ #: C/ui.page:74(title)
+ msgid "Library"
+@@ -210,7 +206,7 @@ msgid ""
+ "with the notable exception of the Apple iPhone, iPad and iPod Touch."
+ msgstr ""
+ "Το Banshee υποστηρίζει σχεδόν όλες τις σύγχρονες φορητές συσκευές "
+-"αναπαραγωγής και τα «έξυπνα» κινητά με την αξιοσημείωτη εξαίρεση των iPhone, "
++"αναπαραγωγής και τα έξυπνα κινητά με την αξιοσημείωτη εξαίρεση των iPhone, "
+ "iPad και iPod Touch της Apple."
+ 
+ #: C/sync.page:42(p)
+@@ -320,8 +316,14 @@ msgid "Sync Your Entire Library"
+ msgstr "Συγχρονισμός ολόκληρης της βιβλιοθήκης σας"
+ 
+ #: C/sync.page:101(p)
++#| msgid ""
++#| "You can drag and drop media to your portable music player form Banshee. "
++#| "Select the file or files you want to copy to your portable media player "
++#| "and then press and hold your right mouse button and drag the file(s) to "
++#| "your portable media player icon in Banshee. This will copy the files to "
++#| "your device."
+ msgid ""
+-"You can drag and drop media to your portable music player form Banshee. "
++"You can drag and drop media to your portable music player from Banshee. "
+ "Select the file or files you want to copy to your portable media player and "
+ "then press and hold your right mouse button and drag the file(s) to your "
+ "portable media player icon in Banshee. This will copy the files to your "
+@@ -383,22 +385,24 @@ msgid "Remove Music From your Portable Music Player"
+ msgstr "Αφαιρέστε μουσική από τη φορητή σας συσκευή αναπαραγωγής"
+ 
+ #: C/sync.page:136(p)
++#| msgid ""
++#| "To remove songs stored on your portable music player, choose your player "
++#| "in Banshee to view its library. Then choose the tracks you would like to "
++#| "remove and right click the tracks and choose \"Delete\" or from the menu "
++#| "choose <guiseq><gui>Edit</gui><gui>Delete</gui></guiseq>."
+ msgid ""
+ "To remove songs stored on your portable music player, choose your player in "
+ "Banshee to view its library. Then choose the tracks you would like to remove "
+-"and right click the tracks and choose \"Delete\" or from the menu choose "
+-"<guiseq><gui>Edit</gui><gui>Delete</gui></guiseq>."
++"and right click the tracks and choose <gui>Delete</gui> or from the menu "
++"choose <guiseq><gui>Edit</gui><gui>Delete</gui></guiseq>."
+ msgstr ""
+ "Για να αφαιρέσετε τραγούδια αποθηκευμένα στη φορητή σας συσκευή, επιλέξτε τη "
+ "στο Banshee για να δείτε τη βιβλιοθήκη της. Έπειτα επιλέξτε τα κομμάτια που "
+-"θα θέλατε να αφαιρέσετε και κάντε δεξί κλικ στα κομμάτια και επιλέξτε "
+-"\"Διαγραφή\" ή από το μενού επιλέξτε <guiseq><gui>Επεξεργασία</"
+-"gui><gui>Διαγραφή</gui></guiseq>."
++"θα θέλατε να αφαιρέσετε και δεξιοπατήστε στα κομμάτια και επιλέξτε "
++"<gui>Διαγραφή</gui> ή από το μενού επιλέξτε "
++"<guiseq><gui>Επεξεργασία</gui><gui>Διαγραφή</gui></guiseq>."
+ 
+ #: C/sync.page:142(p)
+-#| msgid ""
+-#| "Deleting files from your portable music will permanently remove the files "
+-#| "and you will not be able to recover them."
+ msgid ""
+ "Deleting files from your portable music player will permanently remove the "
+ "files and you will not be able to recover them."
+@@ -419,9 +423,6 @@ msgid "Adding Columns"
+ msgstr "Προσθήκη στηλών"
+ 
+ #: C/sort.page:30(p)
+-#| msgid ""
+-#| "As your library grows, you may want to sort your library view to play "
+-#| "search or view certain songs, artists, or albums."
+ msgid ""
+ "As your library grows, you may want to change your library view to add "
+ "additional information about the songs in your library or change the way you "
+@@ -457,12 +458,6 @@ msgid "Sorting Columns"
+ msgstr "Ταξινόμηση στηλών"
+ 
+ #: C/sort.page:47(p)
+-#| msgid ""
+-#| "You can sort your library by using your mouse to click on any of the "
+-#| "columns displayed in library view. If you wish to sort your music library "
+-#| "by Artist, click the <gui>Artist</gui> column header and Banshee will "
+-#| "automically sort that column alphabetically. Clicking the <gui>Artist</"
+-#| "gui> column again will sort the column in reverse alphabetical order."
+ msgid ""
+ "You can sort your library by using your mouse to click on any of the columns "
+ "displayed in library view. If you wish to sort your music library by Artist, "
+@@ -512,27 +507,26 @@ msgstr ""
+ #| "Banshee will search all metatdata fields including Track Title, Album "
+ #| "Title, Album Artist, Year, etc. Any track whose metadata includes "
+ #| "<em>dave</em> and <em>matthews</em> will be returned. Search terms are "
+-#| "case, meaningyou don't have to capitalize. <em>dave</em>, <em>Dave</em>, "
++#| "case, meaning you don't have to capitalize. <em>dave</em>, <em>Dave</em>, "
+ #| "and <em>DAVE</em> all mean the same thing when searching."
+ msgid ""
+ "A search query consists of some basic terms, for example, <em>dave matthews</"
+ "em>. By entering <em>dave matthews</em> in the search box, Banshee will "
+-"search all metatdata fields including Track Title, Album Title, Album "
+-"Artist, Year, etc. Any track whose metadata includes <em>dave</em> and "
+-"<em>matthews</em> will be returned. Search terms are case, meaning you don't "
++"search all metadata fields including Track Title, Album Title, Album Artist, "
++"Year, etc. Any track whose metadata includes <em>dave</em> and <em>matthews</"
++"em> will be returned. Search terms are case insensitive, meaning you don't "
+ "have to capitalize. <em>dave</em>, <em>Dave</em>, and <em>DAVE</em> all mean "
+ "the same thing when searching."
+ msgstr ""
+ "Ένα ερώτημα αναζήτησης αποτελείται από μερικούς βασικούς όρους, "
+ "παραδείγματος χάριν, <em>dave matthews</em>. Εισάγοντας <em>dave "
+ "matthews</em> στο πεδίο αναζήτησης, το Banshee θα ψάξει σε όλα τα πεδία "
+-"μεταδεδομένων, περιλαμβανομένων των Τίτλου κομματιού, Τίτλου δίσκου, "
+-"Καλλιτέχνη δίσκου, Έτους, κλπ. Οποιοδήποτε κομμάτι του οποίου τα "
++"μεταδεδομένων, περιλαμβανομένων των τίτλου κομματιού, τίτλου δίσκου, "
++"καλλιτέχνη δίσκου, έτους, κλπ. Οποιοδήποτε κομμάτι του οποίου τα "
+ "μεταδεδομένα περιλαμβάνουν το <em>dave</em> και το <em>matthews</em> θα "
+-"εντοπισθεί. Οι όροι αναζήτησης δεν κάνουν διάκριση πεζών-κεφαλαίων, δηλαδή "
+-"δεν χρειάζεται να χρησιμοποιήσετε κεφαλαία στην αρχή των λέξεων. Τα "
+-"<em>dave</em>, <em>Dave</em>, και <em>DAVE</em> όλα σημαίνουν το ίδιο πράγμα "
+-"κατά την αναζήτηση."
++"επιστραφεί. Οι όροι αναζήτησης δεν κάνουν διάκριση πεζών-κεφαλαίων, δηλαδή "
++"δεν χρειάζεται να χρησιμοποιήσετε κεφαλαία. Τα <em>dave</em>, <em>Dave</em>, "
++"και <em>DAVE</em> όλα σημαίνουν το ίδιο πράγμα κατά την αναζήτηση."
+ 
+ #: C/search.page:43(title)
+ msgid "Basic Operators"
+@@ -594,7 +588,6 @@ msgid "OR, or, <key>|</key>, <key>,</key>"
+ msgstr "OR, or, <key>|</key>, <key>,</key>"
+ 
+ #: C/search.page:69(p)
+-#| msgid "Search results will be two terms with either result in any field."
+ msgid "Search results will be two songs with either result in any field."
+ msgstr ""
+ "Τα αποτελέσματα θα είναι δύο τραγούδια με οποιοδήποτε από τα δύο "
+@@ -605,9 +598,6 @@ msgid "NOT, not,<key>-</key>"
+ msgstr "NOT, not,<key>-</key>"
+ 
+ #: C/search.page:73(p)
+-#| msgid ""
+-#| "Do not display search results with any search team that follows the "
+-#| "operator of NOT, not,<key>-</key>."
+ msgid ""
+ "Do not display search results with any search term that follows the operator "
+ "of NOT, not,<key>-</key>."
+@@ -640,12 +630,15 @@ msgid "dave, matthews"
+ msgstr "dave, matthews"
+ 
+ #: C/search.page:92(p) C/search.page:97(p) C/search.page:102(p)
++#| msgid ""
++#| "Matches any fields in a track containing both <em>dave</em> or "
++#| "<em>matthews</em>."
+ msgid ""
+-"Matches any fields in a track containing both <em>dave</em> or <em>matthews</"
+-"em>."
++"Matches any fields in a track containing either <em>dave</em> or "
++"<em>matthews</em>."
+ msgstr ""
+-"Ταιριάζει με οποιαδήποτε πεδία ενός κομματιού περιλαμβάνουν το <em>dave</em> "
+-"ή το <em>matthews</em>."
++"Ταιριάζει με οποιαδήποτε πεδία ενός κομματιού που περιλαμβάνουν το "
++"<em>dave</em> ή το <em>matthews</em>."
+ 
+ #: C/search.page:97(p)
+ msgid "dave or matthews"
+@@ -660,8 +653,9 @@ msgid "-\"dave matthews\""
+ msgstr "-\"dave matthews\""
+ 
+ #: C/search.page:107(p)
+-msgid ""
+-"Displays all tracks whose fields do not containt <em>dave matthews</em>."
++#| msgid ""
++#| "Displays all tracks whose fields do not containt <em>dave matthews</em>."
++msgid "Displays all tracks whose fields do not contain <em>dave matthews</em>."
+ msgstr ""
+ "Εμφανίζει όλα τα κομμάτια των οποίων τα πεδία δεν περιέχουν <em>dave "
+ "matthews</em>."
+@@ -727,11 +721,6 @@ msgstr ""
+ "guiseq> από το μενού του Banshee."
+ 
+ #: C/play.page:42(p)
+-#| msgid ""
+-#| "You can also start playing an album by choosing the album in the album "
+-#| "browser and pressing use your mouse to double click the song name, press "
+-#| "the <key>Spacebar</key>, or choose <guiseq><gui>Playback</gui><gui>Play</"
+-#| "gui></guiseq> from the Banshee menu."
+ msgid ""
+ "You can also start playing an album by choosing the album in the album "
+ "browser and using your mouse to double click the song name, press the "
+@@ -740,9 +729,8 @@ msgid ""
+ msgstr ""
+ "Μπορείτε να ξεκινήσετε την αναπαραγωγή ενός δίσκου επιλέγοντας το δίσκο στην "
+ "περιήγηση δίσκων με διπλό κλικ στο όνομα του τραγουδιού, πατώντας το "
+-"<key>πλήκτρο διαστήματος</key> ή επιλέγοντας "
+-"<guiseq><gui>Αναπαραγωγή</gui><gui>Αναπαραγωγή</gui></guiseq> από το μενού "
+-"του Banshee."
++"<key>πλήκτρο διαστήματος</key> ή επιλέγοντας <guiseq><gui>Αναπαραγωγή</"
++"gui><gui>Αναπαραγωγή</gui></guiseq> από το μενού του Banshee."
+ 
+ #: C/play.page:48(p)
+ msgid ""
+@@ -797,8 +785,12 @@ msgid "Play a Podcast"
+ msgstr "Αναπαραγωγή φορητής εκπομπής"
+ 
+ #: C/play.page:76(p)
++#| msgid ""
++#| "Podcasts shows you all Podcasts you're subscribed too, all Podcast shows "
++#| "available, and the Podcast browser lists all Podcasts in order of newest "
++#| "first."
+ msgid ""
+-"Podcasts shows you all Podcasts you're subscribed too, all Podcast shows "
++"Podcasts shows you all Podcasts you're subscribed to, all Podcast shows "
+ "available, and the Podcast browser lists all Podcasts in order of newest "
+ "first."
+ msgstr ""
+@@ -897,19 +889,28 @@ msgstr ""
+ "αναπαραγωγής</gui>."
+ 
+ #: C/play-queue.page:43(p)
++#| msgid ""
++#| "You can select multiple files by using your mouse and pressing "
++#| "<key>Control</key> and choosing each file with your mouse or select a "
++#| "range of files by pressing <key>Shift</key> twice to select that range of "
++#| "files. You can then drag and drop it over the <gui>Play Queue</gui> in "
++#| "the far left window pane or right click the tracks and choose <gui>Add to "
++#| "Play Queue</gui>."
+ msgid ""
+ "You can select multiple files by using your mouse and pressing <key>Control</"
+ "key> and choosing each file with your mouse or select a range of files by "
+-"pressing <key>Shift</key> twice to select that range of files. You can then "
+-"drag and drop it over the <gui>Play Queue</gui> in the far left window pane "
+-"or right click the tracks and choose <gui>Add to Play Queue</gui>."
++"pressing <key>Shift</key> and clicking twice to select that range of files. "
++"You can then drag and drop it over the <gui>Play Queue</gui> in the far left "
++"window pane or right click the tracks and choose <gui>Add to Play Queue</"
++"gui>."
+ msgstr ""
+-"Μπορείτε να επιλέξετε πολλαπλά αρχεία με το ποντίκι και πατώντας το "
++"Μπορείτε να επιλέξετε πολλαπλά αρχεία με το ποντίκι, πατώντας το "
+ "<key>Control</key> και επιλέγοντας κάθε αρχείο με το ποντίκι σας ή "
+-"επιλέγοντας μια σειρά αρχείων πατώντας δυο φορές το <key>Shift</key> για να "
+-"τα επιλέξετε. Μπορείτε μετά να σύρετε και να τα αφήσετε πάνω στη <gui>Σειρά "
+-"αναπαραγωγής</gui> στο αριστερότερο πλαίσιο του παραθύρου ή να κάνετε δεξί "
+-"κλικ στα κομμάτια και να επιλέξτε <gui>Προσθήκη στη σειρά αναπαραγωγής</gui>."
++"επιλέγοντας μια σειρά αρχείων πατώντας το <key>Shift</key> και πατώντας δυο "
++"φορές για να επιλέξετε τα αρχεία. Μπορείτε μετά να σύρετε και να τα αφήσετε "
++"πάνω στη <gui>Σειρά αναπαραγωγής</gui> στο αριστερότερο πλαίσιο του "
++"παραθύρου ή να κάνετε δεξί κλικ στα κομμάτια και να επιλέξτε <gui>Προσθήκη "
++"στη σειρά αναπαραγωγής</gui>."
+ 
+ #: C/play-queue.page:56(title)
+ msgid "Organize Your Play Queue"
+@@ -986,7 +987,7 @@ msgstr ""
+ "διαδικτύου θα έχει ήδη ενσωματωμένα τα μεταδεδομένα και αν εισάγετε μουσική "
+ "από CD, το Banshee θα συμπεριλάβει τα μεταδεδομένα κατά την εξαγωγή από το "
+ "CD, αν είναι διαθέσιμα. Για περισσότερες πληροφορίες για την εξαγωγή CD και "
+-"την συμπερίληψη μεταδεδομένων δείτε την <link xref=\"εισαγωγή\"/>."
++"την συμπερίληψη μεταδεδομένων δείτε την <link xref=\"import\"/>."
+ 
+ #: C/manage-tags.page:39(p)
+ msgid ""
+@@ -1034,8 +1035,9 @@ msgstr ""
+ "προεπιλεγμένα πεδία που εμφανίζονται περιλαμβάνουν:"
+ 
+ #: C/manage-tags.page:63(gui)
+-msgid "Track Title:"
+-msgstr "Τίτλος κομματιού:"
++#| msgid "Track Title:"
++msgid "Track Title"
++msgstr "Τίτλος κομματιού"
+ 
+ #: C/manage-tags.page:64(gui)
+ msgid "Track Artist"
+@@ -1079,7 +1081,7 @@ msgstr ""
+ msgid "Create and manage playlists."
+ msgstr "Δημιουργία και διαχείριση λιστών αναπαραγωγής."
+ 
+-#: C/manage-playlists.page:19(title)
++#: C/manage-playlists.page:19(title) C/keyboardshortcuts.page:69(title)
+ msgid "Playlists"
+ msgstr "Λίστες αναπαραγωγής"
+ 
+@@ -1134,7 +1136,7 @@ msgstr ""
+ #| "gui><gui>New Playlist</gui></guiseq> or by selecing the track(s) you "
+ #| "would like to add to the playlist. Select the track(s), right click them, "
+ #| "and choose <guiseq><gui>Add to Playlist</gui><gui>New Playlist</gui></"
+-#| "guiseq>. You can also drag and drop them to a new playlist by selcting "
++#| "guiseq>. You can also drag and drop them to a new playlist by selecting "
+ #| "the track(s) and dragging them to the left hand window pane over "
+ #| "<gui>Music</gui>. As you drag it over <gui>Music</gui>, a new option "
+ #| "<gui><em>New Playlist</em></gui> will appear and you can drop the track"
+@@ -1143,7 +1145,7 @@ msgstr ""
+ #| "in the playlist."
+ msgid ""
+ "You can create a new playlist by pressing <keyseq><key>Control</key><key>N</"
+-"key></keyseq>, from the menu choosing <guiseq><gui>Menu</gui><gui>New "
++"key></keyseq>, from the menu choosing <guiseq><gui>Media</gui><gui>New "
+ "Playlist</gui></guiseq> or by selecing the track(s) you would like to add to "
+ "the playlist. Select the track(s), right click them, and choose "
+ "<guiseq><gui>Add to Playlist</gui><gui>New Playlist</gui></guiseq>. You can "
+@@ -1156,15 +1158,16 @@ msgid ""
+ msgstr ""
+ "Μπορείτε να δημιουργήσετε μια νέα λίστα αναπαραγωγής πατώντας "
+ "<keyseq><key>Control</key><key>N</key></keyseq>, από το μενού επιλέγοντας "
+-"<guiseq><gui>Μενού</gui><gui>Νέα λίστα αναπαραγωγής</gui></guiseq> ή "
++"<guiseq><gui>Μέσα</gui><gui>Νέα λίστα αναπαραγωγής</gui></guiseq> ή "
+ "επιλέγοντας τα κομμάτια που θέλετε να προσθέσετε στη λίστα αναπαραγωγής. "
+-"Επιλέξτε τα κομμάτια, κάντε δεξί κλικ και επιλέξτε <guiseq><gui>Προσθήκη στη "
++"Επιλέξτε τα κομμάτια, δεξιοπατήστε τα και επιλέξτε <guiseq><gui>Προσθήκη στη "
+ "λίστα αναπαραγωγής</gui><gui>Νέα λίστα αναπαραγωγής</gui></guiseq>. "
+ "Μπορείτε επίσης να σύρετε και να τα αφήσετε σε μια νέα λίστα αναπαραγωγής "
+-"επιλέγοντας τα κομμάτια και σύροντάς τα στο αριστερό πλαίσιο πάνω από το "
+-"<gui>Μουσική</gui>. Καθώς τα σύρετε πάνω από το <gui>Μουσική</gui>, θα "
+-"εμφανισθεί μια νέα επιλογή <gui><em>Νέα λίστα αναπαραγωγής</em></gui> και "
+-"μπορείτε να αφήσετε τα κομμάτια πάνω από αυτή για να προσθέσετε στη λίστα "
++"επιλέγοντας τα κομμάτια και σύροντάς τα στο αριστερό πλαίσιο του παραθύρου "
++"πάνω από το <gui>Μουσική</gui>. Καθώς τα σύρετε πάνω από το "
++"<gui>Μουσική</gui>, θα εμφανισθεί μια νέα επιλογή <gui><em>Νέα λίστα "
++"αναπαραγωγής</em></gui> και μπορείτε να αφήσετε τα κομμάτια πάνω από τη "
++"<gui><em>Νέα λίστα αναπαραγωγής</em></gui> για να τα προσθέσετε στη λίστα "
+ "αναπαραγωγής. Μπορείτε να επαναλάβετε αυτή τη διαδικασία μέχρι να προσθέσετε "
+ "όλα τα κομμάτια που θέλετε στη λίστα αναπαραγωγής."
+ 
+@@ -1326,10 +1329,9 @@ msgstr ""
+ "Πρόσφατα αγαπημένα (τραγούδια που ακούστηκαν συχνά την προηγούμενη εβδομάδα)"
+ 
+ #: C/manage-playlists.page:135(p)
+-msgid "Recently Added (Songs imported within the last week"
+-msgstr ""
+-"Πρόσφατες προσθήκες (τραγούδια που εισήχθησαν εντός της προηγούμενης "
+-"εβδομάδας)"
++#| msgid "Recently Added (Songs imported within the last week"
++msgid "Recently Added (Songs imported within the last week)"
++msgstr "Πρόσφατες προσθήκες (τραγούδια που εισήχθησαν την προηγούμενη εβδομάδα)"
+ 
+ #: C/manage-playlists.page:136(p)
+ msgid "Unheard (Songs that have not been played or skipped)"
+@@ -1371,15 +1373,6 @@ msgid "Last.fm"
+ msgstr "Last.fm"
+ 
+ #: C/lastfm.page:26(p)
+-#| msgid ""
+-#| "Last.fm is a popular online service that offers both free and paid "
+-#| "versions. Last.fm offers information on music artists and albums and if "
+-#| "you create a user profile Last.fm allows you to track the music you "
+-#| "listen to in Banshee for free. If you suscribe as a paying member, you "
+-#| "can also listen to streaming music from Last.fm in various music clients, "
+-#| "including Banshee. Last.fm offers multiple channels to stream, including "
+-#| "recommended music for you based on your listening habits, your favorites "
+-#| "and more."
+ msgid ""
+ "Last.fm is a popular online service that offers both free and paid versions. "
+ "Last.fm offers information on music artists and albums and if you create a "
+@@ -1392,33 +1385,43 @@ msgstr ""
+ "Το Last.fm είναι μια δημοφιλής δικτυακή υπηρεσία που προσφέρει τόσο δωρεάν "
+ "όσο και επί πληρωμή υπηρεσίες. Το Last.fm προσφέρει πληροφορίες για "
+ "καλλιτέχνες της μουσικής και δίσκους και αν δημιουργήσετε ένα προφίλ χρήστη, "
+-"το Last.fm σας επιτρέπει να παρακολουθείτε τη μουσική που ακούτε στο "
+-"Banshee δωρεάν. Αν γίνετε επί πληρωμή συνδρομητής, μπορείτε επίσης να ακούτε "
+-"ροές μουσικής από το Last.fm σε διάφορους πελάτες μουσικής, "
+-"περιλαμβανομένου του Banshee. Το Last.fm προσφέρει πολλαπλά κανάλια για "
+-"ροές, περιλαμβανομένης προτεινόμενης μουσικής για εσάς με βάση τις συνήθειες "
+-"ακρόασής σας, τα αγαπημένα σας και άλλα."
++"το Last.fm σας επιτρέπει να παρακολουθείτε τη μουσική που ακούτε στο Banshee "
++"δωρεάν. Αν γίνετε επί πληρωμή συνδρομητής, μπορείτε επίσης να ακούτε ροές "
++"μουσικής από το Last.fm σε διάφορους πελάτες μουσικής, περιλαμβανομένου του "
++"Banshee. Το Last.fm προσφέρει πολλαπλά κανάλια για ροές, περιλαμβανομένης "
++"προτεινόμενης μουσικής για εσάς με βάση τις συνήθειες ακρόασής σας, τα "
++"αγαπημένα σας και άλλα."
+ 
+ #: C/lastfm.page:35(title)
+ msgid "Enable Last.fm"
+ msgstr "Ενεργοποίηση Last.fm"
+ 
+ #: C/lastfm.page:36(p)
++#| msgid ""
++#| "To get the most out of Last.fm, you will want to create a Last.fm "
++#| "profile. Visit <link href=\"http://www.last.fm/join\">http://www.last.fm/"
++#| "join</link> to create an account or choose <guiseq><gui>Edit</"
++#| "gui><gui>Preferences</gui></guiseq> from the Banshee menu. Then press the "
++#| "<gui>Source Specific</gui> tab and press the <gui>Source</gui> drop down "
++#| "menu and choose <gui>Last.fm</gui> and select the <em>Sign up for Last."
++#| "fm</em> link."
+ msgid ""
+ "To get the most out of Last.fm, you will want to create a Last.fm profile. "
+ "Visit <link href=\"http://www.last.fm/join\">http://www.last.fm/join</link> "
+ "to create an account or choose <guiseq><gui>Edit</gui><gui>Preferences</"
+-"gui></guiseq> from the Banshee menu. Then press the <gui>Source Specific</"
+-"gui> tab and press the <gui>Source</gui> drop down menu and choose <gui>Last."
+-"fm</gui> and select the <em>Sign up for Last.fm</em> link."
+-msgstr ""
+-"Για να αξιοποιήσετε καλύτερα το Last.fm, θα πρέπει να δημιουργήσετε ένα "
+-"προφίλ. Επισκεφθείτε το <link href=\"http://www.last.fm/join\">http://www."
+-"last.fm/join</link> για να δημιουργήσετε ένα λογαριασμό ή επιλέξτε "
++"gui></guiseq> from the Banshee menu. Once in the preferences select the "
++"<gui>Source Specific</gui> tab, press the <gui>Source</gui> drop down menu, "
++"choose <gui>Last.fm</gui> and finally select the <em>Sign up for Last.fm</"
++"em> link."
++msgstr ""
++"Για να αξιοποιήσετε καλύτερα το Last.fm, θα πρέπει να δημιουργήσετε μια "
++"κατατομή στο Last.fm. Επισκεφθείτε το <link "
++"href=\"http://www.last.fm/join\">http://www.last.fm/join</link> για να "
++"δημιουργήσετε ένα λογαριασμό ή επιλέξτε "
+ "<guiseq><gui>Επεξεργασία</gui><gui>Προτιμήσεις</gui></guiseq> από το μενού "
+ "του Banshee. Μετά πατήστε την καρτέλα <gui>Για συγκεκριμένη πηγή</gui> και "
+ "πατήστε το αναπτυσσόμενο μενού <gui>Πηγή</gui>, επιλέξτε <gui>Last.fm</gui> "
+-"και επιλέξτε <em>Εγγραφή στο Last.fm</em>."
++"και επιλέξτε τελικά τον σύνδεσμο <em>Εγγραφή στο Last.fm</em>."
+ 
+ #: C/lastfm.page:45(p)
+ msgid ""
+@@ -1442,35 +1445,111 @@ msgstr ""
+ "<gui>Ολοκλήρωση σύνδεσης</gui> για να ολοκληρωθεί η διαδικασία."
+ 
+ #: C/lastfm.page:58(title)
+-msgid "Enable Last.fm Song Reporting"
+-msgstr "Ενεργοποίηση αναφοράς τραγουδιού στο Last.fm"
++#| msgid "Enable Last.fm Song Reporting"
++msgid "Enable Last.fm Song Reporting From Banshee"
++msgstr "Ενεργοποίηση αναφοράς τραγουδιού στο Last.fm από το Banshee"
+ 
+ #: C/lastfm.page:59(p)
+-msgid ""
+-"After you have successfully linked Banshee to your Last.fm profile, to "
+-"enable Banshee to report the songs to your Last.fm profile, in the "
+-"<gui>Source Specific</gui> tab in Banshee's preferences, press the "
+-"<gui>Enable Song Reporting</gui> checkbox. If you have an active internet "
+-"connection, Banshee will now send Last.fm information regarding the songs "
+-"you play. To view your play history, visit your profile on the Last.fm "
+-"website. Last.fm will automatically update your music metadata if any of "
+-"your artist, song title or album information is incorrect."
+-msgstr ""
+-"Αφού έχετε επιτυχώς συνδέσει το Banshee με το προφίλ σας στο Last.fm, για να "
+-"ενεργοποιήσετε την αναφορά τραγουδιών στο προφίλ σας του Last.fm, στην "
+-"καρτέλα <gui>Συγκεκριμένη πηγή</gui> στις προτιμήσεις του Banshee, πατήστε "
+-"στο πεδίο <gui>Ενεργοποίηση αναφοράς τραγουδιών</gui>. Αν έχετε ενεργή "
+-"σύνδεση στο διαδίκτυο, το Banshee θα στέλνει στο Last.fm πληροφορίες σχετικά "
+-"με τα τραγούδια που παίζετε. Για να προβάλετε το ιστορικό αναπαραγωγής σας, "
+-"επισκεφθείτε το προφίλ σας στην ιστοσελίδα του Last.fm. Το Last.fm θα "
+-"ενημερώνει αυτόματα τα μεταδεδομένα της μουσικής σας αν οι πληροφορίες για "
+-"κάποιο καλλιτέχνη, τίτλο τραγουδιού ή δίσκο είναι λανθασμένες."
+-
+-#: C/lastfm.page:72(title)
++#| msgid ""
++#| "After you have successfully linked Banshee to your Last.fm profile, to "
++#| "enable Banshee to report the songs to your Last.fm profile, in the "
++#| "<gui>Source Specific</gui> tab in Banshee's preferences, press the "
++#| "<gui>Enable Song Reporting</gui> checkbox. If you have an active internet "
++#| "connection, Banshee will now send Last.fm information regarding the songs "
++#| "you play. To view your play history, visit your profile on the Last.fm "
++#| "website. Last.fm will automatically update your music metadata if any of "
++#| "your artist, song title or album information is incorrect."
++msgid ""
++"After you have successfully linked Banshee to your Last.fm profile you must "
++"ensure that you have enabled Banshee to report your songs. To enable Banshee "
++"to report the songs to your Last.fm profile go to Banshee's preferences, "
++"select the <gui>Source Specific</gui> tab, select <gui>Last.fm</gui> from "
++"the dropdown, and press the <gui>Enable Song Reporting From Banshee</gui> "
++"checkbox. If you have an active internet connection Banshee will now send "
++"Last.fm information regarding the songs you play. To view your play history "
++"visit your profile on the Last.fm website. Last.fm will automatically update "
++"your music metadata if any of your artist, song title, or album information "
++"is incorrect (although we recommend that you use the Metadata Fixer "
++"extension to correct your files instead)."
++msgstr ""
++"Αφού έχετε επιτυχώς συνδέσει το Banshee με τη κατατομή σας στο Last.fm, "
++"πρέπει να βεβαιωθείτε ότι έχετε ενεργοποιήσει το Banshee για να αναφέρει τα "
++"τραγούδιά σας. Για την ενεργοποίηση του Banshee ώστε να αναφέρει τα "
++"τραγούδια στην κατατομή σας στο Last.fm, πηγαίνετε στις προτιμήσεις του "
++"Banshee, επιλέξτε στην καρτέλα <gui>Ειδική πηγή</gui>, επιλέξτε "
++"<gui>Last.fm</gui> από το πτυσσόμενο και πατήστε το πλαίσιο ελέγχου "
++"<gui>Ενεργοποίηση αναφοράς τραγουδιού από το Banshee</gui>. Αν έχετε μια "
++"ενεργή σύνδεση διαδικτύου Banshee, θα στείλει τώρα τις πληροφορίες του "
++"Last.fm σχετικά με τα τραγούδια που παίζετε. Για να προβάλετε το ιστορικό "
++"αναπαραγωγής, επισκεφτείτε την κατατομή σας στον ιστότοπο του Last.fm. Το "
++"Last.fm θα ενημερώσει αυτόματα τα μουσικά σας μεταδεδομένα, αν κάποιος από "
++"τα καλλιτέχνης, τίτλος τραγουδιού, ή πληροφορίες δίσκου είναι εσφαλμένο (αν "
++"και συνιστούμε να χρησιμοποιείτε την επέκταση Metadata Fixer για να "
++"διορθώσετε τα αρχεία σας)."
++
++#: C/lastfm.page:75(title)
++#| msgid "Enable Last.fm Song Reporting"
++msgid "Enable Last.fm Song Reporting From Your Device"
++msgstr "Ενεργοποίηση αναφοράς τραγουδιού στο Last.fm από τη συσκευή σας"
++
++#: C/lastfm.page:76(p)
++msgid ""
++"After successfully linking Banshee to your Last.fm profile and enabling "
++"Banshee to report songs to Last.fm you can also enable scrobbling from a "
++"connected device. Banshee will, upon connection of your device, attempt to "
++"scrobble the songs you have played since the device was last connected and "
++"submit them to Last.fm."
++msgstr ""
++"Μετά την πετυχημένη σύνδεση του Banshee στη κατατομή σας του Last.fm και την "
++"ενεργοποίηση του Banshee για αναφορά τραγουδιών στο Last.fm, μπορείτε "
++"επίσης να ενεργοποιήσετε τις επιλογές από μια συνδεμένη συσκευή. Το Banshee, "
++"με τη σύνδεση της συσκευής σας, θα προσπαθήσει να διαλέξει τα τραγούδια που "
++"έχετε παίξει από την τελευταία σύνδεση της συσκευής και να τα υποβάλλει στο "
++"Last.fm."
++
++#: C/lastfm.page:82(p)
++msgid ""
++"To enable scrobbling of a connected device go to Banshee's preferences, "
++"select the <gui>Source Specific</gui> tab, select <gui>Last.fm</gui> from "
++"the dropdown, and press the <gui>Enable Song Reporting From Device</gui> "
++"checkbox. If you have an active internet connection Banshee will, upon "
++"connection of your device, now attempt to gather information regarding the "
++"songs that you have played since it was last connected."
++msgstr ""
++"Για την ενεργοποίηση της επιλογής μιας συνδεμένης συσκευής πηγαίνετε στις "
++"προτιμήσεις του Banshee, επιλέξτε την καρτέλα <gui>Ειδική πηγή</gui>, "
++"επιλέξτε <gui>Last.fm</gui> από την πτυσσόμενη λίστα και πατήστε το πλαίσιο "
++"ελέγχου <gui>Ενεργοποίηση αναφοράς τραγουδιού από συσκευή</gui>. Αν έχετε "
++"μια ενεργή διαδικτυακή σύνδεση το Banshee, με τη σύνδεση της συσκευής σας, "
++"θα προσπαθήσει να συλλέξει πληροφορίες σχετικά με τα τραγούδια που έχουν "
++"παίξει από την τελευταία σύνδεση."
++
++#: C/lastfm.page:89(p)
++msgid ""
++"As with regular Banshee scrobbling submissions Last.fm will automatically "
++"update your music metadata if any of your artist, title, or album "
++"information is incorrect (although we again recommend that you use the "
++"Metadata Fixer extension to correct your files instead)."
++msgstr ""
++"Όπως με τις κανονικές υποβολές επιλογής του Banshee, το Last.fm θα "
++"ενημερώσει αυτόματα τα μουσικά σας μεταδεδομένα αν οποιαδήποτε από τις "
++"πληροφορίες καλλιτέχνη, τίτλου ή δίσκου είναι εσφαλμένες (αν και συνιστούμε "
++"πάλι τη χρήση της επέκτασης Metadata Fixer για διόρθωση των αρχείων σας)."
++
++#: C/lastfm.page:94(p)
++msgid ""
++"Please note that currently Banshee only supports this feature with Apple "
++"products that are supported by the AppleDevice extension."
++msgstr ""
++"Παρακαλούμε, σημειώστε ότι προς το παρόν το Banshee υποστηρίζει αυτό το "
++"γνώρισμα μόνο με προϊόντα Apple που υποστηρίζονται από την επέκταση "
++"AppleDevice."
++
++#: C/lastfm.page:101(title)
+ msgid "Listen to Last.fm Radio"
+ msgstr "Ακούστε το ραδιόφωνο του Last.fm"
+ 
+-#: C/lastfm.page:73(p)
++#: C/lastfm.page:102(p)
+ msgid ""
+ "Last.fm radio is free for residents of the United States, United Kingdom and "
+ "Germany. Residents of other countries will have to pay for a premium account "
+@@ -1483,21 +1562,21 @@ msgstr ""
+ "πληρώσουν για ένα λογαριασμό του Last.fm για ακούσουν ραδιόφωνο. Τα επί "
+ "πληρωμή μέλη, επίσης έχουν επιπλέον χαρακτηριστικά στο ραδιόφωνο: ακρόαση "
+ "λιστών αναπαραγωγής και σταθμούς μουσικής που σας αρέσουν ή έχετε "
+-"επισημάνει. "
++"επισημάνει."
+ 
+-#: C/lastfm.page:80(p)
++#: C/lastfm.page:109(p)
+ #| msgid ""
+-#| "In Banshee's context menu onthe left hand side, you will now have a Last."
+-#| "fm section, including your Lat.fm radio stations. You will need an active "
+-#| "internet connection to listen to Last.fm radio. Choose the radio station "
+-#| "you wish to listen to and Banshee will communicate with Last.fm to "
+-#| "populate songs for that radio station. Press the <gui>Play</gui> button "
+-#| "in Banshee or <key>Spacebar</key> to start streaming a Last.fm radio "
+-#| "station. You can also press the <gui>Next</gui> button in Banshee, "
++#| "In Banshee's context menu on the left hand side, you will now have a Last."
++#| "fm section, including your Last.fm radio stations. You will need an "
++#| "active internet connection to listen to Last.fm radio. Choose the radio "
++#| "station you wish to listen to and Banshee will communicate with Last.fm "
++#| "to populate songs for that radio station. Press the <gui>Play</gui> "
++#| "button in Banshee or <key>Spacebar</key> to start streaming a Last.fm "
++#| "radio station. You can also press the <gui>Next</gui> button in Banshee, "
+ #| "<key>N</key> or choose <guiseq><gui>Playback</gui><gui>Next</gui></"
+ #| "guiseq> to play the next song in your radio station queue."
+ msgid ""
+-"In Banshee's context menu on the left hand side, you will now have a Last.fm "
++"In Banshee's sources pane on the left hand side, you will now have a Last.fm "
+ "section, including your Last.fm radio stations. You will need an active "
+ "internet connection to listen to Last.fm radio. Choose the radio station you "
+ "wish to listen to and Banshee will communicate with Last.fm to populate "
+@@ -1507,16 +1586,17 @@ msgid ""
+ "<guiseq><gui>Playback</gui><gui>Next</gui></guiseq> to play the next song in "
+ "your radio station queue."
+ msgstr ""
+-"Στο μενού περιεχομένου του Banshee, στην αριστερή πλευρά, θα έχετε τώρα μια "
+-"ενότητα Last.fm, που περιλαμβάνει τους σταθμούς σας του Last.fm. Θα "
++"Στο παράθυρο πηγών του Banshee στα αριστερά, θα έχετε τώρα μια ενότητα "
++"Last.fmΣ, που συμπεριλαμβάνει τους σταθμούς σας του ραδιοφώνου Last.fm. Θα "
+ "χρειαστείτε μια ενεργή σύνδεση διαδικτύου για να ακούσετε το ραδιόφωνο του "
+ "Last.fm. Επιλέξτε το ραδιοφωνικό σταθμό που θέλετε να ακούσετε και το "
+ "Banshee θα επικοινωνήσει με το Last.fm για να συμπληρώσει τραγούδια για αυτό "
+ "το ραδιοφωνικό σταθμό. Πατήστε το κουμπί <gui>Αναπαραγωγή</gui> στο Banshee "
+-"ή το <key>Spacebar</key> για να αρχίσετε τη ροή του ραδιοφωνικού σταθμού. "
+-"Μπορείτε επίσης να πατήσετε το κουμπί <gui>Επόμενο</gui>, το <key>N</key> ή "
+-"να επιλέξετε <guiseq><gui>Αναπαραγωγή</gui><gui>Επόμενο</gui></guiseq> για "
+-"να αναπαράγετε το επόμενο τραγούδι στη σειρά του ραδιοφωνικού σταθμού."
++"ή το <key>πλήκτρο διαστήματος</key> για να αρχίσετε τη ροή του ραδιοφωνικού "
++"σταθμού Last.fm. Μπορείτε επίσης να πατήσετε το κουμπί <gui>Επόμενο</gui> "
++"στο Banshee, το <key>N</key> ή να επιλέξετε "
++"<guiseq><gui>Αναπαραγωγή</gui><gui>Επόμενο</gui></guiseq> για να αναπαράγετε "
++"το επόμενο τραγούδι στη σειρά του ραδιοφωνικού σταθμού."
+ 
+ #: C/keyboardshortcuts.page:7(desc) C/advanced.page:27(title)
+ #: C/advanced.page:29(title)
+@@ -1567,28 +1647,28 @@ msgstr "B"
+ msgid "Play the previous song"
+ msgstr "Αναπαραγωγή του προηγούμενου τραγουδιού"
+ 
+-#: C/keyboardshortcuts.page:49(title) C/keyboardshortcuts.page:69(title)
++#: C/keyboardshortcuts.page:49(title)
+ msgid "Library Interaction"
+ msgstr "Αλληλεπίδραση με βιβλιοθήκη"
+ 
+-#: C/keyboardshortcuts.page:56(key) C/keyboardshortcuts.page:76(key)
++#: C/keyboardshortcuts.page:56(p)
++msgid "<key>/</key>, <keyseq><key>Control</key><key>F</key></keyseq>"
++msgstr "<key>/</key>, <keyseq><key>Control</key><key>F</key></keyseq>"
++
++#: C/keyboardshortcuts.page:56(p)
++msgid "Move the focus to the search box"
++msgstr "Μεταφορά της εστίασης στο πεδίο αναζήτησης"
++
++#: C/keyboardshortcuts.page:60(key) C/keyboardshortcuts.page:76(key)
+ #: C/keyboardshortcuts.page:114(key) C/keyboardshortcuts.page:118(key)
+ #: C/keyboardshortcuts.page:123(key) C/keyboardshortcuts.page:127(key)
+ #: C/keyboardshortcuts.page:132(key) C/keyboardshortcuts.page:137(key)
+ msgid "Control"
+ msgstr "Έλεγχος"
+ 
+-#: C/keyboardshortcuts.page:56(key) C/keyboardshortcuts.page:110(key)
+-msgid "F"
+-msgstr "F"
+-
+-#: C/keyboardshortcuts.page:56(p)
+-msgid "Move the focus to the search box"
+-msgstr "Μεταφορά της εστίασης στο πεδίο αναζήτησης"
+-
+-#: C/keyboardshortcuts.page:60(p)
+-msgid "<key>/</key>, <keyseq><key>Control</key><key>F</key></keyseq>"
+-msgstr "<key>/</key>, <keyseq><key>Control</key><key>F</key></keyseq>"
++#: C/keyboardshortcuts.page:60(key)
++msgid "I"
++msgstr "I"
+ 
+ #: C/keyboardshortcuts.page:61(p)
+ msgid "Open import media dialog"
+@@ -1614,6 +1694,10 @@ msgstr "Σήμανση των επιλεγμένων επεισοδίων ως 
+ msgid "Interface"
+ msgstr "Διεπαφή"
+ 
++#: C/keyboardshortcuts.page:110(key)
++msgid "F"
++msgstr "F"
++
+ #: C/keyboardshortcuts.page:110(p)
+ msgid "Toggle full-screen mode"
+ msgstr "Εναλλαγή κατάστασης πλήρους οθόνης"
+@@ -1694,10 +1778,6 @@ msgid "Introduction"
+ msgstr "Εισαγωγή"
+ 
+ #: C/introduction.page:26(p)
+-#| msgid ""
+-#| "<app>Banshee</app> is a media player that allows you to play your music, "
+-#| "videos, and other media media as well sync it with portable devices to "
+-#| "take your media on the go."
+ msgid ""
+ "<app>Banshee</app> is a media player that allows you to play your music, "
+ "videos, and other media as well sync it with portable devices to take your "
+@@ -1730,30 +1810,34 @@ msgstr ""
+ "περισσότερων iPod, τους αναπαραγωγείς MP3 της Sandisk και της Creative και "
+ "κινητά με λειτουργικό Android."
+ 
+-#: C/index.page:24(title)
++#: C/index.page:14(name)
++msgid "Sindhu S"
++msgstr "Sindhu S"
++
++#: C/index.page:15(email)
++msgid "sindhus@live.in"
++msgstr "sindhus@live.in"
++
++#: C/index.page:29(title)
+ msgid "Add, Remove &amp; Play"
+ msgstr "Προσθήκη, Αφαίρεση &amp; Αναπαραγωγή"
+ 
+-#: C/index.page:28(title)
++#: C/index.page:33(title)
+ msgid "Manage &amp; Sort"
+ msgstr "Διαχείριση &amp; Ταξινόμηση"
+ 
+-#: C/index.page:32(title)
++#: C/index.page:37(title)
+ msgid "Sync your media with a portable music player"
+ msgstr "Συγχρονισμός των πολυμέσων σας με φορητή συσκευή μουσικής"
+ 
+-#: C/index.page:36(title)
++#: C/index.page:41(title)
+ msgid "Add additional functionality to Banshee"
+ msgstr "Προσθήκη επιπλέον λειτουργιών στο Banshee"
+ 
+-#: C/index.page:40(title)
++#: C/index.page:45(title)
+ msgid "Advanced options and help"
+ msgstr "Προχωρημένες επιλογές και βοήθεια"
+ 
+-#: C/index.page:44(title)
+-msgid "Common Problems"
+-msgstr "Συνήθη προβλήματα"
+-
+ #: C/import.page:8(desc)
+ msgid "Add music and videos from your computer to your Banshee library."
+ msgstr ""
+@@ -1846,11 +1930,6 @@ msgid "Videos From Photos Folder"
+ msgstr "Βίντεο από το φάκελο φωτογραφίες"
+ 
+ #: C/import.page:55(p)
+-#| msgid ""
+-#| "Many digital cameras can take short vidoes, and photo-management "
+-#| "applications often download these videos directly into your Photos "
+-#| "folder. Choose this option to import any videos that have been stored in "
+-#| "your Photos folder."
+ msgid ""
+ "Many digital cameras can take short videos, and photo-management "
+ "applications often download these videos directly into your Photos folder. "
+@@ -1990,13 +2069,6 @@ msgid "Buy Amazon MP3s in Banshee"
+ msgstr "Αγορά MP3 του Amazon στο Banshee"
+ 
+ #: C/amazon.page:53(p)
+-#| msgid ""
+-#| "You can also search for songs on Amazon within Banshee. Choose the Amazon "
+-#| "MP3 Store from the Banshee menu on the left. This will load the Amazon "
+-#| "MP3 Store just as if you were in a web browser. You can search Amazon for "
+-#| "the music you wish to buy and after logging in to Amazon, buy music with "
+-#| "one click. Banshee will automatically download and import the your "
+-#| "purchase into the library."
+ msgid ""
+ "You can also search for songs on Amazon within Banshee. Choose the Amazon "
+ "MP3 Store from the Banshee menu on the left. This will load the Amazon MP3 "
+@@ -2050,7 +2122,7 @@ msgstr ""
+ 
+ #: C/advanced.page:8(desc)
+ msgid "Get help for advanced actions."
+-msgstr "Βοήθεια για προχωρημένες ενέργειες"
++msgstr "Βοήθεια για προχωρημένες ενέργειες."
+ 
+ #: C/advanced.page:23(title)
+ msgid "Advanced Options and Help"
+@@ -2071,12 +2143,6 @@ msgid "What is Internet Radio?"
+ msgstr "Τι είναι το διαδικτυακό ραδιόφωνο;"
+ 
+ #: C/add-radio.page:31(p)
+-#| msgid ""
+-#| "Internet radio stations are similar to regular radio stations, allowing "
+-#| "an individual or organization to stream music live over the internet. "
+-#| "Internet radio stations can be a simultaneous stream of a regular radio "
+-#| "station, an amateur broadasting their own station, or commercial internet "
+-#| "radio stations that include live DJs and even commercials."
+ msgid ""
+ "Internet radio stations are similar to regular radio stations, allowing an "
+ "individual or organization to stream music live over the internet. Internet "
+@@ -2096,14 +2162,19 @@ msgid "Add Radio Station"
+ msgstr "Προσθήκη ραδιοφωνικού σταθμού"
+ 
+ #: C/add-radio.page:43(p)
++#| msgid ""
++#| "To add an internet radio station to Banshee, press <gui>Add Station</gui> "
++#| "in the upper right hand corner of Banshee or, from the menu, choose "
++#| "<guiseq><gui>Menu</gui><gui>Add Station</gui></guiseq>."
+ msgid ""
+ "To add an internet radio station to Banshee, press <gui>Add Station</gui> in "
+ "the upper right hand corner of Banshee or, from the menu, choose "
+-"<guiseq><gui>Menu</gui><gui>Add Station</gui></guiseq>."
++"<guiseq><gui>Media</gui><gui>Add Station</gui></guiseq>."
+ msgstr ""
+-"Για να προσθέσετε ένα ραδιοφωνικό σταθμό στο Banshee, πατήστε <gui>Προσθήκη "
+-"σταθμού</gui> στην πάνω δεξιά γωνία του Banshee ή από το μενού επιλέξτε "
+-"<guiseq><gui>Μενού</gui><gui>Προσθήκη σταθμού</gui></guiseq>."
++"Για να προσθέσετε ένα ραδιοφωνικό διαδικτυακό σταθμό στο Banshee, πατήστε "
++"<gui>Προσθήκη σταθμού</gui> στην πάνω δεξιά γωνία του Banshee, ή από το "
++"μενού, επιλέξτε <guiseq><gui>Μενού</gui><gui>Προσθήκη "
++"σταθμού</gui></guiseq>."
+ 
+ #: C/add-radio.page:48(p)
+ msgid ""
+@@ -2117,22 +2188,31 @@ msgstr ""
+ "δεσμού</gui>."
+ 
+ #: C/add-radio.page:54(p)
++#| msgid ""
++#| "Banshee will prompt you to enter the <gui>Station Genre</gui>. Choose the "
++#| "kind of music the internet radio station plays from the available drop "
++#| "down selections. You will then need to enter the <gui>Station Name</gui>. "
++#| "Enter a name for the radio station. Then press tab or use your mouse to "
++#| "select the <gui>Stream URL:</gui> dialog to paste the URL of the radio "
++#| "station. Using your mouse right click and choose <gui>Paste</gui> or "
++#| "press <keyseq><key>Control</key>+<key>V</key></keyseq>."
+ msgid ""
+ "Banshee will prompt you to enter the <gui>Station Genre</gui>. Choose the "
+ "kind of music the internet radio station plays from the available drop down "
+ "selections. You will then need to enter the <gui>Station Name</gui>. Enter a "
+ "name for the radio station. Then press tab or use your mouse to select the "
+-"<gui>Stream URL:</gui> dialog to paste the URL of the radio station. Using "
++"<gui>Stream URL</gui> field to paste the URL of the radio station. Using "
+ "your mouse right click and choose <gui>Paste</gui> or press "
+-"<keyseq><key>Control</key>+<key>V</key></keyseq>."
++"<keyseq><key>Control</key><key>V</key></keyseq>."
+ msgstr ""
+ "Το Banshee θα σας ζητήσει να εισάγετε το <gui>Είδος σταθμού</gui>. Επιλέξτε "
+-"το είδος της μουσικής που παίζει ο σταθμός από τις διαθέσιμες επιλογές. Στη "
+-"συνέχεια θα πρέπει εισάγετε το <gui>Όνομα σταθμού</gui>. Εισάγετε ένα όνομα "
+-"για το σταθμό. Μετά πατήστε το tab ή με το ποντίκι σας επιλέξτε το διάλογο "
+-"<gui>URL ροής:</gui> για να επικολλήσετε το URL του ραδιοφωνικού σταθμού. Με "
+-"χρήση του ποντικιού σας κάντε δεξί κλικ και επιλέξτε <gui>Επικόλληση</gui> ή "
+-"πατήστε <keyseq><key>Control</key>+<key>V</key></keyseq>."
++"το είδος της μουσικής που παίζει ο ραδιοφωνικός σταθμός από τις διαθέσιμες "
++"επιλογές. Στη συνέχεια θα πρέπει εισάγετε το <gui>Όνομα σταθμού</gui>. "
++"Εισάγετε ένα όνομα για τον ραδιοφωνικό σταθμό. Μετά πατήστε τον στηλοθέτη ή "
++"με το ποντίκι σας επιλέξτε το πεδίο <gui>URL ροής</gui> για να επικολλήσετε "
++"το URL του ραδιοφωνικού σταθμού. Με χρήση του ποντικιού σας δεξιοπατήστε και "
++"επιλέξτε <gui>Επικόλληση</gui> ή πατήστε "
++"<keyseq><key>Control</key>+<key>V</key></keyseq>."
+ 
+ #: C/add-radio.page:62(p)
+ msgid ""
+@@ -2265,4 +2345,11 @@ msgstr ""
+ #. Put one translator per line, in the form of NAME <EMAIL>, YEAR1, YEAR2
+ #: C/index.page:0(None)
+ msgid "translator-credits"
+-msgstr "Michael Kotsarinis <mk73628@gmail.com>, 2010"
++msgstr ""
++"Ελληνική μεταφραστική ομάδα GNOME\n"
++" Δημήτρης Σπίγγος <dmtrs32@gmail.com>, 2013\n"
++" Michael Kotsarinis <mk73628@gmail.com>, 2010\n"
++"Για περισσότερες πληροφορίες http://gnome.gr"
++
++#~ msgid "Common Problems"
++#~ msgstr "Συνήθη προβλήματα"
+diff --git a/libbanshee/banshee-player-pipeline.c b/libbanshee/banshee-player-pipeline.c
+index ed845f3..4dae104 100644
+--- a/libbanshee/banshee-player-pipeline.c
++++ b/libbanshee/banshee-player-pipeline.c
+@@ -360,9 +360,12 @@ _bp_pipeline_construct (BansheePlayer *player)
+     player->volume = gst_element_factory_make ("volume", NULL);
+     g_return_val_if_fail (player->volume != NULL, FALSE);
+ 
++// gstreamer on OS X does not call the callback upon initialization (see bgo#680917)
++#ifdef __APPLE__
+     // call the volume changed callback once so the volume from the pipeline is
+     // set in the player object
+     bp_volume_changed_callback (player->playbin, NULL, player);
++#endif
+ 
+     audiosinkqueue = gst_element_factory_make ("queue", "audiosinkqueue");
+     g_return_val_if_fail (audiosinkqueue != NULL, FALSE);
+diff --git a/po/POTFILES.in b/po/POTFILES.in
+index 19669bf..987d644 100644
+--- a/po/POTFILES.in
++++ b/po/POTFILES.in
+@@ -13,6 +13,7 @@ data/audio-profiles/wavpack.xml.in
+ data/audio-profiles/wav.xml.in
+ data/audio-profiles/wma.xml.in
+ data/desktop-files/common.desktop.in
++data/banshee.appdata.xml.in
+ libbanshee/banshee-bpmdetector.c
+ libbanshee/banshee-ripper.c
+ libbanshee/banshee-transcoder.c
+diff --git a/po/cs.po b/po/cs.po
+index 3c8ca2e..66e5755 100644
+--- a/po/cs.po
++++ b/po/cs.po
+@@ -5,15 +5,15 @@
+ # Lukáš Novotný <lukasnov@cvs.gnome.org>, 2005, 2006.
+ # Jakub Friedl <jfriedl@suse.cz>, 2006, 2007.
+ # Jiří Eischmann <jiri@eischmann.cz>, 2009.
+-# Marek Černocký <marek@manet.cz>, 2010, 2011, 2012.
++# Marek Černocký <marek@manet.cz>, 2010, 2011, 2012, 2013.
+ #
+ msgid ""
+ msgstr ""
+-"Project-Id-Version: banshee\n"
++"Project-Id-Version: banshee stable-2.6\n"
+ "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
+ "product=banshee&keywords=I18N+L10N&component=general\n"
+-"POT-Creation-Date: 2012-08-21 19:53+0000\n"
+-"PO-Revision-Date: 2012-09-03 00:09+0200\n"
++"POT-Creation-Date: 2013-10-03 17:27+0000\n"
++"PO-Revision-Date: 2013-10-07 22:22+0200\n"
+ "Last-Translator: Marek Černocký <marek@manet.cz>\n"
+ "Language-Team: Czech <gnome-cs-list@gnome.org>\n"
+ "Language: cs\n"
+@@ -21,6 +21,7 @@ msgstr ""
+ "Content-Type: text/plain; charset=UTF-8\n"
+ "Content-Transfer-Encoding: 8bit\n"
+ "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
++"X-Generator: Gtranslator 2.91.6\n"
+ 
+ #. ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice.addin.xml
+ #: ../data/addin-xml-strings.cs:8
+@@ -623,7 +624,7 @@ msgid "Audio Quality"
+ msgstr "Kvalita zvuku"
+ 
+ #: ../data/desktop-files/common.desktop.in.h:1
+-#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:196
++#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:194
+ msgid "Media Player"
+ msgstr "Multimediální přehrávač"
+ 
+@@ -639,6 +640,25 @@ msgstr "Multimediální přehrávač Banshee"
+ msgid "Play and organize your media collection"
+ msgstr "Přehrávat a organizovat své multimediální kolekce"
+ 
++#. Writing GNOME below, instead of just "Linux", is inclusive of *BSD OSs
++#: ../data/banshee.appdata.xml.in.h:2
++msgid ""
++"Banshee is an open source multimedia management and playback application for "
++"GNOME, Mac and Windows."
++msgstr ""
++"Banshee je svobodná aplikace s otevřeným kódem sloužící ke správě a "
++"přehrávání multimédií v GNOME, na Macu a ve Windows."
++
++#: ../data/banshee.appdata.xml.in.h:3
++msgid ""
++"Play your music and videos. Stay entertained and up to date with podcasts "
++"and video podcasts. Sync your Android, iPod, and other devices. We think "
++"you'll love Banshee!"
++msgstr ""
++"Přehrávejte si svoji hudbu a videa. Mějte k dispozici nepřetržitou zábavu s "
++"vždy aktuálními podcasty a videopodcasty. Synchronizujte vše se svými "
++"zařízeními Android, iPod a dalšími. Věříme, že budete Banshee milovat."
++
+ #: ../libbanshee/banshee-bpmdetector.c:202 ../libbanshee/banshee-ripper.c:270
+ #: ../src/Backends/Banshee.GStreamerSharp/Banshee.GStreamerSharp/AudioCdRipper.cs:240
+ msgid "Could not create pipeline"
+@@ -1297,7 +1317,7 @@ msgid "Stream location not found"
+ msgstr "Umístění proudu nebylo nalezeno"
+ 
+ #: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:347
+-#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:339
++#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:344
+ msgid "File not found"
+ msgstr "Soubor nenalezen"
+ 
+@@ -1964,7 +1984,7 @@ msgstr "Vymazat seznam skladeb"
+ #: ../src/Core/Banshee.ThickClient/Banshee.Gui/SourceActions.cs:176
+ #: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:135
+ #: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:462
+-#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/SourceView.cs:595
++#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/SourceView.cs:612
+ #: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/SourceView_DragAndDrop.cs:214
+ msgid "New Playlist"
+ msgstr "Nový seznam skladeb"
+@@ -2568,7 +2588,7 @@ msgstr "drm"
+ #: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/StatisticsPage.cs:234
+ #: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/StatisticsPage.cs:236
+ #: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/StatisticsPage.cs:238
+-#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:400
++#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:405
+ msgid "Unknown"
+ msgstr "Neznámý"
+ 
+@@ -2794,7 +2814,7 @@ msgstr ""
+ #: ../src/Core/Banshee.ThickClient/Banshee.Collection.Gui/ColumnCellDiscAndCount.cs:40
+ #: ../src/Core/Banshee.ThickClient/Banshee.Collection.Gui/ColumnCellTrackAndCount.cs:40
+ #: ../src/Core/Banshee.Widgets/Banshee.Widgets/StreamPositionLabel.cs:174
+-#: ../src/Dap/Banshee.Dap/Banshee.Dap.Gui/DapPropertiesDialog.cs:148
++#: ../src/Dap/Banshee.Dap/Banshee.Dap.Gui/DapPropertiesDialog.cs:149
+ #, csharp-format
+ msgid "{0} of {1}"
+ msgstr "{0} z {1}"
+@@ -3600,19 +3620,19 @@ msgstr "Nastavit čísla a počítadla všech disků na tuto hodnotu"
+ msgid "_Disc Number:"
+ msgstr "Číslo _disku:"
+ 
+-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/BasicTrackDetailsPage.cs:188
++#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/BasicTrackDetailsPage.cs:196
+ msgid "Set all years to this value"
+ msgstr "Nastavit všechny roky na tuto hodnotu"
+ 
+-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/BasicTrackDetailsPage.cs:189
++#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/BasicTrackDetailsPage.cs:197
+ msgid "_Year:"
+ msgstr "_Rok:"
+ 
+-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/BasicTrackDetailsPage.cs:196
++#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/BasicTrackDetailsPage.cs:204
+ msgid "Set all ratings to this value"
+ msgstr "Nastavit všechna hodnocení na tuto hodnotu"
+ 
+-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/BasicTrackDetailsPage.cs:197
++#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/BasicTrackDetailsPage.cs:205
+ msgid "_Rating:"
+ msgstr "_Hodnocení:"
+ 
+@@ -4282,29 +4302,29 @@ msgstr "Podporuje přebaly alb"
+ msgid "Supports photos"
+ msgstr "Podporuje fotografie"
+ 
+-#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:465
++#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:466
+ msgid "Track duration is zero"
+ msgstr "Délka stopy je nulová"
+ 
+-#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:571
++#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:570
+ msgid "Syncing iPod"
+ msgstr "Synchronizace s iPodem"
+ 
+-#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:572
++#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:571
+ msgid "Preparing to synchronize..."
+ msgstr "Připravuje se synchronizace…"
+ 
+-#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:575
++#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:593
+ #, csharp-format
+ msgid "Adding track {0} of {1}"
+ msgstr "Přidává se stopa {0} z {1}"
+ 
+-#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:611
++#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:636
+ #, csharp-format
+ msgid "Removing track {0} of {1}"
+ msgstr "Odstraňuje se stopa {0} z {1}"
+ 
+-#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:664
++#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:710
+ msgid "Writing media database"
+ msgstr "Zapisuje se databáze médií"
+ 
+@@ -4322,31 +4342,31 @@ msgstr "Zařízení"
+ msgid "Device Properties"
+ msgstr "Vlastnosti zařízení"
+ 
+-#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:203
++#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:201
+ msgid "Product"
+ msgstr "Produkt"
+ 
+-#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:204
++#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:202
+ msgid "Vendor"
+ msgstr "Dodavatel"
+ 
+-#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:287
++#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:292
+ #: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Data/PodcastSource.cs:141
+ #, csharp-format
+ msgid "Loading {0}"
+ msgstr "Probíhá načítání {0}"
+ 
+-#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:381
++#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:386
+ #: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/ColumnCellYesNo.cs:37
+ msgid "Yes"
+ msgstr "Ano"
+ 
+-#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:381
++#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:386
+ #: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/ColumnCellYesNo.cs:38
+ msgid "No"
+ msgstr "Žádný"
+ 
+-#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:402
++#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:407
+ #, csharp-format
+ msgid ""
+ "The {0} format is not supported by the device, and no converter was found to "
+@@ -4355,11 +4375,11 @@ msgstr ""
+ "Formát {0} není zařízením podporován a nebyl nalezen žádný převodník, který "
+ "by jej převedl"
+ 
+-#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:408
++#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:413
+ msgid "File format conversion support is not available"
+ msgstr "Podpora převodu formátu souboru není dostupná"
+ 
+-#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:434
++#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:439
+ msgid "Error converting file"
+ msgstr "Chyba při převádění souboru"
+ 
+@@ -4396,7 +4416,7 @@ msgstr[2] "Synchronizací se z vašeho zařízení odstraní {0} stop."
+ msgid "Are you sure you want to continue?"
+ msgstr "Opravdu chcete pokračovat?"
+ 
+-#: ../src/Dap/Banshee.Dap/Banshee.Dap.Gui/DapActions.cs:118
++#: ../src/Dap/Banshee.Dap/Banshee.Dap.Gui/DapActions.cs:121
+ msgid "Remove tracks"
+ msgstr "Odstranit stopy"
+ 
+@@ -4471,12 +4491,12 @@ msgstr "Importovat koupenou hudbu"
+ msgid "Disconnect"
+ msgstr "Odpojit"
+ 
+-#: ../src/Dap/Banshee.Dap/Banshee.Dap/RemovableSource.cs:108
++#: ../src/Dap/Banshee.Dap/Banshee.Dap/RemovableSource.cs:111
+ #, csharp-format
+ msgid "Disconnecting {0}..."
+ msgstr "Odpojuje se {0}…"
+ 
+-#: ../src/Dap/Banshee.Dap/Banshee.Dap/RemovableSource.cs:115
++#: ../src/Dap/Banshee.Dap/Banshee.Dap/RemovableSource.cs:118
+ #, csharp-format
+ msgid "Could not disconnect {0}: {1}"
+ msgstr "Nelze odpojit {0}: {1}"
+@@ -4845,11 +4865,11 @@ msgstr "Přihlášení"
+ msgid "Connecting to {0}"
+ msgstr "Připojování k {0}"
+ 
+-#: ../src/Extensions/Banshee.Daap/Banshee.Daap/DaapService.cs:185
++#: ../src/Extensions/Banshee.Daap/Banshee.Daap/DaapService.cs:186
+ msgid "Add Remote DAAP Server"
+ msgstr "Přidat vzdálený server DAAP"
+ 
+-#: ../src/Extensions/Banshee.Daap/Banshee.Daap/DaapService.cs:186
++#: ../src/Extensions/Banshee.Daap/Banshee.Daap/DaapService.cs:187
+ msgid "Add a new remote DAAP server"
+ msgstr "Přidat nový vzdálený server DAAP"
+ 
+diff --git a/po/el.po b/po/el.po
+index 504b4f0..9f8ed4f 100644
+--- a/po/el.po
++++ b/po/el.po
+@@ -4,21 +4,23 @@
+ # Michael Kotsarinis <mk73628@gmail.com>, 2011.
+ # Emmanouel Kapernaros <manolis@kapcom.gr>, 2011.
+ # Ioannis Zampoukas <ioza1964@yahoo.gr>, 2011.
+-#
++# Dimitris Spingos (Δημήτρης Σπίγγος) <dmtrs32@gmail.com>, 2013.
+ msgid ""
+ msgstr ""
+ "Project-Id-Version: Banshee\n"
+-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=banshee&keywords=I18N+L10N&component=general\n"
+-"POT-Creation-Date: 2012-06-03 13:55+0000\n"
+-"PO-Revision-Date: 2012-06-14 01:19+0200\n"
+-"Last-Translator: Tom Tryfonidis <tomtryf@gmail.com>\n"
+-"Language-Team: Greek <team@gnome.gr>\n"
++"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=banshe"
++"e&keywords=I18N+L10N&component=general\n"
++"POT-Creation-Date: 2013-05-28 23:24+0000\n"
++"PO-Revision-Date: 2013-07-28 09:56+0300\n"
++"Last-Translator: Dimitris Spingos (Δημήτρης Σπίγγος) <dmtrs32@gmail.com>\n"
++"Language-Team: team@gnome.gr\n"
++"Language: el\n"
+ "MIME-Version: 1.0\n"
+ "Content-Type: text/plain; charset=UTF-8\n"
+ "Content-Transfer-Encoding: 8bit\n"
+-"Language: el\n"
+-"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+-"X-Generator: Virtaal 0.6.1\n"
++"Plural-Forms: nplurals=2; plural=(n != 1);\n"
++"X-Generator: Virtaal 0.7.1\n"
++"X-Project-Style: gnome\n"
+ 
+ #. ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice.addin.xml
+ #: ../data/addin-xml-strings.cs:8
+@@ -29,10 +31,8 @@ msgstr "Υποστήριξη συσκευών Apple"
+ msgid "Support for most iPod/iPhone/iPad devices."
+ msgstr "Υποστήριξη για τις περισσότερες συσκευές iPod/iPhone/iPad."
+ 
+-#: ../data/addin-xml-strings.cs:10
+-#: ../data/addin-xml-strings.cs:15
+-#: ../data/addin-xml-strings.cs:20
+-#: ../data/addin-xml-strings.cs:25
++#: ../data/addin-xml-strings.cs:10 ../data/addin-xml-strings.cs:15
++#: ../data/addin-xml-strings.cs:20 ../data/addin-xml-strings.cs:25
+ msgid "Device Support"
+ msgstr "Υποστήριξη Συσκευής"
+ 
+@@ -51,8 +51,12 @@ msgid "Mass Storage Media Player Support"
+ msgstr "Υποστήριξη αναπαραγωγέα πολυμέσων μαζικής αποθήκευσης"
+ 
+ #: ../data/addin-xml-strings.cs:19
+-msgid "Support for USB-drive based devices, including many iAudio devices and Android, Pre, and Galaxy phones."
+-msgstr "Υποστήριξη για συσκευές τύπου USB-drive, συμπεριλαμβανομένων πολλών iAudio συσκευών και Android, Pre και Galaxy τηλεφώνων."
++msgid ""
++"Support for USB-drive based devices, including many iAudio devices and "
++"Android, Pre, and Galaxy phones."
++msgstr ""
++"Υποστήριξη για συσκευές τύπου USB-drive, συμπεριλαμβανομένων πολλών iAudio "
++"συσκευών και Android, Pre και Galaxy τηλεφώνων."
+ 
+ #. ../src/Dap/Banshee.Dap.Mtp/Banshee.Dap.Mtp.addin.xml
+ #: ../data/addin-xml-strings.cs:23
+@@ -61,7 +65,9 @@ msgstr "Υποστήριξη αναπαραγωγέα πολυμέσων MTP"
+ 
+ #: ../data/addin-xml-strings.cs:24
+ msgid "Support for MTP devices, including many Creative Zen devices."
+-msgstr "Υποστήριξη για συσκευές MTP, συμπεριλαμβανομένων πολλών συσκευών Creative Zen."
++msgstr ""
++"Υποστήριξη για συσκευές MTP, συμπεριλαμβανομένων πολλών συσκευών Creative "
++"Zen."
+ 
+ #. ../src/Extensions/Banshee.AmazonMp3.Store/Banshee.AmazonMp3.Store.addin.xml
+ #: ../data/addin-xml-strings.cs:28
+@@ -70,16 +76,13 @@ msgstr "Κατάστημα Amazon MP3"
+ 
+ #: ../data/addin-xml-strings.cs:29
+ msgid "Browse, search, and purchase music from the Amazon MP3 store."
+-msgstr "Περιήγηση, αναζήτηση και αγορά μουσικής από το κατάστημα MP3 του Amazon "
+-
+-#: ../data/addin-xml-strings.cs:30
+-#: ../data/addin-xml-strings.cs:35
+-#: ../data/addin-xml-strings.cs:65
+-#: ../data/addin-xml-strings.cs:70
+-#: ../data/addin-xml-strings.cs:85
+-#: ../data/addin-xml-strings.cs:95
+-#: ../data/addin-xml-strings.cs:100
+-#: ../data/addin-xml-strings.cs:115
++msgstr ""
++"Περιήγηση, αναζήτηση και αγορά μουσικής από το κατάστημα MP3 του Amazon."
++
++#: ../data/addin-xml-strings.cs:30 ../data/addin-xml-strings.cs:35
++#: ../data/addin-xml-strings.cs:65 ../data/addin-xml-strings.cs:70
++#: ../data/addin-xml-strings.cs:85 ../data/addin-xml-strings.cs:95
++#: ../data/addin-xml-strings.cs:100 ../data/addin-xml-strings.cs:115
+ #: ../data/addin-xml-strings.cs:165
+ msgid "Online Sources"
+ msgstr "Πηγές στο διαδίκτυο"
+@@ -102,12 +105,9 @@ msgstr "Βιβλιοθήκη ηοχγραφημένων βιβλίων"
+ msgid "Organize audiobooks, lectures, etc."
+ msgstr "Οργανώστε ηχογραφημένα βιβλία, διαλέξεις, κλπ."
+ 
+-#: ../data/addin-xml-strings.cs:40
+-#: ../data/addin-xml-strings.cs:75
+-#: ../data/addin-xml-strings.cs:90
+-#: ../data/addin-xml-strings.cs:135
+-#: ../data/addin-xml-strings.cs:145
+-#: ../data/addin-xml-strings.cs:150
++#: ../data/addin-xml-strings.cs:40 ../data/addin-xml-strings.cs:75
++#: ../data/addin-xml-strings.cs:90 ../data/addin-xml-strings.cs:135
++#: ../data/addin-xml-strings.cs:145 ../data/addin-xml-strings.cs:150
+ msgid "Core"
+ msgstr "Πυρήνας"
+ 
+@@ -120,20 +120,13 @@ msgstr "Σενάρια ενεργειών Boo"
+ msgid "Customize and extend Banshee with Boo-language scripts."
+ msgstr "Προσαρμόστε και επεκτείνετε το Banshee με script σε γλώσσα Boo."
+ 
+-#: ../data/addin-xml-strings.cs:45
+-#: ../data/addin-xml-strings.cs:50
+-#: ../data/addin-xml-strings.cs:55
+-#: ../data/addin-xml-strings.cs:60
+-#: ../data/addin-xml-strings.cs:80
+-#: ../data/addin-xml-strings.cs:105
+-#: ../data/addin-xml-strings.cs:110
+-#: ../data/addin-xml-strings.cs:120
+-#: ../data/addin-xml-strings.cs:125
+-#: ../data/addin-xml-strings.cs:130
+-#: ../data/addin-xml-strings.cs:140
+-#: ../data/addin-xml-strings.cs:155
+-#: ../data/addin-xml-strings.cs:160
+-#: ../data/addin-xml-strings.cs:170
++#: ../data/addin-xml-strings.cs:45 ../data/addin-xml-strings.cs:50
++#: ../data/addin-xml-strings.cs:55 ../data/addin-xml-strings.cs:60
++#: ../data/addin-xml-strings.cs:80 ../data/addin-xml-strings.cs:105
++#: ../data/addin-xml-strings.cs:110 ../data/addin-xml-strings.cs:120
++#: ../data/addin-xml-strings.cs:125 ../data/addin-xml-strings.cs:130
++#: ../data/addin-xml-strings.cs:140 ../data/addin-xml-strings.cs:155
++#: ../data/addin-xml-strings.cs:160 ../data/addin-xml-strings.cs:170
+ msgid "Utilities"
+ msgstr "Εφαρμογές"
+ 
+@@ -162,7 +155,8 @@ msgstr "Διαμοιρασμός DAAP"
+ 
+ #: ../data/addin-xml-strings.cs:59
+ msgid "Browse and listen to music shared over your local network."
+-msgstr "Περιηγηθείτε και ακούστε μουσική που διαμοιράζεται στο τοπικό σας δίκτυο."
++msgstr ""
++"Περιηγηθείτε και ακούστε μουσική που διαμοιράζεται στο τοπικό σας δίκτυο."
+ 
+ #. ../src/Extensions/Banshee.Emusic.Store/Banshee.Emusic.Store.addin.xml
+ #: ../data/addin-xml-strings.cs:63
+@@ -171,7 +165,7 @@ msgstr "Κατάστημα eMusic"
+ 
+ #: ../data/addin-xml-strings.cs:64
+ msgid "Browse, search, and purchase music and audiobooks from eMusic"
+-msgstr "Περιήγηση, αναζήτηση και αγορά μουσικής από το κατάστημα του eMusic "
++msgstr "Περιήγηση, αναζήτηση και αγορά μουσικής από το κατάστημα του eMusic"
+ 
+ #. ../src/Extensions/Banshee.Emusic/Banshee.Emusic.addin.xml
+ #: ../data/addin-xml-strings.cs:68
+@@ -198,7 +192,9 @@ msgstr "Επιδιόρθωση μεταδεδομένων"
+ 
+ #: ../data/addin-xml-strings.cs:79
+ msgid "Fix broken and missing metadata using bulk operations."
+-msgstr "Επιδιόρθωση κατεστραμμένων και ελλιπών μεταδεδομένων με χρήση μαζικών διαδικασιών."
++msgstr ""
++"Επιδιόρθωση κατεστραμμένων και ελλιπών μεταδεδομένων με χρήση μαζικών "
++"διαδικασιών."
+ 
+ #. ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive.addin.xml
+ #: ../data/addin-xml-strings.cs:83
+@@ -208,7 +204,9 @@ msgstr "Internet Archive"
+ 
+ #: ../data/addin-xml-strings.cs:84
+ msgid "Browse and search the Internet Archive's vast media collection."
+-msgstr "Περιήγηση και αναζήτηση της απέραντης συλλογής πολυμέσων του Internet Archive"
++msgstr ""
++"Περιήγηση και αναζήτηση της απέραντης συλλογής πολυμέσων της αρχειοθήκης "
++"διαδικτύου."
+ 
+ #. ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio.addin.xml
+ #: ../data/addin-xml-strings.cs:88
+@@ -226,7 +224,7 @@ msgstr "Υπηρεσία σύλληψης του Last.fm"
+ 
+ #: ../data/addin-xml-strings.cs:94
+ msgid "Last.fm scrobbling and context pane recommendations."
+-msgstr "Αυτόματη σύλληψη τραγουδιών του Last.fm (scrobbling) και προτάσεις στο πλαίσιο περιεχομένου."
++msgstr "Προτιμήσεις από Last.fm και προτάσεις στο παράθυρο περιεχομένου."
+ 
+ #. ../src/Extensions/Banshee.LastfmStreaming/Banshee.LastfmStreaming.addin.xml
+ #: ../data/addin-xml-strings.cs:98
+@@ -252,8 +250,12 @@ msgid "Mini Mode"
+ msgstr "Μικροσκοπική κατάσταση λειτουργίας"
+ 
+ #: ../data/addin-xml-strings.cs:109
+-msgid "Control Banshee through a small window with only playback controls and track information."
+-msgstr "Έλεγχος του Banshee μέσω ενός μικρού παραθύρου μόνο με κουμπιά αναπαραγωγής και πληροφορίες κομματιών."
++msgid ""
++"Control Banshee through a small window with only playback controls and track "
++"information."
++msgstr ""
++"Έλεγχος του Banshee μέσω ενός μικρού παραθύρου μόνο με κουμπιά αναπαραγωγής "
++"και πληροφορίες κομματιών."
+ 
+ #. ../src/Extensions/Banshee.MiroGuide/Banshee.MiroGuide.addin.xml
+ #: ../data/addin-xml-strings.cs:113
+@@ -262,7 +264,9 @@ msgstr "Miro Guide Podcast Directory"
+ 
+ #: ../data/addin-xml-strings.cs:114
+ msgid "Browse and subscribe to thousands of audio and video podcasts."
+-msgstr "Περιηγηθείτε και γίνεται συνδρομητές σε χιλιάδες φορητές εκπομπές ήχου και βίντεο."
++msgstr ""
++"Περιηγηθείτε και γίνεται συνδρομητές σε χιλιάδες φορητές εκπομπές ήχου και "
++"βίντεο."
+ 
+ #. ../src/Extensions/Banshee.Mpris/Banshee.Mpris.addin.xml
+ #: ../data/addin-xml-strings.cs:118
+@@ -289,7 +293,9 @@ msgstr "Εικονίδιο περιοχής ειδοποιήσεων"
+ 
+ #: ../data/addin-xml-strings.cs:129
+ msgid "Display an icon in the notification area for controlling Banshee."
+-msgstr "Εμφάνιση ενός εικονιδίου στην περιοχή ειδοποιήσεων για τον έλεγχο του Banshee."
++msgstr ""
++"Εμφάνιση ενός εικονιδίου στην περιοχή ειδοποιήσεων για τον έλεγχο του "
++"Banshee."
+ 
+ #. ../src/Extensions/Banshee.OpticalDisc/Banshee.OpticalDisc.addin.xml
+ #: ../data/addin-xml-strings.cs:133
+@@ -318,7 +324,9 @@ msgstr "Σειρά αναπαραγωγής"
+ 
+ #: ../data/addin-xml-strings.cs:144
+ msgid "Queue tracks in an ad-hoc playlist, or let the Auto DJ take over."
+-msgstr "Βάλτε σε σειρά τα κομμάτια σε μια λίστα αναπαραγωγής της στιγμής ή αφήστε τον Αυτόματο DJ να αναλάβει."
++msgstr ""
++"Βάλτε σε σειρά τα κομμάτια σε μια λίστα αναπαραγωγής της στιγμής ή αφήστε "
++"τον Αυτόματο DJ να αναλάβει."
+ 
+ #. ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.addin.xml
+ #: ../data/addin-xml-strings.cs:148
+@@ -331,7 +339,9 @@ msgstr "Φορητές εκπομπές (Podcasts)"
+ 
+ #: ../data/addin-xml-strings.cs:149
+ msgid "Subscribe to podcasts and stream or download episodes."
+-msgstr "Εγγραφείτε σε φορητές εκπομπές και μεταφορτώστε ή παρακολουθήστε σε ροή τα επεισόδια."
++msgstr ""
++"Εγγραφείτε σε φορητές εκπομπές και μεταφορτώστε ή παρακολουθήστε σε ροή τα "
++"επεισόδια."
+ 
+ #. ../src/Extensions/Banshee.SoundMenu/Banshee.SoundMenu.addin.xml
+ #: ../data/addin-xml-strings.cs:153
+@@ -349,7 +359,7 @@ msgstr "Πρόγραμμα μεταφόρτωσης torrent"
+ 
+ #: ../data/addin-xml-strings.cs:159
+ msgid "Support downloading BitTorrent files from podcasts."
+-msgstr "Υποστήριξη μεταφόρτωσης αρχείων φορητών εκπομπών  με BitTorrent."
++msgstr "Υποστήριξη μεταφόρτωσης αρχείων φορητών εκπομπών με BitTorrent."
+ 
+ #. ../src/Extensions/Banshee.UbuntuOneMusicStore/Banshee.UbuntuOneMusicStore.addin.xml
+ #: ../data/addin-xml-strings.cs:163
+@@ -360,8 +370,12 @@ msgid "Ubuntu One Music Store"
+ msgstr "Κατάστημα μουσικής Ubuntu One"
+ 
+ #: ../data/addin-xml-strings.cs:164
+-msgid "This extension grants access to the Ubuntu One Music Store, powered by 7digital."
+-msgstr "Αυτή η επέκταση δίνει πρόσβαση στο κατάστημα μουσικής Ubuntu One, που υποστηρίζεται από την 7digital."
++msgid ""
++"This extension grants access to the Ubuntu One Music Store, powered by "
++"7digital."
++msgstr ""
++"Αυτή η επέκταση δίνει πρόσβαση στο κατάστημα μουσικής Ubuntu One, που "
++"υποστηρίζεται από την 7digital."
+ 
+ #. ../src/Extensions/Banshee.UPnPClient/Banshee.UPnPClient.addin.xml
+ #: ../data/addin-xml-strings.cs:168
+@@ -369,9 +383,11 @@ msgid "UPnP Client"
+ msgstr "Πελάτης UPnP"
+ 
+ #: ../data/addin-xml-strings.cs:169
+-#| msgid "Browse and listen to music shared over your local network."
+-msgid "Browse and play music and videos shared over your local network using UPnP."
+-msgstr "Περιηγηθείτε και ακούστε μουσική που διαμοιράζεται στο τοπικό σας χρησιμοποιώντας το UPnP."
++msgid ""
++"Browse and play music and videos shared over your local network using UPnP."
++msgstr ""
++"Περιηγηθείτε και ακούστε μουσική που διαμοιράζεται στο τοπικό σας "
++"χρησιμοποιώντας το UPnP."
+ 
+ #. ../src/Extensions/Banshee.Wikipedia/Banshee.Wikipedia.addin.xml
+ #: ../data/addin-xml-strings.cs:173
+@@ -381,10 +397,10 @@ msgstr "Wikipedia"
+ 
+ #: ../data/addin-xml-strings.cs:174
+ msgid "View artist information from Wikipedia in the context pane."
+-msgstr "Προβολή πληροφοριών καλλιτέχνη από τη Wikipedia στο πλαίσιο περιεχομένου."
++msgstr ""
++"Προβολή πληροφοριών καλλιτέχνη από τη Wikipedia στο πλαίσιο περιεχομένου."
+ 
+-#: ../data/addin-xml-strings.cs:175
+-#: ../data/addin-xml-strings.cs:180
++#: ../data/addin-xml-strings.cs:175 ../data/addin-xml-strings.cs:180
+ msgid "Context Pane"
+ msgstr "Πλαίσιο περιεχομένου"
+ 
+@@ -403,8 +419,12 @@ msgid "AAC (Novell Encoder)"
+ msgstr "AAC (Κωδικοποιητής της Novell)"
+ 
+ #: ../data/audio-profiles/aac-novell.xml.in.h:2
+-msgid "Designed to be the successor of the MP3 format, AAC generally achieves better sound quality than MP3 at many bit rates."
+-msgstr "Σχεδιασμένο ως ο αντικαταστάτης του MP3, το AAC γενικά επιτυγχάνει καλύτερη ποιότητα ήχου σε σχέση με το MP3 σε διάφορους ρυθμούς διαμεταγωγής (bitrate)."
++msgid ""
++"Designed to be the successor of the MP3 format, AAC generally achieves "
++"better sound quality than MP3 at many bit rates."
++msgstr ""
++"Σχεδιασμένο ως ο αντικαταστάτης του MP3, το AAC γενικά επιτυγχάνει καλύτερη "
++"ποιότητα ήχου σε σχέση με το MP3 σε διάφορους ρυθμούς διαμεταγωγής."
+ 
+ #: ../data/audio-profiles/aac-novell.xml.in.h:3
+ #: ../data/audio-profiles/mp3-lame.xml.in.h:9
+@@ -412,7 +432,7 @@ msgstr "Σχεδιασμένο ως ο αντικαταστάτης του MP3,
+ #: ../data/audio-profiles/wavpack.xml.in.h:13
+ #: ../data/audio-profiles/wma.xml.in.h:4
+ msgid "Bitrate"
+-msgstr "Ρυθμός διαμεταγωγής (bitrate)"
++msgstr "Ρυθμός διαμεταγωγής"
+ 
+ #: ../data/audio-profiles/aac-novell.xml.in.h:4
+ msgid "Container"
+@@ -452,11 +472,16 @@ msgstr "Κανάλια"
+ 
+ #: ../data/audio-profiles/flac.xml.in.h:1
+ msgid "Free Lossless Audio Codec"
+-msgstr "Ελεύθερος Μη Απωλεστικός Κωδικοποιητής Ήχου (FLAC)"
++msgstr "Ελεύθερος μη απωλεστικός κωδικοποιητής ήχου (FLAC)"
+ 
+ #: ../data/audio-profiles/flac.xml.in.h:2
+-msgid "Free Lossless Audio Codec (FLAC) is an open source codec that compresses but does not degrade audio quality."
+-msgstr "Ο ελεύθερος μη απωλεστικός κωδικοποιητής ήχου (FLAC) είναι ένας κωδικοποιητής ανοιχτού κώδικα που συμπιέζει αλλά δεν υποβαθμίζει την ποιότητα του ήχου."
++msgid ""
++"Free Lossless Audio Codec (FLAC) is an open source codec that compresses but "
++"does not degrade audio quality."
++msgstr ""
++"Ο ελεύθερος μη απωλεστικός κωδικοποιητής ήχου (FLAC) είναι ένας "
++"κωδικοποιητής ανοιχτού κώδικα που συμπιέζει αλλά δεν υποβαθμίζει την "
++"ποιότητα του ήχου."
+ 
+ #: ../data/audio-profiles/mp3-lame.xml.in.h:1
+ msgid "MP3 (LAME Encoder)"
+@@ -464,8 +489,12 @@ msgstr "MP3 (Κωδικοποιητής LAME)"
+ 
+ #: ../data/audio-profiles/mp3-lame.xml.in.h:2
+ #: ../data/audio-profiles/mp3-xing.xml.in.h:2
+-msgid "A proprietary and older, but also popular, lossy audio format that produces larger files at lower bitrates."
+-msgstr "Μια ιδιοταγής και παλιότερο, αλλά επίσης διάσημη, απωλεστική μορφή συμπίεσης ήχου που παράγει μεγαλύτερα αρχεία σε χαμηλότερους ρυθμούς διαμεταγωγής."
++msgid ""
++"A proprietary and older, but also popular, lossy audio format that produces "
++"larger files at lower bitrates."
++msgstr ""
++"Μια ιδιοταγής και παλιότερο, αλλά επίσης διάσημη, απωλεστική μορφή συμπίεσης "
++"ήχου που παράγει μεγαλύτερα αρχεία σε χαμηλότερους ρυθμούς διαμεταγωγής."
+ 
+ #: ../data/audio-profiles/mp3-lame.xml.in.h:3
+ msgid "Encoding Mode"
+@@ -473,11 +502,11 @@ msgstr "Κατάσταση κωδικοποίησης"
+ 
+ #: ../data/audio-profiles/mp3-lame.xml.in.h:4
+ msgid "Constant Bitrate"
+-msgstr "Σταθερός ρυθμός διαμεταγωγής (bitrate)"
++msgstr "Σταθερός ρυθμός διαμεταγωγής"
+ 
+ #: ../data/audio-profiles/mp3-lame.xml.in.h:5
+ msgid "Variable Bitrate"
+-msgstr "Μεταβλητός ρυθμός διαμεταγωγής (bitrate)"
++msgstr "Μεταβλητός ρυθμός διαμεταγωγής"
+ 
+ #: ../data/audio-profiles/mp3-lame.xml.in.h:6
+ msgid "VBR Quality"
+@@ -506,8 +535,12 @@ msgid "Ogg Vorbis"
+ msgstr "Ogg Vorbis"
+ 
+ #: ../data/audio-profiles/vorbis.xml.in.h:2
+-msgid "Vorbis is an open source, lossy audio codec with high quality output at a lower file size than MP3."
+-msgstr "Το Vorbis είναι ένας απωλεστικός κωδικοποιητής ήχου, ανοιχτού κώδικα, με υψηλής ποιότητας έξοδο σε μικρότερο μέγεθος αρχείου από το MP3."
++msgid ""
++"Vorbis is an open source, lossy audio codec with high quality output at a "
++"lower file size than MP3."
++msgstr ""
++"Το Vorbis είναι ένας απωλεστικός κωδικοποιητής ήχου, ανοιχτού κώδικα, με "
++"υψηλής ποιότητας έξοδο σε μικρότερο μέγεθος αρχείου από το MP3."
+ 
+ #: ../data/audio-profiles/vorbis.xml.in.h:3
+ msgid "Audio quality"
+@@ -518,8 +551,13 @@ msgid "Wavpack"
+ msgstr "Wavpack"
+ 
+ #: ../data/audio-profiles/wavpack.xml.in.h:2
+-msgid "A fast and efficient open source audio format offering lossless and high-quality lossy encoding with great dynamic range."
+-msgstr "Μία γρήγορη και αποδοτική μορφή αρχείου, ανοιχτού κώδικα, που προσφέρει μη απωλεστική και υψηλής ποιότητας απωλεστική κωδικοποίηση με μεγάλο δυναμικό εύρος."
++msgid ""
++"A fast and efficient open source audio format offering lossless and high-"
++"quality lossy encoding with great dynamic range."
++msgstr ""
++"Μία γρήγορη και αποδοτική μορφή αρχείου, ανοιχτού κώδικα, που προσφέρει μη "
++"απωλεστική και υψηλής ποιότητας απωλεστική κωδικοποίηση με μεγάλο δυναμικό "
++"εύρος."
+ 
+ #: ../data/audio-profiles/wavpack.xml.in.h:3
+ msgid "Mode"
+@@ -566,27 +604,36 @@ msgid "Waveform PCM"
+ msgstr "Κυματομορφή PCM"
+ 
+ #: ../data/audio-profiles/wav.xml.in.h:2
+-msgid "WAV+PCM is a lossless format that holds uncompressed, raw pulse-code modulated (PCM) audio."
+-msgstr "Το WAV+PCM είναι μία μη απωλεστική μορφή που διατηρεί μη συμπιεσμένο, ακατέργαστο ήχο, παλμοκωδικής διαμόρφωσης (PCM)."
++msgid ""
++"WAV+PCM is a lossless format that holds uncompressed, raw pulse-code "
++"modulated (PCM) audio."
++msgstr ""
++"Το WAV+PCM είναι μία μη απωλεστική μορφή που διατηρεί μη συμπιεσμένο, "
++"ακατέργαστο ήχο, παλμοκωδικής διαμόρφωσης (PCM)."
+ 
+ #: ../data/audio-profiles/wma.xml.in.h:1
+ msgid "Windows Media Audio"
+ msgstr "Windows Media Audio"
+ 
+ #: ../data/audio-profiles/wma.xml.in.h:2
+-msgid "A proprietary lossy audio format with high quality output at a lower file size than MP3. A 96 kbps WMA is equivalent to a 128 kbps MP3."
+-msgstr "Μία ιδιοταγής απωλεστική μορφή ήχου με υψηλής ποιότητας έξοδο σε μικρότερο μέγεθος από MP3. Ένα αρχείο στα 96 kbps με WMA είναι ισοδύναμο με ένα στα 128 kbps με MP3."
++msgid ""
++"A proprietary lossy audio format with high quality output at a lower file "
++"size than MP3. A 96 kbps WMA is equivalent to a 128 kbps MP3."
++msgstr ""
++"Μία ιδιοταγής απωλεστική μορφή ήχου με υψηλής ποιότητας έξοδο σε μικρότερο "
++"μέγεθος από MP3. Ένα αρχείο στα 96 kbps με WMA είναι ισοδύναμο με ένα στα "
++"128 kbps με MP3."
+ 
+ #: ../data/audio-profiles/wma.xml.in.h:3
+ msgid "Use a variable bitrate"
+-msgstr "Χρήση μεταβλητού ρυθμού διαμεταγωγής (bitrate)"
++msgstr "Χρήση μεταβλητού ρυθμού διαμεταγωγής"
+ 
+ #: ../data/audio-profiles/wma.xml.in.h:5
+ msgid "Audio Quality"
+ msgstr "Ποιότητα ήχου"
+ 
+ #: ../data/desktop-files/common.desktop.in.h:1
+-#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:196
++#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:194
+ msgid "Media Player"
+ msgstr "Αναπαραγωγέας πολυμέσων"
+ 
+@@ -602,8 +649,7 @@ msgstr "Αναπαραγωγή πολυμέσων Banshee"
+ msgid "Play and organize your media collection"
+ msgstr "Αναπαραγωγή και οργάνωση της συλλογής σας πολυμέσων"
+ 
+-#: ../libbanshee/banshee-bpmdetector.c:202
+-#: ../libbanshee/banshee-ripper.c:270
++#: ../libbanshee/banshee-bpmdetector.c:202 ../libbanshee/banshee-ripper.c:270
+ #: ../src/Backends/Banshee.GStreamerSharp/Banshee.GStreamerSharp/AudioCdRipper.cs:240
+ msgid "Could not create pipeline"
+ msgstr "Δεν μπορεί να δημιουργηθεί διοχέτευση"
+@@ -633,8 +679,7 @@ msgid "Could not create fakesink plugin"
+ msgstr "Δεν μπορεί να δημιουργηθεί πρόσθετο fakesink"
+ 
+ #: ../libbanshee/banshee-bpmdetector.c:241
+-#: ../libbanshee/banshee-bpmdetector.c:250
+-#: ../libbanshee/banshee-ripper.c:311
++#: ../libbanshee/banshee-bpmdetector.c:250 ../libbanshee/banshee-ripper.c:311
+ #: ../src/Backends/Banshee.GStreamerSharp/Banshee.GStreamerSharp/AudioCdRipper.cs:281
+ msgid "Could not link pipeline elements"
+ msgstr "Δεν μπορούν να συνδεθούν στοιχεία διοχέτευσης"
+@@ -694,15 +739,15 @@ msgstr "Αδύνατη η κατασκευή διοχέτευσης"
+ 
+ #: ../src/Backends/Banshee.Gnome/Banshee.GnomeBackend/Brasero.cs:65
+ msgid "Write CD..."
+-msgstr "Εγγραφή CD…"
++msgstr "Εγγραφή CD..."
+ 
+ #: ../src/Backends/Banshee.Gnome/Banshee.GnomeBackend/Brasero.cs:66
+ msgid "Write selected tracks to an audio CD"
+-msgstr "Εγγραφή επιλεγμένων κομματιών σε ένα ψηφιακό δίσκο (CD) ήχου"
++msgstr "Εγγραφή επιλεγμένων κομματιών σε CD ήχου"
+ 
+ #: ../src/Backends/Banshee.Gnome/Banshee.GnomeBackend/Brasero.cs:105
+ msgid "Could not write CD"
+-msgstr "Αδύνατη η εγγραφή ψηφιακού δίσκου (CD)"
++msgstr "Αδύνατη η εγγραφή CD"
+ 
+ #: ../src/Backends/Banshee.Gnome/Banshee.GnomeBackend/Brasero.cs:106
+ msgid "Brasero could not be started"
+@@ -731,28 +776,36 @@ msgstr "Αδυναμία δημιουργίας οδηγού ανίχνευση
+ msgid "Could not initialize GStreamer library"
+ msgstr "Η αρχικοποίηση της βιβλιοθήκης GStreamer δεν μπορεί να γίνει"
+ 
+-#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:503
+-#: ../src/Backends/Banshee.GStreamerSharp/Banshee.GStreamerSharp/PlayerEngine.cs:553
++#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:504
++#: ../src/Backends/Banshee.GStreamerSharp/Banshee.GStreamerSharp/PlayerEngine.cs:555
+ msgid "Unknown Error"
+ msgstr "Άγνωστο σφάλμα"
+ 
+-#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:879
+-#: ../src/Backends/Banshee.GStreamerSharp/Banshee.GStreamerSharp/PlayerEngine.cs:978
++#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:880
++#: ../src/Backends/Banshee.GStreamerSharp/Banshee.GStreamerSharp/PlayerEngine.cs:980
+ msgid "_Enable ReplayGain correction"
+ msgstr "_Ενεργοποίηση διόρθωσης του ReplayGain"
+ 
+-#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:880
+-#: ../src/Backends/Banshee.GStreamerSharp/Banshee.GStreamerSharp/PlayerEngine.cs:979
+-msgid "For tracks that have ReplayGain data, automatically scale (normalize) playback volume"
+-msgstr "Για κομμάτια που έχουν δεδομένα κανονικοποίησης αναπαραγωγής (ReplayGain), αυτόματη προσαρμογή (κανονικοποίηση) της έντασης της αναπαραγωγής"
++#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:881
++#: ../src/Backends/Banshee.GStreamerSharp/Banshee.GStreamerSharp/PlayerEngine.cs:981
++msgid ""
++"For tracks that have ReplayGain data, automatically scale (normalize) "
++"playback volume"
++msgstr ""
++"Για κομμάτια που έχουν δεδομένα κέρδους αναπαραγωγής, αυτόματη κλιμάκωση "
++"(κανονικοποίηση) της έντασης της αναπαραγωγής"
+ 
+-#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:885
++#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:886
+ msgid "Enable _gapless playback"
+ msgstr "Ενεργοποίηση αναπαραγωγής δίχως _κενά"
+ 
+-#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:886
+-msgid "Eliminate the small playback gap on track change. Useful for concept albums and classical music"
+-msgstr "Εξάλειψη της μικρής διακοπής αναπαραγωγής κατά την αλλαγή κομματιού. Χρήσιμο για ειδικά λευκώματα και για κλασσική μουσική"
++#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:887
++msgid ""
++"Eliminate the small playback gap on track change. Useful for concept albums "
++"and classical music"
++msgstr ""
++"Εξάλειψη της μικρής διακοπής αναπαραγωγής κατά την αλλαγή κομματιού. Χρήσιμο "
++"για ειδικά λευκώματα και για κλασσική μουσική"
+ 
+ #: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/Transcoder.cs:63
+ msgid "Could not create transcoder"
+@@ -763,7 +816,7 @@ msgstr "Δεν είναι δυνατή η δημιουργία του διακω
+ msgid "Could not create encoder pipeline : {0}"
+ msgstr "Δεν μπορεί να δημιουργηθεί διοχέτευση κωδικοποιητή: {0}"
+ 
+-#: ../src/Backends/Banshee.GStreamerSharp/Banshee.GStreamerSharp/PlayerEngine.cs:800
++#: ../src/Backends/Banshee.GStreamerSharp/Banshee.GStreamerSharp/PlayerEngine.cs:802
+ msgid "GStreamer# 0.10"
+ msgstr "GStreamer# 0.10"
+ 
+@@ -772,27 +825,23 @@ msgstr "GStreamer# 0.10"
+ msgid "Could not create encoding pipeline : {0}"
+ msgstr "Δεν είναι δυνατή η δημιουργία κωδικοποίησης διοχέτευσης: {0}"
+ 
+-#: ../src/Backends/Banshee.Osx/Banshee.OsxBackend/OsxService.cs:91
+-#: ../src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/NotificationAreaService.cs:132
+-#: ../src/Extensions/Banshee.SoundMenu/Banshee.SoundMenu/SoundMenuService.cs:110
+-msgid "_Close"
+-msgstr "_Κλείσιμο"
+-
+-#: ../src/Backends/Banshee.Osx/Banshee.OsxBackend/OsxService.cs:92
+-#: ../src/Clients/Nereid/Nereid/PlayerInterface.cs:251
+-#: ../src/Extensions/Banshee.Fixup/Banshee.Fixup/FixSource.cs:79
+-#: ../src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/NotificationAreaService.cs:133
+-#: ../src/Extensions/Banshee.SoundMenu/Banshee.SoundMenu/SoundMenuService.cs:111
+-msgid "Close"
+-msgstr "Κλείσιμο"
++#. Translators: verb
++#: ../src/Backends/Banshee.Osx/Banshee.OsxBackend/OsxFileChooserDialog.cs:66
++#| msgid "_Import"
++msgid "Import"
++msgstr "Εισαγωγή"
+ 
+ #: ../src/Backends/Banshee.Windows/Banshee.Windows/VersionUpdater.cs:72
+ msgid "Can't check for updates"
+ msgstr "Αδυναμία ελέγχου ενημερώσεων"
+ 
+ #: ../src/Backends/Banshee.Windows/Banshee.Windows/VersionUpdater.cs:73
+-msgid "We're currently not able to check if there's a new version available. Please try again later."
+-msgstr "Αυτήν τη στιγμή δεν είμαστε  σε θέση να ελέγξουμε αν υπάρχει μια νέα έκδοση διαθέσιμη. Παρακαλώ δοκιμάστε αργότερα."
++msgid ""
++"We're currently not able to check if there's a new version available. Please "
++"try again later."
++msgstr ""
++"Αυτήν τη στιγμή δεν είμαστε σε θέση να ελέγξουμε αν υπάρχει μια νέα έκδοση "
++"διαθέσιμη. Παρακαλώ δοκιμάστε αργότερα."
+ 
+ #: ../src/Backends/Banshee.Windows/Banshee.Windows/VersionUpdater.cs:95
+ msgid "No update available"
+@@ -800,12 +849,14 @@ msgstr "Δεν υπάρχει διαθέσιμη ενημέρωση"
+ 
+ #: ../src/Backends/Banshee.Windows/Banshee.Windows/VersionUpdater.cs:95
+ msgid "You already have the latest version of Banshee installed."
+-msgstr "Έχετε ήδη την τελευταία έκδοση του Banshee εγκατεστημένη"
++msgstr "Έχετε ήδη την τελευταία έκδοση του Banshee εγκατεστημένη."
+ 
+ #: ../src/Backends/Banshee.Windows/Banshee.Windows/VersionUpdater.cs:106
+ #, csharp-format
+ msgid "A new version of Banshee ({0}) is available.{1}Do you want to update?"
+-msgstr "Μια νέα έκδοση του Banshee ({0}) είναι διαθέσιμη.{1}Θέλετε να την ενημερώσετε;"
++msgstr ""
++"Μια νέα έκδοση του Banshee ({0}) είναι διαθέσιμη.{1}Θέλετε να την "
++"ενημερώσετε;"
+ 
+ #: ../src/Backends/Banshee.Windows/Banshee.Windows/VersionUpdater.cs:108
+ msgid "Banshee update available"
+@@ -819,7 +870,6 @@ msgstr "Μεταφόρτωση {0}"
+ 
+ #: ../src/Backends/Banshee.Windows/Banshee.Windows/VersionUpdater.cs:144
+ #, csharp-format
+-#| msgid "{0} by {1} on {2}"
+ msgid "{0} MB / {1} MB ({2} KB/s)"
+ msgstr "{0} MB / {1} MB ({2} KB/s)"
+ 
+@@ -829,12 +879,16 @@ msgstr "Απέτυχε η μεταφόρτωση της ενημέρωσης"
+ 
+ #: ../src/Backends/Banshee.Windows/Banshee.Windows/VersionUpdater.cs:152
+ msgid "The download failed. Please try again later."
+-msgstr "Η μεταφόρτωση απέτυχε Παρακαλώ προσπαθήστε ξανά αργότερα."
++msgstr "Η μεταφόρτωση απέτυχε. Παρακαλώ προσπαθήστε ξανά αργότερα."
+ 
+ #: ../src/Backends/Banshee.Windows/Banshee.Windows/VersionUpdater.cs:165
+ #, csharp-format
+-msgid "The update finished downloading.{0}Do you want to shutdown Banshee and run the installer?"
+-msgstr "Η λήψη της ενημέρωσης ολοκληρώθηκε.{0}Θέλετε να κλείσετε το Banshee και να εκτελέσετε το πρόγραμμα εγκατάστασης;"
++msgid ""
++"The update finished downloading.{0}Do you want to shutdown Banshee and run "
++"the installer?"
++msgstr ""
++"Η λήψη της ενημέρωσης ολοκληρώθηκε.{0}Θέλετε να κλείσετε το Banshee και να "
++"εκτελέσετε το πρόγραμμα εγκατάστασης;"
+ 
+ #: ../src/Backends/Banshee.Windows/Banshee.Windows/VersionUpdater.cs:167
+ msgid "Update finished downloading"
+@@ -885,24 +939,35 @@ msgid "Playback Control Options"
+ msgstr "Επιλογές ελέγχου αναπαραγωγής"
+ 
+ #: ../src/Clients/Booter/Booter/Entry.cs:164
+-msgid "Play the next track, optionally restarting if the 'restart' value is set"
+-msgstr "Αναπαραγωγή του επόμενου κομματιού, προαιρετικά επανεκκίνηση αν η τιμή 'restart' έχει ορισθεί"
++msgid ""
++"Play the next track, optionally restarting if the 'restart' value is set"
++msgstr ""
++"Αναπαραγωγή του επόμενου κομματιού, προαιρετικά επανεκκίνηση αν η τιμή "
++"'restart' έχει ορισθεί"
+ 
+ #: ../src/Clients/Booter/Booter/Entry.cs:165
+-#, fuzzy
+ #| msgid ""
+ #| "Play the previous track, optionally restarting if the 'restart value is "
+ #| "set"
+-msgid "Play the previous track, optionally restarting if the 'restart' value is set"
+-msgstr "Αναπαραγωγή του προηγούμενου κομματιού, προαιρετικά επανεκκίνηση αν η τιμή 'restart' έχει ορισθεί"
++msgid ""
++"Play the previous track, optionally restarting if the 'restart' value is set"
++msgstr ""
++"Αναπαραγωγή του προηγούμενου κομματιού, προαιρετικά επανεκκίνηση αν η τιμή "
++"'restart' έχει ορισθεί"
+ 
+ #: ../src/Clients/Booter/Booter/Entry.cs:166
+-msgid "If the current song has been played longer than 4 seconds then restart it, otherwise the same as --previous"
+-msgstr "Αν το τρέχον τραγούδι έχει αναπαραχθεί για περισσότερα από 4 δευτερόλεπτα μετά επανέναρξη, αλλιώς είναι ίδιο με --previous"
++msgid ""
++"If the current song has been played longer than 4 seconds then restart it, "
++"otherwise the same as --previous"
++msgstr ""
++"Αν το τρέχον τραγούδι έχει αναπαραχθεί για περισσότερα από 4 δευτερόλεπτα "
++"μετά επανέναρξη, αλλιώς είναι ίδιο με --previous"
+ 
+ #: ../src/Clients/Booter/Booter/Entry.cs:167
+ msgid "Automatically start playing any tracks enqueued on the command line"
+-msgstr "Αυτόματη έναρξη αναπαραγωγής οποιουδήποτε κομματιού ακολουθεί στη γραμμή εντολών"
++msgstr ""
++"Αυτόματη έναρξη αναπαραγωγής οποιουδήποτε κομματιού ακολουθεί στη γραμμή "
++"εντολών"
+ 
+ #: ../src/Clients/Booter/Booter/Entry.cs:168
+ msgid "Start playback"
+@@ -921,12 +986,17 @@ msgid "Completely stop playback"
+ msgstr "Ολοκληρωτική διακοπή αναπαραγωγής"
+ 
+ #: ../src/Clients/Booter/Booter/Entry.cs:173
+-msgid "Enable or disable playback stopping after the currently playing track (value should be either 'true' or 'false')"
+-msgstr "Ενεργοποίηση ή απενεργοποίηση διακοπής αναπαραγωγής μετά το τρέχον αναπαραγόμενο κομμάτι (η τιμή θα πρέπει να είναι 'true' ή 'false')"
++msgid ""
++"Enable or disable playback stopping after the currently playing track (value "
++"should be either 'true' or 'false')"
++msgstr ""
++"Ενεργοποίηση ή απενεργοποίηση διακοπής αναπαραγωγής μετά το τρέχον "
++"αναπαραγόμενο κομμάτι (η τιμή θα πρέπει να είναι 'true' ή 'false')"
+ 
+ #: ../src/Clients/Booter/Booter/Entry.cs:174
+ msgid "Set the playback volume (0-100), prefix with +/- for relative values"
+-msgstr "Ρυθμίστε την ένταση αναπαραγωγής (0-100), με πρόσημο +/- για σχετικές τιμές"
++msgstr ""
++"Ρυθμίστε την ένταση αναπαραγωγής (0-100), με πρόσημο +/- για σχετικές τιμές"
+ 
+ #: ../src/Clients/Booter/Booter/Entry.cs:175
+ msgid "Seek to a specific point (seconds, float)"
+@@ -934,7 +1004,8 @@ msgstr "Αναζήτηση σε συγκεκριμένο σημείο (δευτ
+ 
+ #: ../src/Clients/Booter/Booter/Entry.cs:176
+ msgid "Set the currently played track's rating (0 to 5)"
+-msgstr "Ορίστε τη βαθμολόγηση του τρέχοντος κομματιού που αναπαράγεται (0 ως 5)"
++msgstr ""
++"Ορίστε τη βαθμολόγηση του τρέχοντος κομματιού που αναπαράγεται (0 ως 5)"
+ 
+ #: ../src/Clients/Booter/Booter/Entry.cs:179
+ msgid "Player Engine Query Options"
+@@ -1040,7 +1111,7 @@ msgstr "Βαθμοί"
+ #: ../src/Clients/Booter/Booter/Entry.cs:200
+ #: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:145
+ msgid "Bit Rate"
+-msgstr "Ρυθμός διαμεταγωγής (Bitrate)"
++msgstr "Ρυθμός διαμεταγωγής"
+ 
+ #: ../src/Clients/Booter/Booter/Entry.cs:203
+ msgid "User Interface Options"
+@@ -1060,7 +1131,8 @@ msgstr "Απόκρυψη της διεπαφής χρήστη"
+ 
+ #: ../src/Clients/Booter/Booter/Entry.cs:207
+ msgid "Do not present the user interface, regardless of any other options"
+-msgstr "Η διεπαφή χρήστη δεν παρουσιάζεται, ανεξάρτητα από οποιαδήποτε άλλη επιλογή"
++msgstr ""
++"Η διεπαφή χρήστη δεν παρουσιάζεται, ανεξάρτητα από οποιαδήποτε άλλη επιλογή"
+ 
+ #: ../src/Clients/Booter/Booter/Entry.cs:208
+ msgid "Present the import media dialog box"
+@@ -1096,7 +1168,7 @@ msgstr "Ενεργοποίηση εξαγωγής αποσφαλμάτωσης 
+ 
+ #: ../src/Clients/Booter/Booter/Entry.cs:218
+ msgid "Specify an alternate database to use"
+-msgstr "Ορίστε μία εναλλακτική βάση δεδομένων για χρήση "
++msgstr "Ορίστε μία εναλλακτική βάση δεδομένων για χρήση"
+ 
+ #: ../src/Clients/Booter/Booter/Entry.cs:219
+ msgid "Force fetching of missing cover artwork"
+@@ -1107,8 +1179,13 @@ msgid "Specify an alternate key, default is /apps/banshee-1/"
+ msgstr "Ορίστε ένα εναλλακτικό κλειδί, η προεπιλογή είναι /apps/banshee-1/"
+ 
+ #: ../src/Clients/Booter/Booter/Entry.cs:221
+-msgid "Optimize instance for running uninstalled; most notably, this will create an alternate Mono.Addins database in the working directory"
+-msgstr "Βελτιστοποίηση στιγμιότυπου για απεγκατεστημένη εκτέλεση• ειδικότερα, αυτό θα δημιουργήσει μία εναλλακτική βάση δεδομένων Mono.Addins στον τρέχοντα κατάλογο"
++msgid ""
++"Optimize instance for running uninstalled; most notably, this will create an "
++"alternate Mono.Addins database in the working directory"
++msgstr ""
++"Βελτιστοποίηση στιγμιότυπου για απεγκατεστημένη εκτέλεση• ειδικότερα, αυτό "
++"θα δημιουργήσει μία εναλλακτική βάση δεδομένων Mono.Addins στον τρέχοντα "
++"κατάλογο"
+ 
+ #: ../src/Clients/Booter/Booter/Entry.cs:223
+ msgid "Disable DBus support completely"
+@@ -1117,7 +1194,9 @@ msgstr "Εξολοκλήρου απενεργοποίηση υποστήριξη
+ #: ../src/Clients/Booter/Booter/Entry.cs:225
+ #, csharp-format
+ msgid "Skip loading a custom gtkrc file ({0}) if it exists"
+-msgstr "Παραβλέψτε την φόρτωση ενός προσαρμοσμένου αρχείου gtkrc ({0}) αν αυτό υπάρχει"
++msgstr ""
++"Παραβλέψτε την φόρτωση ενός προσαρμοσμένου αρχείου gtkrc ({0}) αν αυτό "
++"υπάρχει"
+ 
+ #: ../src/Clients/Booter/Booter/Entry.cs:256
+ #, csharp-format
+@@ -1164,6 +1243,13 @@ msgstr "{0} υπολείπονται"
+ msgid "Play Song"
+ msgstr "Αναπαραγωγή τραγουδιού"
+ 
++#: ../src/Clients/Nereid/Nereid/PlayerInterface.cs:251
++#: ../src/Extensions/Banshee.Fixup/Banshee.Fixup/FixSource.cs:79
++#: ../src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/NotificationAreaService.cs:133
++#: ../src/Extensions/Banshee.SoundMenu/Banshee.SoundMenu/SoundMenuService.cs:111
++msgid "Close"
++msgstr "Κλείσιμο"
++
+ #. Translators: this is a verb (command), not a noun (things)
+ #: ../src/Clients/Nereid/Nereid/PlayerInterface.cs:472
+ msgid "Search"
+@@ -1231,13 +1317,15 @@ msgid "Stream location not found"
+ msgstr "Η τοποθεσίας της ροής δε βρέθηκε"
+ 
+ #: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:347
+-#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:339
++#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:344
+ msgid "File not found"
+ msgstr "Το αρχείο δε βρέθηκε"
+ 
+ #: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:349
+ msgid "Codec for playing this media type not available"
+-msgstr "Ο αποκωδικοποιητής για για την αναπαραγωγή αυτού του τύπου πολυμέσων δεν είναι διαθέσιμος"
++msgstr ""
++"Ο αποκωδικοποιητής για την αναπαραγωγή αυτού του τύπου πολυμέσων δεν είναι "
++"διαθέσιμος"
+ 
+ #: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:351
+ msgid "File protected by Digital Rights Management (DRM)"
+@@ -1291,7 +1379,6 @@ msgid "_Jump to Playing Item"
+ msgstr "_Μεταπήδηση στο αναπαραγόμενο αντικείμενο"
+ 
+ #: ../src/Core/Banshee.Core/Banshee.Collection/YearInfo.cs:38
+-#| msgid "Unknown error"
+ msgid "Unknown Year"
+ msgstr "Άγνωστο έτος"
+ 
+@@ -1304,7 +1391,6 @@ msgstr "{0} ({1}:{2:00})"
+ 
+ #: ../src/Core/Banshee.Services/Banshee.Collection.Database/DatabaseAlbumArtistListModel.cs:76
+ #, csharp-format
+-#| msgid "All Artists ({0})"
+ msgid "All Album Artists ({0})"
+ msgstr "Όλοι οι δίσκοι των καλλιτεχνών ({0})"
+ 
+@@ -1321,7 +1407,7 @@ msgstr "Όλοι οι καλλιτέχνες ({0})"
+ #: ../src/Core/Banshee.Services/Banshee.Collection.Database/DatabaseImportManager.cs:173
+ #, csharp-format
+ msgid "File is empty so it could not be imported: {0}"
+-msgstr ""
++msgstr "Το αρχείο είναι κενό, γιαυτό δεν μπόρεσε να εισαχθεί: {0}"
+ 
+ #: ../src/Core/Banshee.Services/Banshee.Collection.Database/DatabaseQueryFilterModel.cs:48
+ #: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/StatisticsPage.cs:96
+@@ -1330,7 +1416,6 @@ msgstr "Τιμή"
+ 
+ #: ../src/Core/Banshee.Services/Banshee.Collection.Database/DatabaseYearListModel.cs:66
+ #, csharp-format
+-#| msgid "All Genres ({0})"
+ msgid "All Years ({0})"
+ msgstr "Όλα τα έτη ({0})"
+ 
+@@ -1344,7 +1429,9 @@ msgstr "κατά δίσκο"
+ 
+ #: ../src/Core/Banshee.Services/Banshee.Collection.Database/RandomByAlbum.cs:52
+ msgid "Play all songs from an album, then randomly choose another album"
+-msgstr "Αναπαραγωγή όλων των τραγουδιών από ένα δίσκο, και στη συνέχεια τυχαία επιλογή άλλου δίσκου"
++msgstr ""
++"Αναπαραγωγή όλων των τραγουδιών από ένα δίσκο, και στη συνέχεια τυχαία "
++"επιλογή άλλου δίσκου"
+ 
+ #: ../src/Core/Banshee.Services/Banshee.Collection.Database/RandomByArtist.cs:50
+ msgid "Shuffle by A_rtist"
+@@ -1356,7 +1443,9 @@ msgstr "κατά καλλιτέχνη"
+ 
+ #: ../src/Core/Banshee.Services/Banshee.Collection.Database/RandomByArtist.cs:52
+ msgid "Play all songs by an artist, then randomly choose another artist"
+-msgstr "Αναπαραγωγή όλων των τραγουδιών ενός καλλιτέχνη, έπειτα τυχαία επιλογή άλλου καλλιτέχνη"
++msgstr ""
++"Αναπαραγωγή όλων των τραγουδιών ενός καλλιτέχνη, έπειτα τυχαία επιλογή άλλου "
++"καλλιτέχνη"
+ 
+ #: ../src/Core/Banshee.Services/Banshee.Collection.Database/RandomByOff.cs:38
+ msgid "Shuffle _Off"
+@@ -1380,7 +1469,8 @@ msgstr "κατά βαθμολογία"
+ 
+ #: ../src/Core/Banshee.Services/Banshee.Collection.Database/RandomByRating.cs:48
+ msgid "Play songs randomly, prefer higher rated songs"
+-msgstr "Τυχαία αναπαραγωγή τραγουδιών, προτίμηση σε τραγούδια με υψηλότερη αξιολόγηση"
++msgstr ""
++"Τυχαία αναπαραγωγή τραγουδιών, προτίμηση σε τραγούδια με υψηλότερη αξιολόγηση"
+ 
+ #: ../src/Core/Banshee.Services/Banshee.Collection.Database/RandomByScore.cs:43
+ msgid "Shuffle by S_core"
+@@ -1393,7 +1483,9 @@ msgstr "κατά βαθμολογία"
+ 
+ #: ../src/Core/Banshee.Services/Banshee.Collection.Database/RandomByScore.cs:45
+ msgid "Play songs randomly, prefer higher scored songs"
+-msgstr "Τυχαία αναπαραγωγή τραγουδιών, προτίμηση σε τραγούδια με την υψηλότερη βαθμολογία"
++msgstr ""
++"Τυχαία αναπαραγωγή τραγουδιών, προτίμηση σε τραγούδια με την υψηλότερη "
++"βαθμολογία"
+ 
+ #: ../src/Core/Banshee.Services/Banshee.Collection.Database/RandomByTrack.cs:46
+ msgid "Shuffle by _Song"
+@@ -1414,12 +1506,12 @@ msgstr "Σάρωση για μέσα"
+ #: ../src/Core/Banshee.Services/Banshee.Collection/ImportManager.cs:188
+ #: ../src/Core/Banshee.Services/Banshee.Database/BansheeDbFormatMigrator.cs:1419
+ msgid "Scanning..."
+-msgstr "Σάρωση…"
++msgstr "Σάρωση..."
+ 
+ #: ../src/Core/Banshee.Services/Banshee.Collection/ImportManager.cs:204
+ #, csharp-format
+ msgid "Scanning ({0} files)..."
+-msgstr "Σάρωση ({0} αρχείων)…"
++msgstr "Σάρωση ({0} αρχείων)..."
+ 
+ #: ../src/Core/Banshee.Services/Banshee.Collection/ImportManager.cs:238
+ msgid "Importing Media"
+@@ -1428,7 +1520,8 @@ msgstr "Εισαγωγή μέσων"
+ #: ../src/Core/Banshee.Services/Banshee.Collection/ImportManager.cs:245
+ #: ../src/Core/Banshee.Services/Banshee.Library/ThreadPoolImportSource.cs:119
+ msgid "The import process is currently running. Would you like to stop it?"
+-msgstr "Η διαδικασία εισαγωγής εκτελείται αυτή τη στιγμή. Θα θέλατε να την διακόψετε;"
++msgstr ""
++"Η διαδικασία εισαγωγής εκτελείται αυτή τη στιγμή. Θα θέλατε να την διακόψετε;"
+ 
+ #: ../src/Core/Banshee.Services/Banshee.Collection/ImportManager.cs:251
+ #: ../src/Core/Banshee.Services/Banshee.Library/ThreadPoolImportSource.cs:81
+@@ -1447,8 +1540,11 @@ msgid "Upgrading your Banshee Database"
+ msgstr "Αναβαθμίστε την βάση δεδομένων σας του Banshee"
+ 
+ #: ../src/Core/Banshee.Services/Banshee.Database/BansheeDbFormatMigrator.cs:233
+-msgid "Please wait while your old Banshee database is migrated to the new format."
+-msgstr "Παρακαλώ περιμένετε όσο η παλιά σας βάση δεδομένων του Banshee  μεταφέρεται στη νέα μορφή."
++msgid ""
++"Please wait while your old Banshee database is migrated to the new format."
++msgstr ""
++"Παρακαλώ περιμένετε όσο η παλιά σας βάση δεδομένων του Banshee μεταφέρεται "
++"στη νέα μορφή."
+ 
+ #: ../src/Core/Banshee.Services/Banshee.Database/BansheeDbFormatMigrator.cs:1416
+ msgid "Refreshing Metadata"
+@@ -1526,12 +1622,31 @@ msgstr "Απαλό Ροκ"
+ msgid "Techno"
+ msgstr "Techno"
+ 
+-#: ../src/Core/Banshee.Services/Banshee.Library/LibrarySource.cs:58
++#: ../src/Core/Banshee.Services/Banshee.Library/LibrarySource.cs:63
+ msgid "Remove From Library"
+ msgstr "Αφαίρεση από τη βιβλιοθήκη"
+ 
++#: ../src/Core/Banshee.Services/Banshee.Library/LibrarySource.cs:77
++#: ../src/Core/Banshee.Services/Banshee.Sources/PrimarySource.cs:249
++msgid "File Organization"
++msgstr "Οργάνωση αρχείων"
++
++#: ../src/Core/Banshee.Services/Banshee.Library/LibrarySource.cs:81
++#| msgid "Co_py files to media folders when importing"
++msgid "Co_py files to media folder when importing"
++msgstr "Αντι_γραφή αρχείων σε φακέλους πολυμέσων κατά την εισαγωγή"
++
++#: ../src/Core/Banshee.Services/Banshee.Library/LibrarySource.cs:87
++msgid "_Update file and folder names"
++msgstr "_Ενημέρωση αρχείου και ονόματα φακέλων"
++
++#: ../src/Core/Banshee.Services/Banshee.Library/LibrarySource.cs:88
++msgid "Rename files and folders according to media metadata"
++msgstr ""
++"Μετονομασία αρχείων και φακέλων σύμφωνα με τα μεταδεδομένα των πολυμέσων"
++
+ #. Translators: {0} is the library name, eg 'Music Library' or 'Podcasts'
+-#: ../src/Core/Banshee.Services/Banshee.Library/LibrarySource.cs:121
++#: ../src/Core/Banshee.Services/Banshee.Library/LibrarySource.cs:167
+ #, csharp-format
+ msgid "{0} Folder"
+ msgstr "Φάκελος {0}"
+@@ -1608,105 +1723,107 @@ msgid "Search your music"
+ msgstr "Αναζήτηση της μουσικής σας"
+ 
+ #. Misc section
+-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:80
+-#: ../src/Core/Banshee.Services/Banshee.Preferences/PreferenceService.cs:66
++#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:89
++#: ../src/Core/Banshee.Services/Banshee.Preferences/PreferenceService.cs:62
+ msgid "Miscellaneous"
+ msgstr "Διάφορα"
+ 
+-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:83
++#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:92
+ msgid "_Sort an artist's albums by year, not title"
+ msgstr "_Ταξινόμηση των δίσκων ενός καλλιτέχνη κατά έτος και όχι κατά τίτλο"
+ 
+-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:93
++#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:102
+ #, csharp-format
+ msgid "{0} song"
+ msgid_plural "{0} songs"
+ msgstr[0] "{0} τραγούδι"
+ msgstr[1] "{0} τραγούδια"
+ 
+-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:114
++#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:131
+ msgid "Music Folder"
+ msgstr "Φάκελος μουσικής"
+ 
+-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:119
+-#: ../src/Core/Banshee.Services/Banshee.Library/VideoLibrarySource.cs:95
++#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:136
++#: ../src/Core/Banshee.Services/Banshee.Library/VideoLibrarySource.cs:107
+ msgid "Favorites"
+ msgstr "Αγαπημένα"
+ 
+-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:120
++#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:137
+ msgid "Songs rated four and five stars"
+ msgstr "Τραγούδια που αξιολογήθηκαν με τέσσερα και πέντε αστέρια"
+ 
+-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:124
++#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:141
+ msgid "Recent Favorites"
+ msgstr "Πρόσφατα αγαπημένα"
+ 
+-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:125
++#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:142
+ msgid "Songs listened to often in the past week"
+ msgstr "Τραγούδια που ακούστηκαν αρκετά συχνά την προηγούμενη εβδομάδα"
+ 
+-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:129
++#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:146
+ #: ../src/Extensions/Banshee.InternetArchive/InternetArchive/Sort.cs:95
+ msgid "Recently Added"
+ msgstr "Πρόσφατες προσθήκες"
+ 
+-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:130
++#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:147
+ msgid "Songs imported within the last week"
+ msgstr "Τραγούδια που εισάχθηκαν μέσα στην προηγούμενη εβδομάδα"
+ 
+-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:134
++#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:151
+ msgid "Recently Played"
+ msgstr "Πρόσφατες αναπαραγωγές"
+ 
+-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:135
++#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:152
+ msgid "Recently played songs"
+ msgstr "Πρόσφατα αναπαραχθέντα τραγούδια"
+ 
+-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:139
++#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:156
+ msgid "Unheard"
+ msgstr "Δεν το έχετε ακούσει"
+ 
+-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:140
++#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:157
+ msgid "Songs that have not been played or skipped"
+ msgstr "Τραγούδια που δεν έχουν αναπαραχθεί ή παραλειφθεί"
+ 
+-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:147
++#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:164
+ msgid "Neglected Favorites"
+ msgstr "Παραμελημένα αγαπημένα"
+ 
+-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:148
++#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:165
+ msgid "Favorites not played in over two months"
+ msgstr "Αγαπημένα που δεν έχουν αναπαραχθεί πάνω από δύο μήνες"
+ 
+-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:152
++#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:169
+ msgid "Least Favorite"
+ msgstr "Λιγότερο Αγαπημένο"
+ 
+-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:153
++#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:170
+ msgid "Songs rated one or two stars or that you have frequently skipped"
+-msgstr "Τραγούδια που έχουν αξιολογηθεί με ένα ή δύο αστέρια ή που παραλείπονται συχνά"
++msgstr ""
++"Τραγούδια που έχουν αξιολογηθεί με ένα ή δύο αστέρια ή που παραλείπονται "
++"συχνά"
+ 
+-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:157
++#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:174
+ msgid "700 MB of Favorites"
+ msgstr "700 MB από Αγαπημένα"
+ 
+-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:158
++#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:175
+ msgid "A data CD worth of favorite songs"
+-msgstr "Ένας ψηφιακός δίσκος (CD) δεδομένων για αγαπημένα τραγούδια"
++msgstr "Ένα CD δεδομένων για αγαπημένα τραγούδια"
+ 
+-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:163
++#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:180
+ msgid "80 Minutes of Favorites"
+ msgstr "80 λεπτά από αγαπημένα"
+ 
+-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:164
++#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:181
+ msgid "An audio CD worth of favorite songs"
+ msgstr "Ένα CD ήχου γεμάτο αγαπημένα τραγούδια"
+ 
+-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:169
++#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:186
+ msgid "Unrated"
+ msgstr "Μη αξιολογημένο"
+ 
+-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:170
++#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:187
+ msgid "Songs that haven't been rated"
+ msgstr "Τραγούδια που δεν έχουν αξιολογηθεί"
+ 
+@@ -1720,41 +1837,41 @@ msgid "Importing From {0}"
+ msgstr "Εισήχθηκε από {0}"
+ 
+ #. Catalog.GetString ("Video Library")
+-#: ../src/Core/Banshee.Services/Banshee.Library/VideoLibrarySource.cs:43
++#: ../src/Core/Banshee.Services/Banshee.Library/VideoLibrarySource.cs:44
+ #: ../src/Dap/Banshee.Dap/Banshee.Dap/VideoGroupSource.cs:38
+ msgid "Videos"
+ msgstr "Βίντεο"
+ 
+-#: ../src/Core/Banshee.Services/Banshee.Library/VideoLibrarySource.cs:48
++#: ../src/Core/Banshee.Services/Banshee.Library/VideoLibrarySource.cs:49
+ #: ../src/Extensions/Banshee.UPnPClient/Banshee.UPnPClient/UPnPVideoSource.cs:52
+ msgid "Search your videos"
+ msgstr "Αναζήτηση των βίντεο σας"
+ 
+-#: ../src/Core/Banshee.Services/Banshee.Library/VideoLibrarySource.cs:65
++#: ../src/Core/Banshee.Services/Banshee.Library/VideoLibrarySource.cs:66
+ #: ../src/Extensions/Banshee.UPnPClient/Banshee.UPnPClient/UPnPVideoSource.cs:69
+ msgid "Produced By"
+ msgstr "Δημιουργήθηκε από"
+ 
+-#: ../src/Core/Banshee.Services/Banshee.Library/VideoLibrarySource.cs:70
++#: ../src/Core/Banshee.Services/Banshee.Library/VideoLibrarySource.cs:78
+ #, csharp-format
+ msgid "{0} video"
+ msgid_plural "{0} videos"
+ msgstr[0] "{0} βίντεο"
+ msgstr[1] "{0} βίντεο"
+ 
+-#: ../src/Core/Banshee.Services/Banshee.Library/VideoLibrarySource.cs:90
++#: ../src/Core/Banshee.Services/Banshee.Library/VideoLibrarySource.cs:102
+ msgid "Videos Folder"
+ msgstr "Φάκελος βίντεο"
+ 
+-#: ../src/Core/Banshee.Services/Banshee.Library/VideoLibrarySource.cs:96
++#: ../src/Core/Banshee.Services/Banshee.Library/VideoLibrarySource.cs:108
+ msgid "Videos rated four and five stars"
+ msgstr "Βίντεο αξιολογημένα με τέσσερα και πέντε αστέρια"
+ 
+-#: ../src/Core/Banshee.Services/Banshee.Library/VideoLibrarySource.cs:100
++#: ../src/Core/Banshee.Services/Banshee.Library/VideoLibrarySource.cs:112
+ msgid "Unwatched"
+ msgstr "Δεν προβλήθηκαν"
+ 
+-#: ../src/Core/Banshee.Services/Banshee.Library/VideoLibrarySource.cs:101
++#: ../src/Core/Banshee.Services/Banshee.Library/VideoLibrarySource.cs:113
+ msgid "Videos that haven't been played yet"
+ msgstr "Βίντεο που δεν έχουν αναπαραχθεί ακόμη"
+ 
+@@ -1763,8 +1880,12 @@ msgid "Default player engine"
+ msgstr "Προεπιλεγμένη μηχανή αναπαραγωγής"
+ 
+ #: ../src/Core/Banshee.Services/Banshee.MediaEngine/PlayerEngineService.cs:108
+-msgid "No player engines were found. Please ensure Banshee has been cleanly installed."
+-msgstr "Δεν βρέθηκαν μηχανές αναπαραγωγής. Παρακαλούμε σιγουρευτείτε ότι το Banshee έχει εγκατασταθεί σωστά."
++msgid ""
++"No player engines were found. Please ensure Banshee has been cleanly "
++"installed."
++msgstr ""
++"Δεν βρέθηκαν μηχανές αναπαραγωγής. Παρακαλούμε σιγουρευτείτε ότι το Banshee "
++"έχει εγκατασταθεί σωστά."
+ 
+ #: ../src/Core/Banshee.Services/Banshee.MediaEngine/PlayerEngineService.cs:375
+ msgid "Problem with Player Engine"
+@@ -1780,8 +1901,12 @@ msgid "Initializing"
+ msgstr "Αρχικοποίηση"
+ 
+ #: ../src/Core/Banshee.Services/Banshee.MediaEngine/TranscoderService.cs:138
+-msgid "Files are currently being converted to another format. Would you like to stop this?"
+-msgstr "Τα αρχεία αυτή τη στιγμή μετατρέπονται σε άλλη μορφή. Θα θέλατε να διακόψετε τη διαδικασία;"
++msgid ""
++"Files are currently being converted to another format. Would you like to "
++"stop this?"
++msgstr ""
++"Τα αρχεία αυτή τη στιγμή μετατρέπονται σε άλλη μορφή. Θα θέλατε να διακόψετε "
++"τη διαδικασία;"
+ 
+ #: ../src/Core/Banshee.Services/Banshee.Metadata/SaveTrackMetadataJob.cs:52
+ msgid "Saving Metadata to File"
+@@ -1789,44 +1914,45 @@ msgstr "Αποθήκευση μεταδεδομένων σε αρχείο"
+ 
+ #: ../src/Core/Banshee.Services/Banshee.Metadata/SaveTrackMetadataService.cs:49
+ msgid "Sync _metadata between library and files"
+-msgstr ""
++msgstr "Συγχρονισμός _μεταδεδομένων μεταξύ βιβλιοθήκης και αρχείων"
+ 
+ #: ../src/Core/Banshee.Services/Banshee.Metadata/SaveTrackMetadataService.cs:50
+-#, fuzzy
+ #| msgid ""
+ #| "Enable this option to save rating metadata inside supported audio files"
+-msgid "Enable this option to have metadata in sync between your library and supported media files"
+-msgstr "Ενεργοποίηση αυτής της επιλογής για αποθήκευση μεταδεδομένων βαθμολογιών και αριθμών αναπαραγωγής μέσα στα υποστηριζόμενα αρχεία ήχου"
++msgid ""
++"Enable this option to have metadata in sync between your library and "
++"supported media files"
++msgstr ""
++"Ενεργοποίηση αυτής της επιλογής για συγχρονισμό μεταδεδομένων μεταξύ της "
++"βιβλιοθήκης και των υποστηριζόμενων αρχείων μέσων"
+ 
+ #: ../src/Core/Banshee.Services/Banshee.Metadata/SaveTrackMetadataService.cs:55
+ msgid "Sync _ratings between library and files"
+-msgstr ""
++msgstr "Συγχρονισμός _ταξινόμησης μεταξύ βιβλιοθήκης και αρχείων"
+ 
+ #: ../src/Core/Banshee.Services/Banshee.Metadata/SaveTrackMetadataService.cs:56
+-#, fuzzy
+ #| msgid ""
+ #| "Enable this option to save rating metadata inside supported audio files"
+-msgid "Enable this option to have rating metadata synced between your library and supported audio files"
+-msgstr "Ενεργοποίηση αυτής της επιλογής για αποθήκευση μεταδεδομένων βαθμολογιών και αριθμών αναπαραγωγής μέσα στα υποστηριζόμενα αρχεία ήχου"
++msgid ""
++"Enable this option to have rating metadata synced between your library and "
++"supported audio files"
++msgstr ""
++"Ενεργοποίηση αυτής της επιλογής για συγχρονισμό μεταδεδομένων ταξινόμησης "
++"μεταξύ της βιβλιοθήκης και των υποστηριζόμενων αρχείων ήχου"
+ 
+ #: ../src/Core/Banshee.Services/Banshee.Metadata/SaveTrackMetadataService.cs:61
+ msgid "Sync play counts between library and files"
+-msgstr ""
++msgstr "Συγχρονισμός αριθμών αναπαραγωγής μεταξύ βιβλιοθήκης και αρχείων"
+ 
+ #: ../src/Core/Banshee.Services/Banshee.Metadata/SaveTrackMetadataService.cs:62
+-#, fuzzy
+ #| msgid ""
+ #| "Enable this option to save playcount metadata inside supported audio files"
+-msgid "Enable this option to have playcount metadata synced between your library and supported audio files"
+-msgstr "Ενεργοποίηση αυτής της επιλογής για αποθήκευση μεταδεδομένων βαθμολογιών και αριθμών αναπαραγωγής μέσα στα υποστηριζόμενα αρχεία ήχου"
+-
+-#: ../src/Core/Banshee.Services/Banshee.Metadata/SaveTrackMetadataService.cs:67
+-msgid "_Update file and folder names"
+-msgstr "_Ενημέρωση αρχείου και ονόματα φακέλων"
+-
+-#: ../src/Core/Banshee.Services/Banshee.Metadata/SaveTrackMetadataService.cs:68
+-msgid "Rename files and folders according to media metadata"
+-msgstr "Μετονομασία αρχείων και φακέλων σύμφωνα με τα μεταδεδομένα των πολυμέσων"
++msgid ""
++"Enable this option to have playcount metadata synced between your library "
++"and supported audio files"
++msgstr ""
++"Ενεργοποίηση αυτής της επιλογής για συγχρονισμό μεταδεδομένων αριθμού "
++"αναπαραγωγής μεταξύ της βιβλιοθήκης σας και των υποστηριζόμενων αρχείων ήχου"
+ 
+ #: ../src/Core/Banshee.Services/Banshee.Networking/Network.cs:52
+ msgid "There is no available network connection"
+@@ -1834,19 +1960,23 @@ msgstr "Δεν υπάρχει διαθέσιμη δικτυακή σύνδεση
+ 
+ #: ../src/Core/Banshee.Services/Banshee.Networking/Network.cs:78
+ msgid "Cannot connect to NetworkManager or Wicd"
+-msgstr "Δεν είναι δυνατή η σύνδεση στη διαχείριση δικτύου (Network Manager ή Wicd)"
++msgstr "Αδύνατη η σύνδεση στον διαχειριστή δικτύου ή Wicd"
+ 
+ #: ../src/Core/Banshee.Services/Banshee.Networking/Network.cs:79
+ msgid "An available, working network connection will be assumed"
+-msgstr "Θα υποτεθεί διαθέσιμη, σε λειτουργία, σύνδεση δικτύου "
++msgstr "Θα υποτεθεί διαθέσιμη, σε λειτουργία, σύνδεση δικτύου"
+ 
+ #: ../src/Core/Banshee.Services/Banshee.Networking/Network.cs:159
+ msgid "_Disable features requiring Internet access"
+ msgstr "_Απενεργοποίηση χαρακτηριστικών που απαιτούν πρόσβαση στο διαδίκτυο"
+ 
+ #: ../src/Core/Banshee.Services/Banshee.Networking/Network.cs:160
+-msgid "Some features require a broadband Internet connection such as Last.fm or cover art fetching"
+-msgstr "Κάποια χαρακτηριστικά απαιτούν ευρυζωνική σύνδεση διαδικτύου όπως είναι το Last.fm ή η αναζήτηση για εξώφυλλο"
++msgid ""
++"Some features require a broadband Internet connection such as Last.fm or "
++"cover art fetching"
++msgstr ""
++"Κάποια χαρακτηριστικά απαιτούν ευρυζωνική σύνδεση διαδικτύου όπως είναι το "
++"Last.fm ή η αναζήτηση για εξώφυλλο"
+ 
+ #: ../src/Core/Banshee.Services/Banshee.Playlist/AbstractPlaylistSource.cs:153
+ msgid "Search this playlist"
+@@ -1871,7 +2001,7 @@ msgstr "Διαγραφή λίστας αναπαραγωγής"
+ #: ../src/Core/Banshee.ThickClient/Banshee.Gui/SourceActions.cs:176
+ #: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:135
+ #: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:462
+-#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/SourceView.cs:595
++#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/SourceView.cs:612
+ #: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/SourceView_DragAndDrop.cs:214
+ msgid "New Playlist"
+ msgstr "Νέα λίστα αναπαραγωγής"
+@@ -1914,11 +2044,7 @@ msgstr "Επεκτάσεις"
+ msgid "File Policies"
+ msgstr "Πολιτικές αρχείου"
+ 
+-#: ../src/Core/Banshee.Services/Banshee.Preferences/PreferenceService.cs:58
+-msgid "Co_py files to media folders when importing"
+-msgstr "Αντι_γραφή αρχείων σε φακέλους πολυμέσων όταν γίνεται εισαγωγή"
+-
+-#: ../src/Core/Banshee.Services/Banshee.Preferences/PreferenceService.cs:70
++#: ../src/Core/Banshee.Services/Banshee.Preferences/PreferenceService.cs:66
+ msgid "Improve Banshee by sending anonymous usage data"
+ msgstr "Βελτιώστε το Banshee στέλνοντας ανώνυμες πληροφορίες χρήσης"
+ 
+@@ -2046,7 +2172,7 @@ msgstr "bpm"
+ #. Translators: These are unique search fields. You can use CSV for synonyms. Please, no spaces. Blank ok.
+ #: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:147
+ msgid "bitrate"
+-msgstr "bitrate"
++msgstr "ρυθμός διαμεταγωγής"
+ 
+ #: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:147
+ msgid "kbs"
+@@ -2064,7 +2190,7 @@ msgstr "Ρυθμός δειγματοληψίας"
+ #. Translators: These are unique search fields. You can use CSV for synonyms. Please, no spaces. Blank ok.
+ #: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:156
+ msgid "samplerate"
+-msgstr "samplerate"
++msgstr "ρυθμός-δειγματοληψίας"
+ 
+ #: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:156
+ msgid "Hz"
+@@ -2073,16 +2199,16 @@ msgstr "Hz"
+ #. Translators: noun
+ #: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:163
+ msgid "Bits Per Sample"
+-msgstr "Bit ανά δείγμα"
++msgstr "Δυαδικά ανά δείγμα"
+ 
+ #. Translators: These are unique search fields. You can use CSV for synonyms. Please, no spaces. Blank ok.
+ #: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:165
+ msgid "bitspersample"
+-msgstr "bitspersample"
++msgstr "δυαδικά-ανά-δείγμα"
+ 
+ #: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:165
+ msgid "bitdepth"
+-msgstr "bitdepth"
++msgstr "βάθος-δυαδικών"
+ 
+ #: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:165
+ msgid "quantization"
+@@ -2189,7 +2315,7 @@ msgstr "Καταμέτρηση αναπαραγωγών"
+ #. Translators: These are unique search fields (and nouns). You can use CSV for synonyms. Please, no spaces. Blank ok.
+ #: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:242
+ msgid "plays"
+-msgstr "plays"
++msgstr "αναπαραγωγές"
+ 
+ #: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:242
+ msgid "playcount"
+@@ -2210,7 +2336,7 @@ msgstr "παραβλέψεις"
+ 
+ #: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:250
+ msgid "skipcount"
+-msgstr "skipcount"
++msgstr "παράλειψη-μέτρησης"
+ 
+ #: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:256
+ msgid "File Size"
+@@ -2291,7 +2417,7 @@ msgstr "Τελευταία Αναπαραγωγή"
+ #. Translators: These are unique search fields. You can use CSV for synonyms. Please, no spaces. Blank ok.
+ #: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:290
+ msgid "lastplayed"
+-msgstr "lastplayed"
++msgstr "τελευταία-αναπαραγωγή"
+ 
+ #: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:290
+ msgid "played"
+@@ -2308,7 +2434,7 @@ msgstr "Τελευταία Παράβλεψη"
+ #. Translators: These are unique search fields. You can use CSV for synonyms. Please, no spaces. Blank ok.
+ #: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:298
+ msgid "lastskipped"
+-msgstr "lastskipped"
++msgstr "τελευταία-παράβλεψη"
+ 
+ #: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:298
+ msgid "skipped"
+@@ -2360,7 +2486,7 @@ msgstr "Σφάλμα Αναπαραγωγής"
+ #. Translators: These are unique search fields (and nouns). Please, no spaces. Blank ok.
+ #: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:334
+ msgid "playbackerror"
+-msgstr "playbackerror"
++msgstr "σφάλμα-αναπαραγωγής"
+ 
+ #. Translators: noun
+ #: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:351
+@@ -2479,7 +2605,7 @@ msgstr "drm"
+ #: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/StatisticsPage.cs:234
+ #: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/StatisticsPage.cs:236
+ #: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/StatisticsPage.cs:238
+-#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:400
++#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:405
+ msgid "Unknown"
+ msgstr "Άγνωστο"
+ 
+@@ -2576,24 +2702,20 @@ msgstr "Ταξινόμηση λιστών αναπαραγωγής κατά"
+ msgid "Drive"
+ msgstr "Δίσκος"
+ 
+-#: ../src/Core/Banshee.Services/Banshee.Sources/PrimarySource.cs:249
+-msgid "File Organization"
+-msgstr "Οργάνωση αρχείων"
+-
+ #: ../src/Core/Banshee.Services/Banshee.Sources/PrimarySource.cs:250
+ msgid "Folder hie_rarchy"
+ msgstr "Ιε_ραρχία φακέλων"
+ 
+ #: ../src/Core/Banshee.Services/Banshee.Sources/PrimarySource.cs:251
+ msgid "File _name"
+-msgstr "_Όνομα αρχείου"
++msgstr "Ό_νομα αρχείου"
+ 
+-#: ../src/Core/Banshee.Services/Banshee.Sources/PrimarySource.cs:703
++#: ../src/Core/Banshee.Services/Banshee.Sources/PrimarySource.cs:706
+ #, csharp-format
+ msgid "Adding {0} of {1} to {2}"
+ msgstr "Προσθήκη {0} από {1} σε {2}"
+ 
+-#: ../src/Core/Banshee.Services/Banshee.Sources/PrimarySource.cs:722
++#: ../src/Core/Banshee.Services/Banshee.Sources/PrimarySource.cs:725
+ #, csharp-format
+ msgid "Deleting {0} of {1} From {2}"
+ msgstr "Διαγραφή {0} από {1} από {2}"
+@@ -2653,9 +2775,9 @@ msgid ""
+ "\n"
+ " Check your 'Preferred Applications' settings."
+ msgstr ""
+-"Δεν ήταν δυνατό το άνοιγμα του {0}: {1}\n"
++"Αδύνατο το άνοιγμα του {0}: {1}\n"
+ "\n"
+-"Ελέγξτε τις ρυθμίσεις για τις «Προτιμώμενες Εφαρμογές» σας."
++"Ελέγξτε τις ρυθμίσεις για τις 'Προτιμώμενες Εφαρμογές' σας."
+ 
+ #: ../src/Core/Banshee.ThickClient/Banshee.Addins.Gui/AddinView.cs:49
+ msgid "Show:"
+@@ -2681,26 +2803,32 @@ msgstr "Αναζήτηση:"
+ 
+ #: ../src/Core/Banshee.ThickClient/Banshee.Collection.Gui/AlbumListView.cs:76
+ msgid "Disable album grid"
+-msgstr "Απενεργοποίηση πίνακα δίσκων"
++msgstr "Απενεργοποίηση πλέγματος συλλογής"
+ 
+ #: ../src/Core/Banshee.ThickClient/Banshee.Collection.Gui/AlbumListView.cs:77
+ msgid "Disable album grid and show the classic layout instead"
+-msgstr "Απενεργοποίηση του πίνακα δίσκων και εμφάνιση της κλασσικής διάταξης"
++msgstr ""
++"Απενεργοποίηση του πλέγματος συλλογής και εμφάνιση της κλασσικής διάταξης"
+ 
+ #: ../src/Core/Banshee.ThickClient/Banshee.Collection.Gui/BaseTrackListView.cs:76
+ msgid "Cannot Reorder While Sorted"
+ msgstr "Αδυναμία επαναδιάταξης ενόσω είναι ταξινομημένα"
+ 
+ #: ../src/Core/Banshee.ThickClient/Banshee.Collection.Gui/BaseTrackListView.cs:77
+-msgid "To put the playlist in manual sort mode, click the currently sorted column header until the sort arrow goes away."
+-msgstr "Για να θέσετε τη λίστα αναπαραγωγής σε χειροκίνητη ταξινόμηση, κάντε κλικ στην κεφαλίδα της τρέχουσας ταξινομημένης στήλης μέχρι το βέλος ταξινόμησης να φύγει."
++msgid ""
++"To put the playlist in manual sort mode, click the currently sorted column "
++"header until the sort arrow goes away."
++msgstr ""
++"Για να θέσετε τη λίστα αναπαραγωγής σε χειροκίνητη ταξινόμηση, κάντε κλικ "
++"στην κεφαλίδα της τρέχουσας ταξινομημένης στήλης μέχρι το βέλος ταξινόμησης "
++"να φύγει."
+ 
+ #. Translators: this is {disc number} of {disc count}
+ #. Translators: this is {track number} of {track count}
+ #: ../src/Core/Banshee.ThickClient/Banshee.Collection.Gui/ColumnCellDiscAndCount.cs:40
+ #: ../src/Core/Banshee.ThickClient/Banshee.Collection.Gui/ColumnCellTrackAndCount.cs:40
+ #: ../src/Core/Banshee.Widgets/Banshee.Widgets/StreamPositionLabel.cs:174
+-#: ../src/Dap/Banshee.Dap/Banshee.Dap.Gui/DapPropertiesDialog.cs:148
++#: ../src/Dap/Banshee.Dap/Banshee.Dap.Gui/DapPropertiesDialog.cs:149
+ #, csharp-format
+ msgid "{0} of {1}"
+ msgstr "{0} από {1}"
+@@ -2723,7 +2851,7 @@ msgstr "Εξωτερικό Έγγραφο"
+ 
+ #: ../src/Core/Banshee.ThickClient/Banshee.Collection.Gui/CoverArtEditor.cs:80
+ msgid "Choose New Cover Art..."
+-msgstr "Επιλέξτε νέο εξώφυλλο…"
++msgstr "Επιλέξτε νέο εξώφυλλο..."
+ 
+ #: ../src/Core/Banshee.ThickClient/Banshee.Collection.Gui/CoverArtEditor.cs:98
+ msgid "Delete This Cover Art"
+@@ -2771,12 +2899,12 @@ msgstr "Απόκρυψη πλαισίου περιεχομένου"
+ 
+ #: ../src/Core/Banshee.ThickClient/Banshee.ContextPane/ContextPane.cs:144
+ msgid "Waiting for playback to begin..."
+-msgstr "Αναμονή για έναρξη της αναπαραγωγής…"
++msgstr "Αναμονή για έναρξη της αναπαραγωγής..."
+ 
+ #: ../src/Core/Banshee.ThickClient/Banshee.ContextPane/ContextPane.cs:150
+ #: ../src/Core/Banshee.Widgets/Banshee.Widgets/StreamPositionLabel.cs:152
+ msgid "Loading..."
+-msgstr "Φόρτωση…"
++msgstr "Φόρτωση..."
+ 
+ #: ../src/Core/Banshee.ThickClient/Banshee.Equalizer.Gui/EqualizerView.cs:74
+ msgid "Preamp"
+@@ -2842,10 +2970,6 @@ msgstr "Καταπληκτική Διαχείριση και Αναπαραγω
+ 
+ #: ../src/Core/Banshee.ThickClient/Banshee.Gui.Dialogs/AboutDialog.cs:98
+ #, csharp-format
+-#| msgid ""
+-#| "Copyright © 2005–{0} Novell, Inc.\n"
+-#| "Copyright © 2005–{0} Others\n"
+-#| "Copyright © 2005 Aaron Bockover"
+ msgid ""
+ "Copyright © 2005–{0} Novell, Inc.\n"
+ "Copyright © 2005–{1} Others\n"
+@@ -2864,8 +2988,13 @@ msgid "Important tasks are running"
+ msgstr "Εκτελούνται σημαντικές εργασίες"
+ 
+ #: ../src/Core/Banshee.ThickClient/Banshee.Gui.Dialogs/ConfirmShutdownDialog.cs:53
+-msgid "Closing Banshee now will cancel any currently running tasks. They cannot be resumed automatically the next time Banshee is run."
+-msgstr "Το κλείσιμο του Banshee θα ακυρώσει τις τρέχουσες εκτελέσιμες εργασίες. Δεν μπορούν να επαναληφθούν αυτόματα την επόμενη φορά που θα εκτελεστεί το Banshee."
++msgid ""
++"Closing Banshee now will cancel any currently running tasks. They cannot be "
++"resumed automatically the next time Banshee is run."
++msgstr ""
++"Το κλείσιμο του Banshee θα ακυρώσει τις τρέχουσες εκτελέσιμες εργασίες. Δεν "
++"μπορούν να επαναληφθούν αυτόματα την επόμενη φορά που θα εκτελεστεί το "
++"Banshee."
+ 
+ #: ../src/Core/Banshee.ThickClient/Banshee.Gui.Dialogs/ConfirmShutdownDialog.cs:60
+ msgid "Quit Anyway"
+@@ -2880,8 +3009,13 @@ msgid "Make Banshee the default media player?"
+ msgstr "Να γίνει το Banshee η προεπιλεγμένη εφαρμογή αναπαραγωγής πολυμέσων;"
+ 
+ #: ../src/Core/Banshee.ThickClient/Banshee.Gui.Dialogs/DefaultApplicationHelperDialog.cs:70
+-msgid "Currently another program is configured as the default media player.  Would you prefer Banshee to be the default?"
+-msgstr "Αυτή τη στιγμή ένα άλλο πρόγραμμα έχει ρυθμιστεί σαν η προεπιλεγμένη εφαρμογή αναπαραγωγής πολυμέσων. Θα προτιμούσατε να είναι προεπιλεγμένο το Banshee;"
++msgid ""
++"Currently another program is configured as the default media player.  Would "
++"you prefer Banshee to be the default?"
++msgstr ""
++"Αυτή τη στιγμή ένα άλλο πρόγραμμα έχει ρυθμιστεί σαν η προεπιλεγμένη "
++"εφαρμογή αναπαραγωγής πολυμέσων. Θα προτιμούσατε να είναι προεπιλεγμένο το "
++"Banshee;"
+ 
+ #: ../src/Core/Banshee.ThickClient/Banshee.Gui.Dialogs/DefaultApplicationHelperDialog.cs:72
+ #: ../src/Core/Banshee.ThickClient/Banshee.Gui/SourceActions.cs:443
+@@ -2894,13 +3028,13 @@ msgid "Make Banshee the Default"
+ msgstr "Ορίστε το Banshee ως προεπιλεγμένο"
+ 
+ #. Translators: verb
+-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Dialogs/FileChooserDialog.cs:53
++#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Dialogs/GtkFileChooserDialog.cs:53
+ msgid "I_mport"
+ msgstr "Ε_ισαγωγή"
+ 
+ #: ../src/Core/Banshee.ThickClient/Banshee.Gui.Dialogs/ImageFileChooserDialog.cs:39
+ msgid "Select album cover image"
+-msgstr "Επιλογή εικόνας εξωφύλλου για το δίσκο"
++msgstr "Επιλογή εικόνας εξωφύλλου για τη συλλογή"
+ 
+ #: ../src/Core/Banshee.ThickClient/Banshee.Gui.Dialogs/ImageFileChooserDialog.cs:47
+ msgid "All image files"
+@@ -2921,7 +3055,7 @@ msgstr "Άνοιγμα τοποθεσίας"
+ 
+ #: ../src/Core/Banshee.ThickClient/Banshee.Gui.Dialogs/OpenLocationDialog.cs:54
+ msgid "Browse..."
+-msgstr "Περιήγηση…"
++msgstr "Περιήγηση..."
+ 
+ #: ../src/Core/Banshee.ThickClient/Banshee.Gui.Dialogs/OpenLocationDialog.cs:64
+ msgid "Enter the address of the file you would like to open:"
+@@ -2937,7 +3071,7 @@ msgstr "_Πολυμέσα"
+ 
+ #: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:53
+ msgid "Import _Media..."
+-msgstr "Εισαγωγή _πολυμέσων…"
++msgstr "Εισαγωγή _πολυμέσων..."
+ 
+ #: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:54
+ msgid "Import media from a variety of sources"
+@@ -2945,7 +3079,7 @@ msgstr "Εισαγωγή μέσων από διάφορες πηγές"
+ 
+ #: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:57
+ msgid "Import _Playlist..."
+-msgstr "Εισαγωγή _λίστας αναπαραγωγής"
++msgstr "Εισαγωγή _λίστας αναπαραγωγής..."
+ 
+ #: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:58
+ msgid "Import a playlist"
+@@ -2961,7 +3095,7 @@ msgstr "Νέα σάρωση του φακέλου της Μουσικής Βιβ
+ 
+ #: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:67
+ msgid "Open _Location..."
+-msgstr "Άνοιγμα _τοποθεσίας…"
++msgstr "Άνοιγμα _τοποθεσίας..."
+ 
+ #: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:68
+ msgid "Open a remote location for playback"
+@@ -3064,7 +3198,7 @@ msgstr "Αναπαραγωγή του προηγούμενου αντικειμ
+ 
+ #: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackActions.cs:85
+ msgid "Seek _To..."
+-msgstr "Μετάβαση _Στο…"
++msgstr "Μετάβαση _στο..."
+ 
+ #: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackActions.cs:86
+ msgid "Seek to a specific location in current item"
+@@ -3084,7 +3218,9 @@ msgstr "_Διακοπή όταν ολοκληρωθεί"
+ 
+ #: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackActions.cs:100
+ msgid "Stop playback after the current item finishes playing"
+-msgstr "Διακοπή αναπαραγωγής μετά το τέλος της αναπαραγωγής του τρέχοντος αντικειμένου"
++msgstr ""
++"Διακοπή αναπαραγωγής μετά το τέλος της αναπαραγωγής του τρέχοντος "
++"αντικειμένου"
+ 
+ #: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackActions.cs:106
+ msgid "_Playback"
+@@ -3121,7 +3257,8 @@ msgstr "Επανάληψη ό_λων"
+ 
+ #: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackRepeatActions.cs:84
+ msgid "Play all songs before repeating playlist"
+-msgstr "Αναπαραγωγή όλων των τραγουδιών πριν την επανάληψη της λίστας αναπαραγωγής"
++msgstr ""
++"Αναπαραγωγή όλων των τραγουδιών πριν την επανάληψη της λίστας αναπαραγωγής"
+ 
+ #: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackRepeatActions.cs:88
+ msgid "Repeat Singl_e"
+@@ -3144,7 +3281,7 @@ msgstr "Υπότιτλος"
+ 
+ #: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackSubtitleActions.cs:65
+ msgid "Load File..."
+-msgstr "Φόρτωση αρχείου…"
++msgstr "Φόρτωση αρχείου..."
+ 
+ #: ../src/Core/Banshee.ThickClient/Banshee.Gui/PlaybackSubtitleActions.cs:66
+ msgid "Load subtitle file"
+@@ -3186,7 +3323,7 @@ msgstr "Δημιουργία νέας κενής λίστας αναπαραγω
+ 
+ #: ../src/Core/Banshee.ThickClient/Banshee.Gui/SourceActions.cs:79
+ msgid "New _Smart Playlist..."
+-msgstr "Νέα  έ_ξυπνη λίστα αναπαραγωγής…"
++msgstr "Νέα έ_ξυπνη λίστα αναπαραγωγής..."
+ 
+ #: ../src/Core/Banshee.ThickClient/Banshee.Gui/SourceActions.cs:80
+ msgid "Create a new smart playlist"
+@@ -3206,7 +3343,7 @@ msgstr "Μετονομασία"
+ 
+ #: ../src/Core/Banshee.ThickClient/Banshee.Gui/SourceActions.cs:97
+ msgid "Export Playlist..."
+-msgstr "Εξαγωγή λίστας αναπαραγωγής…"
++msgstr "Εξαγωγή λίστας αναπαραγωγής..."
+ 
+ #: ../src/Core/Banshee.ThickClient/Banshee.Gui/SourceActions.cs:98
+ msgid "Export a playlist"
+@@ -3317,7 +3454,9 @@ msgstr "Προσθήκη στη _λίστα αναπαραγωγής"
+ 
+ #: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:131
+ msgid "Append selected items to playlist or create new playlist from selection"
+-msgstr "Προσαρτήστε τα επιλεγμένα στοιχεία στη λίστα αναπαραγωγής ή δημιουργήστε νέα λίστα αναπαραγωγής από την επιλογή"
++msgstr ""
++"Προσαρτήστε τα επιλεγμένα στοιχεία στη λίστα αναπαραγωγής ή δημιουργήστε νέα "
++"λίστα αναπαραγωγής από την επιλογή"
+ 
+ #: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:136
+ msgid "Create new playlist from selected tracks"
+@@ -3329,7 +3468,7 @@ msgstr "Α_φαίρεση"
+ 
+ #: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:141
+ msgid "Remove selected track(s) from this source"
+-msgstr "Αφαιρέστε το(α) επιλεγμένο(α) κομμάτι(α) από την πηγή"
++msgstr "Αφαιρέστε τα επιλεγμένα κομμάτια από την πηγή"
+ 
+ #: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:144
+ msgid "Remove From _Library"
+@@ -3337,7 +3476,7 @@ msgstr "Αφαίρεση από τη _βιβλιοθήκη"
+ 
+ #: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:145
+ msgid "Remove selected track(s) from library"
+-msgstr "Αφαιρέστε το(α) επιλεγμένο(α) κομμάτι(α) από τη βιβλιοθήκη"
++msgstr "Αφαιρέστε τα επιλεγμένα κομμάτια από τη βιβλιοθήκη"
+ 
+ #: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:148
+ msgid "_Open Containing Folder"
+@@ -3353,7 +3492,7 @@ msgstr "_Διαγραφή από το δίσκο"
+ 
+ #: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:153
+ msgid "Permanently delete selected item(s) from medium"
+-msgstr "Διαγράψτε μόνιμα το επιλεγμένο(α) κομμάτι(α) από το μέσο"
++msgstr "Διαγράψτε μόνιμα τα επιλεγμένα κομμάτια από το μέσο"
+ 
+ #. Translators: this is a verb (command), not a noun (things)
+ #: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:159
+@@ -3369,7 +3508,7 @@ msgstr "Αναζήτηση για αντικείμενα που ταιριάζο
+ 
+ #: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:163
+ msgid "By Matching _Album"
+-msgstr "Ταίριασμα _δίσκου"
++msgstr "Ταίριασμα _συλλογής"
+ 
+ #: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:164
+ msgid "Search all songs of this album"
+@@ -3386,7 +3525,7 @@ msgstr "Αναζήτηση όλων των τραγουδιών αυτού το
+ #: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:322
+ #, csharp-format
+ msgid "_Delete From \"{0}\""
+-msgstr "_Διαγραφή από «{0}»"
++msgstr "_Διαγραφή από \"{0}\""
+ 
+ #: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:535
+ msgid "The folder could not be found."
+@@ -3394,14 +3533,18 @@ msgstr "Ο φάκελος δεν μπόρεσε να βρεθεί."
+ 
+ #: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:536
+ msgid "Please check that the track's location is accessible by the system."
+-msgstr "Παρακαλώ ελέγξτε ότι η τοποθεσία του κομματιού είναι προσβάσιμη από το σύστημα."
++msgstr ""
++"Παρακαλώ ελέγξτε ότι η τοποθεσία του κομματιού είναι προσβάσιμη από το "
++"σύστημα."
+ 
+ #: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:607
+ #, csharp-format
+ msgid "Are you sure you want to permanently delete this item?"
+-msgid_plural "Are you sure you want to permanently delete the selected {0} items?"
++msgid_plural ""
++"Are you sure you want to permanently delete the selected {0} items?"
+ msgstr[0] "Είστε σίγουρος ότι θέλετε να σβήσετε μόνιμα αυτό το αντικείμενο;"
+-msgstr[1] "Είστε σίγουρος ότι θέλετε να σβήσετε μόνιμα τα επιλεγμένα {0} αντικείμενα;"
++msgstr[1] ""
++"Είστε σίγουρος ότι θέλετε να σβήσετε μόνιμα τα επιλεγμένα {0} αντικείμενα;"
+ 
+ #: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:611
+ msgid "If you delete the selection, it will be permanently lost."
+@@ -3415,21 +3558,34 @@ msgstr "Αφαίρεση επιλογής από {0};"
+ #: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:617
+ #, csharp-format
+ msgid "Are you sure you want to remove the selected item from your {1}?"
+-msgid_plural "Are you sure you want to remove the selected {0} items from your {1}?"
+-msgstr[0] "Είστε σίγουροι για την διαγραφή του επιλεγμένου αντικειμένου από το δικό σας {1};"
+-msgstr[1] "Είστε σίγουροι για την διαγραφή των επιλεγμένων {0} αντικειμένων από το δικό σας {1};"
++msgid_plural ""
++"Are you sure you want to remove the selected {0} items from your {1}?"
++msgstr[0] ""
++"Είστε σίγουροι για την διαγραφή του επιλεγμένου αντικειμένου από το δικό σας "
++"{1};"
++msgstr[1] ""
++"Είστε σίγουροι για την διαγραφή των επιλεγμένων {0} αντικειμένων από το δικό "
++"σας {1};"
+ 
+ #: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/AlbumArtistEntry.cs:53
+ msgid "Com_pilation Album Artist:"
+-msgstr "Κα_λλιτέχνης συλλογής:"
++msgstr "_Σύνταξη συλλογής καλλιτέχνη:"
+ 
+ #: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/AlbumArtistEntry.cs:57
+-msgid "Check this if this track is part of an album with tracks by various artists"
+-msgstr "Έλεγχος εάν αυτό το κομμάτι αποτελεί μέρος ενός δίσκου με κομμάτια από διάφορους καλλιτέχνες"
++msgid ""
++"Check this if this track is part of an album with tracks by various artists"
++msgstr ""
++"Έλεγχος εάν αυτό το κομμάτι αποτελεί μέρος ενός δίσκου με κομμάτια από "
++"διάφορους καλλιτέχνες"
+ 
+ #: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/AlbumArtistEntry.cs:59
+-msgid "This value will affect how this album is sorted; if you enter 'Various Artists' then the album will located with other albums that start with 'V'."
+-msgstr "Η επιλογή αυτή θα επηρεάσει τον τρόπο με τον οποίο θα ταξινομηθεί αυτός ο δίσκος• αν εισάγετε 'Διάφοροι Καλλιτέχνες' τότε ο δίσκος θα τοποθετηθεί με τους υπόλοιπους δίσκους που ξεκινάνε με 'Δ'."
++msgid ""
++"This value will affect how this album is sorted; if you enter 'Various "
++"Artists' then the album will located with other albums that start with 'V'."
++msgstr ""
++"Η επιλογή αυτή θα επηρεάσει τον τρόπο με τον οποίο θα ταξινομηθεί αυτός ο "
++"δίσκος· αν εισάγετε 'Διάφοροι Καλλιτέχνες' τότε ο δίσκος θα τοποθετηθεί με "
++"τους υπόλοιπους δίσκους που ξεκινάνε με 'Δ'."
+ 
+ #: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/BasicTrackDetailsPage.cs:44
+ msgid "Basic Details"
+@@ -3484,25 +3640,26 @@ msgstr "Αριθμός _κομματιού:"
+ #. Catalog.GetString ("Automatically set disc number and count"),
+ #: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/BasicTrackDetailsPage.cs:166
+ msgid "Set all disc numbers and counts to these values"
+-msgstr "Ρυθμίστε όλους τους αριθμούς των δίσκων και τις μετρήσεις σε αυτές τις τιμές"
++msgstr ""
++"Ρυθμίστε όλους τους αριθμούς των δίσκων και τις μετρήσεις σε αυτές τις τιμές"
+ 
+ #: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/BasicTrackDetailsPage.cs:167
+ msgid "_Disc Number:"
+ msgstr "_Αριθμός δίσκου:"
+ 
+-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/BasicTrackDetailsPage.cs:188
++#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/BasicTrackDetailsPage.cs:196
+ msgid "Set all years to this value"
+ msgstr "Βάλτε σε όλα τα έτη αυτή τη τιμή"
+ 
+-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/BasicTrackDetailsPage.cs:189
++#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/BasicTrackDetailsPage.cs:197
+ msgid "_Year:"
+ msgstr "Έ_τος:"
+ 
+-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/BasicTrackDetailsPage.cs:196
++#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/BasicTrackDetailsPage.cs:204
+ msgid "Set all ratings to this value"
+ msgstr "Βάλτε σε όλες τις αξιολογήσεις αυτή τη τιμή"
+ 
+-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/BasicTrackDetailsPage.cs:197
++#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/BasicTrackDetailsPage.cs:205
+ msgid "_Rating:"
+ msgstr "_Αξιολόγηση:"
+ 
+@@ -3556,7 +3713,7 @@ msgstr "Βάλτε σε όλες τις άδειες αυτή την τιμή"
+ 
+ #: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/ExtraTrackDetailsPage.cs:101
+ msgid "_License URI:"
+-msgstr "_Άδεια URI"
++msgstr "Ά_δεια URI:"
+ 
+ #: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/ExtraTrackDetailsPage.cs:110
+ msgid "Set all comments to this value"
+@@ -3584,7 +3741,8 @@ msgstr "Ταξινόμηση"
+ 
+ #: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/SortingPage.cs:52
+ msgid "Set all sort track titles to this value"
+-msgstr "Ρυθμίστε όλες τις ταξινομημένες ονομασίες των κομματιών σε αυτή τη τιμή"
++msgstr ""
++"Ρυθμίστε όλες τις ταξινομημένες ονομασίες των κομματιών σε αυτή τη τιμή"
+ 
+ #: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/SortingPage.cs:53
+ msgid "Sort Track Title:"
+@@ -3592,7 +3750,8 @@ msgstr "Ταξινόμηση τίτλου κομματιού:"
+ 
+ #: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/SortingPage.cs:60
+ msgid "Set all sort track artists to this value"
+-msgstr "Ρυθμίστε όλες τις ταξινομημένες ονομασίες των καλλιτεχνών σε αυτή την τιμή"
++msgstr ""
++"Ρυθμίστε όλες τις ταξινομημένες ονομασίες των καλλιτεχνών σε αυτή την τιμή"
+ 
+ #: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/SortingPage.cs:61
+ msgid "Sort Track Artist:"
+@@ -3730,8 +3889,12 @@ msgid "Sync all field _values"
+ msgstr "Συγχρονίστε όλα τα πεδία _τιμών"
+ 
+ #: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:319
+-msgid "Apply the values of all common fields set for this track to all of the tracks selected in this editor"
+-msgstr "Εφαρμόστε τις τιμές όλων των κοινών πεδίων που έχουν ρυθμιστεί για αυτό το κομμάτι σε όλα τα επιλεγμένα κομμάτια του επεξεργαστή"
++msgid ""
++"Apply the values of all common fields set for this track to all of the "
++"tracks selected in this editor"
++msgstr ""
++"Εφαρμόστε τις τιμές όλων των κοινών πεδίων που έχουν ρυθμιστεί για αυτό το "
++"κομμάτι σε όλα τα επιλεγμένα κομμάτια του επεξεργαστή"
+ 
+ #: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:419
+ #, csharp-format
+@@ -3752,7 +3915,9 @@ msgstr "Κλείσιμο _χωρίς αποθήκευση"
+ #: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:753
+ #, csharp-format
+ msgid "If you don't save, changes from the last {0} will be permanently lost."
+-msgstr "Αν δεν αποθηκεύσετε, οι αλλαγές που έγιναν από το τελευταίο {0} θα χαθούν μόνιμα."
++msgstr ""
++"Αν δεν αποθηκεύσετε, οι αλλαγές που έγιναν από το τελευταίο {0} θα χαθούν "
++"μόνιμα."
+ 
+ #: ../src/Core/Banshee.ThickClient/Banshee.Gui/ViewActions.cs:62
+ msgid "_View"
+@@ -3780,7 +3945,7 @@ msgstr "_Πλήρης οθόνη"
+ 
+ #: ../src/Core/Banshee.ThickClient/Banshee.Gui/ViewActions.cs:83
+ msgid "Enter or leave fullscreen mode"
+-msgstr "Είσοδος  ή έξοδος από την κατάσταση λειτουργίας πλήρους οθόνης "
++msgstr "Είσοδος ή έξοδος από την κατάσταση λειτουργίας πλήρους οθόνης"
+ 
+ #: ../src/Core/Banshee.ThickClient/Banshee.Gui/ViewActions.cs:88
+ msgid "Show Cover _Art"
+@@ -3857,8 +4022,9 @@ msgstr "Αυτή η εργασία εκτελείται ακόμη. Θα θέλ
+ 
+ #: ../src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/UserJobTile.cs:144
+ #, csharp-format
+-msgid "The '{0}' operation is still performing work. Would you like to stop it?"
+-msgstr "Η εργασία '{0}' εκτελείται ακόμη. Θα θέλατε να τη διακόψετε; "
++msgid ""
++"The '{0}' operation is still performing work. Would you like to stop it?"
++msgstr "Η εργασία '{0}' εκτελείται ακόμη. Θα θέλατε να τη διακόψετε;"
+ 
+ #: ../src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/UserJobTile.cs:148
+ msgid "Continue"
+@@ -3871,7 +4037,7 @@ msgstr "Συνέχεια {0}"
+ 
+ #: ../src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/UserJobTile.cs:184
+ msgid "Stopping..."
+-msgstr "Γίνεται διακοπή…"
++msgstr "Γίνεται διακοπή..."
+ 
+ #: ../src/Core/Banshee.ThickClient/Banshee.Library.Gui/FileImportSource.cs:45
+ msgid "Import Files to Library"
+@@ -3891,7 +4057,7 @@ msgstr "Αρχεία"
+ 
+ #: ../src/Core/Banshee.ThickClient/Banshee.Library.Gui/FileImportSource.cs:63
+ msgid "C_hoose Files..."
+-msgstr "Ε_πιλογή αρχείων…"
++msgstr "Ε_πιλογή αρχείων..."
+ 
+ #: ../src/Core/Banshee.ThickClient/Banshee.Library.Gui/FolderImportSource.cs:43
+ msgid "Import Folders to Library"
+@@ -3907,15 +4073,19 @@ msgstr "Φάκελοι"
+ 
+ #: ../src/Core/Banshee.ThickClient/Banshee.Library.Gui/FolderImportSource.cs:57
+ msgid "C_hoose Folders..."
+-msgstr "Ε_πιλογή φακέλων…"
++msgstr "Ε_πιλογή φακέλων..."
+ 
+ #: ../src/Core/Banshee.ThickClient/Banshee.Library.Gui/ImportDialog.cs:73
+ msgid "<big><b>Import Media to Library</b></big>"
+ msgstr "<big><b>Εισαγωγή μέσων στη βιβλιοθήκη</b></big>"
+ 
+ #: ../src/Core/Banshee.ThickClient/Banshee.Library.Gui/ImportDialog.cs:79
+-msgid "Your media library is empty. You may import new music and videos into your library now, or choose to do so later."
+-msgstr "Η βιβλιοθήκη των πολυμέσων σας είναι κενή. Μπορείτε να εισαγάγετε μουσική και βίντεο στη βιβλιοθήκη σας τώρα, ή επιλέξτε να γίνει αργότερα."
++msgid ""
++"Your media library is empty. You may import new music and videos into your "
++"library now, or choose to do so later."
++msgstr ""
++"Η βιβλιοθήκη των πολυμέσων σας είναι κενή. Μπορείτε να εισαγάγετε μουσική "
++"και βίντεο στη βιβλιοθήκη σας τώρα, ή επιλέξτε να γίνει αργότερα."
+ 
+ #: ../src/Core/Banshee.ThickClient/Banshee.Library.Gui/ImportDialog.cs:89
+ msgid "Import _from:"
+@@ -3953,7 +4123,7 @@ msgstr "Εξαγωγή"
+ 
+ #: ../src/Core/Banshee.ThickClient/Banshee.Playlist.Gui/PlaylistExportDialog.cs:54
+ msgid "Select Format: "
+-msgstr "Επιλογή μορφής:"
++msgstr "Επιλογή μορφής: "
+ 
+ #: ../src/Core/Banshee.ThickClient/Banshee.Preferences.Gui/DefaultPreferenceWidgets.cs:104
+ msgid "Select library location"
+@@ -3977,7 +4147,7 @@ msgstr "Πηγή:"
+ 
+ #: ../src/Core/Banshee.ThickClient/Banshee.Preferences.Gui/PreferenceDialog.cs:55
+ msgid "Could not show preferences"
+-msgstr "Αδυναμία εμφάνισης προτιμήσεων "
++msgstr "Αδυναμία εμφάνισης προτιμήσεων"
+ 
+ #: ../src/Core/Banshee.ThickClient/Banshee.Preferences.Gui/PreferenceDialog.cs:56
+ msgid "The preferences service could not be found."
+@@ -3989,7 +4159,7 @@ msgstr "Νέα έξυπνη λίστα αναπαραγωγής"
+ 
+ #: ../src/Core/Banshee.ThickClient/Banshee.SmartPlaylist.Gui/Editor.cs:96
+ msgid "Playlist _Name:"
+-msgstr "_Όνομα λίστας αναπαραγωγής:"
++msgstr "Ό_νομα λίστας αναπαραγωγής:"
+ 
+ #: ../src/Core/Banshee.ThickClient/Banshee.SmartPlaylist.Gui/Editor.cs:108
+ msgid "Predefined Smart Playlists"
+@@ -4004,63 +4174,58 @@ msgid "Create and save"
+ msgstr "Δημιουργία και αποθήκευση"
+ 
+ #: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/CompositeTrackSourceContents.cs:96
+-#, fuzzy
+ #| msgid "Browser on Left"
+ msgid "Browser Content"
+-msgstr "Περιηγητής στα αριστερά"
++msgstr "Περιεχόμενο περιηγητή"
+ 
+ #: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/CompositeTrackSourceContents.cs:97
+ msgid "Configure the filters available in the browser"
+-msgstr ""
++msgstr "Ρύθμιση των διαθέσιμων φίλτρων στον περιηγητή"
+ 
+ #: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/CompositeTrackSourceContents.cs:102
+-#, fuzzy
+ #| msgid "Show this help"
+ msgid "Show Artist Filter"
+-msgstr "Εμφάνιση αυτής της βοήθειας"
++msgstr "Εμφάνιση καλλιτεχνικού φίλτρου"
+ 
+ #: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/CompositeTrackSourceContents.cs:103
+ msgid "Show a list of artists to filter by"
+-msgstr ""
++msgstr "Εμφάνιση μιας λίστας καλλιτεχνών για φιλτράρισμα από"
+ 
+ #: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/CompositeTrackSourceContents.cs:107
+-#| msgid "Sort Track Artist:"
+ msgid "Show all Artists"
+ msgstr "Προβολή όλων των καλλιτεχνών"
+ 
+ #: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/CompositeTrackSourceContents.cs:108
+-#, fuzzy
+ #| msgid "Set all track artists to this value"
+ msgid "Show all artists in the artist filter"
+-msgstr "Ορίστε για όλους τους καλλιτέχνες του κομματιού αυτή την τιμή"
++msgstr "Εμφάνιση όλων των καλλιτεχνών στο καλλιτεχνικό φίλτρο"
+ 
+ #: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/CompositeTrackSourceContents.cs:111
+-#, fuzzy
+ #| msgid "Sort Album Artist:"
+ msgid "Show Album Artists"
+-msgstr "Ταξινόμηση καλλιτέχνη δίσκου:"
++msgstr "Εμφάνιση συλλογών καλλιτεχνών"
+ 
+ #: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/CompositeTrackSourceContents.cs:112
+ msgid "Show only album artists, not artists with only single tracks"
+ msgstr ""
++"Εμφάνιση μόνο συλλογών καλλιτεχνών, όχι καλλιτεχνών με μεμονωμένα κομμάτια"
+ 
+ #: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/CompositeTrackSourceContents.cs:117
+-#, fuzzy
+ #| msgid "Show the next track"
+ msgid "Show Genre Filter"
+-msgstr "Εμφάνιση του επόμενου κομματιού"
++msgstr "Εμφάνιση είδους φίλτρου"
+ 
+ #: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/CompositeTrackSourceContents.cs:118
+ msgid "Show a list of genres to filter by"
+-msgstr ""
++msgstr "Εμφάνιση μιας λίστας ειδών για φιλτράρισμα"
+ 
+ #: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/CompositeTrackSourceContents.cs:122
+ msgid "Show Year Filter"
+-msgstr ""
++msgstr "Εμφάνιση φίλτρου έτους"
+ 
+ #: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/CompositeTrackSourceContents.cs:123
+ msgid "Show a list of years to filter by"
+-msgstr ""
++msgstr "Εμφάνιση μιας λίστας ετών για φιλτράρισμα"
+ 
+ #: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/CompositeTrackSourceContents.cs:228
+ #: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/InternetRadioSourceContents.cs:62
+@@ -4073,7 +4238,8 @@ msgstr "Περιηγητής στα αριστερά"
+ 
+ #: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/FilteredListSourceContents.cs:106
+ msgid "Show the artist/album browser to the left of the track list"
+-msgstr "Εμφάνιση του περιηγητή καλλιτέχνη/δίσκου στα αριστερά της λίστας κομματιών"
++msgstr ""
++"Εμφάνιση του περιηγητή καλλιτέχνη/δίσκου στα αριστερά της λίστας κομματιών"
+ 
+ #: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/FilteredListSourceContents.cs:109
+ msgid "Browser on Top"
+@@ -4092,20 +4258,22 @@ msgid "Show or hide the artist/album browser"
+ msgstr "Εμφάνιση ή απόκρυψη του περιηγητή καλλιτεχνών/δίσκων"
+ 
+ #: ../src/Core/Banshee.WebBrowser/Banshee.WebBrowser/NavigationControl.cs:156
+-msgid "This page is blocked because it is probably not the one you are looking for!"
++msgid ""
++"This page is blocked because it is probably not the one you are looking for!"
+ msgstr ""
++"Αυτή η σελίδα είναι φραγμένη, επειδή δεν είναι προφανώς αυτή που ψάχνετε!"
+ 
+ #. Translators: {0} is the URL of the web page that was requested
+ #: ../src/Core/Banshee.WebBrowser/Banshee.WebBrowser/NavigationControl.cs:158
+-#, fuzzy, csharp-format
++#, csharp-format
+ #| msgid "The specified resource is invalid."
+ msgid "The security certificate for {0} is invalid."
+-msgstr "Η καθορισμένη πηγή είναι άκυρη."
++msgstr "Το πιστοποιητικό ασφάλειας για το {0} είναι άκυρο."
+ 
+ #: ../src/Core/Banshee.WebBrowser/Banshee.WebSource/WebBrowserShell.cs:121
+ #, csharp-format
+ msgid "Loading {0}..."
+-msgstr "Φόρτωση {0}…"
++msgstr "Φόρτωση {0}..."
+ 
+ #: ../src/Core/Banshee.Widgets/Banshee.Widgets/DiscUsageDisplay.cs:189
+ msgid ""
+@@ -4130,24 +4298,12 @@ msgstr "Αδρανής"
+ #: ../src/Core/Banshee.Widgets/Banshee.Widgets/StreamPositionLabel.cs:151
+ #: ../src/Extensions/Banshee.AmazonMp3/Banshee.AmazonMp3/AmazonDownloadManager.cs:58
+ msgid "Contacting..."
+-msgstr "Επικοινωνία…"
++msgstr "Επικοινωνία..."
+ 
+ #: ../src/Core/Banshee.Widgets/Banshee.Widgets/StreamPositionLabel.cs:162
+ msgid "Buffering"
+ msgstr "Αποθήκευση στην ενδιάμεση μνήμη"
+ 
+-#: ../src/Core/Banshee.Widgets/Banshee.Widgets/VolumeButton.cs:96
+-msgid "Volume"
+-msgstr "Ένταση"
+-
+-#: ../src/Core/Banshee.Widgets/Banshee.Widgets/VolumeButton.cs:548
+-msgid "Muted"
+-msgstr "Σίγαση"
+-
+-#: ../src/Core/Banshee.Widgets/Banshee.Widgets/VolumeButton.cs:550
+-msgid "Full Volume"
+-msgstr "Μέγιστη ένταση"
+-
+ #: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:115
+ msgid "Device"
+ msgstr "Συσκευή"
+@@ -4184,29 +4340,29 @@ msgstr "Υποστηρίζει εξώφυλλο δίσκου"
+ msgid "Supports photos"
+ msgstr "Υποστηρίζει φωτογραφίες"
+ 
+-#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:463
++#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:466
+ msgid "Track duration is zero"
+ msgstr "Η διάρκεια του κομματιού είναι μηδέν"
+ 
+-#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:569
++#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:570
+ msgid "Syncing iPod"
+ msgstr "Συγχρονισμός του iPod"
+ 
+-#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:570
++#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:571
+ msgid "Preparing to synchronize..."
+-msgstr "Προετοιμασία για συγχρονισμό…"
++msgstr "Προετοιμασία για συγχρονισμό..."
+ 
+-#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:573
++#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:593
+ #, csharp-format
+ msgid "Adding track {0} of {1}"
+ msgstr "Προσθήκη κομματιού {0} από {1}"
+ 
+-#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:609
++#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:636
+ #, csharp-format
+ msgid "Removing track {0} of {1}"
+ msgstr "Απομάκρυνση κομματιού {0} από {1}"
+ 
+-#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:662
++#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:710
+ msgid "Writing media database"
+ msgstr "Εγγραφή σε βάση δεδομένων πολυμέσων"
+ 
+@@ -4224,50 +4380,60 @@ msgstr "Συσκευές"
+ msgid "Device Properties"
+ msgstr "Ιδιότητες συσκευής"
+ 
+-#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:203
++#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:201
+ msgid "Product"
+ msgstr "Προϊόν"
+ 
+-#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:204
++#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:202
+ msgid "Vendor"
+ msgstr "Πωλητής"
+ 
+-#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:287
++#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:292
+ #: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Data/PodcastSource.cs:141
+ #, csharp-format
+ msgid "Loading {0}"
+ msgstr "Φόρτωση {0}"
+ 
+-#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:381
++#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:386
+ #: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/ColumnCellYesNo.cs:37
+ msgid "Yes"
+ msgstr "Ναι"
+ 
+-#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:381
++#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:386
+ #: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/ColumnCellYesNo.cs:38
+ msgid "No"
+ msgstr "Όχι"
+ 
+-#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:402
++#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:407
+ #, csharp-format
+-msgid "The {0} format is not supported by the device, and no converter was found to convert it"
+-msgstr "Η μορφή {0} δεν υποστηρίζεται από τη συσκευή και δε βρέθηκε μετατροπέας για να γίνει μετατροπή "
++msgid ""
++"The {0} format is not supported by the device, and no converter was found to "
++"convert it"
++msgstr ""
++"Η μορφή {0} δεν υποστηρίζεται από τη συσκευή και δε βρέθηκε μετατροπέας για "
++"να γίνει μετατροπή"
+ 
+-#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:408
++#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:413
+ msgid "File format conversion support is not available"
+ msgstr "Δεν είναι διαθέσιμη η υπόστηριξη μετατροπής μορφής αρχείου"
+ 
+-#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:434
++#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:439
+ msgid "Error converting file"
+ msgstr "Σφάλμα μετατροπής αρχείου"
+ 
+ #: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSync.cs:135
+ msgid "Sync when first plugged in and when the libraries change"
+-msgstr "Αυτόματος συγχρονισμός της συσκευής όταν συνδέεται για πρώτη φορά και όταν αλλάζουν οι βιβλιοθήκες"
++msgstr ""
++"Αυτόματος συγχρονισμός της συσκευής όταν συνδέεται για πρώτη φορά και όταν "
++"αλλάζουν οι βιβλιοθήκες"
+ 
+ #: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSync.cs:136
+-msgid "Begin synchronizing the device as soon as the device is plugged in or the libraries change."
+-msgstr "Έναρξη συγχρονισμού της συσκευής μόλις η συσκευή έχει συνδεθεί ή οι βιβλιοθήκες έχουν αλλάξει."
++msgid ""
++"Begin synchronizing the device as soon as the device is plugged in or the "
++"libraries change."
++msgstr ""
++"Έναρξη συγχρονισμού της συσκευής μόλις η συσκευή έχει συνδεθεί ή οι "
++"βιβλιοθήκες έχουν αλλάξει."
+ 
+ #: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSync.cs:139
+ msgid "Sync Preferences"
+@@ -4289,7 +4455,7 @@ msgstr[1] "Η διαδικασία συγχρονισμού θα αφαιρέσ
+ msgid "Are you sure you want to continue?"
+ msgstr "Είστε σίγουρος ότι θέλετε να συνεχίσετε;"
+ 
+-#: ../src/Dap/Banshee.Dap/Banshee.Dap.Gui/DapActions.cs:118
++#: ../src/Dap/Banshee.Dap/Banshee.Dap.Gui/DapActions.cs:121
+ msgid "Remove tracks"
+ msgstr "Αφαίρεση κομματιών"
+ 
+@@ -4353,7 +4519,7 @@ msgstr "Συγχρονισμός ολόκληρης της βιβλιοθήκη
+ #: ../src/Dap/Banshee.Dap/Banshee.Dap.Gui/LibrarySyncOptions.cs:154
+ #, csharp-format
+ msgid "Sync from “{0}”"
+-msgstr "Συγχρονισμός από «{0}»"
++msgstr "Συγχρονισμός από “{0}”"
+ 
+ #: ../src/Dap/Banshee.Dap/Banshee.Dap.Gui/PurchasedMusicActions.cs:53
+ msgid "Import Purchased Music"
+@@ -4364,12 +4530,12 @@ msgstr "Εισαγωγή αγορασμένης μουσικής"
+ msgid "Disconnect"
+ msgstr "Αποσύνδεση"
+ 
+-#: ../src/Dap/Banshee.Dap/Banshee.Dap/RemovableSource.cs:108
++#: ../src/Dap/Banshee.Dap/Banshee.Dap/RemovableSource.cs:111
+ #, csharp-format
+ msgid "Disconnecting {0}..."
+-msgstr "Αποσύνδεση {0}…"
++msgstr "Αποσύνδεση {0}..."
+ 
+-#: ../src/Dap/Banshee.Dap/Banshee.Dap/RemovableSource.cs:115
++#: ../src/Dap/Banshee.Dap/Banshee.Dap/RemovableSource.cs:118
+ #, csharp-format
+ msgid "Could not disconnect {0}: {1}"
+ msgstr "Αδυναμία αποσύνδεσης {0}: {1}"
+@@ -4413,10 +4579,9 @@ msgid "Error Initializing MTP Device Support"
+ msgstr "Σφάλμα κατά την αρχικοποίηση της υποστήριξης συσκευών MTP"
+ 
+ #: ../src/Dap/Banshee.Dap.Mtp/Banshee.Dap.Mtp/MtpSource.cs:83
+-#, fuzzy
+ #| msgid "There was an error intializing MTP device support."
+ msgid "There was an error initializing MTP device support."
+-msgstr "Σφάλμα κατά την αρχικοποίηση της υποστήριξης συσκευών MTP"
++msgstr "Σφάλμα κατά την αρχικοποίηση της υποστήριξης συσκευών MTP."
+ 
+ #: ../src/Dap/Banshee.Dap.Mtp/Banshee.Dap.Mtp/MtpSource.cs:142
+ #: ../src/Hyena/Hyena.Gui/Hyena.Gui.Dialogs/VersionInformationDialog.cs:66
+@@ -4475,7 +4640,8 @@ msgstr "Χώρα"
+ 
+ #: ../src/Extensions/Banshee.AmazonMp3.Store/Banshee.AmazonMp3.Store/StoreSourcePreferences.cs:60
+ msgid "Which Amazon MP3 storefront to use by default."
+-msgstr "Ποια βιτρίνα του καταστήματος Amazon MP3 θα χρησιμοποιηθεί ως προεπιλογή."
++msgstr ""
++"Ποια βιτρίνα του καταστήματος Amazon MP3 θα χρησιμοποιηθεί ως προεπιλογή."
+ 
+ #: ../src/Extensions/Banshee.AmazonMp3.Store/Banshee.AmazonMp3.Store/StoreSourcePreferences.cs:90
+ msgid "Automatic (Geo IP detection)"
+@@ -4518,13 +4684,12 @@ msgstr "Άνοιγμα βιβλίου"
+ 
+ #: ../src/Extensions/Banshee.Audiobook/Banshee.Audiobook/Actions.cs:56
+ msgid "Merge Discs..."
+-msgstr "Συγχώνευση δίσκων…"
++msgstr "Συγχώνευση δίσκων..."
+ 
+ #: ../src/Extensions/Banshee.Audiobook/Banshee.Audiobook/Actions.cs:57
+-#, fuzzy
+ #| msgid "Audiobooks"
+ msgid "Go to Audiobooks"
+-msgstr "Ηχογραφημένα βιβλία"
++msgstr "Μετάβαση σε ηχητικά βιβλία"
+ 
+ #: ../src/Extensions/Banshee.Audiobook/Banshee.Audiobook/Actions.cs:61
+ #: ../src/Extensions/Banshee.Audiobook/Banshee.Audiobook/Actions.cs:65
+@@ -4545,8 +4710,13 @@ msgstr[0] "Συγχώνευση των {0} επιλεγμένων δίσκων 
+ msgstr[1] "Συγχώνευση των {0} επιλεγμένων δίσκων σε ένα βιβλίο;"
+ 
+ #: ../src/Extensions/Banshee.Audiobook/Banshee.Audiobook/Actions.cs:144
+-msgid "This will ensure the disc numbers are all set properly, and then set the author and book title for all tracks on all these discs to the values below"
+-msgstr "Αυτό θα εξασφαλίσει ότι οι αριθμοί των δίσκων είναι ορισμένοι σωστά, και μετά θα οριστεί ο συγγραφέας και ο τίτλος βιβλίου για όλα τα κομμάτια όλων αυτών των δίσκων στις παρακάτω τιμές"
++msgid ""
++"This will ensure the disc numbers are all set properly, and then set the "
++"author and book title for all tracks on all these discs to the values below"
++msgstr ""
++"Αυτό θα εξασφαλίσει ότι οι αριθμοί των δίσκων είναι ορισμένοι σωστά, και "
++"μετά θα οριστεί ο συγγραφέας και ο τίτλος βιβλίου για όλα τα κομμάτια όλων "
++"αυτών των δίσκων στις παρακάτω τιμές"
+ 
+ #: ../src/Extensions/Banshee.Audiobook/Banshee.Audiobook/Actions.cs:153
+ msgid "Author:"
+@@ -4589,7 +4759,7 @@ msgstr[1] "{0} βιβλία"
+ 
+ #: ../src/Extensions/Banshee.Audiobook/Banshee.Audiobook/AudiobookLibrarySource.cs:136
+ msgid "Audiobooks Folder"
+-msgstr "Φάκελος ηχογραφημένων βιβλίων (audiobooks)"
++msgstr "Φάκελος ηχογραφημένων βιβλίων"
+ 
+ #: ../src/Extensions/Banshee.Audiobook/Banshee.Audiobook/BookView.cs:114
+ msgid "Resume Playback"
+@@ -4613,7 +4783,8 @@ msgstr "Χ_τύπημα"
+ 
+ #: ../src/Extensions/Banshee.Bpm/Banshee.Bpm/BpmEntry.cs:112
+ msgid "Have Banshee attempt to auto-detect the BPM of this song"
+-msgstr "Αφήστε το Banshee να προσπαθήσει να ανιχνεύσει αυτόματα το BPM του τραγουδιού"
++msgstr ""
++"Αφήστε το Banshee να προσπαθήσει να ανιχνεύσει αυτόματα το BPM του τραγουδιού"
+ 
+ #: ../src/Extensions/Banshee.Bpm/Banshee.Bpm/BpmEntry.cs:114
+ msgid "Play this song"
+@@ -4621,15 +4792,21 @@ msgstr "Αναπαραγωγή αυτού του τραγουδιού"
+ 
+ #: ../src/Extensions/Banshee.Bpm/Banshee.Bpm/BpmEntry.cs:117
+ msgid "Tap this button to the beat to set the BPM for this song manually"
+-msgstr "Πατήστε αυτό το κουμπί στο ρυθμό ώστε να καθορίσετε χειροκίνητα τους χτύπους ανά λεπτό αυτού του τραγουδιού"
++msgstr ""
++"Πατήστε αυτό το κουμπί στο ρυθμό ώστε να καθορίσετε χειροκίνητα τους χτύπους "
++"ανά λεπτό αυτού του τραγουδιού"
+ 
+ #: ../src/Extensions/Banshee.Bpm/Banshee.Bpm/BpmService.cs:147
+ msgid "_Automatically detect BPM for all songs"
+ msgstr "_Αυτόματη ανίχνευση BPM για όλα τα τραγούδια"
+ 
+ #: ../src/Extensions/Banshee.Bpm/Banshee.Bpm/BpmService.cs:148
+-msgid "Detect beats per minute (BPM) for all songs that don't already have a value set"
+-msgstr "Ανιχνεύστε χτύπους ανά λεπτό (BPM) για όλα τα τραγούδια που δεν έχουν ήδη μία ρυθμισμένη τιμή"
++msgid ""
++"Detect beats per minute (BPM) for all songs that don't already have a value "
++"set"
++msgstr ""
++"Ανιχνεύστε χτύπους ανά λεπτό (BPM) για όλα τα τραγούδια που δεν έχουν ήδη "
++"μία ρυθμισμένη τιμή"
+ 
+ #: ../src/Extensions/Banshee.CoverArt/Banshee.CoverArt/CoverArtJob.cs:58
+ msgid "Downloading Cover Art"
+@@ -4658,13 +4835,19 @@ msgstr "Πίσω"
+ 
+ #: ../src/Extensions/Banshee.Daap/Banshee.Daap/DaapErrorView.cs:101
+ msgid ""
+-"iTunes® 7 introduced new compatibility issues and currently only works with other iTunes® 7 clients.\n"
++"iTunes® 7 introduced new compatibility issues and currently only works with "
++"other iTunes® 7 clients.\n"
+ "\n"
+-"No third-party clients can connect to iTunes® music shares anymore. This is an intentional limitation by Apple in iTunes® 7 and newer, we apologize for the unfortunate inconvenience."
++"No third-party clients can connect to iTunes® music shares anymore. This is "
++"an intentional limitation by Apple in iTunes® 7 and newer, we apologize for "
++"the unfortunate inconvenience."
+ msgstr ""
+-"Το iTunes® 7 εισήγαγε νέα ζητήματα συμβατότητας και αυτή τη στιγμή δουλεύει μόνο με άλλους πελάτες iTunes® 7.\n"
++"Το iTunes® 7 εισήγαγε νέα ζητήματα συμβατότητας και αυτή τη στιγμή δουλεύει "
++"μόνο με άλλους πελάτες iTunes® 7.\n"
+ "\n"
+-"Κανένα πρόγραμμα πελάτης τρίτων δεν μπορεί να συνδεθεί στη κοινόχρηστη μουσική του  iTunes® πια. Είναι ένας σκόπιμος περιορισμός από την Apple στο iTunes® 7 και σας ζητάμε συγγνώμη για την ατυχή αναστάτωση."
++"Κανένα πρόγραμμα πελάτης τρίτων δεν μπορεί να συνδεθεί στη κοινόχρηστη "
++"μουσική του iTunes® πια. Είναι ένας σκόπιμος περιορισμός από την Apple στο "
++"iTunes® 7 και σας ζητάμε συγγνώμη για την ατυχή αναστάτωση."
+ 
+ #: ../src/Extensions/Banshee.Daap/Banshee.Daap/DaapErrorView.cs:111
+ msgid "Common reasons for connection failures:"
+@@ -4722,11 +4905,11 @@ msgstr "Είσοδος"
+ msgid "Connecting to {0}"
+ msgstr "Σύνδεση στο {0}"
+ 
+-#: ../src/Extensions/Banshee.Daap/Banshee.Daap/DaapService.cs:185
++#: ../src/Extensions/Banshee.Daap/Banshee.Daap/DaapService.cs:186
+ msgid "Add Remote DAAP Server"
+ msgstr "Προσθήκη απομακρυσμένου εξυπηρετητή DAAP"
+ 
+-#: ../src/Extensions/Banshee.Daap/Banshee.Daap/DaapService.cs:186
++#: ../src/Extensions/Banshee.Daap/Banshee.Daap/DaapService.cs:187
+ msgid "Add a new remote DAAP server"
+ msgstr "Προσθήκη ενός νέου απομακρυσμένου DAAP εξυπηρετητή"
+ 
+@@ -4756,7 +4939,7 @@ msgstr "Άνοιγμα απομακρυσμένου DAAP εξυπηρετητή"
+ 
+ #: ../src/Extensions/Banshee.Daap/Banshee.Daap/OpenRemoteServer.cs:51
+ msgid "Enter server IP address and port:"
+-msgstr "Εισαγωγή  διεύθυνσης IP και θύρας εξυπηρετητή:"
++msgstr "Εισαγωγή διεύθυνσης IP και θύρας εξυπηρετητή:"
+ 
+ #: ../src/Extensions/Banshee.Emusic/Banshee.Emusic/DownloadManager/DownloadUserJob.cs:46
+ #: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/SearchView.cs:133
+@@ -4768,12 +4951,12 @@ msgstr "Μεταφορτώσεις"
+ 
+ #: ../src/Extensions/Banshee.Emusic/Banshee.Emusic/DownloadManager/DownloadUserJob.cs:50
+ msgid "Downloading eMusic Track(s)"
+-msgstr "Μεταφόρτωση κομματιού/ών eMusic"
++msgstr "Μεταφόρτωση κομματιών eMusic"
+ 
+ #: ../src/Extensions/Banshee.Emusic/Banshee.Emusic/DownloadManager/DownloadUserJob.cs:51
+ #: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/DownloadManager/DownloadUserJob.cs:51
+ msgid "Initializing..."
+-msgstr "Αρχικοποίηση…"
++msgstr "Αρχικοποίηση..."
+ 
+ #: ../src/Extensions/Banshee.Emusic/Banshee.Emusic/DownloadManager/DownloadUserJob.cs:52
+ msgid "Cancel all eMusic downloads?"
+@@ -4785,7 +4968,7 @@ msgstr "Ακύρωση όλων των μεταφορτώσεων από eMusic;
+ msgid "Transferring {0} file at {1} KB/s"
+ msgid_plural "Transferring {0} of {2} files at {1} KB/s"
+ msgstr[0] "Μεταφορά {0} αρχείου στα {1} KB/s"
+-msgstr[1] "Μεταφορά {0} από {2} αρχείων στα {1} KB/s"
++msgstr[1] "Μεταφορά {0} από {2} αρχεία στα {1} KB/s"
+ 
+ #: ../src/Extensions/Banshee.Emusic/Banshee.Emusic/DownloadManager/DownloadUserJob.cs:133
+ #: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/DownloadManager/DownloadUserJob.cs:133
+@@ -4795,7 +4978,7 @@ msgstr "Ακύρωση μεταφορτώσεων"
+ #: ../src/Extensions/Banshee.Emusic/Banshee.Emusic/DownloadManager/DownloadUserJob.cs:135
+ #: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/DownloadManager/DownloadUserJob.cs:135
+ msgid "Waiting for downloads to terminate..."
+-msgstr "Αναμονή για τερματισμό μεταφορτώσεων…"
++msgstr "Αναμονή για τερματισμό μεταφορτώσεων..."
+ 
+ #: ../src/Extensions/Banshee.Emusic/Banshee.Emusic/EmusicImport.cs:59
+ msgid "Import eMusic Downloads to Library"
+@@ -4851,20 +5034,30 @@ msgid "Duplicate Albums"
+ msgstr "Διπλοί δίσκοι"
+ 
+ #: ../src/Extensions/Banshee.Fixup/Banshee.Fixup/AlbumDuplicateSolver.cs:47
+-msgid "Displayed are albums that should likely be merged.  For each row, click the desired title to make it bold, or uncheck it to take no action."
+-msgstr "Οι προβαλλόμενοι είναι δίσκοι που πιθανότατα πρέπει να συγχωνευθούν. Για κάθε σειρά, πατήστε στον επιθυμητό τίτλο για να τον κάνετε έντονο, ή απο-επιλέξτε τον για να μη γίνει καμία ενέργεια."
++msgid ""
++"Displayed are albums that should likely be merged.  For each row, click the "
++"desired title to make it bold, or uncheck it to take no action."
++msgstr ""
++"Οι προβαλλόμενοι είναι δίσκοι που πιθανότατα πρέπει να συγχωνευθούν. Για "
++"κάθε σειρά, πατήστε στον επιθυμητό τίτλο για να τον κάνετε έντονο, ή "
++"αποεπιλέξτε τον για να μη γίνει καμία ενέργεια."
+ 
+ #: ../src/Extensions/Banshee.Fixup/Banshee.Fixup/ArtistDuplicateSolver.cs:46
+ msgid "Duplicate Artists"
+ msgstr "Διπλοί καλλιτέχνες"
+ 
+ #: ../src/Extensions/Banshee.Fixup/Banshee.Fixup/ArtistDuplicateSolver.cs:47
+-msgid "Displayed are artists that should likely be merged.  For each row, click the desired name to make it bold, or uncheck it to take no action."
+-msgstr "Εμφανίζονται καλλιτέχνες που θα έπρεπε πιθανόν να ενοποιηθούν. Για κάθε γραμμή, κάντε κλικ στο επιθυμητό όνομα για να το κάνετε έντονο ή αποεπιλέξτε το για να μη γίνει καμία ενέργεια."
++msgid ""
++"Displayed are artists that should likely be merged.  For each row, click the "
++"desired name to make it bold, or uncheck it to take no action."
++msgstr ""
++"Εμφανίζονται καλλιτέχνες που θα έπρεπε πιθανόν να ενοποιηθούν. Για κάθε "
++"γραμμή, κάντε κλικ στο επιθυμητό όνομα για να το κάνετε έντονο ή αποεπιλέξτε "
++"το για να μη γίνει καμία ενέργεια."
+ 
+ #: ../src/Extensions/Banshee.Fixup/Banshee.Fixup/FixActions.cs:50
+ msgid "Fix Music Metadata..."
+-msgstr "Διόρθωση Μεταδεδομένων Μουσικής…"
++msgstr "Διόρθωση Μεταδεδομένων Μουσικής..."
+ 
+ #: ../src/Extensions/Banshee.Fixup/Banshee.Fixup/FixSource.cs:48
+ msgid "Metadata Fixer"
+@@ -4883,12 +5076,17 @@ msgid "Duplicate Genres"
+ msgstr "Διπλά είδη"
+ 
+ #: ../src/Extensions/Banshee.Fixup/Banshee.Fixup/GenreDuplicateSolver.cs:47
+-msgid "Displayed are genres that should likely be merged.  For each row, click the desired genre to make it bold, or uncheck it to take no action."
+-msgstr "Εμφανίζονται είδη που θα έπρεπε πιθανόν να ενοποιηθούν. Για κάθε γραμμή, κάντε κλικ στο επιθυμητό είδος για να το κάνετε έντονο ή αποεπιλέξτε το για να μη γίνει καμία ενέργεια."
++msgid ""
++"Displayed are genres that should likely be merged.  For each row, click the "
++"desired genre to make it bold, or uncheck it to take no action."
++msgstr ""
++"Εμφανίζονται είδη που θα έπρεπε πιθανόν να ενοποιηθούν. Για κάθε γραμμή, "
++"κάντε κλικ στο επιθυμητό είδος για να το κάνετε έντονο ή αποεπιλέξτε το για "
++"να μη γίνει καμία ενέργεια."
+ 
+ #: ../src/Extensions/Banshee.Fixup/Banshee.Fixup/GenreDuplicateSolver.cs:77
+ msgid " and "
+-msgstr "και"
++msgstr " και "
+ 
+ #. Translators: These are articles that might be prefixed or suffixed
+ #. on artist names or album titles.  You can add as many as you need,
+@@ -4945,7 +5143,9 @@ msgstr "Λήψη λεπτομερειών αντικειμένου από το I
+ 
+ #: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/DetailsSource.cs:148
+ msgid "Timed out getting item details from the Internet Archive"
+-msgstr "Υπέρβαση χρονικού ορίου κατά την λήψη λεπτομερειών αντικειμένου από το Internet Archive"
++msgstr ""
++"Υπέρβαση χρονικού ορίου κατά την λήψη λεπτομερειών αντικειμένου από το "
++"Internet Archive"
+ 
+ #: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/DetailsSource.cs:149
+ #: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/SearchSource.cs:190
+@@ -5085,7 +5285,7 @@ msgstr "Προτιμώμενοι τύποι πολυμέσων"
+ 
+ #: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HomeSource.cs:122
+ msgid "_Audio"
+-msgstr "_Ήχος"
++msgstr "Ή_χος"
+ 
+ #: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HomeSource.cs:125
+ msgid "_Video"
+@@ -5098,7 +5298,7 @@ msgstr "_Κείμενο"
+ #: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HomeView.cs:100
+ #, csharp-format
+ msgid "Search..."
+-msgstr "Αναζήτηση…"
++msgstr "Αναζήτηση..."
+ 
+ #: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HomeView.cs:111
+ msgid "_Go"
+@@ -5162,13 +5362,20 @@ msgid "Library of Congress"
+ msgstr "Βιβλιοθήκη του Κογκρέσου"
+ 
+ #: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HomeView.cs:136
+-#| msgid "Sample"
+ msgid "Examples:"
+ msgstr "Παραδείγματα:"
+ 
+ #: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HomeView.cs:148
+-msgid "The Internet Archive, a 501(c)(3) non-profit, is building a digital library of Internet sites and other cultural artifacts in digital form. Like a paper library, we provide free access to researchers, historians, scholars, and the general public."
+-msgstr "Το Internet Archive, μια μη κερδοσκοπική οργάνωση του 501(c)(3), δομεί μια ψηφιακή βιβλιοθήκη ιστοσελίδων διαδικτύου και άλλων καλλιτεχνημάτων σε ψηφιακή μορφή. Όπως και μια παραδοσιακή βιβλιοθήκη, παρέχουμε ελεύθερη πρόσβαση σε ερευνητές, ιστορικούς, μελετητές και το ευρύ κοινό."
++msgid ""
++"The Internet Archive, a 501(c)(3) non-profit, is building a digital library "
++"of Internet sites and other cultural artifacts in digital form. Like a paper "
++"library, we provide free access to researchers, historians, scholars, and "
++"the general public."
++msgstr ""
++"Το Internet Archive, μια μη κερδοσκοπική οργάνωση του 501(c)(3), δομεί μια "
++"ψηφιακή βιβλιοθήκη ιστοσελίδων διαδικτύου και άλλων καλλιτεχνημάτων σε "
++"ψηφιακή μορφή. Όπως και μια παραδοσιακή βιβλιοθήκη, παρέχουμε ελεύθερη "
++"πρόσβαση σε ερευνητές, ιστορικούς, μελετητές και το ευρύ κοινό."
+ 
+ #: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HomeView.cs:151
+ msgid "Visit the Internet Archive online at archive.org"
+@@ -5207,8 +5414,8 @@ msgstr "Δεν βρέθηκαν αποτελέσματα."
+ #, csharp-format
+ msgid "Showing 1 match"
+ msgid_plural "Showing 1 to {0:N0} of {1:N0} total matches"
+-msgstr[0] "Προβάλλεται 1 αποτέλεσμα"
+-msgstr[1] "Προβάλλεται 1 έως {0:N0} από {1:N0} συνολικά αποτελεσμάτων"
++msgstr[0] "Προβάλλεται 1 συμφωνία"
++msgstr[1] "Προβάλλεται 1 έως {0:N0} από {1:N0} συνολικές συμφωνίες"
+ 
+ #: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/SearchSource.cs:189
+ msgid "Timed out searching the Internet Archive"
+@@ -5483,8 +5690,12 @@ msgid "Edit radio station"
+ msgstr "Επεξεργασία σταθμού ραδιοφώνου"
+ 
+ #: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/StationEditor.cs:97
+-msgid "Enter the Genre, Title and URL of the radio station you wish to add. A description is optional."
+-msgstr "Εισαγάγετε το είδος, ονομασία και το URL του ραδιοφωνικού σταθμού που θα επιθυμούσατε να προστεθεί. Η περιγραφή είναι προαιρετική."
++msgid ""
++"Enter the Genre, Title and URL of the radio station you wish to add. A "
++"description is optional."
++msgstr ""
++"Εισαγάγετε το είδος, ονομασία και το URL του ραδιοφωνικού σταθμού που θα "
++"επιθυμούσατε να προστεθεί. Η περιγραφή είναι προαιρετική."
+ 
+ #: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/StationEditor.cs:118
+ msgid "Station Genre:"
+@@ -5532,43 +5743,39 @@ msgstr "Επισκεφτείτε τη σελίδα προφίλ σας στο La
+ 
+ #: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:146
+ #: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmPreferences.cs:93
+-#, fuzzy
+ #| msgid "_Enable Song Reporting"
+ msgid "_Enable Song Reporting From Banshee"
+-msgstr "_Ενεργοποίηση αναφοράς τραγουδιού"
++msgstr "_Ενεργοποίηση αναφοράς τραγουδιού από το Banshee"
+ 
+ #: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:147
+-#, fuzzy
+ #| msgid "Enable song reporting"
+ msgid "Enable song reporting From Banshee"
+-msgstr "Ενεργοποίηση αναφοράς τραγουδιού"
++msgstr "Ενεργοποίηση αναφοράς τραγουδιού από το Banshee"
+ 
+ #: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:152
+ #: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmPreferences.cs:98
+-#, fuzzy
+ #| msgid "_Enable Song Reporting"
+ msgid "_Enable Song Reporting From Device"
+-msgstr "_Ενεργοποίηση αναφοράς τραγουδιού"
++msgstr "_Ενεργοποίηση αναφοράς τραγουδιού από συσκευή"
+ 
+ #: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:153
+-#, fuzzy
+ #| msgid "Enable song reporting"
+ msgid "Enable song reporting From Device"
+-msgstr "Ενεργοποίηση αναφοράς τραγουδιού"
++msgstr "Ενεργοποίηση αναφοράς τραγουδιού από συσκευή"
+ 
+ #: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:402
+ msgid "Scrobbling from device"
+-msgstr ""
++msgstr "Προτιμήσεις από συσκευή"
+ 
+ #: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:403
+ msgid "Scrobbling from device..."
+-msgstr ""
++msgstr "Προτιμήσεις από συσκευή..."
+ 
+ #: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:414
+-#, fuzzy, csharp-format
++#, csharp-format
+ #| msgid "Removing track {0} of {1}"
+ msgid "Processing track {0} of {1} ..."
+-msgstr "Απομάκρυνση κομματιού {0} από {1}"
++msgstr "Επεξεργασία κομματιού {0} από {1}..."
+ 
+ #: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmActions.cs:66
+ msgid "Connect"
+@@ -5668,8 +5875,12 @@ msgid "Sign up for Last.fm"
+ msgstr "Εγγραφείτε για το Last.fm"
+ 
+ #: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmPreferences.cs:262
+-msgid "Open Last.fm in a browser, giving you the option to authorize Banshee to work with your account"
+-msgstr "Άνοιγμα του Last.fm σε έναν περιηγητή, δίνοντάς σας την επιλογή να εξουσιοδοτήστε το Banshee για να δουλέψτε με το λογαριασμό σας"
++msgid ""
++"Open Last.fm in a browser, giving you the option to authorize Banshee to "
++"work with your account"
++msgstr ""
++"Άνοιγμα του Last.fm σε έναν περιηγητή, δίνοντάς σας την επιλογή να "
++"εξουσιοδοτήστε το Banshee για να δουλέψτε με το λογαριασμό σας"
+ 
+ #: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmPreferences.cs:273
+ #: ../src/Libraries/Lastfm.Gui/Lastfm.Gui/AccountLoginDialog.cs:49
+@@ -5677,10 +5888,11 @@ msgid "Log in to Last.fm"
+ msgstr "Συνδεθείτε στο Last.fm"
+ 
+ #: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmPreferences.cs:294
+-#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:294
+-#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:321
++#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:298
++#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:335
+ msgid "You need to allow Banshee to access your Last.fm account."
+-msgstr "Πρέπει να επιτρέψτε στο Banshee να έχει πρόσβαση στο λογαριασμό σας Last.fm"
++msgstr ""
++"Πρέπει να επιτρέψτε στο Banshee να έχει πρόσβαση στο λογαριασμό σας Last.fm."
+ 
+ #: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmPreferences.cs:304
+ msgid "Finish Logging In"
+@@ -5753,7 +5965,7 @@ msgstr "Άγνωστη ομοιότητα"
+ 
+ #: ../src/Extensions/Banshee.LastfmStreaming/Banshee.LastfmStreaming/LastfmStreamingActions.cs:59
+ msgid "_Add Station..."
+-msgstr "_Προσθήκη σταθμού.."
++msgstr "_Προσθήκη σταθμού..."
+ 
+ #: ../src/Extensions/Banshee.LastfmStreaming/Banshee.LastfmStreaming/LastfmStreamingActions.cs:60
+ msgid "Add a new Last.fm radio station"
+@@ -5825,7 +6037,7 @@ msgstr "Νέος σταθμός"
+ 
+ #: ../src/Extensions/Banshee.LastfmStreaming/Banshee.LastfmStreaming/StationEditor.cs:90
+ msgid "Station _Type:"
+-msgstr "_Τύπος σταθμού"
++msgstr "_Τύπος σταθμού:"
+ 
+ #: ../src/Extensions/Banshee.LastfmStreaming/Banshee.LastfmStreaming/StationSource.cs:58
+ msgid "Last.fm Station"
+@@ -5842,7 +6054,7 @@ msgstr "Διαγραφή του σταθμού Last.fm"
+ #: ../src/Extensions/Banshee.LastfmStreaming/Banshee.LastfmStreaming/StationSource.cs:239
+ #, csharp-format
+ msgid "Tuning Last.fm to {0}."
+-msgstr "Συντονισμός του  Last.fm σε {0}."
++msgstr "Συντονισμός του Last.fm σε {0}."
+ 
+ #. Translators: {0} is an error message sentence from RadioConnection.cs.
+ #: ../src/Extensions/Banshee.LastfmStreaming/Banshee.LastfmStreaming/StationSource.cs:249
+@@ -5994,7 +6206,8 @@ msgstr "Οδηγός Miro"
+ 
+ #: ../src/Extensions/Banshee.MiroGuide/Banshee.MiroGuide/MiroGuideSource.cs:97
+ msgid "Discover interesting podcasts in the Miro Guide podcast directory!"
+-msgstr "Ανακαλύψτε ενδιαφέρουσες φορητές εκπομπές στο Miro Guide podcast directory!"
++msgstr ""
++"Ανακαλύψτε ενδιαφέρουσες φορητές εκπομπές στο Miro Guide podcast directory!"
+ 
+ #: ../src/Extensions/Banshee.MiroGuide/Banshee.MiroGuide/MiroGuideSource.cs:100
+ msgid "Open Miro Guide"
+@@ -6008,6 +6221,11 @@ msgstr "Αναζήτηση φορητών εκπομπών (podcasts)"
+ msgid "Search for video podcasts"
+ msgstr "Αναζήτηση για φορητές εκπομπές βίντεο (Podcasts)"
+ 
++#: ../src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/NotificationAreaService.cs:132
++#: ../src/Extensions/Banshee.SoundMenu/Banshee.SoundMenu/SoundMenuService.cs:110
++msgid "_Close"
++msgstr "_Κλείσιμο"
++
+ #: ../src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/NotificationAreaService.cs:139
+ msgid "_Show Notifications"
+ msgstr "_Εμφάνιση ειδοποιήσεων"
+@@ -6021,8 +6239,12 @@ msgid "Still Running"
+ msgstr "Εκτελείται ακόμη"
+ 
+ #: ../src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/NotificationAreaService.cs:348
+-msgid "Banshee was closed to the notification area. Use the <i>Quit</i> option to end your session."
+-msgstr "Το Banshee έχει κλείσει στη περιοχή ειδοποιήσεων. Χρησιμοποιήστε την επιλογή <i>Έξοδος</i> για να τερματίσετε τη συνεδρία σας."
++msgid ""
++"Banshee was closed to the notification area. Use the <i>Quit</i> option to "
++"end your session."
++msgstr ""
++"Το Banshee έχει κλείσει στη περιοχή ειδοποιήσεων. Χρησιμοποιήστε την επιλογή "
++"<i>Έξοδος</i> για να τερματίσετε τη συνεδρία σας."
+ 
+ #: ../src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/NotificationAreaService.cs:483
+ #: ../src/Extensions/Banshee.SoundMenu/Banshee.SoundMenu/SoundMenuService.cs:326
+@@ -6055,12 +6277,14 @@ msgstr "Απλοποίηση"
+ 
+ #: ../src/Extensions/Banshee.NowPlaying/Banshee.NowPlaying/NowPlayingSource.cs:60
+ msgid "Hide/Show the source list, menu, toolbar, and status bar"
+-msgstr "Απόκρυψη/Εμφάνιση της λίστας πηγής, γραμμής μενού, γραμμής εργαλείων, και της μπάρας κατάστασης"
++msgstr ""
++"Απόκρυψη/Εμφάνιση της λίστας πηγής, γραμμής μενού, γραμμής εργαλείων, και "
++"της μπάρας κατάστασης"
+ 
+ #: ../src/Extensions/Banshee.OpticalDisc/Banshee.OpticalDisc.AudioCd/AudioCdDiscModel.cs:75
+ #: ../src/Extensions/Banshee.OpticalDisc/Banshee.OpticalDisc.AudioCd/AudioCdSource.cs:54
+ msgid "Audio CD"
+-msgstr "Ψηφιακός δίσκος (CD) ήχου"
++msgstr "CD ήχου"
+ 
+ #: ../src/Extensions/Banshee.OpticalDisc/Banshee.OpticalDisc.AudioCd/AudioCdDiscModel.cs:103
+ #, csharp-format
+@@ -6077,8 +6301,12 @@ msgstr "Αρχικοποίηση οδηγού"
+ 
+ #: ../src/Extensions/Banshee.OpticalDisc/Banshee.OpticalDisc.AudioCd/AudioCdRipper.cs:124
+ #, csharp-format
+-msgid "<i>{0}</i> is still being imported into the music library. Would you like to stop it?"
+-msgstr "<i>{0}</i> ακόμη εισάγεται στη βιβλιοθήκη μουσικής. Θα θέλατε να το διακόψετε;"
++msgid ""
++"<i>{0}</i> is still being imported into the music library. Would you like to "
++"stop it?"
++msgstr ""
++"<i>{0}</i> ακόμη εισάγεται στη βιβλιοθήκη μουσικής. Θα θέλατε να το "
++"διακόψετε;"
+ 
+ #: ../src/Extensions/Banshee.OpticalDisc/Banshee.OpticalDisc.AudioCd/AudioCdRipper.cs:254
+ msgid "Cannot Import CD"
+@@ -6098,11 +6326,15 @@ msgstr "_Εισαγωγή μορφής"
+ 
+ #: ../src/Extensions/Banshee.OpticalDisc/Banshee.OpticalDisc.AudioCd/AudioCdService.cs:114
+ msgid "_Automatically import audio CDs when inserted"
+-msgstr "_Αυτόματη εισαγωγή ψηφιακών δίσκων (CD) ήχου όταν εισάγονται"
++msgstr "_Αυτόματη εισαγωγή CDs ήχου όταν εισάγονται"
+ 
+ #: ../src/Extensions/Banshee.OpticalDisc/Banshee.OpticalDisc.AudioCd/AudioCdService.cs:115
+-msgid "When an audio CD is inserted, automatically begin importing it if metadata can be found and it is not already in the library."
+-msgstr "Όταν ένα CD (ψηφιακός δίσκος) ήχου εισάγεται, αυτόματη εκκίνηση της εισαγωγής του αν βρεθούν τα μεταδεδομένα και δεν είναι ήδη στην βιβλιοθήκη."
++msgid ""
++"When an audio CD is inserted, automatically begin importing it if metadata "
++"can be found and it is not already in the library."
++msgstr ""
++"Όταν ένα CD ήχου εισάγεται, αυτόματη εκκίνηση της εισαγωγής του αν βρεθούν "
++"τα μεταδεδομένα και δεν είναι ήδη στην βιβλιοθήκη."
+ 
+ #: ../src/Extensions/Banshee.OpticalDisc/Banshee.OpticalDisc.AudioCd/AudioCdService.cs:119
+ msgid "_Eject when done importing"
+@@ -6110,15 +6342,20 @@ msgstr "_Αποβολή όταν ολοκληρωθεί η εισαγωγή"
+ 
+ #: ../src/Extensions/Banshee.OpticalDisc/Banshee.OpticalDisc.AudioCd/AudioCdService.cs:120
+ msgid "When an audio CD has been imported, automatically eject it."
+-msgstr "Όταν ένας ηχητικός ψηφιακός δίσκος έχει εισαχθεί, να γίνει αυτόματη αποβολή. "
++msgstr "Όταν ένα CD ήχου έχει εισαχθεί, να γίνει αυτόματη αποβολή."
+ 
+ #: ../src/Extensions/Banshee.OpticalDisc/Banshee.OpticalDisc.AudioCd/AudioCdService.cs:123
+ msgid "Use error correction when importing"
+ msgstr "Χρήση της διόρθωσης σφάλματος κατά την εισαγωγή"
+ 
+ #: ../src/Extensions/Banshee.OpticalDisc/Banshee.OpticalDisc.AudioCd/AudioCdService.cs:124
+-msgid "Error correction tries to work around problem areas on a disc, such as surface scratches, but will slow down importing substantially."
+-msgstr "Η διόρθωση σφάλματος προσπαθεί να αντιμετωπίσει προβληματικές περιοχές του δίσκου, όπως χαράγματα στην επιφάνεια, αλλά αυτό θα καθυστερήσει την εισαγωγή σημαντικά."
++msgid ""
++"Error correction tries to work around problem areas on a disc, such as "
++"surface scratches, but will slow down importing substantially."
++msgstr ""
++"Η διόρθωση σφάλματος προσπαθεί να αντιμετωπίσει προβληματικές περιοχές του "
++"δίσκου, όπως χαράγματα στην επιφάνεια, αλλά αυτό θα καθυστερήσει την "
++"εισαγωγή σημαντικά."
+ 
+ #: ../src/Extensions/Banshee.OpticalDisc/Banshee.OpticalDisc.AudioCd/AudioCdService.cs:192
+ #: ../src/Extensions/Banshee.OpticalDisc/Banshee.OpticalDisc.AudioCd/AudioCdSource.cs:311
+@@ -6139,7 +6376,7 @@ msgstr "Δημιουργία αντιγράφου αυτού του CD ήχου"
+ 
+ #: ../src/Extensions/Banshee.OpticalDisc/Banshee.OpticalDisc.AudioCd/AudioCdSource.cs:113
+ msgid "Searching for track information..."
+-msgstr "Αναζήτηση για πληροφορίες κομματιού…"
++msgstr "Αναζήτηση για πληροφορίες κομματιού..."
+ 
+ #: ../src/Extensions/Banshee.OpticalDisc/Banshee.OpticalDisc.AudioCd/AudioCdSource.cs:146
+ msgid "Could not fetch track information"
+@@ -6147,7 +6384,9 @@ msgstr "Αδυναμία λήψης πληροφοριών κομματιού."
+ 
+ #: ../src/Extensions/Banshee.OpticalDisc/Banshee.OpticalDisc.AudioCd/AudioCdSource.cs:175
+ msgid "Automatic import off since this album is already in the Music Library."
+-msgstr "Αυτόματη παύση εισαγωγής από τη στιγμή που αυτό το άλμπουμ υπάρχει ήδη στη Βιβλιοθήκη Μουσικής."
++msgstr ""
++"Αυτόματη παύση εισαγωγής από τη στιγμή που αυτό το άλμπουμ υπάρχει ήδη στη "
++"Βιβλιοθήκη Μουσικής."
+ 
+ #: ../src/Extensions/Banshee.OpticalDisc/Banshee.OpticalDisc.AudioCd/AudioCdSource.cs:198
+ msgid "Could not import CD"
+@@ -6169,12 +6408,11 @@ msgstr "Αποβολή δίσκου"
+ #: ../src/Extensions/Banshee.OpticalDisc/Banshee.OpticalDisc.AudioCd/AudioCdSource.cs:310
+ #, csharp-format
+ msgid "Import ‟{0}”"
+-msgstr "Εισαγωγή «{0}»"
++msgstr "Εισαγωγή ‟{0}”"
+ 
+ #. Translators: {0} is the type of disc, "Audio CD" or "DVD"
+ #: ../src/Extensions/Banshee.OpticalDisc/Banshee.OpticalDisc/DiscSource.cs:154
+ #, csharp-format
+-#| msgid "Eject {0}"
+ msgid "Ejecting {0}..."
+ msgstr "Αποβολή {0}..."
+ 
+@@ -6189,10 +6427,9 @@ msgid "Go to Menu"
+ msgstr "Μετάβαση στο μενού"
+ 
+ #: ../src/Extensions/Banshee.OpticalDisc/Banshee.OpticalDisc.Dvd/DvdService.cs:92
+-#, fuzzy
+ #| msgid "Naviguate to menu"
+ msgid "Navigate to menu"
+-msgstr "Μεταβείτε στο μενού"
++msgstr "Περιήγηση στο μενού"
+ 
+ #: ../src/Extensions/Banshee.OpticalDisc/Banshee.OpticalDisc.Dvd/DvdSource.cs:38
+ msgid "DVD"
+@@ -6235,12 +6472,12 @@ msgstr "Εισαγωγή λιστών αναπαραγωγής"
+ #: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/ItunesPlayerImportDialogs.cs:120
+ #, csharp-format
+ msgid "Locate your \"{0}\" file..."
+-msgstr "Εντοπισμός του «{0}» αρχείου σας…"
++msgstr "Εντοπισμός του \"{0}\" αρχείου σας..."
+ 
+ #: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/ItunesPlayerImportDialogs.cs:138
+ #, csharp-format
+ msgid "Locate \"{0}\""
+-msgstr "Εντοπισμός «{0}»"
++msgstr "Εντοπισμός \"{0}\""
+ 
+ #: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/ItunesPlayerImportDialogs.cs:167
+ msgid "Locate iTunes Music Directory"
+@@ -6248,16 +6485,28 @@ msgstr "Εντοπισμός του iTunes Music Directory"
+ 
+ #: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/ItunesPlayerImportDialogs.cs:196
+ #, csharp-format
+-msgid "The iTunes library refers to your music directory as \"{0}\" but Banshee was not able to infer the location of this directory. Please locate it."
+-msgstr "Η βιβλιοθήκη του iTunes αναφέρει τον  κατάλογο της μουσικής σας ως «{0}» αλλά το Banshee δεν ήταν δυνατό να εντοπίσει την τοποθεσία αυτού του καταλόγου. Παρακαλώ εντοπίστε τον."
++msgid ""
++"The iTunes library refers to your music directory as \"{0}\" but Banshee was "
++"not able to infer the location of this directory. Please locate it."
++msgstr ""
++"Η βιβλιοθήκη του iTunes αναφέρει τον κατάλογο της μουσικής σας ως \"{0}\" αλλά "
++"το Banshee δεν ήταν δυνατό να εντοπίσει την τοποθεσία αυτού του καταλόγου. "
++"Παρακαλώ εντοπίστε τον."
+ 
+ #: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/ItunesPlayerImportSource.cs:74
+ msgid "iTunes Media Player"
+ msgstr "Αναπαραγωγέας πολυμέσων iTunes"
+ 
+ #: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/ItunesPlayerImportSource.cs:134
+-msgid "Banshee is not familiar with this version of the iTunes library format. Importing may or may not work as expected, or at all. Would you like to attempt to import anyway?"
+-msgstr "Το Banshee δεν είναι εξοικειωμένο με αυτή την έκδοση της μορφής της βιβλιοθήκης του iTunes. Η εισαγωγή μπορεί να δουλέψει ή να μη δουλέψει κατά το αναμενόμενο, ή και καθόλου. Θέλετε να γίνει προσπάθεια εισαγωγής έτσι και αλλιώς;"
++msgid ""
++"Banshee is not familiar with this version of the iTunes library format. "
++"Importing may or may not work as expected, or at all. Would you like to "
++"attempt to import anyway?"
++msgstr ""
++"Το Banshee δεν είναι εξοικειωμένο με αυτή την έκδοση της μορφής της "
++"βιβλιοθήκης του iTunes. Η εισαγωγή μπορεί να δουλέψει ή να μη δουλέψει κατά "
++"το αναμενόμενο, ή και καθόλου. Θέλετε να γίνει προσπάθεια εισαγωγής έτσι και "
++"αλλιώς;"
+ 
+ #: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/ItunesPlayerImportSource.cs:439
+ #: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/RhythmboxPlayerImportSource.cs:235
+@@ -6290,7 +6539,8 @@ msgstr "Αναπαραγωγή μετά"
+ 
+ #: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueActions.cs:58
+ msgid "Add selected songs after the currently playing track, album, or artist"
+-msgstr "Προσθήκη επιλεγμένων τραγουδιών μετά το τρέχον κομμάτι, δίσκο ή καλλιτέχνη"
++msgstr ""
++"Προσθήκη επιλεγμένων τραγουδιών μετά το τρέχον κομμάτι, δίσκο ή καλλιτέχνη"
+ 
+ #: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueActions.cs:62
+ msgid "Current Track"
+@@ -6298,7 +6548,9 @@ msgstr "Τρέχον κομμάτι"
+ 
+ #: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueActions.cs:63
+ msgid "Add selected songs to the play queue after the currently playing song"
+-msgstr "Προσθέστε τα επιλεγμένα τραγούδια στη σειρά αναπαραγωγής μετά το τραγούδι που αναπαράγεται τώρα"
++msgstr ""
++"Προσθέστε τα επιλεγμένα τραγούδια στη σειρά αναπαραγωγής μετά το τραγούδι "
++"που αναπαράγεται τώρα"
+ 
+ #: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueActions.cs:67
+ msgid "Current Album"
+@@ -6306,7 +6558,9 @@ msgstr "Τρέχων δίσκος"
+ 
+ #: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueActions.cs:68
+ msgid "Add selected songs to the play queue after the currently playing album"
+-msgstr "Προσθέστε τα επιλεγμένα τραγούδια στη σειρά αναπαραγωγής μετά το δίσκο που αναπαράγεται τώρα"
++msgstr ""
++"Προσθέστε τα επιλεγμένα τραγούδια στη σειρά αναπαραγωγής μετά το δίσκο που "
++"αναπαράγεται τώρα"
+ 
+ #: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueActions.cs:72
+ msgid "Current Artist"
+@@ -6314,7 +6568,9 @@ msgstr "Τρέχων καλλιτέχνης"
+ 
+ #: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueActions.cs:73
+ msgid "Add selected songs to the play queue after the currently playing artist"
+-msgstr "Προσθέστε τα επιλεγμένα τραγούδια στη σειρά αναπαραγωγής μετά τον καλλιτέχνη που αναπαράγεται τώρα"
++msgstr ""
++"Προσθέστε τα επιλεγμένα τραγούδια στη σειρά αναπαραγωγής μετά τον καλλιτέχνη "
++"που αναπαράγεται τώρα"
+ 
+ #: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueActions.cs:80
+ msgid "Refresh random tracks in the play queue"
+@@ -6322,7 +6578,8 @@ msgstr "Ανανέωση τυχαίων κομματιών στη σειρά α
+ 
+ #: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueActions.cs:85
+ msgid "Randomize the playback order of items in the play queue"
+-msgstr "Τυχαιοποίηση της σειράς αναπαραγωγής των αντικειμένων στη σειρά αναπαραγωγής"
++msgstr ""
++"Τυχαιοποίηση της σειράς αναπαραγωγής των αντικειμένων στη σειρά αναπαραγωγής"
+ 
+ #: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueActions.cs:89
+ msgid "Add More"
+@@ -6344,11 +6601,11 @@ msgstr "Καθαρισμός της σειράς αναπαραγωγής κατ
+ msgid "Remove From Play Queue"
+ msgstr "Αφαίρεση από τη σειρά αναπαραγωγής"
+ 
+-#: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueSource.cs:967
++#: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueSource.cs:965
+ msgid "Number of _played songs to show"
+ msgstr "Αριθμός _παιγμένων τραγουδιών προς εμφάνιση"
+ 
+-#: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueSource.cs:973
++#: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueSource.cs:971
+ msgid "Number of _upcoming songs to show"
+ msgstr "Αριθμός _επόμενων τραγουδιών προς εμφάνιση"
+ 
+@@ -6466,7 +6723,7 @@ msgstr "Έλεγχος όλων των podcasts για νέα επεισόδια
+ 
+ #: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastActions.cs:78
+ msgid "Add Podcast..."
+-msgstr "Προσθήκη φορητής εκπομπής (Podcast)…"
++msgstr "Προσθήκη φορητής εκπομπής (Podcast)..."
+ 
+ #: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastActions.cs:79
+ msgid "Subscribe to a new podcast"
+@@ -6541,8 +6798,12 @@ msgid "Check periodically for new episodes"
+ msgstr "Περιοδικός έλεγχος για νέα επεισόδια"
+ 
+ #: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastFeedPropertiesDialog.cs:106
+-msgid "If checked, Banshee will check every hour to see if this podcast has new episodes"
+-msgstr "Αν επιλεγεί το Banshee θα ελέγχει κάθε ώρα για νέα επεισόδια αυτής της φορητής εκπομπής"
++msgid ""
++"If checked, Banshee will check every hour to see if this podcast has new "
++"episodes"
++msgstr ""
++"Αν επιλεγεί το Banshee θα ελέγχει κάθε ώρα για νέα επεισόδια αυτής της "
++"φορητής εκπομπής"
+ 
+ #: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastFeedPropertiesDialog.cs:109
+ #: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastSubscribeDialog.cs:136
+@@ -6606,8 +6867,11 @@ msgid "Subscribe to New Podcast"
+ msgstr "Εγγραφή σε νέα φορητή εκπομπή (Podcast)"
+ 
+ #: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastSubscribeDialog.cs:103
+-msgid "Please enter the URL of the podcast to which you would like to subscribe."
+-msgstr "Παρακαλώ εισάγετε τη διεύθυνση URL της φορητής εκπομπής (podcast) στην οποία θα θέλατε να εγγραφείτε."
++msgid ""
++"Please enter the URL of the podcast to which you would like to subscribe."
++msgstr ""
++"Παρακαλώ εισάγετε τη διεύθυνση URL της φορητής εκπομπής (podcast) στην οποία "
++"θα θέλατε να εγγραφείτε."
+ 
+ #: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/SyncPreferenceComboBox.cs:41
+ msgid "Download all episodes"
+@@ -6676,7 +6940,6 @@ msgid "Track Preview"
+ msgstr "Προεπισκόπηση κομματιού"
+ 
+ #: ../src/Extensions/Banshee.UPnPClient/Banshee.UPnPClient/UPnPContainerSource.cs:39
+-#| msgid "Shared Music"
+ msgid "Shared Media"
+ msgstr "Κοινόχρηστα πολυμέσα"
+ 
+@@ -6691,12 +6954,12 @@ msgstr "Αποστολή από"
+ #: ../src/Extensions/Banshee.YouTube/Banshee.YouTube.Gui/VideoStreamTile.cs:233
+ #: ../src/Extensions/Banshee.YouTube/Banshee.YouTube.Gui/VideoStreamTile.cs:234
+ msgid "Play in Banshee..."
+-msgstr "Αναπαραγωγή στο Banshee…"
++msgstr "Αναπαραγωγή στο Banshee..."
+ 
+ #: ../src/Extensions/Banshee.YouTube/Banshee.YouTube.Gui/VideoStreamTile.cs:237
+ #: ../src/Extensions/Banshee.YouTube/Banshee.YouTube.Gui/VideoStreamTile.cs:238
+ msgid "Play in Web Browser..."
+-msgstr "Αναπαραγωγή στον περιηγητή ιστού…"
++msgstr "Αναπαραγωγή στον περιηγητή ιστού..."
+ 
+ #: ../src/Extensions/Banshee.YouTube/Banshee.YouTube/YouTubePane.cs:61
+ msgid "No videos found"
+@@ -6731,7 +6994,7 @@ msgstr "Λεπτομέρειες σφάλματος"
+ 
+ #: ../src/Hyena/Hyena.Gui/Hyena.Gui.Dialogs/ExceptionDialog.cs:136
+ msgid "An unhandled exception was thrown: "
+-msgstr "Μία μη αντιμετωπίσιμη εξαίρεση απορρίφθηκε:"
++msgstr "Μία μη αντιμετωπίσιμη εξαίρεση απορρίφθηκε: "
+ 
+ #: ../src/Hyena/Hyena.Gui/Hyena.Gui.Dialogs/VersionInformationDialog.cs:58
+ msgid "Assembly Version Information"
+@@ -6887,7 +7150,7 @@ msgstr "Σύνδεση στο λογαριασμό Last.fm"
+ 
+ #: ../src/Libraries/Lastfm.Gui/Lastfm.Gui/AccountLoginDialog.cs:79
+ msgid "Please enter your Last.fm account credentials."
+-msgstr "Παρακαλώ εισάγετε τα πιστοποιητικά του λογαριασμού σας στο Last.fm"
++msgstr "Παρακαλώ εισάγετε τα πιστοποιητικά του λογαριασμού σας στο Last.fm."
+ 
+ #: ../src/Libraries/Lastfm.Gui/Lastfm.Gui/AccountLoginDialog.cs:106
+ msgid "Save and Log In"
+@@ -6897,91 +7160,119 @@ msgstr "Αποθήκευση και είσοδος"
+ msgid "Authorize for Last.fm"
+ msgstr "Εξουσιοδότηση για το Last.fm"
+ 
+-#: ../src/Libraries/Lastfm/Lastfm/AudioscrobblerConnection.cs:450
+-msgid "Last.fm username is invalid or Banshee is not authorized to access your account."
+-msgstr "Το Last.fm όνομα χρήστη είναι άκυρο ή το Banshee δεν έχει εξουσιοδοτηθεί να έχει πρόσβαση στον λογαριασμό σας."
+-
+-#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:271
++#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:275
+ msgid "This service does not exist."
+ msgstr "Η υπηρεσία δεν υπάρχει."
+ 
+-#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:275
++#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:279
+ msgid "Stations are only available to paying Last.fm subscribers."
+-msgstr "Οι σταθμοί είναι διαθέσιμοι για αναπαραγωγή μόνο στους συνδρομητές του Last.fm"
++msgstr ""
++"Οι σταθμοί είναι διαθέσιμοι για αναπαραγωγή μόνο στους συνδρομητές του "
++"Last.fm."
+ 
+-#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:277
++#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:281
+ msgid "This station is not available."
+ msgstr "Αυτός ο σταθμός δεν είναι διαθέσιμος."
+ 
+-#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:279
++#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:283
+ msgid "The request is missing a required parameter."
+ msgstr "Το αίτημα δεν έχει μια απαιτούμενη παράμετρο."
+ 
+-#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:281
++#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:285
+ msgid "The specified resource is invalid."
+ msgstr "Η καθορισμένη πηγή είναι άκυρη."
+ 
+-#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:283
++#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:287
+ msgid "Server error, please try again later."
+ msgstr "Σφάλμα εξυπηρετητή, παρακαλώ προσπαθήστε ξανά αργότερα."
+ 
+-#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:285
++#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:289
+ msgid "Invalid authentication information, please re-authenticate."
+ msgstr "Άκυρες πληροφορίες εξουσιοδότησης, παρακαλώ εξουσιοδοτήστε ξανά."
+ 
+-#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:287
++#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:291
+ msgid "The API key used by this application is invalid."
+ msgstr "Το κλειδί API που χρησιμοποιείται από αυτή την εφαρμογή είναι άκυρο."
+ 
+-#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:289
+-msgid "The streaming system is offline for maintenance, please try again later."
+-msgstr "Το σύστημα ροής είναι εκτός σύνδεσης για συντήρηση, προσπαθήστε ξανά αργότερα."
++#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:293
++msgid ""
++"The streaming system is offline for maintenance, please try again later."
++msgstr ""
++"Το σύστημα ροής είναι εκτός σύνδεσης για συντήρηση, προσπαθήστε ξανά "
++"αργότερα."
+ 
+-#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:291
++#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:295
+ msgid "The method signature is invalid."
+ msgstr "Η υπογραφή της μεθόδου είναι άκυρη."
+ 
+-#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:296
++#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:300
+ msgid "There is not enough content to play this station."
+ msgstr "Δεν υπάρχει αρκετό περιεχόμενο για αναπαραγωγή του σταθμού."
+ 
+-#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:298
++#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:302
+ msgid "This group does not have enough members for radio."
+ msgstr "Αυτή η ομάδα δεν έχει αρκετά μέλη για ραδιόφωνο."
+ 
+-#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:300
++#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:304
+ msgid "This artist does not have enough fans for radio."
+ msgstr "Ο καλλιτέχνης δεν έχει πολλούς οπαδούς για ραδιόφωνο."
+ 
+-#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:302
++#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:306
+ msgid "There are not enough neighbours for this station."
+ msgstr "Δεν υπάρχουν αρκετοί γείτονες για αυτό το σταθμό."
+ 
+-#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:304
++#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:308
++msgid "This user is not allowed to listen to radio during peak usage"
++msgstr ""
++"Αυτός ο χρήστης δεν επιτρέπεται να ακούσει ραδιόφωνο κατά τη διάρκεια αιχμής"
++
++#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:310
++#| msgid "Stream location not found"
++msgid "Radio station not found"
++msgstr "Δε βρέθηκε ο ραδιοφωνικός σταθμός"
++
++#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:312
++msgid "This application is not allowed to make requests to the web services"
++msgstr ""
++"Αυτή η εφαρμογή δεν επιτρέπεται να υποβάλει αιτήματα στις υπηρεσίες ιστού"
++
++#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:314
++msgid "This type of request is no longer supported"
++msgstr "Αυτός ο τύπος αιτήματος δεν υποστηρίζεται πια"
++
++#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:316
++msgid ""
++"Your IP has made too many requests in a short period, exceeding our API "
++"guidelines"
++msgstr ""
++"Το IP σας έχει κάνει υπερβολικό αριθμό αιτημάτων σε σύντομη περίοδο, που "
++"υπερβαίνει τις οδηγίες του API μας"
++
++#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:318
+ msgid "There was an unknown error."
+ msgstr "Υπήρξε ένα άγνωστο σφάλμα."
+ 
+-#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:313
++#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:327
+ msgid "Not connected to Last.fm."
+-msgstr "Δεν συνδέθηκε στο  Last.fm."
++msgstr "Δεν συνδέθηκε στο Last.fm."
+ 
+-#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:315
++#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:329
+ msgid "Account details are needed before you can connect to Last.fm"
+ msgstr "Λεπτομέρειες λογαριασμού χρειάζονται πριν την σύνδεση σας στο Last.fm"
+ 
+-#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:317
++#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:331
+ msgid "No network connection detected."
+ msgstr "Δεν εντοπίστηκε σύνδεση δικτύου."
+ 
+-#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:319
++#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:333
+ msgid "Last.fm username is invalid."
+-msgstr "Άκυρο όνομα χρήστη του Last.fm"
++msgstr "Άκυρο όνομα χρήστη του Last.fm."
+ 
+-#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:323
++#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:337
+ msgid "Connecting to Last.fm."
+ msgstr "Γίνεται σύνδεση στο Last.fm."
+ 
+-#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:325
++#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:339
+ msgid "Connected to Last.fm."
+ msgstr "Συνδέθηκε στο Last.fm."
+ 
+@@ -6991,6 +7282,22 @@ msgstr "Συνδέθηκε στο Last.fm."
+ msgid "Unknown Podcast"
+ msgstr "Άγνωστη φορητή εκπομπή (Podcast)"
+ 
++#~ msgid "Volume"
++#~ msgstr "Ένταση"
++
++#~ msgid "Muted"
++#~ msgstr "Σίγαση"
++
++#~ msgid "Full Volume"
++#~ msgstr "Μέγιστη ένταση"
++
++#~ msgid ""
++#~ "Last.fm username is invalid or Banshee is not authorized to access your "
++#~ "account."
++#~ msgstr ""
++#~ "Το Last.fm όνομα χρήστη είναι άκυρο ή το Banshee δεν έχει εξουσιοδοτηθεί "
++#~ "να έχει πρόσβαση στον λογαριασμό σας."
++
+ #~ msgid "Write _metadata to files"
+ #~ msgstr "Εγγραφή _μεταδεδομένων σε αρχεία"
+ 
+diff --git a/po/es.po b/po/es.po
+index ad72f62..6176898 100644
+--- a/po/es.po
++++ b/po/es.po
+@@ -9,15 +9,15 @@
+ # Andrés Herrera <andres@usr.cl>, 2008.
+ # Jorge González <jorgegonz@svn.gnome.org>, 2007, 2008, 2009, 2010, 2011.
+ # Benjamín Valero Espinosa <benjavalero@gmail.com>, 2008, 2009, 2010, 2011, 2012.
+-# Daniel Mustieles <daniel.mustieles@gmail.com>, 2011, 2012.
++# Daniel Mustieles <daniel.mustieles@gmail.com>, 2011, 2012, 2013.
+ #
+ msgid ""
+ msgstr ""
+ "Project-Id-Version: banshee.master\n"
+ "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
+ "product=banshee&keywords=I18N+L10N&component=general\n"
+-"POT-Creation-Date: 2012-08-21 19:53+0000\n"
+-"PO-Revision-Date: 2012-08-25 12:06+0200\n"
++"POT-Creation-Date: 2013-10-13 21:45+0000\n"
++"PO-Revision-Date: 2013-10-15 17:05+0200\n"
+ "Last-Translator: Daniel Mustieles <daniel.mustieles@gmail.com>\n"
+ "Language-Team: Español <gnome-es-list@gnome.org>\n"
+ "Language: \n"
+@@ -25,7 +25,7 @@ msgstr ""
+ "Content-Type: text/plain; charset=UTF-8\n"
+ "Content-Transfer-Encoding: 8bit\n"
+ "X-Generator: Gtranslator 2.91.5\n"
+-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
++"Plural-Forms: nplurals=2; plural=(n!=1);\n"
+ 
+ #. ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice.addin.xml
+ #: ../data/addin-xml-strings.cs:8
+@@ -624,7 +624,7 @@ msgid "Audio Quality"
+ msgstr "Calidad del sonido"
+ 
+ #: ../data/desktop-files/common.desktop.in.h:1
+-#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:196
++#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:194
+ msgid "Media Player"
+ msgstr "Reproductor multimedia"
+ 
+@@ -640,6 +640,25 @@ msgstr "Reproductor multimedia Banshee"
+ msgid "Play and organize your media collection"
+ msgstr "Reproduzca y organice su colección multimedia"
+ 
++#. Writing GNOME below, instead of just "Linux", is inclusive of *BSD OSs
++#: ../data/banshee.appdata.xml.in.h:2
++msgid ""
++"Banshee is an open source multimedia management and playback application for "
++"GNOME, Mac and Windows."
++msgstr ""
++"Banshee es una aplicación de software libre para GNOME, Mac y Windows para "
++"gestionar y reproducir archivos multimedia."
++
++#: ../data/banshee.appdata.xml.in.h:3
++msgid ""
++"Play your music and videos. Stay entertained and up to date with podcasts "
++"and video podcasts. Sync your Android, iPod, and other devices. We think "
++"you'll love Banshee!"
++msgstr ""
++"Reproducir música y vídeos. Estar entretenido y actualizado con podcasts y "
++"podcasts de vídeo. Sincronizar su dispositivo Android, iPod y otros. ¡Seguro "
++"que le gustará Banshee!"
++
+ #: ../libbanshee/banshee-bpmdetector.c:202 ../libbanshee/banshee-ripper.c:270
+ #: ../src/Backends/Banshee.GStreamerSharp/Banshee.GStreamerSharp/AudioCdRipper.cs:240
+ msgid "Could not create pipeline"
+@@ -818,7 +837,6 @@ msgstr "No se pudo crear la tubería de codificación: {0}"
+ 
+ #. Translators: verb
+ #: ../src/Backends/Banshee.Osx/Banshee.OsxBackend/OsxFileChooserDialog.cs:66
+-#| msgid "_Import"
+ msgid "Import"
+ msgstr "Importar"
+ 
+@@ -932,8 +950,8 @@ msgstr "Opciones de control de reproducción"
+ msgid ""
+ "Play the next track, optionally restarting if the 'restart' value is set"
+ msgstr ""
+-"Reproduce la pista siguiente, reiniciando opcionalmente si el valor "
+-"«restart» está establecido"
++"Reproduce la pista siguiente, reiniciando opcionalmente si el valor «restart» "
++"está establecido"
+ 
+ #: ../src/Clients/Booter/Booter/Entry.cs:165
+ msgid ""
+@@ -1302,7 +1320,7 @@ msgid "Stream location not found"
+ msgstr "No se encontró la ubicación del flujo"
+ 
+ #: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:347
+-#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:339
++#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:344
+ msgid "File not found"
+ msgstr "No se encontró el archivo"
+ 
+@@ -1971,7 +1989,7 @@ msgstr "Eliminar la lista de reproducción"
+ #: ../src/Core/Banshee.ThickClient/Banshee.Gui/SourceActions.cs:176
+ #: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:135
+ #: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:462
+-#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/SourceView.cs:595
++#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/SourceView.cs:612
+ #: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/SourceView_DragAndDrop.cs:214
+ msgid "New Playlist"
+ msgstr "Lista de reproducción nueva"
+@@ -2575,7 +2593,7 @@ msgstr "drm"
+ #: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/StatisticsPage.cs:234
+ #: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/StatisticsPage.cs:236
+ #: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/StatisticsPage.cs:238
+-#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:400
++#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:405
+ msgid "Unknown"
+ msgstr "Desconocido"
+ 
+@@ -2799,7 +2817,7 @@ msgstr ""
+ #: ../src/Core/Banshee.ThickClient/Banshee.Collection.Gui/ColumnCellDiscAndCount.cs:40
+ #: ../src/Core/Banshee.ThickClient/Banshee.Collection.Gui/ColumnCellTrackAndCount.cs:40
+ #: ../src/Core/Banshee.Widgets/Banshee.Widgets/StreamPositionLabel.cs:174
+-#: ../src/Dap/Banshee.Dap/Banshee.Dap.Gui/DapPropertiesDialog.cs:148
++#: ../src/Dap/Banshee.Dap/Banshee.Dap.Gui/DapPropertiesDialog.cs:149
+ #, csharp-format
+ msgid "{0} of {1}"
+ msgstr "{0} de {1}"
+@@ -3610,19 +3628,19 @@ msgstr "Establecer todos los números de disco y totales a estos valores"
+ msgid "_Disc Number:"
+ msgstr "Número de di_sco:"
+ 
+-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/BasicTrackDetailsPage.cs:188
++#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/BasicTrackDetailsPage.cs:196
+ msgid "Set all years to this value"
+ msgstr "Establecer todos los años a este valor"
+ 
+-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/BasicTrackDetailsPage.cs:189
++#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/BasicTrackDetailsPage.cs:197
+ msgid "_Year:"
+ msgstr "A_ño:"
+ 
+-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/BasicTrackDetailsPage.cs:196
++#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/BasicTrackDetailsPage.cs:204
+ msgid "Set all ratings to this value"
+ msgstr "Establecer todas las valoraciones a este valor"
+ 
+-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/BasicTrackDetailsPage.cs:197
++#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/BasicTrackDetailsPage.cs:205
+ msgid "_Rating:"
+ msgstr "Valo_ración:"
+ 
+@@ -4291,29 +4309,29 @@ msgstr "Soporta portadas"
+ msgid "Supports photos"
+ msgstr "Soporta imágenes"
+ 
+-#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:465
++#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:466
+ msgid "Track duration is zero"
+ msgstr "La duración de la pista es cero"
+ 
+-#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:571
++#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:570
+ msgid "Syncing iPod"
+ msgstr "Sincronizando iPod"
+ 
+-#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:572
++#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:571
+ msgid "Preparing to synchronize..."
+ msgstr "Preparándose para sincronizar…"
+ 
+-#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:575
++#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:593
+ #, csharp-format
+ msgid "Adding track {0} of {1}"
+ msgstr "Añadiendo pista {0} de {1}"
+ 
+-#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:611
++#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:636
+ #, csharp-format
+ msgid "Removing track {0} of {1}"
+ msgstr "Quitando pista {0} de {1}"
+ 
+-#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:664
++#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:710
+ msgid "Writing media database"
+ msgstr "Escribiendo la base de datos multimedia"
+ 
+@@ -4331,31 +4349,31 @@ msgstr "Dispositivos"
+ msgid "Device Properties"
+ msgstr "Propiedades del dispositivo"
+ 
+-#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:203
++#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:201
+ msgid "Product"
+ msgstr "Producto"
+ 
+-#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:204
++#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:202
+ msgid "Vendor"
+ msgstr "Fabricante"
+ 
+-#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:287
++#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:292
+ #: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Data/PodcastSource.cs:141
+ #, csharp-format
+ msgid "Loading {0}"
+ msgstr "Cargando {0}"
+ 
+-#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:381
++#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:386
+ #: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/ColumnCellYesNo.cs:37
+ msgid "Yes"
+ msgstr "Sí"
+ 
+-#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:381
++#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:386
+ #: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/ColumnCellYesNo.cs:38
+ msgid "No"
+ msgstr "No"
+ 
+-#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:402
++#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:407
+ #, csharp-format
+ msgid ""
+ "The {0} format is not supported by the device, and no converter was found to "
+@@ -4364,12 +4382,12 @@ msgstr ""
+ "El formato {0} no está soportado por el dispositivo, y no se ha encontrado "
+ "ningún conversor para convertirlo."
+ 
+-#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:408
++#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:413
+ msgid "File format conversion support is not available"
+ msgstr ""
+ "El soporte para la conversión de formatos de archivo no está disponible"
+ 
+-#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:434
++#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:439
+ msgid "Error converting file"
+ msgstr "Error al convertir el archivo"
+ 
+@@ -4407,7 +4425,7 @@ msgstr[1] ""
+ msgid "Are you sure you want to continue?"
+ msgstr "¿Está seguro de que quiere continuar?"
+ 
+-#: ../src/Dap/Banshee.Dap/Banshee.Dap.Gui/DapActions.cs:118
++#: ../src/Dap/Banshee.Dap/Banshee.Dap.Gui/DapActions.cs:121
+ msgid "Remove tracks"
+ msgstr "Quitar pistas"
+ 
+@@ -4482,12 +4500,12 @@ msgstr "Importar música adquirida"
+ msgid "Disconnect"
+ msgstr "Desconectar"
+ 
+-#: ../src/Dap/Banshee.Dap/Banshee.Dap/RemovableSource.cs:108
++#: ../src/Dap/Banshee.Dap/Banshee.Dap/RemovableSource.cs:111
+ #, csharp-format
+ msgid "Disconnecting {0}..."
+ msgstr "Desconectando {0}…"
+ 
+-#: ../src/Dap/Banshee.Dap/Banshee.Dap/RemovableSource.cs:115
++#: ../src/Dap/Banshee.Dap/Banshee.Dap/RemovableSource.cs:118
+ #, csharp-format
+ msgid "Could not disconnect {0}: {1}"
+ msgstr "No se pudo desconectar {0}: {1}"
+@@ -4852,11 +4870,11 @@ msgstr "Iniciar sesión"
+ msgid "Connecting to {0}"
+ msgstr "Conectando a {0}"
+ 
+-#: ../src/Extensions/Banshee.Daap/Banshee.Daap/DaapService.cs:185
++#: ../src/Extensions/Banshee.Daap/Banshee.Daap/DaapService.cs:186
+ msgid "Add Remote DAAP Server"
+ msgstr "Añadir servidor DAAP remoto"
+ 
+-#: ../src/Extensions/Banshee.Daap/Banshee.Daap/DaapService.cs:186
++#: ../src/Extensions/Banshee.Daap/Banshee.Daap/DaapService.cs:187
+ msgid "Add a new remote DAAP server"
+ msgstr "Añadir un nuevo servidor DAAP remoto"
+ 
+@@ -6429,9 +6447,8 @@ msgid ""
+ "The iTunes library refers to your music directory as \"{0}\" but Banshee was "
+ "not able to infer the location of this directory. Please locate it."
+ msgstr ""
+-"La colección de iTunes indica que su carpeta de música es «{0}», pero "
+-"Banshee no ha podido deducir la ubicación de esta carpeta. Por favor, "
+-"localícela."
++"La colección de iTunes indica que su carpeta de música es «{0}», pero Banshee "
++"no ha podido deducir la ubicación de esta carpeta. Por favor, localícela."
+ 
+ #: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/ItunesPlayerImportSource.cs:74
+ msgid "iTunes Media Player"
+diff --git a/po/hu.po b/po/hu.po
+index 886ea20..991c800 100644
+--- a/po/hu.po
++++ b/po/hu.po
+@@ -4,20 +4,21 @@
+ #
+ # Kéménczy Kálmán <kkemenczy at novell dot com>, 2006.
+ # Gabor Kelemen <kelemeng at gnome dot hu>, 2006, 2007, 2008, 2009, 2010, 2011, 2012.
++# Balázs Úr <urbalazs at gmail dot com>, 2013.
+ msgid ""
+ msgstr ""
+ "Project-Id-Version: banshee master\n"
+ "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
+ "product=banshee&keywords=I18N+L10N&component=general\n"
+-"POT-Creation-Date: 2012-09-04 17:57+0000\n"
+-"PO-Revision-Date: 2012-09-20 15:05+0200\n"
+-"Last-Translator: Gabor Kelemen <kelemeng at gnome dot hu>\n"
++"POT-Creation-Date: 2013-10-13 00:11+0000\n"
++"PO-Revision-Date: 2013-10-13 13:17+0200\n"
++"Last-Translator: Balázs Úr <urbalazs at gmail dot com>\n"
+ "Language-Team: Hungarian <gnome-hu-list at gnome dot org>\n"
+ "Language: hu\n"
+ "MIME-Version: 1.0\n"
+ "Content-Type: text/plain; charset=UTF-8\n"
+ "Content-Transfer-Encoding: 8bit\n"
+-"X-Generator: Lokalize 1.4\n"
++"X-Generator: Lokalize 1.2\n"
+ "Plural-Forms:  nplurals=2; plural=(n != 1);\n"
+ 
+ #. ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice.addin.xml
+@@ -616,7 +617,7 @@ msgid "Audio Quality"
+ msgstr "Hangminőség"
+ 
+ #: ../data/desktop-files/common.desktop.in.h:1
+-#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:196
++#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:194
+ msgid "Media Player"
+ msgstr "Médialejátszó"
+ 
+@@ -632,6 +633,25 @@ msgstr "Banshee médialejátszó"
+ msgid "Play and organize your media collection"
+ msgstr "Médiagyűjteményének lejátszása és rendszerezése"
+ 
++#. Writing GNOME below, instead of just "Linux", is inclusive of *BSD OSs
++#: ../data/banshee.appdata.xml.in.h:2
++msgid ""
++"Banshee is an open source multimedia management and playback application for "
++"GNOME, Mac and Windows."
++msgstr ""
++"A Banshee egy nyílt forrású multimédia-kezelő és lejátszó alkalmazás GNOME, "
++"Mac és Windows platformokhoz."
++
++#: ../data/banshee.appdata.xml.in.h:3
++msgid ""
++"Play your music and videos. Stay entertained and up to date with podcasts "
++"and video podcasts. Sync your Android, iPod, and other devices. We think "
++"you'll love Banshee!"
++msgstr ""
++"Zenék és videók lejátszása. Szórakoztató és naprakész marad a podcastokkal és "
++"videó podcastokkal. Szinkronizál az Androiddal, iPoddal és más eszközökkel. "
++"Úgy gondoljuk, hogy imádni fogja a Banshee-t!"
++
+ #: ../libbanshee/banshee-bpmdetector.c:202 ../libbanshee/banshee-ripper.c:270
+ #: ../src/Backends/Banshee.GStreamerSharp/Banshee.GStreamerSharp/AudioCdRipper.cs:240
+ msgid "Could not create pipeline"
+@@ -810,7 +830,6 @@ msgstr "A kódoló adatcsatorna nem hozható létre: {0}"
+ 
+ #. Translators: verb
+ #: ../src/Backends/Banshee.Osx/Banshee.OsxBackend/OsxFileChooserDialog.cs:66
+-#| msgid "_Import"
+ msgid "Import"
+ msgstr "Importálás"
+ 
+@@ -1290,7 +1309,7 @@ msgid "Stream location not found"
+ msgstr "Az adatfolyam helye nem található"
+ 
+ #: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:347
+-#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:343
++#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:344
+ msgid "File not found"
+ msgstr "A fájl nem található"
+ 
+@@ -1596,7 +1615,6 @@ msgid "File Organization"
+ msgstr "Fájlrendszerezés"
+ 
+ #: ../src/Core/Banshee.Services/Banshee.Library/LibrarySource.cs:81
+-#| msgid "Co_py files to media folders when importing"
+ msgid "Co_py files to media folder when importing"
+ msgstr "_Fájlok másolása a médiamappába importáláskor"
+ 
+@@ -1955,7 +1973,7 @@ msgstr "Lejátszólista törlése"
+ #: ../src/Core/Banshee.ThickClient/Banshee.Gui/SourceActions.cs:176
+ #: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:135
+ #: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:462
+-#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/SourceView.cs:595
++#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/SourceView.cs:612
+ #: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/SourceView_DragAndDrop.cs:214
+ msgid "New Playlist"
+ msgstr "Új lejátszólista"
+@@ -2560,7 +2578,7 @@ msgstr "drm"
+ #: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/StatisticsPage.cs:234
+ #: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/StatisticsPage.cs:236
+ #: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/StatisticsPage.cs:238
+-#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:404
++#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:405
+ msgid "Unknown"
+ msgstr "Ismeretlen"
+ 
+@@ -2781,7 +2799,7 @@ msgstr ""
+ #: ../src/Core/Banshee.ThickClient/Banshee.Collection.Gui/ColumnCellDiscAndCount.cs:40
+ #: ../src/Core/Banshee.ThickClient/Banshee.Collection.Gui/ColumnCellTrackAndCount.cs:40
+ #: ../src/Core/Banshee.Widgets/Banshee.Widgets/StreamPositionLabel.cs:174
+-#: ../src/Dap/Banshee.Dap/Banshee.Dap.Gui/DapPropertiesDialog.cs:148
++#: ../src/Dap/Banshee.Dap/Banshee.Dap.Gui/DapPropertiesDialog.cs:149
+ #, csharp-format
+ msgid "{0} of {1}"
+ msgstr "{1}/{0}"
+@@ -2923,10 +2941,6 @@ msgstr "Kivételes multimédia-kezelés és -lejátszás"
+ 
+ #: ../src/Core/Banshee.ThickClient/Banshee.Gui.Dialogs/AboutDialog.cs:98
+ #, csharp-format
+-#| msgid ""
+-#| "Copyright © 2005–{0} Novell, Inc.\n"
+-#| "Copyright © 2005–{0} Others\n"
+-#| "Copyright © 2005 Aaron Bockover"
+ msgid ""
+ "Copyright © 2005–{0} Novell, Inc.\n"
+ "Copyright © 2005–{1} Others\n"
+@@ -3591,19 +3605,19 @@ msgstr "Minden lemezszám és darabszám beállítása erre az értékre"
+ msgid "_Disc Number:"
+ msgstr "_Lemezszám:"
+ 
+-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/BasicTrackDetailsPage.cs:188
++#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/BasicTrackDetailsPage.cs:196
+ msgid "Set all years to this value"
+ msgstr "Minden Év beállítása erre az értékre"
+ 
+-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/BasicTrackDetailsPage.cs:189
++#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/BasicTrackDetailsPage.cs:197
+ msgid "_Year:"
+ msgstr "É_v:"
+ 
+-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/BasicTrackDetailsPage.cs:196
++#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/BasicTrackDetailsPage.cs:204
+ msgid "Set all ratings to this value"
+ msgstr "Minden Értékelés beállítása erre az értékre"
+ 
+-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/BasicTrackDetailsPage.cs:197
++#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/BasicTrackDetailsPage.cs:205
+ msgid "_Rating:"
+ msgstr "É_rtékelés:"
+ 
+@@ -4269,29 +4283,29 @@ msgstr "Támogatja a borítókat"
+ msgid "Supports photos"
+ msgstr "Támogatja a fényképeket"
+ 
+-#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:465
++#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:466
+ msgid "Track duration is zero"
+ msgstr "A szám időtartama nulla"
+ 
+-#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:571
++#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:570
+ msgid "Syncing iPod"
+ msgstr "iPod szinkronizálása"
+ 
+-#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:572
++#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:571
+ msgid "Preparing to synchronize..."
+ msgstr "Szinkronizálás előkészítése…"
+ 
+-#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:575
++#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:593
+ #, csharp-format
+ msgid "Adding track {0} of {1}"
+ msgstr "{1}/{0} szám hozzáadása"
+ 
+-#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:611
++#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:636
+ #, csharp-format
+ msgid "Removing track {0} of {1}"
+ msgstr "{1}/{0} szám eltávolítása"
+ 
+-#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:664
++#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:710
+ msgid "Writing media database"
+ msgstr "Média-adatbázis írása"
+ 
+@@ -4309,31 +4323,31 @@ msgstr "Eszközök"
+ msgid "Device Properties"
+ msgstr "Eszköztulajdonságok"
+ 
+-#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:203
++#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:201
+ msgid "Product"
+ msgstr "Termék"
+ 
+-#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:204
++#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:202
+ msgid "Vendor"
+ msgstr "Gyártó"
+ 
+-#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:291
++#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:292
+ #: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Data/PodcastSource.cs:141
+ #, csharp-format
+ msgid "Loading {0}"
+ msgstr "{0} betöltése"
+ 
+-#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:385
++#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:386
+ #: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/ColumnCellYesNo.cs:37
+ msgid "Yes"
+ msgstr "Igen"
+ 
+-#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:385
++#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:386
+ #: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/ColumnCellYesNo.cs:38
+ msgid "No"
+ msgstr "Nem"
+ 
+-#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:406
++#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:407
+ #, csharp-format
+ msgid ""
+ "The {0} format is not supported by the device, and no converter was found to "
+@@ -4342,11 +4356,11 @@ msgstr ""
+ "Az eszköz nem támogatja a(z) {0} formátumot és nem található átalakító az "
+ "átalakításához."
+ 
+-#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:412
++#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:413
+ msgid "File format conversion support is not available"
+ msgstr "A fájlformátum-átalakítás nem érhető el"
+ 
+-#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:438
++#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:439
+ msgid "Error converting file"
+ msgstr "Hiba a fájl átalakításakor"
+ 
+@@ -4385,7 +4399,7 @@ msgstr[1] ""
+ msgid "Are you sure you want to continue?"
+ msgstr "Biztos, hogy folytatni kívánja?"
+ 
+-#: ../src/Dap/Banshee.Dap/Banshee.Dap.Gui/DapActions.cs:118
++#: ../src/Dap/Banshee.Dap/Banshee.Dap.Gui/DapActions.cs:121
+ msgid "Remove tracks"
+ msgstr "Számok eltávolítása"
+ 
+@@ -4460,12 +4474,12 @@ msgstr "Megvásárolt zene importálása"
+ msgid "Disconnect"
+ msgstr "Bontás"
+ 
+-#: ../src/Dap/Banshee.Dap/Banshee.Dap/RemovableSource.cs:108
++#: ../src/Dap/Banshee.Dap/Banshee.Dap/RemovableSource.cs:111
+ #, csharp-format
+ msgid "Disconnecting {0}..."
+ msgstr "{0} leválasztása…"
+ 
+-#: ../src/Dap/Banshee.Dap/Banshee.Dap/RemovableSource.cs:115
++#: ../src/Dap/Banshee.Dap/Banshee.Dap/RemovableSource.cs:118
+ #, csharp-format
+ msgid "Could not disconnect {0}: {1}"
+ msgstr "A(z) {0} nem választható le: {1}"
+@@ -4827,11 +4841,11 @@ msgstr "Bejelentkezés"
+ msgid "Connecting to {0}"
+ msgstr "Kapcsolódás: {0}"
+ 
+-#: ../src/Extensions/Banshee.Daap/Banshee.Daap/DaapService.cs:185
++#: ../src/Extensions/Banshee.Daap/Banshee.Daap/DaapService.cs:186
+ msgid "Add Remote DAAP Server"
+ msgstr "Távoli DAAP-kiszolgáló hozzáadása"
+ 
+-#: ../src/Extensions/Banshee.Daap/Banshee.Daap/DaapService.cs:186
++#: ../src/Extensions/Banshee.Daap/Banshee.Daap/DaapService.cs:187
+ msgid "Add a new remote DAAP server"
+ msgstr "Új távoli DAAP-kiszolgáló hozzáadása"
+ 
+@@ -5283,7 +5297,6 @@ msgid "Library of Congress"
+ msgstr "Kongresszusi könyvtár"
+ 
+ #: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HomeView.cs:136
+-#| msgid "Sample"
+ msgid "Examples:"
+ msgstr "Példák:"
+ 
+@@ -5666,23 +5679,19 @@ msgstr "Saját last.fm profiloldal meglátogatása"
+ 
+ #: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:146
+ #: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmPreferences.cs:93
+-#| msgid "_Enable Song Reporting"
+ msgid "_Enable Song Reporting From Banshee"
+ msgstr "Szá_mok jelentésének engedélyezése a Bansheeből"
+ 
+ #: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:147
+-#| msgid "Enable song reporting"
+ msgid "Enable song reporting From Banshee"
+ msgstr "Számok jelentésének engedélyezése a Bansheeből"
+ 
+ #: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:152
+ #: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmPreferences.cs:98
+-#| msgid "_Enable Song Reporting"
+ msgid "_Enable Song Reporting From Device"
+ msgstr "Szám_ok jelentésének engedélyezése az eszközről"
+ 
+ #: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:153
+-#| msgid "Enable song reporting"
+ msgid "Enable song reporting From Device"
+ msgstr "Számok jelentésének engedélyezése az eszközről"
+ 
+@@ -5696,7 +5705,6 @@ msgstr "Beküldés az eszközről…"
+ 
+ #: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:414
+ #, csharp-format
+-#| msgid "Removing track {0} of {1}"
+ msgid "Processing track {0} of {1} ..."
+ msgstr "{1}/{0} szám feldolgozása…"
+ 
+@@ -6332,7 +6340,6 @@ msgstr "„{0}” importálása"
+ #. Translators: {0} is the type of disc, "Audio CD" or "DVD"
+ #: ../src/Extensions/Banshee.OpticalDisc/Banshee.OpticalDisc/DiscSource.cs:154
+ #, csharp-format
+-#| msgid "Disconnecting {0}..."
+ msgid "Ejecting {0}..."
+ msgstr "{0} kiadása…"
+ 
+@@ -7138,7 +7145,6 @@ msgid "This user is not allowed to listen to radio during peak usage"
+ msgstr "Ez a felhasználó nem hallgathat rádiót csúcsidőben"
+ 
+ #: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:310
+-#| msgid "Stream location not found"
+ msgid "Radio station not found"
+ msgstr "A rádióállomás nem található"
+ 
+@@ -7155,8 +7161,8 @@ msgid ""
+ "Your IP has made too many requests in a short period, exceeding our API "
+ "guidelines"
+ msgstr ""
+-"Az IP-címe túl sok kérést küldött rövid idő alatt, meghaladva az "
+-"API-irányelveket"
++"Az IP-címe túl sok kérést küldött rövid idő alatt, meghaladva az API-"
++"irányelveket"
+ 
+ #: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:318
+ msgid "There was an unknown error."
+diff --git a/po/lv.po b/po/lv.po
+index 20f9456..6090d8d 100644
+--- a/po/lv.po
++++ b/po/lv.po
+@@ -2,25 +2,25 @@
+ # Copyright (C) 2007 THE PACKAGE'S COPYRIGHT HOLDER
+ # This file is distributed under the same license as the PACKAGE package.
+ #
+-# Raivis Dejus <orvils@gmail.com>, 2007.
+-# Rūdolfs Mazurs <rudolfs.mazurs@gmail.com>, 2011, 2012.
+ #
++# Raivis Dejus <orvils@gmail.com>, 2007.
++# Rūdolfs Mazurs <rudolfs.mazurs@gmail.com>, 2011, 2012, 2013.
+ msgid ""
+ msgstr ""
+ "Project-Id-Version: lv\n"
+ "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
+ "product=banshee&keywords=I18N+L10N&component=general\n"
+-"POT-Creation-Date: 2012-05-01 12:53+0000\n"
+-"PO-Revision-Date: 2012-05-27 15:22+0300\n"
++"POT-Creation-Date: 2013-10-07 20:24+0000\n"
++"PO-Revision-Date: 2013-10-08 00:56+0300\n"
+ "Last-Translator: Rūdolfs Mazurs <rudolfs.mazurs@gmail.com>\n"
+-"Language-Team: Latviešu <lata-l10n@googlegroups.com>\n"
++"Language-Team: Latvian <lata-l10n@googlegroups.com>\n"
++"Language: lv\n"
+ "MIME-Version: 1.0\n"
+ "Content-Type: text/plain; charset=UTF-8\n"
+ "Content-Transfer-Encoding: 8bit\n"
+ "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : "
+ "2);\n"
+-"X-Generator: Lokalize 1.2\n"
+-"Language: lv\n"
++"X-Generator: Lokalize 1.5\n"
+ 
+ #. ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice.addin.xml
+ #: ../data/addin-xml-strings.cs:8
+@@ -616,7 +616,7 @@ msgid "Audio Quality"
+ msgstr "Audio kvalitāte"
+ 
+ #: ../data/desktop-files/common.desktop.in.h:1
+-#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:193
++#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:194
+ msgid "Media Player"
+ msgstr "Mediju atskaņotājs"
+ 
+@@ -632,6 +632,25 @@ msgstr "Banshee mūzikas atskaņotājs"
+ msgid "Play and organize your media collection"
+ msgstr "Atskaņo un organizē mediju kolekciju"
+ 
++#. Writing GNOME below, instead of just "Linux", is inclusive of *BSD OSs
++#: ../data/banshee.appdata.xml.in.h:2
++msgid ""
++"Banshee is an open source multimedia management and playback application for "
++"GNOME, Mac and Windows."
++msgstr ""
++"Banshee ir atvērtā pirmkoda multimediju pārvaldības atskaņošanas lietotne "
++"GNOME, Mac un Windows vidē."
++
++#: ../data/banshee.appdata.xml.in.h:3
++msgid ""
++"Play your music and videos. Stay entertained and up to date with podcasts "
++"and video podcasts. Sync your Android, iPod, and other devices. We think "
++"you'll love Banshee!"
++msgstr ""
++"Atskaņojiet savu mūziku un video. Sekojiet līdzi jaunumiem ar audio un video "
++"podraidēm. Sinhronizējiet savas Android, iPod un citas ierīces. Domājam, ka "
++"jums patiks Banshee!"
++
+ #: ../libbanshee/banshee-bpmdetector.c:202 ../libbanshee/banshee-ripper.c:270
+ #: ../src/Backends/Banshee.GStreamerSharp/Banshee.GStreamerSharp/AudioCdRipper.cs:240
+ msgid "Could not create pipeline"
+@@ -759,18 +778,18 @@ msgstr "Neizdevās izveidot sitienu minūtē noteikšanas spraudni"
+ msgid "Could not initialize GStreamer library"
+ msgstr "Nevar inicializēt GStreamer bibliotēku"
+ 
+-#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:503
+-#: ../src/Backends/Banshee.GStreamerSharp/Banshee.GStreamerSharp/PlayerEngine.cs:553
++#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:504
++#: ../src/Backends/Banshee.GStreamerSharp/Banshee.GStreamerSharp/PlayerEngine.cs:555
+ msgid "Unknown Error"
+ msgstr "Nezināma kļūda"
+ 
+-#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:879
+-#: ../src/Backends/Banshee.GStreamerSharp/Banshee.GStreamerSharp/PlayerEngine.cs:978
++#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:880
++#: ../src/Backends/Banshee.GStreamerSharp/Banshee.GStreamerSharp/PlayerEngine.cs:980
+ msgid "_Enable ReplayGain correction"
+ msgstr "Aktivēt R_eplayGain kļūdu labošanu"
+ 
+-#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:880
+-#: ../src/Backends/Banshee.GStreamerSharp/Banshee.GStreamerSharp/PlayerEngine.cs:979
++#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:881
++#: ../src/Backends/Banshee.GStreamerSharp/Banshee.GStreamerSharp/PlayerEngine.cs:981
+ msgid ""
+ "For tracks that have ReplayGain data, automatically scale (normalize) "
+ "playback volume"
+@@ -778,11 +797,11 @@ msgstr ""
+ "Celiņiem, kuriem ir ReplayGain dati, automātiski mainīt (normalizēt) "
+ "atskaņošanas skaļumu"
+ 
+-#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:885
++#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:886
+ msgid "Enable _gapless playback"
+ msgstr "_Aktivēt atskaņošanu bez pauzēm"
+ 
+-#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:886
++#: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:887
+ msgid ""
+ "Eliminate the small playback gap on track change. Useful for concept albums "
+ "and classical music"
+@@ -799,7 +818,7 @@ msgstr "Nevar izveidot transkodētāju"
+ msgid "Could not create encoder pipeline : {0}"
+ msgstr "Nevarēja izveidot iekodētāja konveijeru: {0}"
+ 
+-#: ../src/Backends/Banshee.GStreamerSharp/Banshee.GStreamerSharp/PlayerEngine.cs:800
++#: ../src/Backends/Banshee.GStreamerSharp/Banshee.GStreamerSharp/PlayerEngine.cs:802
+ msgid "GStreamer# 0.10"
+ msgstr "GStreamer# 0.10"
+ 
+@@ -808,19 +827,11 @@ msgstr "GStreamer# 0.10"
+ msgid "Could not create encoding pipeline : {0}"
+ msgstr "Nevarēja izveidot iekodēšanas konveijeru: {0}"
+ 
+-#: ../src/Backends/Banshee.Osx/Banshee.OsxBackend/OsxService.cs:91
+-#: ../src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/NotificationAreaService.cs:132
+-#: ../src/Extensions/Banshee.SoundMenu/Banshee.SoundMenu/SoundMenuService.cs:110
+-msgid "_Close"
+-msgstr "_Aizvērt"
+-
+-#: ../src/Backends/Banshee.Osx/Banshee.OsxBackend/OsxService.cs:92
+-#: ../src/Clients/Nereid/Nereid/PlayerInterface.cs:251
+-#: ../src/Extensions/Banshee.Fixup/Banshee.Fixup/FixSource.cs:79
+-#: ../src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/NotificationAreaService.cs:133
+-#: ../src/Extensions/Banshee.SoundMenu/Banshee.SoundMenu/SoundMenuService.cs:111
+-msgid "Close"
+-msgstr "Aizvērt"
++#. Translators: verb
++#: ../src/Backends/Banshee.Osx/Banshee.OsxBackend/OsxFileChooserDialog.cs:66
++#| msgid "_Import"
++msgid "Import"
++msgstr "Importēt"
+ 
+ #: ../src/Backends/Banshee.Windows/Banshee.Windows/VersionUpdater.cs:72
+ msgid "Can't check for updates"
+@@ -1223,6 +1234,13 @@ msgstr "atlicis {0}"
+ msgid "Play Song"
+ msgstr "Atskaņot dziesmu"
+ 
++#: ../src/Clients/Nereid/Nereid/PlayerInterface.cs:251
++#: ../src/Extensions/Banshee.Fixup/Banshee.Fixup/FixSource.cs:79
++#: ../src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/NotificationAreaService.cs:133
++#: ../src/Extensions/Banshee.SoundMenu/Banshee.SoundMenu/SoundMenuService.cs:111
++msgid "Close"
++msgstr "Aizvērt"
++
+ #. Translators: this is a verb (command), not a noun (things)
+ #: ../src/Clients/Nereid/Nereid/PlayerInterface.cs:472
+ msgid "Search"
+@@ -1290,7 +1308,7 @@ msgid "Stream location not found"
+ msgstr "Straumes vieta nav atrasta"
+ 
+ #: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:347
+-#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:328
++#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:344
+ msgid "File not found"
+ msgstr "Fails nav atrasts"
+ 
+@@ -1585,12 +1603,30 @@ msgstr "Vieglais roks"
+ msgid "Techno"
+ msgstr "Tehno"
+ 
+-#: ../src/Core/Banshee.Services/Banshee.Library/LibrarySource.cs:58
++#: ../src/Core/Banshee.Services/Banshee.Library/LibrarySource.cs:63
+ msgid "Remove From Library"
+ msgstr "Izņemt no fonotēkas"
+ 
++#: ../src/Core/Banshee.Services/Banshee.Library/LibrarySource.cs:77
++#: ../src/Core/Banshee.Services/Banshee.Sources/PrimarySource.cs:249
++msgid "File Organization"
++msgstr "Failu organizēšana"
++
++#: ../src/Core/Banshee.Services/Banshee.Library/LibrarySource.cs:81
++#| msgid "Co_py files to media folders when importing"
++msgid "Co_py files to media folder when importing"
++msgstr "Im_portējot kopēt datnes uz datu nesēja mapi"
++
++#: ../src/Core/Banshee.Services/Banshee.Library/LibrarySource.cs:87
++msgid "_Update file and folder names"
++msgstr "Atja_unināt failu un mapju nosaukumus"
++
++#: ../src/Core/Banshee.Services/Banshee.Library/LibrarySource.cs:88
++msgid "Rename files and folders according to media metadata"
++msgstr "Pārsaukt failus un mapes atbilstoši metadatiem"
++
+ #. Translators: {0} is the library name, eg 'Music Library' or 'Podcasts'
+-#: ../src/Core/Banshee.Services/Banshee.Library/LibrarySource.cs:121
++#: ../src/Core/Banshee.Services/Banshee.Library/LibrarySource.cs:167
+ #, csharp-format
+ msgid "{0} Folder"
+ msgstr "{0} mape"
+@@ -1667,16 +1703,16 @@ msgid "Search your music"
+ msgstr "Meklēt mūziku"
+ 
+ #. Misc section
+-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:80
+-#: ../src/Core/Banshee.Services/Banshee.Preferences/PreferenceService.cs:66
++#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:89
++#: ../src/Core/Banshee.Services/Banshee.Preferences/PreferenceService.cs:62
+ msgid "Miscellaneous"
+ msgstr "Dažādi"
+ 
+-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:83
++#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:92
+ msgid "_Sort an artist's albums by year, not title"
+ msgstr "_Kārtot izpildītāja albumus pēc gada, nevis nosaukuma"
+ 
+-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:93
++#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:102
+ #, csharp-format
+ msgid "{0} song"
+ msgid_plural "{0} songs"
+@@ -1684,91 +1720,91 @@ msgstr[0] "{0} dziesma"
+ msgstr[1] "{0} dziesmas"
+ msgstr[2] "{0} dziesmas"
+ 
+-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:114
++#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:131
+ msgid "Music Folder"
+ msgstr "Mūzikas mape"
+ 
+-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:119
+-#: ../src/Core/Banshee.Services/Banshee.Library/VideoLibrarySource.cs:95
++#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:136
++#: ../src/Core/Banshee.Services/Banshee.Library/VideoLibrarySource.cs:107
+ msgid "Favorites"
+ msgstr "Iecienītās"
+ 
+-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:120
++#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:137
+ msgid "Songs rated four and five stars"
+ msgstr "Dziesmas ar četrām un piecām zvaigznēm"
+ 
+-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:124
++#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:141
+ msgid "Recent Favorites"
+ msgstr "Nesen iecienītās"
+ 
+-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:125
++#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:142
+ msgid "Songs listened to often in the past week"
+ msgstr "Dziesmas, kas pēdējā nedēļā dzirdētas pārāk bieži"
+ 
+-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:129
++#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:146
+ #: ../src/Extensions/Banshee.InternetArchive/InternetArchive/Sort.cs:95
+ msgid "Recently Added"
+ msgstr "Nesen pievienotās"
+ 
+-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:130
++#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:147
+ msgid "Songs imported within the last week"
+ msgstr "Dziesmas, kas importētas pēdējā nedēļā"
+ 
+-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:134
++#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:151
+ msgid "Recently Played"
+ msgstr "Nesen atskaņotās"
+ 
+-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:135
++#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:152
+ msgid "Recently played songs"
+ msgstr "Nesen atskaņotās dziesmas"
+ 
+-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:139
++#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:156
+ msgid "Unheard"
+ msgstr "Nenoklausīts"
+ 
+-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:140
++#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:157
+ msgid "Songs that have not been played or skipped"
+ msgstr "Dziesmas, kuras nav atskaņotas, vai ir izlaistas"
+ 
+-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:147
++#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:164
+ msgid "Neglected Favorites"
+ msgstr "Novārtā atstāts iecienītās"
+ 
+-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:148
++#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:165
+ msgid "Favorites not played in over two months"
+ msgstr "Iecienītās, kas nav atskaņotas jau divus mēnešus"
+ 
+-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:152
++#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:169
+ msgid "Least Favorite"
+ msgstr "Mazāk iecienītās"
+ 
+-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:153
++#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:170
+ msgid "Songs rated one or two stars or that you have frequently skipped"
+ msgstr ""
+ "Dziesmas, kas ir vērtētas ar vienu vai divām zvaigznēm kuras jūs bieži "
+ "izlaižat"
+ 
+-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:157
++#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:174
+ msgid "700 MB of Favorites"
+ msgstr "700 MB ar iecienītajām"
+ 
+-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:158
++#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:175
+ msgid "A data CD worth of favorite songs"
+ msgstr "Datu CD ar iecienītajām dziesmām"
+ 
+-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:163
++#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:180
+ msgid "80 Minutes of Favorites"
+ msgstr "80 minūtes ar iecienītajām"
+ 
+-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:164
++#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:181
+ msgid "An audio CD worth of favorite songs"
+ msgstr "Audio CD ar iecienītajām dziesmām"
+ 
+-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:169
++#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:186
+ msgid "Unrated"
+ msgstr "Nenovērtētas"
+ 
+-#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:170
++#: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:187
+ msgid "Songs that haven't been rated"
+ msgstr "Dziesmas, kas nav novērtētas"
+ 
+@@ -1782,22 +1818,22 @@ msgid "Importing From {0}"
+ msgstr "Importē no {0}"
+ 
+ #. Catalog.GetString ("Video Library")
+-#: ../src/Core/Banshee.Services/Banshee.Library/VideoLibrarySource.cs:43
++#: ../src/Core/Banshee.Services/Banshee.Library/VideoLibrarySource.cs:44
+ #: ../src/Dap/Banshee.Dap/Banshee.Dap/VideoGroupSource.cs:38
+ msgid "Videos"
+ msgstr "Video"
+ 
+-#: ../src/Core/Banshee.Services/Banshee.Library/VideoLibrarySource.cs:48
++#: ../src/Core/Banshee.Services/Banshee.Library/VideoLibrarySource.cs:49
+ #: ../src/Extensions/Banshee.UPnPClient/Banshee.UPnPClient/UPnPVideoSource.cs:52
+ msgid "Search your videos"
+ msgstr "Meklēt video"
+ 
+-#: ../src/Core/Banshee.Services/Banshee.Library/VideoLibrarySource.cs:65
++#: ../src/Core/Banshee.Services/Banshee.Library/VideoLibrarySource.cs:66
+ #: ../src/Extensions/Banshee.UPnPClient/Banshee.UPnPClient/UPnPVideoSource.cs:69
+ msgid "Produced By"
+ msgstr "Producējis"
+ 
+-#: ../src/Core/Banshee.Services/Banshee.Library/VideoLibrarySource.cs:70
++#: ../src/Core/Banshee.Services/Banshee.Library/VideoLibrarySource.cs:78
+ #, csharp-format
+ msgid "{0} video"
+ msgid_plural "{0} videos"
+@@ -1805,19 +1841,19 @@ msgstr[0] "{0} video"
+ msgstr[1] "{0} video"
+ msgstr[2] "{0} video"
+ 
+-#: ../src/Core/Banshee.Services/Banshee.Library/VideoLibrarySource.cs:90
++#: ../src/Core/Banshee.Services/Banshee.Library/VideoLibrarySource.cs:102
+ msgid "Videos Folder"
+ msgstr "Video mape"
+ 
+-#: ../src/Core/Banshee.Services/Banshee.Library/VideoLibrarySource.cs:96
++#: ../src/Core/Banshee.Services/Banshee.Library/VideoLibrarySource.cs:108
+ msgid "Videos rated four and five stars"
+ msgstr "Video, kas novērtēti ar četrām un piecām zvaigznēm"
+ 
+-#: ../src/Core/Banshee.Services/Banshee.Library/VideoLibrarySource.cs:100
++#: ../src/Core/Banshee.Services/Banshee.Library/VideoLibrarySource.cs:112
+ msgid "Unwatched"
+ msgstr "Nenoskatīts"
+ 
+-#: ../src/Core/Banshee.Services/Banshee.Library/VideoLibrarySource.cs:101
++#: ../src/Core/Banshee.Services/Banshee.Library/VideoLibrarySource.cs:113
+ msgid "Videos that haven't been played yet"
+ msgstr "Video, kuri vēl nav atskaņoti"
+ 
+@@ -1892,14 +1928,6 @@ msgstr ""
+ "Aktivēt šo opciju, lai atskaņojumu skaiti starp fonotēku un atbalstītajiem "
+ "audio failiem būtu sinhroni."
+ 
+-#: ../src/Core/Banshee.Services/Banshee.Metadata/SaveTrackMetadataService.cs:67
+-msgid "_Update file and folder names"
+-msgstr "Atja_unināt failu un mapju nosaukumus"
+-
+-#: ../src/Core/Banshee.Services/Banshee.Metadata/SaveTrackMetadataService.cs:68
+-msgid "Rename files and folders according to media metadata"
+-msgstr "Pārsaukt failus un mapes atbilstoši metadatiem"
+-
+ #: ../src/Core/Banshee.Services/Banshee.Networking/Network.cs:52
+ msgid "There is no available network connection"
+ msgstr "Nav pieejams tīkla savienojums"
+@@ -1947,7 +1975,7 @@ msgstr "Dzēst repertuāru"
+ #: ../src/Core/Banshee.ThickClient/Banshee.Gui/SourceActions.cs:176
+ #: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:135
+ #: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:462
+-#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/SourceView.cs:595
++#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/SourceView.cs:612
+ #: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/SourceView_DragAndDrop.cs:214
+ msgid "New Playlist"
+ msgstr "Jauns repertuārs"
+@@ -1990,11 +2018,7 @@ msgstr "Paplašinājumi"
+ msgid "File Policies"
+ msgstr "Faila politikas"
+ 
+-#: ../src/Core/Banshee.Services/Banshee.Preferences/PreferenceService.cs:58
+-msgid "Co_py files to media folders when importing"
+-msgstr "Im_portējot kopēt failus uz datu nesēja mapēm"
+-
+-#: ../src/Core/Banshee.Services/Banshee.Preferences/PreferenceService.cs:70
++#: ../src/Core/Banshee.Services/Banshee.Preferences/PreferenceService.cs:66
+ msgid "Improve Banshee by sending anonymous usage data"
+ msgstr "Uzlabojiet Banshee, anonīmi sūtīt izmantošanas datus"
+ 
+@@ -2555,7 +2579,7 @@ msgstr "drm"
+ #: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/StatisticsPage.cs:234
+ #: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/StatisticsPage.cs:236
+ #: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/StatisticsPage.cs:238
+-#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:389
++#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:405
+ msgid "Unknown"
+ msgstr "Nezināms"
+ 
+@@ -2643,37 +2667,33 @@ msgstr "Kļūda"
+ msgid "Details"
+ msgstr "Sīkāka informācija"
+ 
+-#: ../src/Core/Banshee.Services/Banshee.Sources/PrimarySource.cs:156
++#: ../src/Core/Banshee.Services/Banshee.Sources/PrimarySource.cs:158
+ msgid "Errors"
+ msgstr "Kļūdas"
+ 
+-#: ../src/Core/Banshee.Services/Banshee.Sources/PrimarySource.cs:213
++#: ../src/Core/Banshee.Services/Banshee.Sources/PrimarySource.cs:215
+ msgid "Sort Playlists By"
+ msgstr "Kārtot repertuāru pēc"
+ 
+ #. Translators: this is a noun, referring to the harddisk
+-#: ../src/Core/Banshee.Services/Banshee.Sources/PrimarySource.cs:223
++#: ../src/Core/Banshee.Services/Banshee.Sources/PrimarySource.cs:225
+ msgid "Drive"
+ msgstr "Dzinis"
+ 
+-#: ../src/Core/Banshee.Services/Banshee.Sources/PrimarySource.cs:247
+-msgid "File Organization"
+-msgstr "Failu organizēšana"
+-
+-#: ../src/Core/Banshee.Services/Banshee.Sources/PrimarySource.cs:248
++#: ../src/Core/Banshee.Services/Banshee.Sources/PrimarySource.cs:250
+ msgid "Folder hie_rarchy"
+ msgstr "Mapes hie_rarhija"
+ 
+-#: ../src/Core/Banshee.Services/Banshee.Sources/PrimarySource.cs:249
++#: ../src/Core/Banshee.Services/Banshee.Sources/PrimarySource.cs:251
+ msgid "File _name"
+ msgstr "Faila _nosaukums"
+ 
+-#: ../src/Core/Banshee.Services/Banshee.Sources/PrimarySource.cs:701
++#: ../src/Core/Banshee.Services/Banshee.Sources/PrimarySource.cs:706
+ #, csharp-format
+ msgid "Adding {0} of {1} to {2}"
+ msgstr "Pievieno {0} no {1} pie {2}"
+ 
+-#: ../src/Core/Banshee.Services/Banshee.Sources/PrimarySource.cs:720
++#: ../src/Core/Banshee.Services/Banshee.Sources/PrimarySource.cs:725
+ #, csharp-format
+ msgid "Deleting {0} of {1} From {2}"
+ msgstr "Dzēš {0} no {1} no {2}"
+@@ -2785,7 +2805,7 @@ msgstr ""
+ #: ../src/Core/Banshee.ThickClient/Banshee.Collection.Gui/ColumnCellDiscAndCount.cs:40
+ #: ../src/Core/Banshee.ThickClient/Banshee.Collection.Gui/ColumnCellTrackAndCount.cs:40
+ #: ../src/Core/Banshee.Widgets/Banshee.Widgets/StreamPositionLabel.cs:174
+-#: ../src/Dap/Banshee.Dap/Banshee.Dap.Gui/DapPropertiesDialog.cs:148
++#: ../src/Dap/Banshee.Dap/Banshee.Dap.Gui/DapPropertiesDialog.cs:149
+ #, csharp-format
+ msgid "{0} of {1}"
+ msgstr "{0} no {1}"
+@@ -2927,10 +2947,6 @@ msgstr "Īpaša multimediju pārvaldība un atskaņošana"
+ 
+ #: ../src/Core/Banshee.ThickClient/Banshee.Gui.Dialogs/AboutDialog.cs:98
+ #, csharp-format
+-#| msgid ""
+-#| "Copyright © 2005–{0} Novell, Inc.\n"
+-#| "Copyright © 2005–{0} Others\n"
+-#| "Copyright © 2005 Aaron Bockover"
+ msgid ""
+ "Copyright © 2005–{0} Novell, Inc.\n"
+ "Copyright © 2005–{1} Others\n"
+@@ -2987,7 +3003,7 @@ msgid "Make Banshee the Default"
+ msgstr "Padarīt Banshee par noklusēto"
+ 
+ #. Translators: verb
+-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Dialogs/FileChooserDialog.cs:53
++#: ../src/Core/Banshee.ThickClient/Banshee.Gui.Dialogs/GtkFileChooserDialog.cs:53
+ msgid "I_mport"
+ msgstr "I_mportēt"
+ 
+@@ -3595,19 +3611,19 @@ msgstr "Iestatīt visu disku numuru un skaitu uz šīm vērtībām"
+ msgid "_Disc Number:"
+ msgstr "_Diska nosaukums:"
+ 
+-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/BasicTrackDetailsPage.cs:188
++#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/BasicTrackDetailsPage.cs:196
+ msgid "Set all years to this value"
+ msgstr "Iestatīt visus gadus uz šo vērtību"
+ 
+-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/BasicTrackDetailsPage.cs:189
++#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/BasicTrackDetailsPage.cs:197
+ msgid "_Year:"
+ msgstr "_Gads:"
+ 
+-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/BasicTrackDetailsPage.cs:196
++#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/BasicTrackDetailsPage.cs:204
+ msgid "Set all ratings to this value"
+ msgstr "Iestatīt visus vērtējumus uz šo vērtību"
+ 
+-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/BasicTrackDetailsPage.cs:197
++#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/BasicTrackDetailsPage.cs:205
+ msgid "_Rating:"
+ msgstr "Vē_rtējums:"
+ 
+@@ -4204,7 +4220,6 @@ msgstr "Šī lapa ir bloķēta, jo tā visdrīzāk nav tā, ko jūs meklējat."
+ #. Translators: {0} is the URL of the web page that was requested
+ #: ../src/Core/Banshee.WebBrowser/Banshee.WebBrowser/NavigationControl.cs:158
+ #, csharp-format
+-#| msgid "The specified resource is invalid."
+ msgid "The security certificate for {0} is invalid."
+ msgstr "{0} drošības sertifikāts nav derīgs."
+ 
+@@ -4242,18 +4257,6 @@ msgstr "Sazinās ar..."
+ msgid "Buffering"
+ msgstr "Buferē"
+ 
+-#: ../src/Core/Banshee.Widgets/Banshee.Widgets/VolumeButton.cs:96
+-msgid "Volume"
+-msgstr "Skaļums"
+-
+-#: ../src/Core/Banshee.Widgets/Banshee.Widgets/VolumeButton.cs:548
+-msgid "Muted"
+-msgstr "Apklusināts"
+-
+-#: ../src/Core/Banshee.Widgets/Banshee.Widgets/VolumeButton.cs:550
+-msgid "Full Volume"
+-msgstr "Pilns skaļums"
+-
+ #: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:115
+ msgid "Device"
+ msgstr "Ierīce"
+@@ -4290,29 +4293,29 @@ msgstr "Atbalsta albumu vāciņus"
+ msgid "Supports photos"
+ msgstr "Atbalsta fotogrāfijas"
+ 
+-#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:463
++#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:466
+ msgid "Track duration is zero"
+ msgstr "Celiņa ilgums ir nulle"
+ 
+-#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:566
++#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:570
+ msgid "Syncing iPod"
+ msgstr "Sinhronizē iPod"
+ 
+-#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:567
++#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:571
+ msgid "Preparing to synchronize..."
+ msgstr "Gatavojas sinhronizēšanai..."
+ 
+-#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:570
++#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:593
+ #, csharp-format
+ msgid "Adding track {0} of {1}"
+ msgstr "Pievieno celiņu {0} no {1}"
+ 
+-#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:606
++#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:636
+ #, csharp-format
+ msgid "Removing track {0} of {1}"
+ msgstr "Izņem celiņu {0} no {1}"
+ 
+-#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:659
++#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:710
+ msgid "Writing media database"
+ msgstr "Raksta multimediju datubāzē"
+ 
+@@ -4326,35 +4329,35 @@ msgstr "Sinhronizē {0}"
+ msgid "Devices"
+ msgstr "Ierīces"
+ 
+-#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:176
++#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:179
+ msgid "Device Properties"
+ msgstr "Ierīču īpašības"
+ 
+-#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:200
++#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:201
+ msgid "Product"
+ msgstr "Produkts"
+ 
+-#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:201
++#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:202
+ msgid "Vendor"
+ msgstr "Ražotājs"
+ 
+-#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:284
++#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:292
+ #: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Data/PodcastSource.cs:141
+ #, csharp-format
+ msgid "Loading {0}"
+ msgstr "Ielādē {0}"
+ 
+-#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:370
++#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:386
+ #: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/ColumnCellYesNo.cs:37
+ msgid "Yes"
+ msgstr "Jā"
+ 
+-#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:370
++#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:386
+ #: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/ColumnCellYesNo.cs:38
+ msgid "No"
+ msgstr "Nē"
+ 
+-#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:391
++#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:407
+ #, csharp-format
+ msgid ""
+ "The {0} format is not supported by the device, and no converter was found to "
+@@ -4363,11 +4366,11 @@ msgstr ""
+ "Šī ierīce neatbalsta formātu {0}, un netika atrasts konvertētājs, lai to "
+ "pārveidotu"
+ 
+-#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:397
++#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:413
+ msgid "File format conversion support is not available"
+ msgstr "Nav pieejama failu formāta pārveidošana"
+ 
+-#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:423
++#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:439
+ msgid "Error converting file"
+ msgstr "Kļūda, pārveidojot failu"
+ 
+@@ -4405,7 +4408,7 @@ msgstr[2] "Sinhronizēšanas darbība no ierīces izņems {0} celiņus."
+ msgid "Are you sure you want to continue?"
+ msgstr "Vai tiešām vēlaties turpināt?"
+ 
+-#: ../src/Dap/Banshee.Dap/Banshee.Dap.Gui/DapActions.cs:118
++#: ../src/Dap/Banshee.Dap/Banshee.Dap.Gui/DapActions.cs:121
+ msgid "Remove tracks"
+ msgstr "Izņemt celiņus"
+ 
+@@ -4480,12 +4483,12 @@ msgstr "Importēt iegādāto mūziku"
+ msgid "Disconnect"
+ msgstr "Atvienot"
+ 
+-#: ../src/Dap/Banshee.Dap/Banshee.Dap/RemovableSource.cs:108
++#: ../src/Dap/Banshee.Dap/Banshee.Dap/RemovableSource.cs:111
+ #, csharp-format
+ msgid "Disconnecting {0}..."
+ msgstr "Atvieno {0}..."
+ 
+-#: ../src/Dap/Banshee.Dap/Banshee.Dap/RemovableSource.cs:115
++#: ../src/Dap/Banshee.Dap/Banshee.Dap/RemovableSource.cs:118
+ #, csharp-format
+ msgid "Could not disconnect {0}: {1}"
+ msgstr "Neizdevās atvienot {0}: {1}"
+@@ -4853,11 +4856,11 @@ msgstr "Pieteikšanās"
+ msgid "Connecting to {0}"
+ msgstr "Savienojas ar {0}"
+ 
+-#: ../src/Extensions/Banshee.Daap/Banshee.Daap/DaapService.cs:185
++#: ../src/Extensions/Banshee.Daap/Banshee.Daap/DaapService.cs:186
+ msgid "Add Remote DAAP Server"
+ msgstr "Pievienot attālinātu DAAP serveri"
+ 
+-#: ../src/Extensions/Banshee.Daap/Banshee.Daap/DaapService.cs:186
++#: ../src/Extensions/Banshee.Daap/Banshee.Daap/DaapService.cs:187
+ msgid "Add a new remote DAAP server"
+ msgstr "Pievienot jaunu attālinātu DAAP serveri"
+ 
+@@ -5311,7 +5314,6 @@ msgid "Library of Congress"
+ msgstr "Kongresa bibliotēka"
+ 
+ #: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HomeView.cs:136
+-#| msgid "Sample"
+ msgid "Examples:"
+ msgstr "Piemēri:"
+ 
+@@ -5695,28 +5697,23 @@ msgstr "Apmeklēt savu Last.fm profila lapu"
+ 
+ #: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:146
+ #: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmPreferences.cs:93
+-#| msgid "_Enable Song Reporting"
+ msgid "_Enable Song Reporting From Banshee"
+ msgstr "Aktivēt dzi_esmu ziņošanu no Banshee"
+ 
+ #: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:147
+-#| msgid "Enable song reporting"
+ msgid "Enable song reporting From Banshee"
+ msgstr "Aktivēt dziesmu ziņošanu no Banshee"
+ 
+ #: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:152
+ #: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmPreferences.cs:98
+-#| msgid "_Enable Song Reporting"
+ msgid "_Enable Song Reporting From Device"
+ msgstr "Aktivēt dzi_esmu ziņošanu no ierīces"
+ 
+ #: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:153
+-#| msgid "Enable song reporting"
+ msgid "Enable song reporting From Device"
+ msgstr "Aktivēt dziesmu ziņošanu no ierīces"
+ 
+ #: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:402
+-#| msgid "Song Playing on Device"
+ msgid "Scrobbling from device"
+ msgstr "Skroblē no ierīces"
+ 
+@@ -5726,7 +5723,6 @@ msgstr "Skroblē no ierīces..."
+ 
+ #: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm.Audioscrobbler/AudioscrobblerService.cs:414
+ #, csharp-format
+-#| msgid "Removing track {0} of {1}"
+ msgid "Processing track {0} of {1} ..."
+ msgstr "Apstrādā celiņu {0} no {1} ..."
+ 
+@@ -5841,8 +5837,8 @@ msgid "Log in to Last.fm"
+ msgstr "Pieteikties Last.fm"
+ 
+ #: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmPreferences.cs:294
+-#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:294
+-#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:321
++#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:298
++#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:335
+ msgid "You need to allow Banshee to access your Last.fm account."
+ msgstr "Jums vajadzēs atļaut Banshee darboties ar jūsu Last.fm kontu."
+ 
+@@ -6173,6 +6169,11 @@ msgstr "Meklēt podraides"
+ msgid "Search for video podcasts"
+ msgstr "Meklēt video podraides"
+ 
++#: ../src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/NotificationAreaService.cs:132
++#: ../src/Extensions/Banshee.SoundMenu/Banshee.SoundMenu/SoundMenuService.cs:110
++msgid "_Close"
++msgstr "_Aizvērt"
++
+ #: ../src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/NotificationAreaService.cs:139
+ msgid "_Show Notifications"
+ msgstr "_Rādīt paziņojumus"
+@@ -6354,7 +6355,6 @@ msgstr "Importēt ‟{0}”"
+ #. Translators: {0} is the type of disc, "Audio CD" or "DVD"
+ #: ../src/Extensions/Banshee.OpticalDisc/Banshee.OpticalDisc/DiscSource.cs:154
+ #, csharp-format
+-#| msgid "Eject {0}"
+ msgid "Ejecting {0}..."
+ msgstr "Izgrūž {0}..."
+ 
+@@ -7100,99 +7100,117 @@ msgstr "Saglabāt un pieteikties"
+ msgid "Authorize for Last.fm"
+ msgstr "Autorizēties Last.fm"
+ 
+-#: ../src/Libraries/Lastfm/Lastfm/AudioscrobblerConnection.cs:450
+-msgid ""
+-"Last.fm username is invalid or Banshee is not authorized to access your "
+-"account."
+-msgstr ""
+-"Last.fm lietotājvārds ir nederīgs, vai arī Banshee nav autorizēts piekļūt "
+-"jūsu kontam."
+-
+-#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:271
++#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:275
+ msgid "This service does not exist."
+ msgstr "Serviss neeksistē."
+ 
+-#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:275
++#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:279
+ msgid "Stations are only available to paying Last.fm subscribers."
+ msgstr "Stacijas ir pieejamas tikai maksājošiem Last.fm abonentiem."
+ 
+-#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:277
++#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:281
+ msgid "This station is not available."
+ msgstr "Stacija nav pieejama."
+ 
+-#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:279
++#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:283
+ msgid "The request is missing a required parameter."
+ msgstr "Pieprasījumam pietrūkst nepieciešama parametra."
+ 
+-#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:281
++#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:285
+ msgid "The specified resource is invalid."
+ msgstr "Norādītais resurss nav derīgs."
+ 
+-#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:283
++#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:287
+ msgid "Server error, please try again later."
+ msgstr "Servera kļūda, lūdzu, mēģiniet vēlāk."
+ 
+-#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:285
++#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:289
+ msgid "Invalid authentication information, please re-authenticate."
+ msgstr ""
+ "Nederīga autentifikācijas informācija, lūdzu, autentificējieties vēlreiz."
+ 
+-#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:287
++#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:291
+ msgid "The API key used by this application is invalid."
+ msgstr "API atslēga, ko izmanto šī lietotne, nav derīga."
+ 
+-#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:289
++#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:293
+ msgid ""
+ "The streaming system is offline for maintenance, please try again later."
+ msgstr ""
+ "Straumēšanas sistēma nav pieejama uzkopšanas dēļ, lūdzu, mēģiniet atkal "
+ "vēlāk."
+ 
+-#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:291
++#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:295
+ msgid "The method signature is invalid."
+ msgstr "Metodes paraksts ir nederīgs."
+ 
+-#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:296
++#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:300
+ msgid "There is not enough content to play this station."
+ msgstr "Nepietiek satura, lai atskaņotu šo staciju."
+ 
+-#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:298
++#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:302
+ msgid "This group does not have enough members for radio."
+ msgstr "Šai grupai nav pietiekami daudz dalībnieku, lai veidotu radio."
+ 
+-#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:300
++#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:304
+ msgid "This artist does not have enough fans for radio."
+ msgstr "Šim izpildītājam nav pietiekami daudz fanu, lai veidotu radio."
+ 
+-#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:302
++#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:306
+ msgid "There are not enough neighbours for this station."
+ msgstr "Nepietiek kaimiņu, lai veidotu šo staciju."
+ 
+-#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:304
++#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:308
++msgid "This user is not allowed to listen to radio during peak usage"
++msgstr ""
++"Šim lietotājam nav atļaujas klausīties radio, kad ir vislielākā izmantošana"
++
++#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:310
++#| msgid "Stream location not found"
++msgid "Radio station not found"
++msgstr "Radio stacija nav atrasta"
++
++#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:312
++msgid "This application is not allowed to make requests to the web services"
++msgstr "Šai lietotnei nav atļauts veidot pieprasījumus tīmekļa servisiem"
++
++#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:314
++msgid "This type of request is no longer supported"
++msgstr "Šāda veida pieprasījuma veids vairs nav atbalstīts"
++
++#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:316
++msgid ""
++"Your IP has made too many requests in a short period, exceeding our API "
++"guidelines"
++msgstr ""
++"Jūsu IP adresei veica pārāk daudz pieprasījumu īsā periodā, pārsniedzot mūsu "
++"API vadlīnijas"
++
++#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:318
+ msgid "There was an unknown error."
+ msgstr "Gadījās nezināma kļūda."
+ 
+-#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:313
++#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:327
+ msgid "Not connected to Last.fm."
+ msgstr "Nav savienojuma ar Last.fm."
+ 
+-#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:315
++#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:329
+ msgid "Account details are needed before you can connect to Last.fm"
+ msgstr "Lai savienotos ar Last.fm, ir nepieciešami konta dati"
+ 
+-#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:317
++#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:331
+ msgid "No network connection detected."
+ msgstr "Nav atrasts tīkla savienojums."
+ 
+-#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:319
++#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:333
+ msgid "Last.fm username is invalid."
+ msgstr "Last.fm lietotājvārds ir nederīgs."
+ 
+-#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:323
++#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:337
+ msgid "Connecting to Last.fm."
+ msgstr "Savienojas ar Last.fm."
+ 
+-#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:325
++#: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:339
+ msgid "Connected to Last.fm."
+ msgstr "Savienojies ar Last.fm."
+ 
+@@ -7202,6 +7220,22 @@ msgstr "Savienojies ar Last.fm."
+ msgid "Unknown Podcast"
+ msgstr "Nezināma podraide"
+ 
++#~ msgid "Volume"
++#~ msgstr "Skaļums"
++
++#~ msgid "Muted"
++#~ msgstr "Apklusināts"
++
++#~ msgid "Full Volume"
++#~ msgstr "Pilns skaļums"
++
++#~ msgid ""
++#~ "Last.fm username is invalid or Banshee is not authorized to access your "
++#~ "account."
++#~ msgstr ""
++#~ "Last.fm lietotājvārds ir nederīgs, vai arī Banshee nav autorizēts piekļūt "
++#~ "jūsu kontam."
++
+ #~ msgid "Dvd"
+ #~ msgstr "DVD"
+ 
+diff --git a/po/pl.po b/po/pl.po
+index 6707926..dd27afb 100644
+--- a/po/pl.po
++++ b/po/pl.po
+@@ -7,14 +7,14 @@
+ # Artur Flinta <aflinta@gmail.com>, 2007, 2008.
+ # Wadim Dziedzic <wdziedzic@aviary.pl>, 2008, 2009.
+ # Tomasz Dominikowski <tdominikowski@aviary.pl>, 2007, 2008, 2009.
+-# Piotr Drąg <piotrdrag@gmail.com>, 2009, 2010, 2012.
++# Piotr Drąg <piotrdrag@gmail.com>, 2009, 2010, 2012, 2013.
+ # Mateusz Kacprzak <mateusz.kacprzak@yandex.ru>, 2011, 2012.
+ msgid ""
+ msgstr ""
+ "Project-Id-Version: banshee\n"
+ "Report-Msgid-Bugs-To: \n"
+-"POT-Creation-Date: 2012-08-25 21:05+0200\n"
+-"PO-Revision-Date: 2012-08-25 21:28+0200\n"
++"POT-Creation-Date: 2013-10-03 17:38+0200\n"
++"PO-Revision-Date: 2013-10-03 17:39+0200\n"
+ "Last-Translator: Piotr Drąg <piotrdrag@gmail.com>\n"
+ "Language-Team: Polish <gnomepl@aviary.pl>\n"
+ "Language: pl\n"
+@@ -630,7 +630,7 @@ msgid "Audio Quality"
+ msgstr "Jakość dźwięku"
+ 
+ #: ../data/desktop-files/common.desktop.in.h:1
+-#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:196
++#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:194
+ msgid "Media Player"
+ msgstr "Odtwarzacz multimediów"
+ 
+@@ -646,6 +646,25 @@ msgstr "Odtwarzacz multimediów Banshee"
+ msgid "Play and organize your media collection"
+ msgstr "Odtwarzanie i organizowanie kolekcji multimediów"
+ 
++#. Writing GNOME below, instead of just "Linux", is inclusive of *BSD OSs
++#: ../data/banshee.appdata.xml.in.h:2
++msgid ""
++"Banshee is an open source multimedia management and playback application for "
++"GNOME, Mac and Windows."
++msgstr ""
++"Banshee to program open source do zarządzania i odtwarzania multimediów dla "
++"systemów GNOME, Mac i Windows."
++
++#: ../data/banshee.appdata.xml.in.h:3
++msgid ""
++"Play your music and videos. Stay entertained and up to date with podcasts "
++"and video podcasts. Sync your Android, iPod, and other devices. We think "
++"you'll love Banshee!"
++msgstr ""
++"Funkcje programu Banshee obejmują odtwarzanie muzyki i nagrań wideo, "
++"podcastów dźwiękowych i wideo oraz synchronizowanie kolekcji z urządzeniami "
++"Android, iPod i wieloma innymi."
++
+ #: ../libbanshee/banshee-bpmdetector.c:202 ../libbanshee/banshee-ripper.c:270
+ #: ../src/Backends/Banshee.GStreamerSharp/Banshee.GStreamerSharp/AudioCdRipper.cs:240
+ msgid "Could not create pipeline"
+@@ -1307,7 +1326,7 @@ msgid "Stream location not found"
+ msgstr "Nie odnaleziono położenia strumienia"
+ 
+ #: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:347
+-#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:343
++#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:344
+ msgid "File not found"
+ msgstr "Nie odnaleziono pliku"
+ 
+@@ -1977,7 +1996,7 @@ msgstr "Usuń listę odtwarzania"
+ #: ../src/Core/Banshee.ThickClient/Banshee.Gui/SourceActions.cs:176
+ #: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:135
+ #: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:462
+-#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/SourceView.cs:595
++#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/SourceView.cs:612
+ #: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/SourceView_DragAndDrop.cs:214
+ msgid "New Playlist"
+ msgstr "Nowa lista odtwarzania"
+@@ -2588,7 +2607,7 @@ msgstr "drm"
+ #: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/StatisticsPage.cs:234
+ #: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/StatisticsPage.cs:236
+ #: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/StatisticsPage.cs:238
+-#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:404
++#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:405
+ msgid "Unknown"
+ msgstr "Nieznana"
+ 
+@@ -2815,7 +2834,7 @@ msgstr ""
+ #: ../src/Core/Banshee.ThickClient/Banshee.Collection.Gui/ColumnCellDiscAndCount.cs:40
+ #: ../src/Core/Banshee.ThickClient/Banshee.Collection.Gui/ColumnCellTrackAndCount.cs:40
+ #: ../src/Core/Banshee.Widgets/Banshee.Widgets/StreamPositionLabel.cs:174
+-#: ../src/Dap/Banshee.Dap/Banshee.Dap.Gui/DapPropertiesDialog.cs:148
++#: ../src/Dap/Banshee.Dap/Banshee.Dap.Gui/DapPropertiesDialog.cs:149
+ #, csharp-format
+ msgid "{0} of {1}"
+ msgstr "{0} z {1}"
+@@ -3625,19 +3644,19 @@ msgstr "Ustawia wszystkie pola numeru płyty i numerów ścieżek na tę wartoś
+ msgid "_Disc Number:"
+ msgstr "_Numer płyty:"
+ 
+-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/BasicTrackDetailsPage.cs:188
++#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/BasicTrackDetailsPage.cs:196
+ msgid "Set all years to this value"
+ msgstr "Ustawia wszystkie pola lat na tę wartość"
+ 
+-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/BasicTrackDetailsPage.cs:189
++#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/BasicTrackDetailsPage.cs:197
+ msgid "_Year:"
+ msgstr "_Rok:"
+ 
+-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/BasicTrackDetailsPage.cs:196
++#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/BasicTrackDetailsPage.cs:204
+ msgid "Set all ratings to this value"
+ msgstr "Ustawia wszystkie oceny na tę wartość"
+ 
+-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/BasicTrackDetailsPage.cs:197
++#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/BasicTrackDetailsPage.cs:205
+ msgid "_Rating:"
+ msgstr "_Ocena:"
+ 
+@@ -4316,29 +4335,29 @@ msgstr "Obsługuje okładki"
+ msgid "Supports photos"
+ msgstr "Obsługuje zdjęcia"
+ 
+-#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:465
++#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:466
+ msgid "Track duration is zero"
+ msgstr "Długość ścieżki wynosi zero"
+ 
+-#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:571
++#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:570
+ msgid "Syncing iPod"
+ msgstr "Synchronizowanie odtwarzacza iPod"
+ 
+-#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:572
++#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:571
+ msgid "Preparing to synchronize..."
+ msgstr "Przygotowywanie do synchronizacji..."
+ 
+-#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:575
++#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:593
+ #, csharp-format
+ msgid "Adding track {0} of {1}"
+ msgstr "Dodawanie ścieżki {0} z {1}"
+ 
+-#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:611
++#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:636
+ #, csharp-format
+ msgid "Removing track {0} of {1}"
+ msgstr "Usuwanie ścieżki {0} z {1}"
+ 
+-#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:664
++#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:710
+ msgid "Writing media database"
+ msgstr "Zapisywanie bazy danych multimediów"
+ 
+@@ -4356,31 +4375,31 @@ msgstr "Urządzenia"
+ msgid "Device Properties"
+ msgstr "Właściwości urządzenia"
+ 
+-#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:203
++#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:201
+ msgid "Product"
+ msgstr "Produkt"
+ 
+-#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:204
++#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:202
+ msgid "Vendor"
+ msgstr "Producent"
+ 
+-#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:291
++#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:292
+ #: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Data/PodcastSource.cs:141
+ #, csharp-format
+ msgid "Loading {0}"
+ msgstr "Wczytywanie {0}"
+ 
+-#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:385
++#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:386
+ #: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/ColumnCellYesNo.cs:37
+ msgid "Yes"
+ msgstr "Tak"
+ 
+-#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:385
++#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:386
+ #: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/ColumnCellYesNo.cs:38
+ msgid "No"
+ msgstr "Nie"
+ 
+-#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:406
++#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:407
+ #, csharp-format
+ msgid ""
+ "The {0} format is not supported by the device, and no converter was found to "
+@@ -4389,11 +4408,11 @@ msgstr ""
+ "Format {0} nie jest obsługiwany przez to urządzenie i nie odnaleziono "
+ "konwertera do konwersji tego formatu"
+ 
+-#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:412
++#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:413
+ msgid "File format conversion support is not available"
+ msgstr "Konwersja formatu plików nie jest obsługiwana"
+ 
+-#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:438
++#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:439
+ msgid "Error converting file"
+ msgstr "Błąd podczas konwertowania pliku"
+ 
+@@ -4430,7 +4449,7 @@ msgstr[2] "Synchronizacja usunie {0} ścieżek z urządzenia."
+ msgid "Are you sure you want to continue?"
+ msgstr "Na pewno kontynuować?"
+ 
+-#: ../src/Dap/Banshee.Dap/Banshee.Dap.Gui/DapActions.cs:118
++#: ../src/Dap/Banshee.Dap/Banshee.Dap.Gui/DapActions.cs:121
+ msgid "Remove tracks"
+ msgstr "Usuń ścieżki"
+ 
+@@ -4505,12 +4524,12 @@ msgstr "Importowanie zakupionej muzyki"
+ msgid "Disconnect"
+ msgstr "Rozłącz"
+ 
+-#: ../src/Dap/Banshee.Dap/Banshee.Dap/RemovableSource.cs:108
++#: ../src/Dap/Banshee.Dap/Banshee.Dap/RemovableSource.cs:111
+ #, csharp-format
+ msgid "Disconnecting {0}..."
+ msgstr "Rozłączanie {0}..."
+ 
+-#: ../src/Dap/Banshee.Dap/Banshee.Dap/RemovableSource.cs:115
++#: ../src/Dap/Banshee.Dap/Banshee.Dap/RemovableSource.cs:118
+ #, csharp-format
+ msgid "Could not disconnect {0}: {1}"
+ msgstr "Nie można rozłączyć {0}: {1}"
+@@ -4876,11 +4895,11 @@ msgstr "Login"
+ msgid "Connecting to {0}"
+ msgstr "Łączenie z {0}"
+ 
+-#: ../src/Extensions/Banshee.Daap/Banshee.Daap/DaapService.cs:185
++#: ../src/Extensions/Banshee.Daap/Banshee.Daap/DaapService.cs:186
+ msgid "Add Remote DAAP Server"
+ msgstr "Dodaj zdalny serwer DAAP"
+ 
+-#: ../src/Extensions/Banshee.Daap/Banshee.Daap/DaapService.cs:186
++#: ../src/Extensions/Banshee.Daap/Banshee.Daap/DaapService.cs:187
+ msgid "Add a new remote DAAP server"
+ msgstr "Dodaj nowy zdalny serwer DAAP"
+ 
+@@ -6936,22 +6955,22 @@ msgstr "kliknięcie"
+ msgid "menu"
+ msgstr "menu"
+ 
+-#: ../src/Hyena/Hyena.Gui/Hyena.Data.Gui/ListView/ListView_Header.cs:612
++#: ../src/Hyena/Hyena.Gui/Hyena.Data.Gui/ListView/ListView_Header.cs:613
+ #, csharp-format
+ msgid "Hide <i>{0}</i>"
+ msgstr "Ukryj <i>{0}</i>"
+ 
+ #. Translators: {0} is substituted with the application name
+-#: ../src/Hyena/Hyena.Gui/Hyena.Gui.Dialogs/ExceptionDialog.cs:53
++#: ../src/Hyena/Hyena.Gui/Hyena.Gui.Dialogs/ExceptionDialog.cs:52
+ #, csharp-format
+ msgid "{0} Encountered a Fatal Error"
+ msgstr "{0} - Napotkano krytyczny błąd"
+ 
+-#: ../src/Hyena/Hyena.Gui/Hyena.Gui.Dialogs/ExceptionDialog.cs:92
++#: ../src/Hyena/Hyena.Gui/Hyena.Gui.Dialogs/ExceptionDialog.cs:91
+ msgid "Error Details"
+ msgstr "Szczegóły błędu"
+ 
+-#: ../src/Hyena/Hyena.Gui/Hyena.Gui.Dialogs/ExceptionDialog.cs:136
++#: ../src/Hyena/Hyena.Gui/Hyena.Gui.Dialogs/ExceptionDialog.cs:135
+ msgid "An unhandled exception was thrown: "
+ msgstr "Wystąpił nieobsługiwany wyjątek: "
+ 
+diff --git a/po/pt_BR.po b/po/pt_BR.po
+index 663566b..69bbacd 100644
+--- a/po/pt_BR.po
++++ b/po/pt_BR.po
+@@ -13,7 +13,7 @@
+ # Carlos Eduardo Moreira dos Santos <cems@cemshost.com.br>, 2008.
+ # Fábio Nogueira <deb-user-ba@ubuntu.com>, 2008.
+ # Amanda Magalhães <amandinha@comum.org>, 2010.
+-# Enrico Nicoletto <liverig@gmail.com>, 2010.
++# Enrico Nicoletto <liverig@gmail.com>, 2010, 2013.
+ # Pablo Garrido <pablo@pablogarrido.com.br>, 2010.
+ # Michel Recondo <michel@recondo.com.br>, 2008, 2010.
+ # Daniel S. Koda <danielskoda@gmail.com>, 2009, 2010.
+@@ -25,14 +25,15 @@
+ # filesink -> consumidor de arquivo
+ # scrobble   -> http://www.lastfm.com.br/help/faq?category=Scrobbling
+ # scrobbling -> http://www.lastfm.com.br/help/faq?category=Scrobbling
++#
+ msgid ""
+ msgstr ""
+ "Project-Id-Version: banshee help\n"
+ "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
+ "product=banshee&keywords=I18N+L10N&component=general\n"
+-"POT-Creation-Date: 2013-01-25 00:16+0000\n"
+-"PO-Revision-Date: 2013-02-12 18:05-0300\n"
+-"Last-Translator: Rafael Ferreira <rafael.f.f1@gmail.com>\n"
++"POT-Creation-Date: 2013-10-07 20:24+0000\n"
++"PO-Revision-Date: 2013-10-08 14:42-0300\n"
++"Last-Translator: Enrico Nicoletto <liverig@gmail.com>\n"
+ "Language-Team: Brazilian Portuguese <gnome-pt_br-list@gnome.org>\n"
+ "Language: pt_BR\n"
+ "MIME-Version: 1.0\n"
+@@ -654,6 +655,25 @@ msgstr "Reprodutor de mídia Banshee"
+ msgid "Play and organize your media collection"
+ msgstr "Reproduza e organize a sua coleção de mídia"
+ 
++#. Writing GNOME below, instead of just "Linux", is inclusive of *BSD OSs
++#: ../data/banshee.appdata.xml.in.h:2
++msgid ""
++"Banshee is an open source multimedia management and playback application for "
++"GNOME, Mac and Windows."
++msgstr ""
++"Banshee é um gerenciador de multimídia de código aberto e aplicativo de "
++"reprodução para o GNOME, Mac e Windows."
++
++#: ../data/banshee.appdata.xml.in.h:3
++msgid ""
++"Play your music and videos. Stay entertained and up to date with podcasts "
++"and video podcasts. Sync your Android, iPod, and other devices. We think "
++"you'll love Banshee!"
++msgstr ""
++"Reproduza suas músicas e vídeos. Fique entretido e mantenha-se atualizado "
++"com podcasts de áudio e video. Sincronize seu Android, iPod, e outros "
++"dispositivos. Acreditamos que você irá amar o Banshee!"
++
+ #: ../libbanshee/banshee-bpmdetector.c:202 ../libbanshee/banshee-ripper.c:270
+ #: ../src/Backends/Banshee.GStreamerSharp/Banshee.GStreamerSharp/AudioCdRipper.cs:240
+ msgid "Could not create pipeline"
+@@ -2809,7 +2829,7 @@ msgstr ""
+ #: ../src/Core/Banshee.ThickClient/Banshee.Collection.Gui/ColumnCellDiscAndCount.cs:40
+ #: ../src/Core/Banshee.ThickClient/Banshee.Collection.Gui/ColumnCellTrackAndCount.cs:40
+ #: ../src/Core/Banshee.Widgets/Banshee.Widgets/StreamPositionLabel.cs:174
+-#: ../src/Dap/Banshee.Dap/Banshee.Dap.Gui/DapPropertiesDialog.cs:148
++#: ../src/Dap/Banshee.Dap/Banshee.Dap.Gui/DapPropertiesDialog.cs:149
+ #, csharp-format
+ msgid "{0} of {1}"
+ msgstr "{0} de {1}"
+@@ -3106,16 +3126,6 @@ msgid "_Tools"
+ msgstr "Ferrame_ntas"
+ 
+ #: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:88
+-#, csharp-format
+-msgid "The rescan operation will remove one track from your music library."
+-msgid_plural ""
+-"The rescan operation will remove {0} tracks from your music library."
+-msgstr[0] ""
+-"A operação de varredura removerá uma faixa da sua biblioteca de músicas."
+-msgstr[1] ""
+-"A operação de varredura removerá {0} faixas da sua biblioteca de músicas."
+-
+-#: ../src/Core/Banshee.ThickClient/Banshee.Gui/GlobalActions.cs:99
+ #: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HeaderFilters.cs:134
+ msgid "_Help"
+ msgstr "Aj_uda"
+@@ -4316,29 +4326,29 @@ msgstr "Suporta arte de capa"
+ msgid "Supports photos"
+ msgstr "Suporta fotos"
+ 
+-#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:462
++#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:466
+ msgid "Track duration is zero"
+ msgstr "A duração da faixa é zero"
+ 
+-#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:566
++#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:570
+ msgid "Syncing iPod"
+ msgstr "Sincronizando o iPod"
+ 
+-#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:567
++#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:571
+ msgid "Preparing to synchronize..."
+ msgstr "Preparando para sincroniar..."
+ 
+-#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:589
++#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:593
+ #, csharp-format
+ msgid "Adding track {0} of {1}"
+ msgstr "Adicionando faixa {0} de {1}"
+ 
+-#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:632
++#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:636
+ #, csharp-format
+ msgid "Removing track {0} of {1}"
+ msgstr "Removendo faixa {0} de {1}"
+ 
+-#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:706
++#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:710
+ msgid "Writing media database"
+ msgstr "Gravando o banco de dados de mídia"
+ 
+@@ -4506,12 +4516,12 @@ msgstr "Importar música comprada"
+ msgid "Disconnect"
+ msgstr "Desconectar"
+ 
+-#: ../src/Dap/Banshee.Dap/Banshee.Dap/RemovableSource.cs:108
++#: ../src/Dap/Banshee.Dap/Banshee.Dap/RemovableSource.cs:111
+ #, csharp-format
+ msgid "Disconnecting {0}..."
+ msgstr "Desconectando {0}..."
+ 
+-#: ../src/Dap/Banshee.Dap/Banshee.Dap/RemovableSource.cs:115
++#: ../src/Dap/Banshee.Dap/Banshee.Dap/RemovableSource.cs:118
+ #, csharp-format
+ msgid "Could not disconnect {0}: {1}"
+ msgstr "Não foi possível desconectar {0}: {1}"
+@@ -7236,6 +7246,14 @@ msgstr "Conectado ao Last.fm."
+ msgid "Unknown Podcast"
+ msgstr "Podcast desconhecido"
+ 
++#~ msgid "The rescan operation will remove one track from your music library."
++#~ msgid_plural ""
++#~ "The rescan operation will remove {0} tracks from your music library."
++#~ msgstr[0] ""
++#~ "A operação de varredura removerá uma faixa da sua biblioteca de músicas."
++#~ msgstr[1] ""
++#~ "A operação de varredura removerá {0} faixas da sua biblioteca de músicas."
++
+ #~ msgid "Volume"
+ #~ msgstr "Volume"
+ 
+diff --git a/po/sl.po b/po/sl.po
+index f13a1e9..774f98e 100644
+--- a/po/sl.po
++++ b/po/sl.po
+@@ -8,20 +8,20 @@
+ msgid ""
+ msgstr ""
+ "Project-Id-Version: banshee master\n"
+-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=banshee&keywords=I18N+L10N&component=general\n"
+-"POT-Creation-Date: 2012-08-26 13:25+0000\n"
+-"PO-Revision-Date: 2012-08-29 08:44+0100\n"
++"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
++"product=banshee&keywords=I18N+L10N&component=general\n"
++"POT-Creation-Date: 2013-10-13 00:11+0000\n"
++"PO-Revision-Date: 2013-10-13 23:42+0100\n"
+ "Last-Translator: Matej Urbančič <mateju@svn.gnome.org>\n"
+ "Language-Team: Slovenian GNOME Translation Team <gnome-si@googlegroups.com>\n"
+-"Language: \n"
++"Language: sl_SI\n"
+ "MIME-Version: 1.0\n"
+ "Content-Type: text/plain; charset=UTF-8\n"
+ "Content-Transfer-Encoding: 8bit\n"
+-"Plural-Forms: nplurals=4; plural=(n%100==1 ? 1 : n%100==2 ? 2 : n%100==3 || n%100==4 ? 3 : 0);\n"
++"Plural-Forms: nplurals=4; plural=(n%100==1 ? 1 : n%100==2 ? 2 : n%100==3 || n"
++"%100==4 ? 3 : 0);\n"
+ "X-Launchpad-Export-Date: 2011-04-11 06:24+0000\n"
+-"X-Generator: Launchpad (build 12757)\n"
+-"X-Poedit-Country: SLOVENIA\n"
+-"X-Poedit-Language: Slovenian\n"
++"X-Generator: Poedit 1.5.4\n"
+ "X-Poedit-SourceCharset: utf-8\n"
+ 
+ #. ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice.addin.xml
+@@ -33,10 +33,8 @@ msgstr "Podpora napravam Apple"
+ msgid "Support for most iPod/iPhone/iPad devices."
+ msgstr "Podpora napravam iPod/iPhone/iPad."
+ 
+-#: ../data/addin-xml-strings.cs:10
+-#: ../data/addin-xml-strings.cs:15
+-#: ../data/addin-xml-strings.cs:20
+-#: ../data/addin-xml-strings.cs:25
++#: ../data/addin-xml-strings.cs:10 ../data/addin-xml-strings.cs:15
++#: ../data/addin-xml-strings.cs:20 ../data/addin-xml-strings.cs:25
+ msgid "Device Support"
+ msgstr "Podpora napravam"
+ 
+@@ -55,8 +53,12 @@ msgid "Mass Storage Media Player Support"
+ msgstr "Podpora shramb predstavnih datotek"
+ 
+ #: ../data/addin-xml-strings.cs:19
+-msgid "Support for USB-drive based devices, including many iAudio devices and Android, Pre, and Galaxy phones."
+-msgstr "Podpora napravam USB, vključno s številnimi napravami iAudio in telefoni Android, Pre in Galaxy."
++msgid ""
++"Support for USB-drive based devices, including many iAudio devices and "
++"Android, Pre, and Galaxy phones."
++msgstr ""
++"Podpora napravam USB, vključno s številnimi napravami iAudio in telefoni "
++"Android, Pre in Galaxy."
+ 
+ #. ../src/Dap/Banshee.Dap.Mtp/Banshee.Dap.Mtp.addin.xml
+ #: ../data/addin-xml-strings.cs:23
+@@ -76,14 +78,10 @@ msgstr "Trgovina Amazon MP3"
+ msgid "Browse, search, and purchase music from the Amazon MP3 store."
+ msgstr "Brskanje, iskanje in nakup glasbe v trgovini Amazon MP3."
+ 
+-#: ../data/addin-xml-strings.cs:30
+-#: ../data/addin-xml-strings.cs:35
+-#: ../data/addin-xml-strings.cs:65
+-#: ../data/addin-xml-strings.cs:70
+-#: ../data/addin-xml-strings.cs:85
+-#: ../data/addin-xml-strings.cs:95
+-#: ../data/addin-xml-strings.cs:100
+-#: ../data/addin-xml-strings.cs:115
++#: ../data/addin-xml-strings.cs:30 ../data/addin-xml-strings.cs:35
++#: ../data/addin-xml-strings.cs:65 ../data/addin-xml-strings.cs:70
++#: ../data/addin-xml-strings.cs:85 ../data/addin-xml-strings.cs:95
++#: ../data/addin-xml-strings.cs:100 ../data/addin-xml-strings.cs:115
+ #: ../data/addin-xml-strings.cs:165
+ msgid "Online Sources"
+ msgstr "Spletni viri"
+@@ -106,12 +104,9 @@ msgstr "Knjižnica zvočnih knjig"
+ msgid "Organize audiobooks, lectures, etc."
+ msgstr "Urejanje zvočnih knjig, predavanj in drugih vrst posnetkov."
+ 
+-#: ../data/addin-xml-strings.cs:40
+-#: ../data/addin-xml-strings.cs:75
+-#: ../data/addin-xml-strings.cs:90
+-#: ../data/addin-xml-strings.cs:135
+-#: ../data/addin-xml-strings.cs:145
+-#: ../data/addin-xml-strings.cs:150
++#: ../data/addin-xml-strings.cs:40 ../data/addin-xml-strings.cs:75
++#: ../data/addin-xml-strings.cs:90 ../data/addin-xml-strings.cs:135
++#: ../data/addin-xml-strings.cs:145 ../data/addin-xml-strings.cs:150
+ msgid "Core"
+ msgstr "Jedro"
+ 
+@@ -122,22 +117,16 @@ msgstr "Skriptni programi Boo"
+ 
+ #: ../data/addin-xml-strings.cs:44
+ msgid "Customize and extend Banshee with Boo-language scripts."
+-msgstr "Prilagajanje in razširjanje predvajalnika Banshee s skriptami v jeziku Boo."
+-
+-#: ../data/addin-xml-strings.cs:45
+-#: ../data/addin-xml-strings.cs:50
+-#: ../data/addin-xml-strings.cs:55
+-#: ../data/addin-xml-strings.cs:60
+-#: ../data/addin-xml-strings.cs:80
+-#: ../data/addin-xml-strings.cs:105
+-#: ../data/addin-xml-strings.cs:110
+-#: ../data/addin-xml-strings.cs:120
+-#: ../data/addin-xml-strings.cs:125
+-#: ../data/addin-xml-strings.cs:130
+-#: ../data/addin-xml-strings.cs:140
+-#: ../data/addin-xml-strings.cs:155
+-#: ../data/addin-xml-strings.cs:160
+-#: ../data/addin-xml-strings.cs:170
++msgstr ""
++"Prilagajanje in razširjanje predvajalnika Banshee s skriptami v jeziku Boo."
++
++#: ../data/addin-xml-strings.cs:45 ../data/addin-xml-strings.cs:50
++#: ../data/addin-xml-strings.cs:55 ../data/addin-xml-strings.cs:60
++#: ../data/addin-xml-strings.cs:80 ../data/addin-xml-strings.cs:105
++#: ../data/addin-xml-strings.cs:110 ../data/addin-xml-strings.cs:120
++#: ../data/addin-xml-strings.cs:125 ../data/addin-xml-strings.cs:130
++#: ../data/addin-xml-strings.cs:140 ../data/addin-xml-strings.cs:155
++#: ../data/addin-xml-strings.cs:160 ../data/addin-xml-strings.cs:170
+ msgid "Utilities"
+ msgstr "Pripomočki"
+ 
+@@ -202,7 +191,9 @@ msgstr "Popravljanje metapodatkov"
+ 
+ #: ../data/addin-xml-strings.cs:79
+ msgid "Fix broken and missing metadata using bulk operations."
+-msgstr "Popravljanje pokvarjenih in manjkajočih metapodatkov z uporabo paketnih opravil."
++msgstr ""
++"Popravljanje pokvarjenih in manjkajočih metapodatkov z uporabo paketnih "
++"opravil."
+ 
+ #. ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive.addin.xml
+ #: ../data/addin-xml-strings.cs:83
+@@ -230,7 +221,9 @@ msgstr "Pošiljanje seznama predvajane glasbe Last.fm"
+ 
+ #: ../data/addin-xml-strings.cs:94
+ msgid "Last.fm scrobbling and context pane recommendations."
+-msgstr "Pošiljanje seznama predvajane glasbe Last.fm in priporočila vsebinskega pladnja."
++msgstr ""
++"Pošiljanje seznama predvajane glasbe Last.fm in priporočila vsebinskega "
++"pladnja."
+ 
+ #. ../src/Extensions/Banshee.LastfmStreaming/Banshee.LastfmStreaming.addin.xml
+ #: ../data/addin-xml-strings.cs:98
+@@ -256,8 +249,12 @@ msgid "Mini Mode"
+ msgstr "Enostavni vmesni"
+ 
+ #: ../data/addin-xml-strings.cs:109
+-msgid "Control Banshee through a small window with only playback controls and track information."
+-msgstr "Nadzor predvajalnika Banshee preko enostavnega vmesnika z nadzornikom predvajanja in nekaterimi podrobnostmi skladbe."
++msgid ""
++"Control Banshee through a small window with only playback controls and track "
++"information."
++msgstr ""
++"Nadzor predvajalnika Banshee preko enostavnega vmesnika z nadzornikom "
++"predvajanja in nekaterimi podrobnostmi skladbe."
+ 
+ #. ../src/Extensions/Banshee.MiroGuide/Banshee.MiroGuide.addin.xml
+ #: ../data/addin-xml-strings.cs:113
+@@ -302,7 +299,8 @@ msgstr "Podpora za DVD in zvočne nosilce CD"
+ 
+ #: ../data/addin-xml-strings.cs:134
+ msgid "Watch DVDs, listen to and rip Audio CDs."
+-msgstr "Ogled vsebine nosilcev DVD in poslušanje ter zajemanje zvočnih nosilcev CD."
++msgstr ""
++"Ogled vsebine nosilcev DVD in poslušanje ter zajemanje zvočnih nosilcev CD."
+ 
+ #. ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration.addin.xml
+ #: ../data/addin-xml-strings.cs:138
+@@ -335,7 +333,8 @@ msgstr "Podcasti"
+ 
+ #: ../data/addin-xml-strings.cs:149
+ msgid "Subscribe to podcasts and stream or download episodes."
+-msgstr "Naročilo na podcaste in pretakanje oziroma prejemanje posnetkov epizod."
++msgstr ""
++"Naročilo na podcaste in pretakanje oziroma prejemanje posnetkov epizod."
+ 
+ #. ../src/Extensions/Banshee.SoundMenu/Banshee.SoundMenu.addin.xml
+ #: ../data/addin-xml-strings.cs:153
+@@ -364,8 +363,11 @@ msgid "Ubuntu One Music Store"
+ msgstr "Glasbena trgovina Ubuntu One"
+ 
+ #: ../data/addin-xml-strings.cs:164
+-msgid "This extension grants access to the Ubuntu One Music Store, powered by 7digital."
+-msgstr "Podpora dostopa do glasbene trgovine Ubuntu One preko sistema 7digital."
++msgid ""
++"This extension grants access to the Ubuntu One Music Store, powered by "
++"7digital."
++msgstr ""
++"Podpora dostopa do glasbene trgovine Ubuntu One preko sistema 7digital."
+ 
+ #. ../src/Extensions/Banshee.UPnPClient/Banshee.UPnPClient.addin.xml
+ #: ../data/addin-xml-strings.cs:168
+@@ -373,8 +375,11 @@ msgid "UPnP Client"
+ msgstr "Odjemalec UPnp"
+ 
+ #: ../data/addin-xml-strings.cs:169
+-msgid "Browse and play music and videos shared over your local network using UPnP."
+-msgstr "Brskanje in poslušanje glasbe v souporabi preko krajevnega omrežja z uporabo UPnP."
++msgid ""
++"Browse and play music and videos shared over your local network using UPnP."
++msgstr ""
++"Brskanje in poslušanje glasbe v souporabi preko krajevnega omrežja z uporabo "
++"UPnP."
+ 
+ #. ../src/Extensions/Banshee.Wikipedia/Banshee.Wikipedia.addin.xml
+ #: ../data/addin-xml-strings.cs:173
+@@ -386,8 +391,7 @@ msgstr "Wikipedia"
+ msgid "View artist information from Wikipedia in the context pane."
+ msgstr "Prikaz podrobnosti izvajalca iz Wikipedije v vsebinskem pladnju."
+ 
+-#: ../data/addin-xml-strings.cs:175
+-#: ../data/addin-xml-strings.cs:180
++#: ../data/addin-xml-strings.cs:175 ../data/addin-xml-strings.cs:180
+ msgid "Context Pane"
+ msgstr "Vsebinski pladenj"
+ 
+@@ -399,15 +403,20 @@ msgstr "YouTube"
+ 
+ #: ../data/addin-xml-strings.cs:179
+ msgid "Show related YouTube videos in the context pane."
+-msgstr "Podpora sorodnim videoposnetkom spletišča YouTube v vsebinskem pladnju."
++msgstr ""
++"Podpora sorodnim videoposnetkom spletišča YouTube v vsebinskem pladnju."
+ 
+ #: ../data/audio-profiles/aac-novell.xml.in.h:1
+ msgid "AAC (Novell Encoder)"
+ msgstr "AAC (Nov kodirnik)"
+ 
+ #: ../data/audio-profiles/aac-novell.xml.in.h:2
+-msgid "Designed to be the successor of the MP3 format, AAC generally achieves better sound quality than MP3 at many bit rates."
+-msgstr "Zasnovan kot naslednik zapisa MP3. AAC v splošnem dosega boljšo kakovost zvoka kot MP3 pri številnih bitnih hitrostih."
++msgid ""
++"Designed to be the successor of the MP3 format, AAC generally achieves "
++"better sound quality than MP3 at many bit rates."
++msgstr ""
++"Zasnovan kot naslednik zapisa MP3. AAC v splošnem dosega boljšo kakovost "
++"zvoka kot MP3 pri številnih bitnih hitrostih."
+ 
+ #: ../data/audio-profiles/aac-novell.xml.in.h:3
+ #: ../data/audio-profiles/mp3-lame.xml.in.h:9
+@@ -458,8 +467,12 @@ msgid "Free Lossless Audio Codec"
+ msgstr "Brezplačni kodek za kodiranje brez zvočnih izgub (FLAC)"
+ 
+ #: ../data/audio-profiles/flac.xml.in.h:2
+-msgid "Free Lossless Audio Codec (FLAC) is an open source codec that compresses but does not degrade audio quality."
+-msgstr "Brezplačni kodek za kodiranje brez zvočnih izgub (FLAC) je odprtokodni kodek, ki zvok stisne, vendar ne poslabša njegove kakovosti."
++msgid ""
++"Free Lossless Audio Codec (FLAC) is an open source codec that compresses but "
++"does not degrade audio quality."
++msgstr ""
++"Brezplačni kodek za kodiranje brez zvočnih izgub (FLAC) je odprtokodni "
++"kodek, ki zvok stisne, vendar ne poslabša njegove kakovosti."
+ 
+ #: ../data/audio-profiles/mp3-lame.xml.in.h:1
+ msgid "MP3 (LAME Encoder)"
+@@ -467,8 +480,12 @@ msgstr "MP3 (kodirnik LAME)"
+ 
+ #: ../data/audio-profiles/mp3-lame.xml.in.h:2
+ #: ../data/audio-profiles/mp3-xing.xml.in.h:2
+-msgid "A proprietary and older, but also popular, lossy audio format that produces larger files at lower bitrates."
+-msgstr "Priljubljeni starejši zakonsko zaščiteni zvočni zapis, ki kodira zvok v večje datoteke s slabšo kakovostjo."
++msgid ""
++"A proprietary and older, but also popular, lossy audio format that produces "
++"larger files at lower bitrates."
++msgstr ""
++"Priljubljeni starejši zakonsko zaščiteni zvočni zapis, ki kodira zvok v "
++"večje datoteke s slabšo kakovostjo."
+ 
+ #: ../data/audio-profiles/mp3-lame.xml.in.h:3
+ msgid "Encoding Mode"
+@@ -509,8 +526,12 @@ msgid "Ogg Vorbis"
+ msgstr "Ogg Vorbis"
+ 
+ #: ../data/audio-profiles/vorbis.xml.in.h:2
+-msgid "Vorbis is an open source, lossy audio codec with high quality output at a lower file size than MP3."
+-msgstr "Vorbis je odprtokodni kodek za kodiranje izgubami, z visoko kakovostnim izhodom pri manjši velikosti datoteke kot MP3."
++msgid ""
++"Vorbis is an open source, lossy audio codec with high quality output at a "
++"lower file size than MP3."
++msgstr ""
++"Vorbis je odprtokodni kodek za kodiranje izgubami, z visoko kakovostnim "
++"izhodom pri manjši velikosti datoteke kot MP3."
+ 
+ #: ../data/audio-profiles/vorbis.xml.in.h:3
+ msgid "Audio quality"
+@@ -521,8 +542,13 @@ msgid "Wavpack"
+ msgstr "Wavpack"
+ 
+ #: ../data/audio-profiles/wavpack.xml.in.h:2
+-msgid "A fast and efficient open source audio format offering lossless and high-quality lossy encoding with great dynamic range."
+-msgstr "Hiter in učinkovit odprtokodni zvočni zapis, ki ponuja kodiranje brez zvočnih izgub in visoko kakovostno kodiranje z izgubami z velikim zvočnim razponom."
++msgid ""
++"A fast and efficient open source audio format offering lossless and high-"
++"quality lossy encoding with great dynamic range."
++msgstr ""
++"Hiter in učinkovit odprtokodni zvočni zapis, ki ponuja kodiranje brez "
++"zvočnih izgub in visoko kakovostno kodiranje z izgubami z velikim zvočnim "
++"razponom."
+ 
+ #: ../data/audio-profiles/wavpack.xml.in.h:3
+ msgid "Mode"
+@@ -569,16 +595,25 @@ msgid "Waveform PCM"
+ msgstr "Waveform PCM"
+ 
+ #: ../data/audio-profiles/wav.xml.in.h:2
+-msgid "WAV+PCM is a lossless format that holds uncompressed, raw pulse-code modulated (PCM) audio."
+-msgstr "Oblika zapisa WAV+PCM je kodirana brez zvočnih izgub in vsebuje nestisnjen, surov pulzirajoče-kodno moduliran (PCM) zvok."
++msgid ""
++"WAV+PCM is a lossless format that holds uncompressed, raw pulse-code "
++"modulated (PCM) audio."
++msgstr ""
++"Oblika zapisa WAV+PCM je kodirana brez zvočnih izgub in vsebuje nestisnjen, "
++"surov pulzirajoče-kodno moduliran (PCM) zvok."
+ 
+ #: ../data/audio-profiles/wma.xml.in.h:1
+ msgid "Windows Media Audio"
+ msgstr "Zvočna datoteka Windows Media"
+ 
+ #: ../data/audio-profiles/wma.xml.in.h:2
+-msgid "A proprietary lossy audio format with high quality output at a lower file size than MP3. A 96 kbps WMA is equivalent to a 128 kbps MP3."
+-msgstr "Zakonsko zaščiteni kodek za kodiranje z zvočnimi izgubami in z visoko kakovostnim izhod pri manjši velikosti datotek kot MP3. 96kbps WMA je enakovreden 128 kbps MP3."
++msgid ""
++"A proprietary lossy audio format with high quality output at a lower file "
++"size than MP3. A 96 kbps WMA is equivalent to a 128 kbps MP3."
++msgstr ""
++"Zakonsko zaščiteni kodek za kodiranje z zvočnimi izgubami in z visoko "
++"kakovostnim izhod pri manjši velikosti datotek kot MP3. 96kbps WMA je "
++"enakovreden 128 kbps MP3."
+ 
+ #: ../data/audio-profiles/wma.xml.in.h:3
+ msgid "Use a variable bitrate"
+@@ -589,7 +624,7 @@ msgid "Audio Quality"
+ msgstr "Kakovost zvoka"
+ 
+ #: ../data/desktop-files/common.desktop.in.h:1
+-#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:196
++#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:194
+ msgid "Media Player"
+ msgstr "Predstavni predvajalnik"
+ 
+@@ -605,8 +640,26 @@ msgstr "Predvajalnik Banshee"
+ msgid "Play and organize your media collection"
+ msgstr "Predvajanje in urejanje zbirke predstavnih datotek"
+ 
+-#: ../libbanshee/banshee-bpmdetector.c:202
+-#: ../libbanshee/banshee-ripper.c:270
++#. Writing GNOME below, instead of just "Linux", is inclusive of *BSD OSs
++#: ../data/banshee.appdata.xml.in.h:2
++msgid ""
++"Banshee is an open source multimedia management and playback application for "
++"GNOME, Mac and Windows."
++msgstr ""
++"Banshee je odprto-kodni program za upravljanje in predvajanje predstavnih "
++"vsebin v okoljih GNOME, Mac in Windows."
++
++#: ../data/banshee.appdata.xml.in.h:3
++msgid ""
++"Play your music and videos. Stay entertained and up to date with podcasts "
++"and video podcasts. Sync your Android, iPod, and other devices. We think "
++"you'll love Banshee!"
++msgstr ""
++"Predvajajte svojo glasbo in filme. Zabavajte se in ostanite v stiku s "
++"podcasti in video podcasti. Uskladite vsebine s svojim Androidom, iPodom in "
++"drugimi napravami. Menimo, da se boste v Banshee zaljubili!"
++
++#: ../libbanshee/banshee-bpmdetector.c:202 ../libbanshee/banshee-ripper.c:270
+ #: ../src/Backends/Banshee.GStreamerSharp/Banshee.GStreamerSharp/AudioCdRipper.cs:240
+ msgid "Could not create pipeline"
+ msgstr "Cevovoda ni mogoče ustvariti"
+@@ -636,8 +689,7 @@ msgid "Could not create fakesink plugin"
+ msgstr "Vstavka lažnega korita ni mogoče ustvariti"
+ 
+ #: ../libbanshee/banshee-bpmdetector.c:241
+-#: ../libbanshee/banshee-bpmdetector.c:250
+-#: ../libbanshee/banshee-ripper.c:311
++#: ../libbanshee/banshee-bpmdetector.c:250 ../libbanshee/banshee-ripper.c:311
+ #: ../src/Backends/Banshee.GStreamerSharp/Banshee.GStreamerSharp/AudioCdRipper.cs:281
+ msgid "Could not link pipeline elements"
+ msgstr "Predmetov cevovoda ni mogoče povezati"
+@@ -746,7 +798,9 @@ msgstr "_Omogoči popravek ReplayGain"
+ 
+ #: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:881
+ #: ../src/Backends/Banshee.GStreamerSharp/Banshee.GStreamerSharp/PlayerEngine.cs:981
+-msgid "For tracks that have ReplayGain data, automatically scale (normalize) playback volume"
++msgid ""
++"For tracks that have ReplayGain data, automatically scale (normalize) "
++"playback volume"
+ msgstr "Samodejno izravnaj glasnost predvajanja skladb s podatki ReplayGain"
+ 
+ #: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:886
+@@ -754,8 +808,12 @@ msgid "Enable _gapless playback"
+ msgstr "Omogoči predvajanje _brez premora"
+ 
+ #: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/PlayerEngine.cs:887
+-msgid "Eliminate the small playback gap on track change. Useful for concept albums and classical music"
+-msgstr "Odstrani premor predvajanja ob spremembi skladbe. Uporabno za tematske albume in pri poslušanju klasične glasbe."
++msgid ""
++"Eliminate the small playback gap on track change. Useful for concept albums "
++"and classical music"
++msgstr ""
++"Odstrani premor predvajanja ob spremembi skladbe. Uporabno za tematske "
++"albume in pri poslušanju klasične glasbe."
+ 
+ #: ../src/Backends/Banshee.GStreamer/Banshee.GStreamer/Transcoder.cs:63
+ msgid "Could not create transcoder"
+@@ -785,8 +843,12 @@ msgid "Can't check for updates"
+ msgstr "Ni mogoče preveriti za posodobitve."
+ 
+ #: ../src/Backends/Banshee.Windows/Banshee.Windows/VersionUpdater.cs:73
+-msgid "We're currently not able to check if there's a new version available. Please try again later."
+-msgstr "Trenutno ni mogoče preveriti, če je na voljo nova različica. Poskusite znova kasneje."
++msgid ""
++"We're currently not able to check if there's a new version available. Please "
++"try again later."
++msgstr ""
++"Trenutno ni mogoče preveriti, če je na voljo nova različica. Poskusite znova "
++"kasneje."
+ 
+ #: ../src/Backends/Banshee.Windows/Banshee.Windows/VersionUpdater.cs:95
+ msgid "No update available"
+@@ -799,7 +861,9 @@ msgstr "Nameščena je zadnja različica predvajalnika Banshee."
+ #: ../src/Backends/Banshee.Windows/Banshee.Windows/VersionUpdater.cs:106
+ #, csharp-format
+ msgid "A new version of Banshee ({0}) is available.{1}Do you want to update?"
+-msgstr "Na voljo je nova različica predvajalnika Banshee ({0}). {1}Ali želite program posodobiti?"
++msgstr ""
++"Na voljo je nova različica predvajalnika Banshee ({0}). {1}Ali želite "
++"program posodobiti?"
+ 
+ #: ../src/Backends/Banshee.Windows/Banshee.Windows/VersionUpdater.cs:108
+ msgid "Banshee update available"
+@@ -826,8 +890,12 @@ msgstr "Prejem je spodletel. Poskusite ponovno kasneje."
+ 
+ #: ../src/Backends/Banshee.Windows/Banshee.Windows/VersionUpdater.cs:165
+ #, csharp-format
+-msgid "The update finished downloading.{0}Do you want to shutdown Banshee and run the installer?"
+-msgstr "Prejemanje posodobitve je končano. {0} Ali želite izklopiti Banshee in zagnati namestilnik?"
++msgid ""
++"The update finished downloading.{0}Do you want to shutdown Banshee and run "
++"the installer?"
++msgstr ""
++"Prejemanje posodobitve je končano. {0} Ali želite izklopiti Banshee in "
++"zagnati namestilnik?"
+ 
+ #: ../src/Backends/Banshee.Windows/Banshee.Windows/VersionUpdater.cs:167
+ msgid "Update finished downloading"
+@@ -878,16 +946,26 @@ msgid "Playback Control Options"
+ msgstr "Možnosti nadzora predvajanja"
+ 
+ #: ../src/Clients/Booter/Booter/Entry.cs:164
+-msgid "Play the next track, optionally restarting if the 'restart' value is set"
+-msgstr "Predvajanje naslednje skladbe, oziroma ponovno predvajanje trenutne, če je nastavljena vrednost 'restart'"
++msgid ""
++"Play the next track, optionally restarting if the 'restart' value is set"
++msgstr ""
++"Predvajanje naslednje skladbe, oziroma ponovno predvajanje trenutne, če je "
++"nastavljena vrednost 'restart'"
+ 
+ #: ../src/Clients/Booter/Booter/Entry.cs:165
+-msgid "Play the previous track, optionally restarting if the 'restart' value is set"
+-msgstr "Predvajanje predhodne skladbe, oziroma ponovno predvajanje, če je nastavljena vrednost 'restart'"
++msgid ""
++"Play the previous track, optionally restarting if the 'restart' value is set"
++msgstr ""
++"Predvajanje predhodne skladbe, oziroma ponovno predvajanje, če je "
++"nastavljena vrednost 'restart'"
+ 
+ #: ../src/Clients/Booter/Booter/Entry.cs:166
+-msgid "If the current song has been played longer than 4 seconds then restart it, otherwise the same as --previous"
+-msgstr "V primeru da je bila trenutna skladba predvajanja dlje kot 4 sekunde, ponovno predvajanje, drugače pa enako kot --previous"
++msgid ""
++"If the current song has been played longer than 4 seconds then restart it, "
++"otherwise the same as --previous"
++msgstr ""
++"V primeru da je bila trenutna skladba predvajanja dlje kot 4 sekunde, "
++"ponovno predvajanje, drugače pa enako kot --previous"
+ 
+ #: ../src/Clients/Booter/Booter/Entry.cs:167
+ msgid "Automatically start playing any tracks enqueued on the command line"
+@@ -910,12 +988,17 @@ msgid "Completely stop playback"
+ msgstr "Popolna zaustavitev predvajanja"
+ 
+ #: ../src/Clients/Booter/Booter/Entry.cs:173
+-msgid "Enable or disable playback stopping after the currently playing track (value should be either 'true' or 'false')"
+-msgstr "Omogoči ali onemogoči zaustavitev predvajanja po končanem predvajanju trenutno predvajanega posnetka (vrednost mora biti 'prav' ali 'napak')"
++msgid ""
++"Enable or disable playback stopping after the currently playing track (value "
++"should be either 'true' or 'false')"
++msgstr ""
++"Omogoči ali onemogoči zaustavitev predvajanja po končanem predvajanju "
++"trenutno predvajanega posnetka (vrednost mora biti 'prav' ali 'napak')"
+ 
+ #: ../src/Clients/Booter/Booter/Entry.cs:174
+ msgid "Set the playback volume (0-100), prefix with +/- for relative values"
+-msgstr "Nastavitev glasnosti predvajanja (0-100), predpona +/- za relativne vrednosti"
++msgstr ""
++"Nastavitev glasnosti predvajanja (0-100), predpona +/- za relativne vrednosti"
+ 
+ #: ../src/Clients/Booter/Booter/Entry.cs:175
+ msgid "Seek to a specific point (seconds, float)"
+@@ -1096,8 +1179,12 @@ msgid "Specify an alternate key, default is /apps/banshee-1/"
+ msgstr "Navadite dodaten ključ, privzet je /apps/banshee-1/"
+ 
+ #: ../src/Clients/Booter/Booter/Entry.cs:221
+-msgid "Optimize instance for running uninstalled; most notably, this will create an alternate Mono.Addins database in the working directory"
+-msgstr "Optimiziraj program za nenameščeno delovanje; možnost ustvari dodatno podatkovno zbirko vstavka Mono v delovni mapi"
++msgid ""
++"Optimize instance for running uninstalled; most notably, this will create an "
++"alternate Mono.Addins database in the working directory"
++msgstr ""
++"Optimiziraj program za nenameščeno delovanje; možnost ustvari dodatno "
++"podatkovno zbirko vstavka Mono v delovni mapi"
+ 
+ #: ../src/Clients/Booter/Booter/Entry.cs:223
+ msgid "Disable DBus support completely"
+@@ -1227,7 +1314,7 @@ msgid "Stream location not found"
+ msgstr "Mesta pretoka ni mogoče najti"
+ 
+ #: ../src/Core/Banshee.Core/Banshee.Collection/TrackInfo.cs:347
+-#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:343
++#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:344
+ msgid "File not found"
+ msgstr "Datoteke ni mogoče najti"
+ 
+@@ -1349,7 +1436,8 @@ msgstr "po izvajalcu"
+ 
+ #: ../src/Core/Banshee.Services/Banshee.Collection.Database/RandomByArtist.cs:52
+ msgid "Play all songs by an artist, then randomly choose another artist"
+-msgstr "Predvaja vse skladbe izvajalca, nato naključno izbere drugega izvajalca"
++msgstr ""
++"Predvaja vse skladbe izvajalca, nato naključno izbere drugega izvajalca"
+ 
+ #: ../src/Core/Banshee.Services/Banshee.Collection.Database/RandomByOff.cs:38
+ msgid "Shuffle _Off"
+@@ -1439,8 +1527,11 @@ msgid "Upgrading your Banshee Database"
+ msgstr "Nadgrajevanje podatkovne zbirke predvajalnika Banshee"
+ 
+ #: ../src/Core/Banshee.Services/Banshee.Database/BansheeDbFormatMigrator.cs:233
+-msgid "Please wait while your old Banshee database is migrated to the new format."
+-msgstr "Počakajte, da se stara podatkovna zbirka predvajalnika Banshee pretvori v novejšo različico."
++msgid ""
++"Please wait while your old Banshee database is migrated to the new format."
++msgstr ""
++"Počakajte, da se stara podatkovna zbirka predvajalnika Banshee pretvori v "
++"novejšo različico."
+ 
+ #: ../src/Core/Banshee.Services/Banshee.Database/BansheeDbFormatMigrator.cs:1416
+ msgid "Refreshing Metadata"
+@@ -1695,7 +1786,9 @@ msgstr "Najmanj priljubljeno"
+ 
+ #: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:170
+ msgid "Songs rated one or two stars or that you have frequently skipped"
+-msgstr "Skladbe, ki so bile ocenjene z eno ali dvema zvezdicama, ali pa ste jih pogosto preskočili"
++msgstr ""
++"Skladbe, ki so bile ocenjene z eno ali dvema zvezdicama, ali pa ste jih "
++"pogosto preskočili"
+ 
+ #: ../src/Core/Banshee.Services/Banshee.Library/MusicLibrarySource.cs:174
+ msgid "700 MB of Favorites"
+@@ -1776,8 +1869,12 @@ msgid "Default player engine"
+ msgstr "Privzeti programnik predvajalnika"
+ 
+ #: ../src/Core/Banshee.Services/Banshee.MediaEngine/PlayerEngineService.cs:108
+-msgid "No player engines were found. Please ensure Banshee has been cleanly installed."
+-msgstr "Programnikov predvajalnika ni mogoče najti. Prepričajte se, da je bil predvajalnik Banshee pravilno nameščen."
++msgid ""
++"No player engines were found. Please ensure Banshee has been cleanly "
++"installed."
++msgstr ""
++"Programnikov predvajalnika ni mogoče najti. Prepričajte se, da je bil "
++"predvajalnik Banshee pravilno nameščen."
+ 
+ #: ../src/Core/Banshee.Services/Banshee.MediaEngine/PlayerEngineService.cs:375
+ msgid "Problem with Player Engine"
+@@ -1793,8 +1890,11 @@ msgid "Initializing"
+ msgstr "Začenjanje"
+ 
+ #: ../src/Core/Banshee.Services/Banshee.MediaEngine/TranscoderService.cs:138
+-msgid "Files are currently being converted to another format. Would you like to stop this?"
+-msgstr "Datoteke se trenutno pretvarjajo v drugo vrsto. Ali želite to zaustaviti?"
++msgid ""
++"Files are currently being converted to another format. Would you like to "
++"stop this?"
++msgstr ""
++"Datoteke se trenutno pretvarjajo v drugo vrsto. Ali želite to zaustaviti?"
+ 
+ #: ../src/Core/Banshee.Services/Banshee.Metadata/SaveTrackMetadataJob.cs:52
+ msgid "Saving Metadata to File"
+@@ -1805,24 +1905,36 @@ msgid "Sync _metadata between library and files"
+ msgstr "Uskladi _metapodatke med knjižnico in datotekami"
+ 
+ #: ../src/Core/Banshee.Services/Banshee.Metadata/SaveTrackMetadataService.cs:50
+-msgid "Enable this option to have metadata in sync between your library and supported media files"
+-msgstr "Izbrana možnost omogoča usklajevanje metapodatkov med knjižnico in podprtimi zvočnimi datotekami"
++msgid ""
++"Enable this option to have metadata in sync between your library and "
++"supported media files"
++msgstr ""
++"Izbrana možnost omogoča usklajevanje metapodatkov med knjižnico in podprtimi "
++"zvočnimi datotekami"
+ 
+ #: ../src/Core/Banshee.Services/Banshee.Metadata/SaveTrackMetadataService.cs:55
+ msgid "Sync _ratings between library and files"
+ msgstr "Uskladi _ocene med knjižnico in datotekami"
+ 
+ #: ../src/Core/Banshee.Services/Banshee.Metadata/SaveTrackMetadataService.cs:56
+-msgid "Enable this option to have rating metadata synced between your library and supported audio files"
+-msgstr "Izbrana možnost omogoča usklajevanje metapodatkov ocen med knjižnico in podprtimi zvočnimi datotekami"
++msgid ""
++"Enable this option to have rating metadata synced between your library and "
++"supported audio files"
++msgstr ""
++"Izbrana možnost omogoča usklajevanje metapodatkov ocen med knjižnico in "
++"podprtimi zvočnimi datotekami"
+ 
+ #: ../src/Core/Banshee.Services/Banshee.Metadata/SaveTrackMetadataService.cs:61
+ msgid "Sync play counts between library and files"
+ msgstr "Uskladi _števec predvajanja med knjižnico in datotekami"
+ 
+ #: ../src/Core/Banshee.Services/Banshee.Metadata/SaveTrackMetadataService.cs:62
+-msgid "Enable this option to have playcount metadata synced between your library and supported audio files"
+-msgstr "Izbrana možnost omogoča usklajevanje metapodatkov števca predvajanja med knjižnico in podprtimi zvočnimi datotekami"
++msgid ""
++"Enable this option to have playcount metadata synced between your library "
++"and supported audio files"
++msgstr ""
++"Izbrana možnost omogoča usklajevanje metapodatkov števca predvajanja med "
++"knjižnico in podprtimi zvočnimi datotekami"
+ 
+ #: ../src/Core/Banshee.Services/Banshee.Networking/Network.cs:52
+ msgid "There is no available network connection"
+@@ -1841,8 +1953,12 @@ msgid "_Disable features requiring Internet access"
+ msgstr "_Onemogoči zmožnosti, ki zahtevajo medmrežni dostop"
+ 
+ #: ../src/Core/Banshee.Services/Banshee.Networking/Network.cs:160
+-msgid "Some features require a broadband Internet connection such as Last.fm or cover art fetching"
+-msgstr "Nekatere zmožnosti kot so Last.fm ali pridobivanje naslovnic zahtevajo širokopasovno medmrežno povezavo"
++msgid ""
++"Some features require a broadband Internet connection such as Last.fm or "
++"cover art fetching"
++msgstr ""
++"Nekatere zmožnosti kot so Last.fm ali pridobivanje naslovnic zahtevajo "
++"širokopasovno medmrežno povezavo"
+ 
+ #: ../src/Core/Banshee.Services/Banshee.Playlist/AbstractPlaylistSource.cs:153
+ msgid "Search this playlist"
+@@ -1867,7 +1983,7 @@ msgstr "Izbriši seznam predvajanja"
+ #: ../src/Core/Banshee.ThickClient/Banshee.Gui/SourceActions.cs:176
+ #: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:135
+ #: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:462
+-#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/SourceView.cs:595
++#: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/SourceView.cs:612
+ #: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/SourceView_DragAndDrop.cs:214
+ msgid "New Playlist"
+ msgstr "Nov seznam predvajanja"
+@@ -1912,7 +2028,8 @@ msgstr "Upravljanje datotek"
+ 
+ #: ../src/Core/Banshee.Services/Banshee.Preferences/PreferenceService.cs:66
+ msgid "Improve Banshee by sending anonymous usage data"
+-msgstr "Izboljšajte predvajalnik Banshee s pošiljanjem brezimnih podatkov o uporabi"
++msgstr ""
++"Izboljšajte predvajalnik Banshee s pošiljanjem brezimnih podatkov o uporabi"
+ 
+ #: ../src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:65
+ msgid "items"
+@@ -2471,7 +2588,7 @@ msgstr "drm"
+ #: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/StatisticsPage.cs:234
+ #: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/StatisticsPage.cs:236
+ #: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/StatisticsPage.cs:238
+-#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:404
++#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:405
+ msgid "Unknown"
+ msgstr "Neznano"
+ 
+@@ -2690,15 +2807,20 @@ msgid "Cannot Reorder While Sorted"
+ msgstr "Ni mogoče preurediti, medtem ko je razvrščeno"
+ 
+ #: ../src/Core/Banshee.ThickClient/Banshee.Collection.Gui/BaseTrackListView.cs:77
+-msgid "To put the playlist in manual sort mode, click the currently sorted column header until the sort arrow goes away."
+-msgstr "Za predstavitev seznama predvajanj v ročni način razvrščanja je treba klikniti glavo trenutno razvrščenega stolpca dokler puščica razvrščanja ne izgine."
++msgid ""
++"To put the playlist in manual sort mode, click the currently sorted column "
++"header until the sort arrow goes away."
++msgstr ""
++"Za predstavitev seznama predvajanj v ročni način razvrščanja je treba "
++"klikniti glavo trenutno razvrščenega stolpca dokler puščica razvrščanja ne "
++"izgine."
+ 
+ #. Translators: this is {disc number} of {disc count}
+ #. Translators: this is {track number} of {track count}
+ #: ../src/Core/Banshee.ThickClient/Banshee.Collection.Gui/ColumnCellDiscAndCount.cs:40
+ #: ../src/Core/Banshee.ThickClient/Banshee.Collection.Gui/ColumnCellTrackAndCount.cs:40
+ #: ../src/Core/Banshee.Widgets/Banshee.Widgets/StreamPositionLabel.cs:174
+-#: ../src/Dap/Banshee.Dap/Banshee.Dap.Gui/DapPropertiesDialog.cs:148
++#: ../src/Dap/Banshee.Dap/Banshee.Dap.Gui/DapPropertiesDialog.cs:149
+ #, csharp-format
+ msgid "{0} of {1}"
+ msgstr "{0} od {1}"
+@@ -2858,8 +2980,12 @@ msgid "Important tasks are running"
+ msgstr "Izvajajo se pomembne naloge"
+ 
+ #: ../src/Core/Banshee.ThickClient/Banshee.Gui.Dialogs/ConfirmShutdownDialog.cs:53
+-msgid "Closing Banshee now will cancel any currently running tasks. They cannot be resumed automatically the next time Banshee is run."
+-msgstr "Izhod iz programa Banshee bo prekinil vse trenutno dejavne naloge. Nalog ni mogoče samodejno nadaljevati ob naslednjem zagonu."
++msgid ""
++"Closing Banshee now will cancel any currently running tasks. They cannot be "
++"resumed automatically the next time Banshee is run."
++msgstr ""
++"Izhod iz programa Banshee bo prekinil vse trenutno dejavne naloge. Nalog ni "
++"mogoče samodejno nadaljevati ob naslednjem zagonu."
+ 
+ #: ../src/Core/Banshee.ThickClient/Banshee.Gui.Dialogs/ConfirmShutdownDialog.cs:60
+ msgid "Quit Anyway"
+@@ -2874,8 +3000,12 @@ msgid "Make Banshee the default media player?"
+ msgstr "Ali naj bo Banshee privzeti predvajalnik predstavnih datotek?"
+ 
+ #: ../src/Core/Banshee.ThickClient/Banshee.Gui.Dialogs/DefaultApplicationHelperDialog.cs:70
+-msgid "Currently another program is configured as the default media player.  Would you prefer Banshee to be the default?"
+-msgstr "Trenutno je kot privzeti predvajalnik predstavnih datotek nastavljen drug program. Ali želite nastaviti predvajalnik Banshee kot privzeti program?"
++msgid ""
++"Currently another program is configured as the default media player.  Would "
++"you prefer Banshee to be the default?"
++msgstr ""
++"Trenutno je kot privzeti predvajalnik predstavnih datotek nastavljen drug "
++"program. Ali želite nastaviti predvajalnik Banshee kot privzeti program?"
+ 
+ #: ../src/Core/Banshee.ThickClient/Banshee.Gui.Dialogs/DefaultApplicationHelperDialog.cs:72
+ #: ../src/Core/Banshee.ThickClient/Banshee.Gui/SourceActions.cs:443
+@@ -3311,7 +3441,8 @@ msgstr "Dodaj na _seznam predvajanja"
+ 
+ #: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:131
+ msgid "Append selected items to playlist or create new playlist from selection"
+-msgstr "Pripenjanje izbranih predmetov seznamu predvajanja ali ustvarjanje novega"
++msgstr ""
++"Pripenjanje izbranih predmetov seznamu predvajanja ali ustvarjanje novega"
+ 
+ #: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:136
+ msgid "Create new playlist from selected tracks"
+@@ -3393,11 +3524,15 @@ msgstr "Preverite, če lahko sistem dostopa do mesta skladbe."
+ #: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:607
+ #, csharp-format
+ msgid "Are you sure you want to permanently delete this item?"
+-msgid_plural "Are you sure you want to permanently delete the selected {0} items?"
+-msgstr[0] "Ali ste prepričani, da želite trajno izbrisati {0} izbranih predmetov?"
++msgid_plural ""
++"Are you sure you want to permanently delete the selected {0} items?"
++msgstr[0] ""
++"Ali ste prepričani, da želite trajno izbrisati {0} izbranih predmetov?"
+ msgstr[1] "Ali ste prepričani, da želite trajno izbrisati {0} izbran predmet?"
+-msgstr[2] "Ali ste prepričani, da želite trajno izbrisati {0} izbrana predmeta?"
+-msgstr[3] "Ali ste prepričani, da želite trajno izbrisati {0} izbrane predmete?"
++msgstr[2] ""
++"Ali ste prepričani, da želite trajno izbrisati {0} izbrana predmeta?"
++msgstr[3] ""
++"Ali ste prepričani, da želite trajno izbrisati {0} izbrane predmete?"
+ 
+ #: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:611
+ msgid "If you delete the selection, it will be permanently lost."
+@@ -3411,23 +3546,32 @@ msgstr "Odstranitev izbora iz {0}?"
+ #: ../src/Core/Banshee.ThickClient/Banshee.Gui/TrackActions.cs:617
+ #, csharp-format
+ msgid "Are you sure you want to remove the selected item from your {1}?"
+-msgid_plural "Are you sure you want to remove the selected {0} items from your {1}?"
+-msgstr[0] "Ali ste prepričani, da želite odstraniti {0} izbranih predmetov iz {1}?"
++msgid_plural ""
++"Are you sure you want to remove the selected {0} items from your {1}?"
++msgstr[0] ""
++"Ali ste prepričani, da želite odstraniti {0} izbranih predmetov iz {1}?"
+ msgstr[1] "Ali ste prepričani, da želite odstraniti {0} izbran predmet iz {1}?"
+-msgstr[2] "Ali ste prepričani, da želite odstraniti {0} izbrana predmeta iz {1}?"
+-msgstr[3] "Ali ste prepričani, da želite odstraniti {0} izbrane predmete iz {1}?"
++msgstr[2] ""
++"Ali ste prepričani, da želite odstraniti {0} izbrana predmeta iz {1}?"
++msgstr[3] ""
++"Ali ste prepričani, da želite odstraniti {0} izbrane predmete iz {1}?"
+ 
+ #: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/AlbumArtistEntry.cs:53
+ msgid "Com_pilation Album Artist:"
+ msgstr "Izvajalec _mešanega albuma:"
+ 
+ #: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/AlbumArtistEntry.cs:57
+-msgid "Check this if this track is part of an album with tracks by various artists"
++msgid ""
++"Check this if this track is part of an album with tracks by various artists"
+ msgstr "Preveri, če je ta skladba del albuma s skladbami različnih izvajalcev"
+ 
+ #: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/AlbumArtistEntry.cs:59
+-msgid "This value will affect how this album is sorted; if you enter 'Various Artists' then the album will located with other albums that start with 'V'."
+-msgstr "Ta vrednost bo vplivala na razvrščanje albuma; v primeru vnosa 'Različni izvajalci' se bo album nahajal skupaj z ostalimi albumi, ki se začnejo z 'R'."
++msgid ""
++"This value will affect how this album is sorted; if you enter 'Various "
++"Artists' then the album will located with other albums that start with 'V'."
++msgstr ""
++"Ta vrednost bo vplivala na razvrščanje albuma; v primeru vnosa 'Različni "
++"izvajalci' se bo album nahajal skupaj z ostalimi albumi, ki se začnejo z 'R'."
+ 
+ #: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/BasicTrackDetailsPage.cs:44
+ msgid "Basic Details"
+@@ -3488,19 +3632,19 @@ msgstr "Nastavi vse številke diskov in skupno število diskov na te vrednosti"
+ msgid "_Disc Number:"
+ msgstr "Številka _diska:"
+ 
+-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/BasicTrackDetailsPage.cs:188
++#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/BasicTrackDetailsPage.cs:196
+ msgid "Set all years to this value"
+ msgstr "Nastavi vse letnice izida na to vrednost"
+ 
+-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/BasicTrackDetailsPage.cs:189
++#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/BasicTrackDetailsPage.cs:197
+ msgid "_Year:"
+ msgstr "_Leto:"
+ 
+-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/BasicTrackDetailsPage.cs:196
++#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/BasicTrackDetailsPage.cs:204
+ msgid "Set all ratings to this value"
+ msgstr "Nastavi vse ocene na to vrednost"
+ 
+-#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/BasicTrackDetailsPage.cs:197
++#: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/BasicTrackDetailsPage.cs:205
+ msgid "_Rating:"
+ msgstr "_Ocena:"
+ 
+@@ -3728,8 +3872,12 @@ msgid "Sync all field _values"
+ msgstr "Usklajevanje vseh vrednosti _polj"
+ 
+ #: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:319
+-msgid "Apply the values of all common fields set for this track to all of the tracks selected in this editor"
+-msgstr "Uveljavi vrednosti vseh nastavljenih skupnih polj te skladbe za vse skladbe izbrane v urejevalniku"
++msgid ""
++"Apply the values of all common fields set for this track to all of the "
++"tracks selected in this editor"
++msgstr ""
++"Uveljavi vrednosti vseh nastavljenih skupnih polj te skladbe za vse skladbe "
++"izbrane v urejevalniku"
+ 
+ #: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:419
+ #, csharp-format
+@@ -3752,7 +3900,9 @@ msgstr "Zapri _brez shranjevanja"
+ #: ../src/Core/Banshee.ThickClient/Banshee.Gui.TrackEditor/TrackEditorDialog.cs:753
+ #, csharp-format
+ msgid "If you don't save, changes from the last {0} will be permanently lost."
+-msgstr "V primeru, da datoteke ne shranite, bo zadnjih {0} sprememb trajno izgubljenih."
++msgstr ""
++"V primeru, da datoteke ne shranite, bo zadnjih {0} sprememb trajno "
++"izgubljenih."
+ 
+ #: ../src/Core/Banshee.ThickClient/Banshee.Gui/ViewActions.cs:62
+ msgid "_View"
+@@ -3857,7 +4007,8 @@ msgstr "Opravilo se vedno izvaja. Ali ga želite zaustaviti?"
+ 
+ #: ../src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/UserJobTile.cs:144
+ #, csharp-format
+-msgid "The '{0}' operation is still performing work. Would you like to stop it?"
++msgid ""
++"The '{0}' operation is still performing work. Would you like to stop it?"
+ msgstr "Opravilo  '{0}' je v teku. Ali ga želite zaustaviti?"
+ 
+ #: ../src/Core/Banshee.ThickClient/Banshee.Gui.Widgets/UserJobTile.cs:148
+@@ -3914,8 +4065,12 @@ msgid "<big><b>Import Media to Library</b></big>"
+ msgstr "<big><b>Uvoz predstavnih datotek v knjižnico</b></big>"
+ 
+ #: ../src/Core/Banshee.ThickClient/Banshee.Library.Gui/ImportDialog.cs:79
+-msgid "Your media library is empty. You may import new music and videos into your library now, or choose to do so later."
+-msgstr "Knjižnica predstavnih datotek je prazna. Novo glasbo in video lahko v knjižnico uvozite takoj ali pa pozneje."
++msgid ""
++"Your media library is empty. You may import new music and videos into your "
++"library now, or choose to do so later."
++msgstr ""
++"Knjižnica predstavnih datotek je prazna. Novo glasbo in video lahko v "
++"knjižnico uvozite takoj ali pa pozneje."
+ 
+ #: ../src/Core/Banshee.ThickClient/Banshee.Library.Gui/ImportDialog.cs:89
+ msgid "Import _from:"
+@@ -4033,7 +4188,8 @@ msgstr "Pokaži izvajalce albuma"
+ 
+ #: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/CompositeTrackSourceContents.cs:112
+ msgid "Show only album artists, not artists with only single tracks"
+-msgstr "Pokaži le izvajalce albuma in ne tudi izvajalcev le posameznih posnetkov"
++msgstr ""
++"Pokaži le izvajalce albuma in ne tudi izvajalcev le posameznih posnetkov"
+ 
+ #: ../src/Core/Banshee.ThickClient/Banshee.Sources.Gui/CompositeTrackSourceContents.cs:117
+ msgid "Show Genre Filter"
+@@ -4081,7 +4237,8 @@ msgid "Show or hide the artist/album browser"
+ msgstr "Prikaži ali skrij brskalnik izvajalcev/albumov"
+ 
+ #: ../src/Core/Banshee.WebBrowser/Banshee.WebBrowser/NavigationControl.cs:156
+-msgid "This page is blocked because it is probably not the one you are looking for!"
++msgid ""
++"This page is blocked because it is probably not the one you are looking for!"
+ msgstr "Stran je blokirana, ker najverjetneje ni stran, ki jo iščete."
+ 
+ #. Translators: {0} is the URL of the web page that was requested
+@@ -4160,29 +4317,29 @@ msgstr "Podpira ovitke"
+ msgid "Supports photos"
+ msgstr "Podpira fotografije"
+ 
+-#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:465
++#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:466
+ msgid "Track duration is zero"
+ msgstr "Trajanje skladbe je nič"
+ 
+-#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:571
++#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:570
+ msgid "Syncing iPod"
+ msgstr "Usklajevanje iPoda"
+ 
+-#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:572
++#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:571
+ msgid "Preparing to synchronize..."
+ msgstr "Pripravljanje na usklajevanje ..."
+ 
+-#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:575
++#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:593
+ #, csharp-format
+ msgid "Adding track {0} of {1}"
+ msgstr "Dodajanje skladbe {0} od {1}"
+ 
+-#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:611
++#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:636
+ #, csharp-format
+ msgid "Removing track {0} of {1}"
+ msgstr "Odstranjevanje skladbe {0} od {1}"
+ 
+-#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:664
++#: ../src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceSource.cs:710
+ msgid "Writing media database"
+ msgstr "Zapisovanje podatkovne zbirke predstavnih datotek"
+ 
+@@ -4200,40 +4357,44 @@ msgstr "Naprave"
+ msgid "Device Properties"
+ msgstr "Lastnosti naprave"
+ 
+-#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:203
++#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:201
+ msgid "Product"
+ msgstr "Izdelek"
+ 
+-#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:204
++#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:202
+ msgid "Vendor"
+ msgstr "Ponudnik"
+ 
+-#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:291
++#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:292
+ #: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Data/PodcastSource.cs:141
+ #, csharp-format
+ msgid "Loading {0}"
+ msgstr "Nalaganje {0}"
+ 
+-#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:385
++#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:386
+ #: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/ColumnCellYesNo.cs:37
+ msgid "Yes"
+ msgstr "Da"
+ 
+-#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:385
++#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:386
+ #: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/ColumnCellYesNo.cs:38
+ msgid "No"
+ msgstr "Ne"
+ 
+-#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:406
++#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:407
+ #, csharp-format
+-msgid "The {0} format is not supported by the device, and no converter was found to convert it"
+-msgstr "Naprava ne podpira vrste zapisa {0}, in ni mogoče najti pretvornika za njeno pretvarjanje"
++msgid ""
++"The {0} format is not supported by the device, and no converter was found to "
++"convert it"
++msgstr ""
++"Naprava ne podpira vrste zapisa {0}, in ni mogoče najti pretvornika za njeno "
++"pretvarjanje"
+ 
+-#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:412
++#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:413
+ msgid "File format conversion support is not available"
+ msgstr "Podpora za pretvorbo vrste datoteke ni na voljo"
+ 
+-#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:438
++#: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs:439
+ msgid "Error converting file"
+ msgstr "Napaka med pretvarjanjem datoteke"
+ 
+@@ -4242,8 +4403,12 @@ msgid "Sync when first plugged in and when the libraries change"
+ msgstr "Samodejno usklajevanje naprave ob prvem vklopu ali spremembi knjižnic"
+ 
+ #: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSync.cs:136
+-msgid "Begin synchronizing the device as soon as the device is plugged in or the libraries change."
+-msgstr "Začetek usklajevanja naprave takoj, ko je priklopljena ali se knjižnice spremenijo."
++msgid ""
++"Begin synchronizing the device as soon as the device is plugged in or the "
++"libraries change."
++msgstr ""
++"Začetek usklajevanja naprave takoj, ko je priklopljena ali se knjižnice "
++"spremenijo."
+ 
+ #: ../src/Dap/Banshee.Dap/Banshee.Dap/DapSync.cs:139
+ msgid "Sync Preferences"
+@@ -4267,7 +4432,7 @@ msgstr[3] "Opravilo usklajevanja bo odstranilo {0} skladbe z naprave."
+ msgid "Are you sure you want to continue?"
+ msgstr "Ali ste prepričani, da želite nadaljevati?"
+ 
+-#: ../src/Dap/Banshee.Dap/Banshee.Dap.Gui/DapActions.cs:118
++#: ../src/Dap/Banshee.Dap/Banshee.Dap.Gui/DapActions.cs:121
+ msgid "Remove tracks"
+ msgstr "Odstrani skladbe"
+ 
+@@ -4342,12 +4507,12 @@ msgstr "Uvozi kupljeno glasbo"
+ msgid "Disconnect"
+ msgstr "Odklopi"
+ 
+-#: ../src/Dap/Banshee.Dap/Banshee.Dap/RemovableSource.cs:108
++#: ../src/Dap/Banshee.Dap/Banshee.Dap/RemovableSource.cs:111
+ #, csharp-format
+ msgid "Disconnecting {0}..."
+ msgstr "Odklapljanje {0} ..."
+ 
+-#: ../src/Dap/Banshee.Dap/Banshee.Dap/RemovableSource.cs:115
++#: ../src/Dap/Banshee.Dap/Banshee.Dap/RemovableSource.cs:118
+ #, csharp-format
+ msgid "Could not disconnect {0}: {1}"
+ msgstr "{0} ni bilo mogoče odklopiti: {1}"
+@@ -4524,8 +4689,12 @@ msgstr[2] "Združitev {0} izbranih diskov v eno knjigo?"
+ msgstr[3] "Združitev {0} izbranih diskov v eno knjigo?"
+ 
+ #: ../src/Extensions/Banshee.Audiobook/Banshee.Audiobook/Actions.cs:144
+-msgid "This will ensure the disc numbers are all set properly, and then set the author and book title for all tracks on all these discs to the values below"
+-msgstr "To bo zagotovilo pravilno nastavitev vseh števil diskov in nato nastavilo avtorja in naslov knjige na vrednosti spodaj za vse skladbe na teh diskih"
++msgid ""
++"This will ensure the disc numbers are all set properly, and then set the "
++"author and book title for all tracks on all these discs to the values below"
++msgstr ""
++"To bo zagotovilo pravilno nastavitev vseh števil diskov in nato nastavilo "
++"avtorja in naslov knjige na vrednosti spodaj za vse skladbe na teh diskih"
+ 
+ #: ../src/Extensions/Banshee.Audiobook/Banshee.Audiobook/Actions.cs:153
+ msgid "Author:"
+@@ -4609,8 +4778,12 @@ msgid "_Automatically detect BPM for all songs"
+ msgstr "_Samodejno zaznaj UNM za vse skladbe"
+ 
+ #: ../src/Extensions/Banshee.Bpm/Banshee.Bpm/BpmService.cs:148
+-msgid "Detect beats per minute (BPM) for all songs that don't already have a value set"
+-msgstr "Zaznavanje ritma preko podatkov o udarcih na minuto (UNM) za vse skladbe brez že določene vrednosti"
++msgid ""
++"Detect beats per minute (BPM) for all songs that don't already have a value "
++"set"
++msgstr ""
++"Zaznavanje ritma preko podatkov o udarcih na minuto (UNM) za vse skladbe "
++"brez že določene vrednosti"
+ 
+ #: ../src/Extensions/Banshee.CoverArt/Banshee.CoverArt/CoverArtJob.cs:58
+ msgid "Downloading Cover Art"
+@@ -4639,13 +4812,18 @@ msgstr "Nazaj"
+ 
+ #: ../src/Extensions/Banshee.Daap/Banshee.Daap/DaapErrorView.cs:101
+ msgid ""
+-"iTunes® 7 introduced new compatibility issues and currently only works with other iTunes® 7 clients.\n"
++"iTunes® 7 introduced new compatibility issues and currently only works with "
++"other iTunes® 7 clients.\n"
+ "\n"
+-"No third-party clients can connect to iTunes® music shares anymore. This is an intentional limitation by Apple in iTunes® 7 and newer, we apologize for the unfortunate inconvenience."
++"No third-party clients can connect to iTunes® music shares anymore. This is "
++"an intentional limitation by Apple in iTunes® 7 and newer, we apologize for "
++"the unfortunate inconvenience."
+ msgstr ""
+-"Z iTunes® 7 so se pojavile težave združljivosti. Trenutno iTunes® 7 delujejo le z ostalimi odjemalci  iTunes® 7.\n"
++"Z iTunes® 7 so se pojavile težave združljivosti. Trenutno iTunes® 7 delujejo "
++"le z ostalimi odjemalci  iTunes® 7.\n"
+ "\n"
+-"Odjemalci tretjih virov ne podpirajo povezav v iTunes® souporabo glasbe. To je namerna omejitev, ki jo je vpeljalo podjetje Apple v iTunes® 7."
++"Odjemalci tretjih virov ne podpirajo povezav v iTunes® souporabo glasbe. To "
++"je namerna omejitev, ki jo je vpeljalo podjetje Apple v iTunes® 7."
+ 
+ #: ../src/Extensions/Banshee.Daap/Banshee.Daap/DaapErrorView.cs:111
+ msgid "Common reasons for connection failures:"
+@@ -4703,11 +4881,11 @@ msgstr "Prijava"
+ msgid "Connecting to {0}"
+ msgstr "Povezovanje z {0}"
+ 
+-#: ../src/Extensions/Banshee.Daap/Banshee.Daap/DaapService.cs:185
++#: ../src/Extensions/Banshee.Daap/Banshee.Daap/DaapService.cs:186
+ msgid "Add Remote DAAP Server"
+ msgstr "Dodaj oddaljen strežnik DAAP"
+ 
+-#: ../src/Extensions/Banshee.Daap/Banshee.Daap/DaapService.cs:186
++#: ../src/Extensions/Banshee.Daap/Banshee.Daap/DaapService.cs:187
+ msgid "Add a new remote DAAP server"
+ msgstr "Doda nov oddaljen strežnik DAAP"
+ 
+@@ -4836,16 +5014,26 @@ msgid "Duplicate Albums"
+ msgstr "Podvojeni albumi"
+ 
+ #: ../src/Extensions/Banshee.Fixup/Banshee.Fixup/AlbumDuplicateSolver.cs:47
+-msgid "Displayed are albums that should likely be merged.  For each row, click the desired title to make it bold, or uncheck it to take no action."
+-msgstr "Prikazani so albumi, ki jih je verjetno treba združiti. Za vsako vrstico kliknite na želeno ime da postane krepko ali odstranite oznako, če ne želite storiti ničesar."
++msgid ""
++"Displayed are albums that should likely be merged.  For each row, click the "
++"desired title to make it bold, or uncheck it to take no action."
++msgstr ""
++"Prikazani so albumi, ki jih je verjetno treba združiti. Za vsako vrstico "
++"kliknite na želeno ime da postane krepko ali odstranite oznako, če ne želite "
++"storiti ničesar."
+ 
+ #: ../src/Extensions/Banshee.Fixup/Banshee.Fixup/ArtistDuplicateSolver.cs:46
+ msgid "Duplicate Artists"
+ msgstr "Podvojeni izvajalci"
+ 
+ #: ../src/Extensions/Banshee.Fixup/Banshee.Fixup/ArtistDuplicateSolver.cs:47
+-msgid "Displayed are artists that should likely be merged.  For each row, click the desired name to make it bold, or uncheck it to take no action."
+-msgstr "Prikazani so izvajalci, ki jih je verjetno treba združiti. Za vsako vrstico kliknite na želeno ime, da postane krepko ali odstranite oznako, če ne želite storiti ničesar."
++msgid ""
++"Displayed are artists that should likely be merged.  For each row, click the "
++"desired name to make it bold, or uncheck it to take no action."
++msgstr ""
++"Prikazani so izvajalci, ki jih je verjetno treba združiti. Za vsako vrstico "
++"kliknite na želeno ime, da postane krepko ali odstranite oznako, če ne "
++"želite storiti ničesar."
+ 
+ #: ../src/Extensions/Banshee.Fixup/Banshee.Fixup/FixActions.cs:50
+ msgid "Fix Music Metadata..."
+@@ -4868,8 +5056,13 @@ msgid "Duplicate Genres"
+ msgstr "Podvojene zvrsti"
+ 
+ #: ../src/Extensions/Banshee.Fixup/Banshee.Fixup/GenreDuplicateSolver.cs:47
+-msgid "Displayed are genres that should likely be merged.  For each row, click the desired genre to make it bold, or uncheck it to take no action."
+-msgstr "Prikazane so zvrsti, ki jih je verjetno treba združiti. Za vsako vrstico kliknite na želeno zvrst da postane krepka ali odstranite oznako, če ne želite storiti ničesar."
++msgid ""
++"Displayed are genres that should likely be merged.  For each row, click the "
++"desired genre to make it bold, or uncheck it to take no action."
++msgstr ""
++"Prikazane so zvrsti, ki jih je verjetno treba združiti. Za vsako vrstico "
++"kliknite na želeno zvrst da postane krepka ali odstranite oznako, če ne "
++"želite storiti ničesar."
+ 
+ #: ../src/Extensions/Banshee.Fixup/Banshee.Fixup/GenreDuplicateSolver.cs:77
+ msgid " and "
+@@ -5153,8 +5346,16 @@ msgid "Examples:"
+ msgstr "Primeri:"
+ 
+ #: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HomeView.cs:148
+-msgid "The Internet Archive, a 501(c)(3) non-profit, is building a digital library of Internet sites and other cultural artifacts in digital form. Like a paper library, we provide free access to researchers, historians, scholars, and the general public."
+-msgstr "Spletni arhiv, gradi digitalno knjižnico spletnih strani in drugih kulturnih značilnosti v digitalni obliki. Podobno kot papirnata knjižnica zagotavlja brezplačen dostop raziskovalcem, zgodovinarjem, učenjakom in splošni javnosti."
++msgid ""
++"The Internet Archive, a 501(c)(3) non-profit, is building a digital library "
++"of Internet sites and other cultural artifacts in digital form. Like a paper "
++"library, we provide free access to researchers, historians, scholars, and "
++"the general public."
++msgstr ""
++"Spletni arhiv, gradi digitalno knjižnico spletnih strani in drugih kulturnih "
++"značilnosti v digitalni obliki. Podobno kot papirnata knjižnica zagotavlja "
++"brezplačen dostop raziskovalcem, zgodovinarjem, učenjakom in splošni "
++"javnosti."
+ 
+ #: ../src/Extensions/Banshee.InternetArchive/Banshee.InternetArchive/HomeView.cs:151
+ msgid "Visit the Internet Archive online at archive.org"
+@@ -5473,8 +5674,11 @@ msgid "Edit radio station"
+ msgstr "Urejanje radijske postaje"
+ 
+ #: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/StationEditor.cs:97
+-msgid "Enter the Genre, Title and URL of the radio station you wish to add. A description is optional."
+-msgstr "Vnesite zvrst, naslov in URL radijske postaje za dodajanje. Opis je poljuben."
++msgid ""
++"Enter the Genre, Title and URL of the radio station you wish to add. A "
++"description is optional."
++msgstr ""
++"Vnesite zvrst, naslov in URL radijske postaje za dodajanje. Opis je poljuben."
+ 
+ #: ../src/Extensions/Banshee.InternetRadio/Banshee.InternetRadio/StationEditor.cs:118
+ msgid "Station Genre:"
+@@ -5649,8 +5853,12 @@ msgid "Sign up for Last.fm"
+ msgstr "Vpis v Last.fm"
+ 
+ #: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmPreferences.cs:262
+-msgid "Open Last.fm in a browser, giving you the option to authorize Banshee to work with your account"
+-msgstr "Odpre Last.fm v brskalniku in vam ponudi možnost pooblastitve predvajalnika Banshee za delo z računom"
++msgid ""
++"Open Last.fm in a browser, giving you the option to authorize Banshee to "
++"work with your account"
++msgstr ""
++"Odpre Last.fm v brskalniku in vam ponudi možnost pooblastitve predvajalnika "
++"Banshee za delo z računom"
+ 
+ #: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmPreferences.cs:273
+ #: ../src/Libraries/Lastfm.Gui/Lastfm.Gui/AccountLoginDialog.cs:49
+@@ -5661,7 +5869,9 @@ msgstr "Prijava v Last.fm"
+ #: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:298
+ #: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:335
+ msgid "You need to allow Banshee to access your Last.fm account."
+-msgstr "Predvajalniku Banshee mora biti dodeljeno dovoljenje za dostop do računa Last.fm."
++msgstr ""
++"Predvajalniku Banshee mora biti dodeljeno dovoljenje za dostop do računa "
++"Last.fm."
+ 
+ #: ../src/Extensions/Banshee.Lastfm/Banshee.Lastfm/LastfmPreferences.cs:304
+ msgid "Finish Logging In"
+@@ -6009,8 +6219,12 @@ msgid "Still Running"
+ msgstr "Še vedno teče"
+ 
+ #: ../src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/NotificationAreaService.cs:348
+-msgid "Banshee was closed to the notification area. Use the <i>Quit</i> option to end your session."
+-msgstr "Program Banshee je skrit v obvestilnem področju. Uporabite možnost <i>Končaj</i> za končanje programa."
++msgid ""
++"Banshee was closed to the notification area. Use the <i>Quit</i> option to "
++"end your session."
++msgstr ""
++"Program Banshee je skrit v obvestilnem področju. Uporabite možnost "
++"<i>Končaj</i> za končanje programa."
+ 
+ #: ../src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea/NotificationAreaService.cs:483
+ #: ../src/Extensions/Banshee.SoundMenu/Banshee.SoundMenu/SoundMenuService.cs:326
+@@ -6065,7 +6279,9 @@ msgstr "Zaganjanje pogona"
+ 
+ #: ../src/Extensions/Banshee.OpticalDisc/Banshee.OpticalDisc.AudioCd/AudioCdRipper.cs:124
+ #, csharp-format
+-msgid "<i>{0}</i> is still being imported into the music library. Would you like to stop it?"
++msgid ""
++"<i>{0}</i> is still being imported into the music library. Would you like to "
++"stop it?"
+ msgstr "<i>{0}</i> se uvaža v knjižnico. Ali želite postopek prekiniti?"
+ 
+ #: ../src/Extensions/Banshee.OpticalDisc/Banshee.OpticalDisc.AudioCd/AudioCdRipper.cs:254
+@@ -6089,8 +6305,12 @@ msgid "_Automatically import audio CDs when inserted"
+ msgstr "_Samodejno uvažanje zvočnih CD-jev ob vstavitvi v pogon"
+ 
+ #: ../src/Extensions/Banshee.OpticalDisc/Banshee.OpticalDisc.AudioCd/AudioCdService.cs:115
+-msgid "When an audio CD is inserted, automatically begin importing it if metadata can be found and it is not already in the library."
+-msgstr "Ob vstavitvi v pogon začne samodejno uvažanje CD-ja, če je mogoče najti metapodatke in CD še ni na voljo v knjižnici."
++msgid ""
++"When an audio CD is inserted, automatically begin importing it if metadata "
++"can be found and it is not already in the library."
++msgstr ""
++"Ob vstavitvi v pogon začne samodejno uvažanje CD-ja, če je mogoče najti "
++"metapodatke in CD še ni na voljo v knjižnici."
+ 
+ #: ../src/Extensions/Banshee.OpticalDisc/Banshee.OpticalDisc.AudioCd/AudioCdService.cs:119
+ msgid "_Eject when done importing"
+@@ -6105,8 +6325,12 @@ msgid "Use error correction when importing"
+ msgstr "Ob uvažanju uporabi popravljanje napak"
+ 
+ #: ../src/Extensions/Banshee.OpticalDisc/Banshee.OpticalDisc.AudioCd/AudioCdService.cs:124
+-msgid "Error correction tries to work around problem areas on a disc, such as surface scratches, but will slow down importing substantially."
+-msgstr "Popravljanje napak poskuša zaobiti območja diska, ki so poškodovana, vendar močno upočasni delovanje in uvoz glasbe."
++msgid ""
++"Error correction tries to work around problem areas on a disc, such as "
++"surface scratches, but will slow down importing substantially."
++msgstr ""
++"Popravljanje napak poskuša zaobiti območja diska, ki so poškodovana, vendar "
++"močno upočasni delovanje in uvoz glasbe."
+ 
+ #: ../src/Extensions/Banshee.OpticalDisc/Banshee.OpticalDisc.AudioCd/AudioCdService.cs:192
+ #: ../src/Extensions/Banshee.OpticalDisc/Banshee.OpticalDisc.AudioCd/AudioCdSource.cs:311
+@@ -6135,7 +6359,8 @@ msgstr "Ni mogoče pridobiti podrobnosti skladbe"
+ 
+ #: ../src/Extensions/Banshee.OpticalDisc/Banshee.OpticalDisc.AudioCd/AudioCdSource.cs:175
+ msgid "Automatic import off since this album is already in the Music Library."
+-msgstr "Samodejno uvažanje je izključeno, ker je ta album že v glasbeni knjižnici."
++msgstr ""
++"Samodejno uvažanje je izključeno, ker je ta album že v glasbeni knjižnici."
+ 
+ #: ../src/Extensions/Banshee.OpticalDisc/Banshee.OpticalDisc.AudioCd/AudioCdSource.cs:198
+ msgid "Could not import CD"
+@@ -6233,16 +6458,26 @@ msgstr "Poišči mapo glasbe iTunes"
+ 
+ #: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/ItunesPlayerImportDialogs.cs:196
+ #, csharp-format
+-msgid "The iTunes library refers to your music directory as \"{0}\" but Banshee was not able to infer the location of this directory. Please locate it."
+-msgstr "Knjižnica iTunes mapo z glasbo imenuje \"{0}\", vendar mesta te mape ni mogoče najti. Določiti jo je treba ročno."
++msgid ""
++"The iTunes library refers to your music directory as \"{0}\" but Banshee was "
++"not able to infer the location of this directory. Please locate it."
++msgstr ""
++"Knjižnica iTunes mapo z glasbo imenuje \"{0}\", vendar mesta te mape ni "
++"mogoče najti. Določiti jo je treba ročno."
+ 
+ #: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/ItunesPlayerImportSource.cs:74
+ msgid "iTunes Media Player"
+ msgstr "Predvajalnik iTunes"
+ 
+ #: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/ItunesPlayerImportSource.cs:134
+-msgid "Banshee is not familiar with this version of the iTunes library format. Importing may or may not work as expected, or at all. Would you like to attempt to import anyway?"
+-msgstr "Predvajalnik Banshee ne pozna te različice zapisa knjižnice iTunes. Uvoz morda ne bo deloval po pričakovanjih ali pa sploh ne. Ali želite vseeno poskusiti z uvozom?"
++msgid ""
++"Banshee is not familiar with this version of the iTunes library format. "
++"Importing may or may not work as expected, or at all. Would you like to "
++"attempt to import anyway?"
++msgstr ""
++"Predvajalnik Banshee ne pozna te različice zapisa knjižnice iTunes. Uvoz "
++"morda ne bo deloval po pričakovanjih ali pa sploh ne. Ali želite vseeno "
++"poskusiti z uvozom?"
+ 
+ #: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/ItunesPlayerImportSource.cs:439
+ #: ../src/Extensions/Banshee.PlayerMigration/Banshee.PlayerMigration/RhythmboxPlayerImportSource.cs:235
+@@ -6275,7 +6510,8 @@ msgstr "Predvajaj za"
+ 
+ #: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueActions.cs:58
+ msgid "Add selected songs after the currently playing track, album, or artist"
+-msgstr "Doda izbrane skladbe za trenutno predvajajočo se skladbo, album ali izvajalca"
++msgstr ""
++"Doda izbrane skladbe za trenutno predvajajočo se skladbo, album ali izvajalca"
+ 
+ #: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueActions.cs:62
+ msgid "Current Track"
+@@ -6283,7 +6519,9 @@ msgstr "Trenutna skladba"
+ 
+ #: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueActions.cs:63
+ msgid "Add selected songs to the play queue after the currently playing song"
+-msgstr "Doda izbrane skladbe v čakalno vrsto predvajanja za trenutno predvajajočo se skladbo"
++msgstr ""
++"Doda izbrane skladbe v čakalno vrsto predvajanja za trenutno predvajajočo se "
++"skladbo"
+ 
+ #: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueActions.cs:67
+ msgid "Current Album"
+@@ -6291,7 +6529,9 @@ msgstr "Trenutni album"
+ 
+ #: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueActions.cs:68
+ msgid "Add selected songs to the play queue after the currently playing album"
+-msgstr "Doda izbrane skladbe v čakalno vrsto predvajanja za trenutno predvajajoči se album"
++msgstr ""
++"Doda izbrane skladbe v čakalno vrsto predvajanja za trenutno predvajajoči se "
++"album"
+ 
+ #: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueActions.cs:72
+ msgid "Current Artist"
+@@ -6299,7 +6539,9 @@ msgstr "Trenutni izvajalec"
+ 
+ #: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueActions.cs:73
+ msgid "Add selected songs to the play queue after the currently playing artist"
+-msgstr "Doda izbrane skladbe v čakalno vrsto predvajanja za trenutno predvajanega izvajalca"
++msgstr ""
++"Doda izbrane skladbe v čakalno vrsto predvajanja za trenutno predvajanega "
++"izvajalca"
+ 
+ #: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueActions.cs:80
+ msgid "Refresh random tracks in the play queue"
+@@ -6307,7 +6549,9 @@ msgstr "Osvežitev naključnih skladb v čakalni vrsti predvajanja"
+ 
+ #: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueActions.cs:85
+ msgid "Randomize the playback order of items in the play queue"
+-msgstr "Naključno razporedi vrstni red predvajanja predmetov v čakalni vrsti predvajanja"
++msgstr ""
++"Naključno razporedi vrstni red predvajanja predmetov v čakalni vrsti "
++"predvajanja"
+ 
+ #: ../src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/PlayQueueActions.cs:89
+ msgid "Add More"
+@@ -6530,8 +6774,12 @@ msgid "Check periodically for new episodes"
+ msgstr "Občasno preveri za nove epizode"
+ 
+ #: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastFeedPropertiesDialog.cs:106
+-msgid "If checked, Banshee will check every hour to see if this podcast has new episodes"
+-msgstr "Izbrana možnost določi, da predvajalnik Banshee vsako uro preveri ali so na podcastu na voljo nove epizode"
++msgid ""
++"If checked, Banshee will check every hour to see if this podcast has new "
++"episodes"
++msgstr ""
++"Izbrana možnost določi, da predvajalnik Banshee vsako uro preveri ali so na "
++"podcastu na voljo nove epizode"
+ 
+ #: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastFeedPropertiesDialog.cs:109
+ #: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastSubscribeDialog.cs:136
+@@ -6595,7 +6843,8 @@ msgid "Subscribe to New Podcast"
+ msgstr "Naročilo na nov podcast"
+ 
+ #: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/PodcastSubscribeDialog.cs:103
+-msgid "Please enter the URL of the podcast to which you would like to subscribe."
++msgid ""
++"Please enter the URL of the podcast to which you would like to subscribe."
+ msgstr "Vnesite URL podcasta, na katerega se želite naročiti."
+ 
+ #: ../src/Extensions/Banshee.Podcasting/Banshee.Podcasting.Gui/PodcastManager/Dialog/SyncPreferenceComboBox.cs:41
+@@ -6922,7 +7171,8 @@ msgid "The API key used by this application is invalid."
+ msgstr "Ključ API programa ni veljaven."
+ 
+ #: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:293
+-msgid "The streaming system is offline for maintenance, please try again later."
++msgid ""
++"The streaming system is offline for maintenance, please try again later."
+ msgstr "Sistem pretoka ni na voljo zaradi vzdrževalnih del. Poskusite pozneje."
+ 
+ #: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:295
+@@ -6947,7 +7197,9 @@ msgstr "Za to postajo ni dovolj sosedov."
+ 
+ #: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:308
+ msgid "This user is not allowed to listen to radio during peak usage"
+-msgstr "Uporabniku ni dovoljeno poslušanje radijske postaje med največjimi obremenitvami povezave"
++msgstr ""
++"Uporabniku ni dovoljeno poslušanje radijske postaje med največjimi "
++"obremenitvami povezave"
+ 
+ #: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:310
+ msgid "Radio station not found"
+@@ -6962,8 +7214,12 @@ msgid "This type of request is no longer supported"
+ msgstr "Ta vrsta zahteve ni več podprta"
+ 
+ #: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:316
+-msgid "Your IP has made too many requests in a short period, exceeding our API guidelines"
+-msgstr "Z vašega naslova IP je bilo podanih preveč zahtev v zelo kratkem času, kar presega določila API."
++msgid ""
++"Your IP has made too many requests in a short period, exceeding our API "
++"guidelines"
++msgstr ""
++"Z vašega naslova IP je bilo podanih preveč zahtev v zelo kratkem času, kar "
++"presega določila API."
+ 
+ #: ../src/Libraries/Lastfm/Lastfm/RadioConnection.cs:318
+ msgid "There was an unknown error."
+diff --git a/src/Backends/Banshee.Gio/Banshee.Hardware.Gio/LowLevel/RawVolume.cs b/src/Backends/Banshee.Gio/Banshee.Hardware.Gio/LowLevel/RawVolume.cs
+index 0ac09f9..5e8dc80 100644
+--- a/src/Backends/Banshee.Gio/Banshee.Hardware.Gio/LowLevel/RawVolume.cs
++++ b/src/Backends/Banshee.Gio/Banshee.Hardware.Gio/LowLevel/RawVolume.cs
+@@ -239,10 +239,15 @@ namespace Banshee.Hardware.Gio
+                 if (Volume.Drive == null) {
+                     return null;
+                 }
++
++                var device = Manager.GudevDeviceFromGioDrive (Volume.Drive);
++                if (device == null) {
++                    return null;
++                }
+                 return new RawBlockDevice (Volume.Drive,
+                                            Manager,
+                                            new GioDriveMetadetaSource (Volume.Drive),
+-                                           new UdevMetadataSource (Manager.GudevDeviceFromGioDrive (Volume.Drive)));
++                                           new UdevMetadataSource (device));
+             }
+         }
+ 
+diff --git a/src/Core/Banshee.Services/Banshee.Sources/PrimarySource.cs b/src/Core/Banshee.Services/Banshee.Sources/PrimarySource.cs
+index a1250ec..2d637ec 100644
+--- a/src/Core/Banshee.Services/Banshee.Sources/PrimarySource.cs
++++ b/src/Core/Banshee.Services/Banshee.Sources/PrimarySource.cs
+@@ -663,7 +663,7 @@ namespace Banshee.Sources
+             bool finished = false, notify = false;
+ 
+             lock (this) {
+-                add_track_job.Completed++;
++                AddTrackJob.Completed++;
+ 
+                 if (add_track_job.IsFinished) {
+                     finished = true;
+diff --git a/src/Core/Banshee.Services/Banshee.Sources/SourceManager.cs b/src/Core/Banshee.Services/Banshee.Sources/SourceManager.cs
+index bcb556d..395d451 100644
+--- a/src/Core/Banshee.Services/Banshee.Sources/SourceManager.cs
++++ b/src/Core/Banshee.Services/Banshee.Sources/SourceManager.cs
+@@ -100,11 +100,6 @@ namespace Banshee.Sources
+                     AddinManager.RemoveExtensionNodeHandler ("/Banshee/SourceManager/Source", OnExtensionChanged);
+                 } catch {}
+ 
+-                active_source = null;
+-                default_source = null;
+-                music_library = null;
+-                video_library = null;
+-
+                 // Do dispose extension sources
+                 foreach (Source source in extension_sources.Values) {
+                     RemoveSource (source, true);
+@@ -117,6 +112,11 @@ namespace Banshee.Sources
+ 
+                 sources.Clear ();
+                 extension_sources.Clear ();
++
++                active_source = null;
++                default_source = null;
++                music_library = null;
++                video_library = null;
+             }
+         }
+ 
+diff --git a/src/Core/Banshee.ThickClient/Banshee.Collection.Gui/ArtworkManager.cs b/src/Core/Banshee.ThickClient/Banshee.Collection.Gui/ArtworkManager.cs
+index 6e1aa47..d3da931 100644
+--- a/src/Core/Banshee.ThickClient/Banshee.Collection.Gui/ArtworkManager.cs
++++ b/src/Core/Banshee.ThickClient/Banshee.Collection.Gui/ArtworkManager.cs
+@@ -1,10 +1,12 @@
+ //
+ // ArtworkManager.cs
+ //
+-// Author:
++// Authors:
+ //   Aaron Bockover <abockover@novell.com>
++//   Andrés G. Aragoneses <knocte@gmail.com>
+ //
+ // Copyright (C) 2007-2008 Novell, Inc.
++// Copyright (C) 2013 Andrés G. Aragoneses
+ //
+ // Permission is hereby granted, free of charge, to any person obtaining
+ // a copy of this software and associated documentation files (the
+@@ -28,9 +30,6 @@
+ 
+ using System;
+ using System.Collections.Generic;
+-using System.Text.RegularExpressions;
+-
+-using Mono.Unix;
+ 
+ using Gdk;
+ 
+@@ -68,6 +67,11 @@ namespace Banshee.Collection.Gui
+ 
+         public ArtworkManager ()
+         {
++            Init ();
++        }
++
++        protected virtual void Init ()
++        {
+             AddCachedSize (36);
+             AddCachedSize (40);
+             AddCachedSize (42);
+@@ -122,13 +126,9 @@ namespace Banshee.Collection.Gui
+                 return surface;
+             }
+ 
+-            if (null_artwork_ids.Contains (id)) {
+-                return null;
+-            }
+-
+             Pixbuf pixbuf = LookupScalePixbuf (id, size);
+             if (pixbuf == null || pixbuf.Handle == IntPtr.Zero) {
+-                null_artwork_ids.Add (id);
++                // no need to add to null_artwork_ids here, LookupScalePixbuf already did it
+                 return null;
+             }
+ 
+@@ -165,6 +165,8 @@ namespace Banshee.Collection.Gui
+         public Pixbuf LookupScalePixbuf (string id, int size)
+         {
+             if (id == null || (size != 0 && size < 10)) {
++                // explicitly don't add this id into null_artwork_ids here,
++                // otherwise it would blacklist all other non-invalid sizes
+                 return null;
+             }
+ 
+@@ -232,6 +234,9 @@ namespace Banshee.Collection.Gui
+                     }
+ 
+                     DisposePixbuf (pixbuf);
++                    if (scaled_pixbuf == null || scaled_pixbuf.Handle == IntPtr.Zero) {
++                        null_artwork_ids.Add (id);
++                    }
+                     return scaled_pixbuf;
+                 } catch {}
+             }
+diff --git a/src/Core/Banshee.ThickClient/Banshee.Collection.Gui/Tests/ArtworkManagerTests.cs b/src/Core/Banshee.ThickClient/Banshee.Collection.Gui/Tests/ArtworkManagerTests.cs
+new file mode 100644
+index 0000000..e29658e
+--- /dev/null
++++ b/src/Core/Banshee.ThickClient/Banshee.Collection.Gui/Tests/ArtworkManagerTests.cs
+@@ -0,0 +1,102 @@
++//
++// ArtworkManagerTests.cs
++//
++// Author:
++//   Andrés G. Aragoneses <knocte@gmail.com>
++//
++// Copyright 2013 Andrés G. Aragoneses
++//
++// Permission is hereby granted, free of charge, to any person obtaining a copy
++// of this software and associated documentation files (the "Software"), to deal
++// in the Software without restriction, including without limitation the rights
++// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
++// copies of the Software, and to permit persons to whom the Software is
++// furnished to do so, subject to the following conditions:
++//
++// The above copyright notice and this permission notice shall be included in
++// all copies or substantial portions of the Software.
++//
++// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
++// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
++// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
++// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
++// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
++// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
++// THE SOFTWARE.
++
++#if ENABLE_TESTS
++
++using Banshee.Base;
++using Hyena.Tests;
++
++using NUnit.Framework;
++using System;
++using System.Linq;
++using System.Reflection;
++using System.IO;
++using Gdk;
++
++namespace Banshee.Collection.Gui.Tests
++{
++    class CustomArtworkManager : ArtworkManager
++    {
++        internal static int SizeTest = 36;
++        protected override void Init ()
++        {
++            AddCachedSize (SizeTest);
++        }
++    }
++
++    [TestFixture]
++    public class ArtworkManagerTests : TestBase
++    {
++        static string ExtractPngFromResource ()
++        {
++            var first_image = Assembly.GetExecutingAssembly ().GetManifestResourceNames ().Where (n => n.EndsWith (".png")).First ();
++            var temp_png = Path.Combine (Path.GetTempPath (), first_image);
++            Stream s = Assembly.GetExecutingAssembly ().GetManifestResourceStream (first_image);
++            using (FileStream file = new FileStream (temp_png, FileMode.Create)) {
++                byte[] b = new byte[s.Length + 1];
++                s.Read (b, 0, Convert.ToInt32 (s.Length));
++                file.Write (b, 0, Convert.ToInt32 (b.Length - 1));
++                file.Flush ();
++            }
++            return temp_png;
++        }
++
++        static ArtworkManagerTests ()
++        {
++            GLib.GType.Init ();
++            Mono.Addins.AddinManager.Initialize (BinDir);
++            Banshee.IO.Provider.SetProvider (new Banshee.IO.SystemIO.Provider ());
++        }
++
++        [Test]
++        public void TestSizePath ()
++        {
++            var png_file_path = ExtractPngFromResource ();
++            string jpg_file_path = null;
++
++            try {
++                var artist_album_id = CoverArtSpec.CreateArtistAlbumId ("Metallica", "Master Of Puppets");
++                jpg_file_path = CoverArtSpec.GetPathForSize (artist_album_id, CustomArtworkManager.SizeTest); // i.e.: /home/knocte/.cache/media-art/36/album-d33f25dbd7dfb4817a7e99f6bc2de49e.jpg"
++                var pixbuf = new Pixbuf (png_file_path);
++                pixbuf.Save (jpg_file_path, "jpeg");
++
++                var artwork_manager = new CustomArtworkManager ();
++                Assert.IsNull (artwork_manager.LookupScaleSurface (artist_album_id, 1, false),
++                               "Should have got null at the first request, with an invalid size");
++                Assert.IsNotNull (artwork_manager.LookupScaleSurface (artist_album_id, CustomArtworkManager.SizeTest, false),
++                                  "Null at the second request, was null cached incorrectly?");
++
++            } finally {
++                File.Delete (png_file_path);
++                if (File.Exists (jpg_file_path)) {
++                    File.Delete (jpg_file_path);
++                }
++            }
++        }
++    }
++}
++
++#endif
+\ No newline at end of file
+diff --git a/src/Core/Banshee.ThickClient/Makefile.am b/src/Core/Banshee.ThickClient/Makefile.am
+index bdcea43..ef2af92 100644
+--- a/src/Core/Banshee.ThickClient/Makefile.am
++++ b/src/Core/Banshee.ThickClient/Makefile.am
+@@ -35,6 +35,7 @@ SOURCES =  \
+ 	Banshee.Collection.Gui/QueryFilterView.cs \
+ 	Banshee.Collection.Gui/SearchableListView.cs \
+ 	Banshee.Collection.Gui/TerseTrackListView.cs \
++	Banshee.Collection.Gui/Tests/ArtworkManagerTests.cs \
+ 	Banshee.Collection.Gui/TrackFilterListView.cs \
+ 	Banshee.Collection.Gui/TrackListView.cs \
+ 	Banshee.Collection.Gui/XmlColumnController.cs \
+diff --git a/src/Dap/Banshee.Dap.Mtp/Banshee.Dap.Mtp/MtpSource.cs b/src/Dap/Banshee.Dap.Mtp/Banshee.Dap.Mtp/MtpSource.cs
+index 766f066..a9da82d 100644
+--- a/src/Dap/Banshee.Dap.Mtp/Banshee.Dap.Mtp/MtpSource.cs
++++ b/src/Dap/Banshee.Dap.Mtp/Banshee.Dap.Mtp/MtpSource.cs
+@@ -294,7 +294,7 @@ namespace Banshee.Dap.Mtp
+         private long bytes_used;
+         public override long BytesUsed {
+             get {
+-                if (Monitor.TryEnter (mtp_device)) {
++                if (mtp_device != null && Monitor.TryEnter (mtp_device)) {
+                     try {
+                         bytes_used = 0;
+                         foreach (DeviceStorage s in mtp_device.GetStorage ()) {
diff --git a/nonprism/claws-mail-libre-nonprism/PKGBUILD b/nonprism/claws-mail-nonprism/PKGBUILD
index 099b6e1a0..4df1a5e5f 100644
--- a/nonprism/claws-mail-libre-nonprism/PKGBUILD
+++ b/nonprism/claws-mail-nonprism/PKGBUILD
@@ -1,17 +1,17 @@
-# $Id$
+# $Id: PKGBUILD 196415 2013-10-13 09:17:50Z andyrtr $
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 # Maintainer (Parabola): Márcio Silva <coadde@lavabit.com>
 
 _pkgname=claws-mail
-pkgname=$_pkgname-libre-nonprism
+pkgname=$_pkgname-nonprism
 pkgver=3.9.2
-pkgrel=3.1
-pkgdesc='A GTK+ based e-mail client, without nonfree PalmOS handheld devices and libgdata support'
+pkgrel=4
+pkgdesc="A GTK+ based e-mail client, without libgdata support"
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL3')
 url="http://www.$_pkgname.org"
-depends=('gtk2' 'gnutls' 'startup-notification' 'enchant'
-         'gpgme' 'libetpan>=1.1-4' 'libsm' 'dbus-glib' 'hicolor-icon-theme' 'desktop-file-utils')
+depends=('gtk2' 'gnutls' 'startup-notification' 'enchant' 'gpgme' 'libetpan>=1.1-4' 
+         'libsm' 'dbus-glib' 'hicolor-icon-theme' 'desktop-file-utils')
 makedepends=('compface' 'spamassassin' 'bogofilter' 'valgrind' 
              # dependencies for plugins
              'libsoup' 'webkitgtk2' 'libnotify' 'libcanberra' 'poppler-glib' 'pygtk') 
@@ -31,7 +31,7 @@ optdepends=('python2:           needed for some tools and python plugin'
             'libsoup:           for the fancy webkit html plugin'
 	        'poppler-glib:      for pdf viewer plugin'
 	        'ghostscript:       for pdf viewer plugin')
-replaces=("$_pkgname" "sylpheed-claws" "$_pkgname-extra-plugins" "$_pkgname-libre")
+replaces=("$_pkgname" "sylpheed-claws" "$_pkgname-extra-plugins" "$_pkgname-libre" "$_pkgname-libre-nonprism")
 conflicts=("$_pkgname" "$_pkgname-extra-plugins")
 provides=("$_pkgname=$pkgver" 'claws')
 options=(!libtool)
@@ -41,7 +41,7 @@ md5sums=('90de2a265e65fbd9dffdbf428bb0ee28'
          'SKIP')
 
 build() {
-  cd $srcdir/$_pkgname-$pkgver
+  cd $_pkgname-$pkgver
 
   # fixes for python2
   export PYTHON="/usr/bin/python2"
@@ -56,14 +56,13 @@ build() {
     --enable-pgpmime-plugin \
     --enable-spamassassin-plugin \
     --enable-bogofilter-plugin \
-    --disable-jpilot \
     --disable-gdata-plugin
     #--help
   setarch $CARCH make
 }
 
 package() {
-  cd $srcdir/$_pkgname-$pkgver
+  cd $_pkgname-$pkgver
   setarch $CARCH make DESTDIR=$pkgdir install
 
   # build and install extra tools
@@ -71,6 +70,7 @@ package() {
   setarch $CARCH make
    # all executables and .conf files ; only top directory
   find -maxdepth 1 -type f -and -perm /111 -or -name '*.conf' | while read i ; do
-    install -D -m755 $i $pkgdir/usr/lib/$_pkgname/tools/$i
+      install -D -m755 $i \
+        $pkgdir/usr/lib/$_pkgname/tools/$i
   done
 }
diff --git a/nonprism/claws-mail-nonprism/claws-mail.install b/nonprism/claws-mail-nonprism/claws-mail.install
new file mode 100644
index 000000000..4d2f155d4
--- /dev/null
+++ b/nonprism/claws-mail-nonprism/claws-mail.install
@@ -0,0 +1,16 @@
+post_install() {
+  echo "install \"html2ps\" from AUR to add support for printing html mails with fancy plugin"
+  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+  update-desktop-database -q
+}
+
+post_upgrade() {
+  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+  update-desktop-database -q
+}
+
+post_remove() {
+  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+  update-desktop-database -q
+}
+
diff --git a/nonprism/duplicity-nonprism/PKGBUILD b/nonprism/duplicity-nonprism/PKGBUILD
new file mode 100644
index 000000000..cf18f2ae1
--- /dev/null
+++ b/nonprism/duplicity-nonprism/PKGBUILD
@@ -0,0 +1,48 @@
+# $Id: PKGBUILD 96718 2013-09-03 12:44:55Z lfleischer $
+# Maintainer: Kaiting Chen <kaitocracy@gmail.com>
+# Contributor: Aaron Schaefer <aaron@elasticdog.com>
+# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
+
+_pkgname=duplicity
+pkgname=duplicity-nonprism
+pkgver=0.6.22
+pkgrel=1
+pkgdesc='A utility for encrypted, bandwidth-efficient backups using the rsync algorithm, without python2-gdata recommendation'
+arch=('i686' 'x86_64')
+url='http://www.nongnu.org/duplicity/'
+license=('GPL')
+depends=('gnupg' 'librsync' 'ncftp' 'python2-paramiko')
+optdepends=('lftp: FTPS backend'
+            'python2-boto: Amazon S3 backend'
+            'python2-gobject: GIO backend'
+            'gvfs: GIO backend'
+            'python2-httplib2: Ubuntu One backend'
+            'python2-oauthlib: Ubuntu One backend'
+            'rsync: rsync backend')
+replaces=$_pkgname
+conflicts=$_pkgname
+provides=$_pkgname=$pkgver
+source=("http://savannah.nongnu.org/download/$_pkgname/$_pkgname-$pkgver.tar.gz"{,.sig})
+md5sums=('5b035359a6bb7b2f3f3b9829c6c071e1'
+         'SKIP')
+
+build() {
+  cd "${srcdir}/${_pkgname}-${pkgver}"
+
+  # python2 fix
+  for file in $(find . -name '*.py' -print); do
+    sed -i 's_^#!.*/usr/bin/python$_#!/usr/bin/python2_' $file
+    sed -i 's_^#!.*/usr/bin/env.*python$_#!/usr/bin/env python2_' $file
+  done
+}
+
+package() {
+  cd "${srcdir}/${_pkgname}-${pkgver}"
+  
+  python2 setup.py install --root="$pkgdir" --optimize=1
+
+  # fix broken documentation permissions until upstream does (FS#27301)
+  chmod 644 "$pkgdir/usr/share/man/man1/$_pkgname.1"
+  chmod 644 "$pkgdir/usr/share/man/man1/rdiffdir.1"
+  chmod 644 "$pkgdir/usr/share/doc/$_pkgname-$pkgver"/*
+}
diff --git a/nonprism/eog-plugins-nonprism/PKGBUILD b/nonprism/eog-plugins-nonprism/PKGBUILD
index 7c889280b..58d53cb83 100644
--- a/nonprism/eog-plugins-nonprism/PKGBUILD
+++ b/nonprism/eog-plugins-nonprism/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 194995 2013-09-24 13:10:42Z heftig $
+# $Id: PKGBUILD 196609 2013-10-15 18:22:34Z heftig $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Maintainer (Parabola): Márcio Silva <coadde@lavabit.com>
 
 _pkgname=eog-plugins
 pkgname=eog-plugins-nonprism
-pkgver=3.10.0
+pkgver=3.10.1
 pkgrel=1
 pkgdesc="Plugins for Eye of Gnome, without libgdata support"
 arch=('i686' 'x86_64')
@@ -18,7 +18,7 @@ replaces=$_pkgname
 install=eog-plugins.install
 options=('!libtool')
 source=(http://download.gnome.org/sources/$_pkgname/${pkgver%.*}/$_pkgname-$pkgver.tar.xz)
-sha256sums=('0e6699c45181264e87f34a6eb03deeadfd5d73e35995772b7afc803e8218906d')
+sha256sums=('d5b32c49dbf1e0b6cf56c9fdc6c19186c92e98d92b71aa98805491e2bb2f8e12')
 
 build() {
   cd $_pkgname-$pkgver
diff --git a/nonprism/evolution-data-server-nonprism/PKGBUILD b/nonprism/evolution-data-server-nonprism/PKGBUILD
index df988e12b..a84fbf135 100644
--- a/nonprism/evolution-data-server-nonprism/PKGBUILD
+++ b/nonprism/evolution-data-server-nonprism/PKGBUILD
@@ -1,11 +1,13 @@
+# $Id: PKGBUILD 196433 2013-10-13 19:19:09Z heftig $
+# Maintainer: Jan de Groot <jgc@archlinux.org>
 
 _pkgname=evolution-data-server
 pkgname=evolution-data-server-nonprism
-pkgver=3.10.0
+pkgver=3.10.1
 pkgrel=1
 pkgdesc="Centralized access to appointments and contacts, without libgdata support"
 arch=(i686 x86_64)
-depends=(gnome-online-accounts nss krb5 libgweather libical db gcr)
+depends=(gnome-online-accounts nss krb5 libgweather libical db gcr libsoup)
 makedepends=(intltool gperf gobject-introspection vala python2)
 options=('!libtool')
 install=$_pkgname.install
@@ -15,7 +17,7 @@ replaces=("$_pkgname" 'evolution-data-server-coherence')
 conflicts=$_pkgname
 provides=$_pkgname=$pkgver
 source=(http://ftp.gnome.org/pub/gnome/sources/$_pkgname/${pkgver%.*}/$_pkgname-$pkgver.tar.xz)
-sha256sums=('1c47a0e138e9a5ed630d6e3ab30761e74e5f26ed7bbc31debfe76c2bac058b27')
+sha256sums=('a6b5acbd21767b685d58ebfd4c152baa693387f5654fb738b3645ee39e82f9f5')
 
 build() {
   cd "$_pkgname-$pkgver"
diff --git a/nonprism/gnome-online-accounts-nonprism/PKGBUILD b/nonprism/gnome-online-accounts-nonprism/PKGBUILD
index 39bb599d2..e9c333171 100644
--- a/nonprism/gnome-online-accounts-nonprism/PKGBUILD
+++ b/nonprism/gnome-online-accounts-nonprism/PKGBUILD
@@ -1,16 +1,17 @@
-# $Id: PKGBUILD 195045 2013-09-24 18:59:12Z heftig $
+# $Id: PKGBUILD 196736 2013-10-17 12:37:48Z heftig $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 # Maintainer (Parabola): Márcio Silva <coadde@lavabit.com>
 
 _pkgname=gnome-online-accounts
 pkgname=gnome-online-accounts-nonprism
-pkgver=3.10.0
-pkgrel=1
+pkgver=3.10.1
+pkgrel=2
 pkgdesc="GNOME service to access online accounts, without support for unsafe and dangerous for privacy protocols"
 arch=(i686 x86_64 mips64el)
 url="http://www.gnome.org"
 license=('GPL')
-depends=('webkitgtk' 'json-glib' 'libnotify' 'rest' 'hicolor-icon-theme' 'libsecret' 'telepathy-glib')
+depends=('webkitgtk' 'json-glib' 'libnotify' 'rest' 'hicolor-icon-theme' 'libsecret'
+         'telepathy-glib' 'krb5' 'gcr')
 makedepends=('intltool' 'libxslt' 'gobject-introspection' 'docbook-xsl')
 provides=("$_pkgname=$pkgver")
 conflicts=$_pkgname
@@ -18,22 +19,15 @@ replaces=($_pkgname $pkgname-coherence)
 options=(!libtool)
 install=$_pkgname.install
 source=(http://ftp.gnome.org/pub/gnome/sources/$_pkgname/${pkgver:0:4}/$_pkgname-$pkgver.tar.xz)
-sha256sums=('bba85366632cf5ce777b6889eab505d98d7593c37f7859a312dc57dde05a0feb')
+sha256sums=('d925841a4c1c7a46a0837fc7e219891a46431e089847fa248e3f691c23ff7d9b')
 
 build() {
   cd $_pkgname-$pkgver
-  ./configure --prefix=/usr --libexecdir=/usr/lib/$_pkgname \
-    --disable-exchange \
-    --disable-google \
-    --disable-facebook \
-    --disable-flickr \
-    --enable-imap-smtp \
-    --disable-kerberos \
-    --enable-owncloud \
-    --enable-telepathy \
-    --disable-twitter \
-    --disable-windows-live \
-    --disable-yahoo
+  ./configure --prefix=/usr --libexecdir=/usr/lib/$_pkgname --disable-static \
+    --disable-exchange --disable-facebook -disable-flickr \
+    --disable-google --enable-imap-smtp --disable-kerberos \
+    --enable-owncloud --enable-telepathy --disable-windows-live \
+    --disable-twitter --disable-yahoo
   make
 }
 
diff --git a/nonprism/grilo-plugins-nonprism/PKGBUILD b/nonprism/grilo-plugins-nonprism/PKGBUILD
new file mode 100644
index 000000000..8f07b2069
--- /dev/null
+++ b/nonprism/grilo-plugins-nonprism/PKGBUILD
@@ -0,0 +1,41 @@
+# $Id: PKGBUILD 194625 2013-09-19 19:20:52Z jgc $
+# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
+# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
+
+_pkgname=grilo-plugins
+pkgname=grilo-plugins-nonprism
+pkgver=0.2.9
+pkgrel=2
+pkgdesc="Plugins for Grilo, without libgdata support"
+url="http://www.gnome.org"
+arch=(i686 x86_64)
+license=(LGPL)
+depends=(grilo sqlite libgcrypt)
+makedepends=(gupnp-av gmime rest libtracker-sparql totem-plparser libdmapsharing
+             json-glib intltool)
+optdepends=('gupnp-av: uPnP plugin'
+            'gmime: Podcasts plugin'
+            'rest: Blip.tv plugin'
+            'libtracker-sparql: Tracker plugin'
+            'totem-plparser: Youtube plugin, Vimeo plugin, Optical media plugin'
+            'libdmapsharing: DMAP sharing plugin'
+            'json-glib: TMDb plugin')
+options=('!libtool' '!emptydirs')
+groups=('gnome')
+replaces=$_pkgname
+conflicts=$_pkgname
+provides=$_pkgname=$pkgver
+source=(http://ftp.gnome.org/pub/gnome/sources/${_pkgname}/${pkgver%.*}/${_pkgname}-${pkgver}.tar.xz)
+sha256sums=('902b839bd1cdc27613d9e44af2afe00d1ef3b7471ae72c66c622560007e1023e')
+
+build() {
+  cd $_pkgname-$pkgver
+  ./configure --prefix=/usr --sysconfdir=/etc --disable-static \
+    --enable-shoutcast
+  make
+}
+
+package() {
+  cd $_pkgname-$pkgver
+  make DESTDIR="$pkgdir" install
+}
diff --git a/nonprism/kdenetwork-kopete-libre-nonprism/PKGBUILD b/nonprism/kdenetwork-kopete-libre-nonprism/PKGBUILD
index f54f3b92c..a5f4e9807 100644
--- a/nonprism/kdenetwork-kopete-libre-nonprism/PKGBUILD
+++ b/nonprism/kdenetwork-kopete-libre-nonprism/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 195745 2013-10-01 15:33:32Z svenstaro $
+# $Id: PKGBUILD 198789 2013-11-04 15:13:00Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
-# Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
+# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
 
 _pkgname=kdenetwork-kopete
 pkgname=kdenetwork-kopete-libre-nonprism
-pkgver=4.11.2
+pkgver=4.11.3
 pkgrel=1
 pkgdesc='Instant Messenger, without skype and support for unsafe and dangerous for privacy protocols'
 url='http://kde.org/applications/internet/kopete/'
@@ -22,7 +22,7 @@ source=("http://download.kde.org/stable/${pkgver}/src/kopete-${pkgver}.tar.xz"
         'libotr3.patch'
         'mediastreamer29.patch'
         'libre-nonprism.patch')
-sha1sums=('d7616376d7488050ce2c6ec6b7a1f4010fe91084'
+sha1sums=('70fd03fb955574f4eba733d590ce15c841fd8805'
           '9c3b0ee15538fbfa36aa0a4748b1f6b5a7905384'
           '317683a5c2acd0a0058c5ab42f6006e9db511ef3'
           '3c46e5c80ef0cd3f6fe9fb6d5cb8c252c6792208')
diff --git a/nonprism/kdepim-runtime-nonprism/PKGBUILD b/nonprism/kdepim-runtime-nonprism/PKGBUILD
index 9e42ee3ca..771a3e045 100644
--- a/nonprism/kdepim-runtime-nonprism/PKGBUILD
+++ b/nonprism/kdepim-runtime-nonprism/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 195505 2013-10-01 15:14:14Z svenstaro $
+# $Id: PKGBUILD 198789 2013-11-04 15:13:00Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 # Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
 
 _pkgname=kdepim-runtime
 pkgname=kdepim-runtime-nonprism
-pkgver=4.11.2
+pkgver=4.11.3
 pkgrel=1
 pkgdesc='Extends the functionality of kdepim, without libkgapi and libkfbapi support'
 arch=('i686' 'x86_64')
@@ -18,7 +18,7 @@ replaces=('kdepim-runtime' 'kdepim-runtime-coherence')
 conflicts=kdepim-runtime
 provides=kdepim-runtime=$pkgver
 source=("http://download.kde.org/stable/${pkgver}/src/${_pkgname}-${pkgver}.tar.xz")
-sha1sums=('acc133c3c9d5cff0cdc9901b5ff7bd8b31a15825')
+sha1sums=('168455654655bd302c668ca91f18fab47fa6cd3c')
 
 prepare() {
   mkdir build
diff --git a/nonprism/sylpheed-nonprism/PKGBUILD b/nonprism/sylpheed-nonprism/PKGBUILD
new file mode 100644
index 000000000..34d15ce73
--- /dev/null
+++ b/nonprism/sylpheed-nonprism/PKGBUILD
@@ -0,0 +1,52 @@
+# $Id: PKGBUILD 79630 2012-11-09 11:59:02Z speps $
+# Maintainer: speps <speps at aur dot archlinux dot org>
+# Contributor: Alexander Fehr <pizzapunk gmail com>
+# Contributor: dorphell <dorphell@archlinux.org>
+# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
+# Contributor (Parabola): Aditya Som <icarious@hacari.org>"
+
+_pkgname=sylpheed
+pkgname=sylpheed-nonprism
+pkgver=3.3.0
+pkgrel=1
+pkgdesc="Lightweight and user-friendly e-mail client, without Gmail support"
+arch=('i686' 'x86_64')
+url="http://sylpheed.sraoss.jp/en/"
+license=('GPL')
+depends=('gpgme' 'gtkspell' 'desktop-file-utils')
+makedepends=('compface' 'openssl')
+options=('!libtool')
+replaces=$_pkgname
+conflicts=$_pkgname
+provides=$_pkgname=$pkgver
+install="$_pkgname.install"
+source=("http://sylpheed.sraoss.jp/$_pkgname/v3.3/$_pkgname-$pkgver.tar.bz2"
+        'nonprism.patch')
+md5sums=('20442f81dbb4e7c59462360ad0bb1afb'
+         'e1bddc14962e607cdb899ec082660639')
+
+prepare() {
+  cd "$srcdir/$_pkgname-$pkgver"
+
+  # Remove Gmail support
+  patch -Np1 -i "$srcdir/nonprism.patch"
+}
+
+build() {
+  cd "$srcdir/$_pkgname-$pkgver"
+  ./configure --prefix=/usr \
+              --enable-ldap
+  make
+
+  # Build Attachment-Tool Plug-in
+  cd plugin/attachment_tool && make
+}
+
+package() {
+  cd "$srcdir/$_pkgname-$pkgver"
+  make DESTDIR="$pkgdir/" install
+
+  # Install Attachment-Tool Plug-in
+  cd plugin/attachment_tool
+  make DESTDIR="$pkgdir/" install-plugin
+}
diff --git a/nonprism/sylpheed-nonprism/nonprism.patch b/nonprism/sylpheed-nonprism/nonprism.patch
new file mode 100644
index 000000000..50d000634
--- /dev/null
+++ b/nonprism/sylpheed-nonprism/nonprism.patch
@@ -0,0 +1,168 @@
+diff -Nur a/src/setup.c b/src/setup.c
+--- a/src/setup.c	2010-08-19 02:23:28.000000000 -0300
++++ b/src/setup.c	2013-10-23 15:10:24.439721307 -0200
+@@ -327,10 +327,6 @@
+ 	GtkWidget *cancel_btn;
+ 	GtkWidget *pop3_radio;
+ 	GtkWidget *imap_radio;
+-#if USE_SSL
+-	GtkWidget *pop3g_radio;
+-	GtkWidget *imapg_radio;
+-#endif
+ 	GtkWidget *name_entry;
+ 	GtkWidget *addr_entry;
+ 	GtkWidget *id_entry;
+@@ -378,15 +374,8 @@
+ {
+ 	SETUP_TYPE_POP3,
+ 	SETUP_TYPE_IMAP,
+-#if USE_SSL
+-	SETUP_TYPE_POP3G,
+-	SETUP_TYPE_IMAPG
+-#endif
+ };
+ 
+-#define GMAIL_POP3_SERVER	"pop.gmail.com"
+-#define GMAIL_IMAP_SERVER	"imap.gmail.com"
+-#define GMAIL_SMTP_SERVER	"smtp.gmail.com"
+ #define POP3_PORT		110
+ #define IMAP_PORT		143
+ #define SMTP_PORT		25
+@@ -410,14 +399,6 @@
+ 	serv = gtk_entry_get_text(GTK_ENTRY(setupac.serv_entry));
+ 	smtp = gtk_entry_get_text(GTK_ENTRY(setupac.smtp_entry));
+ 
+-#if USE_SSL
+-	if (setupac.type == SETUP_TYPE_POP3G ||
+-	    setupac.type == SETUP_TYPE_IMAPG) {
+-		if (GTK_WIDGET(editable) == setupac.addr_entry)
+-			gtk_entry_set_text(GTK_ENTRY(setupac.id_entry), addr);
+-	}
+-#endif
+-
+ 	if (page == SETUP_PAGE_ADDRESS && name && *name && addr && *addr)
+ 		next_enable = TRUE;
+ 	else if (page == SETUP_PAGE_ACCOUNT &&
+@@ -436,8 +417,6 @@
+ 	p = str = gtk_entry_get_text(GTK_ENTRY(entry));
+ 	if (!str || *p == '\0')
+ 		return FALSE;
+-	if (!strcmp(str, "(username)@gmail.com"))
+-		return FALSE;
+ 
+ 	while (*p) {
+ 		c = *p;
+@@ -480,14 +459,6 @@
+ 	} else if (response_id == GTK_RESPONSE_ACCEPT) {
+ 		if (prev_page == SETUP_PAGE_ADDRESS) {
+ 			if (entry_is_valid(setupac.addr_entry)) {
+-#if USE_SSL
+-				if (setupac.type == SETUP_TYPE_POP3G ||
+-				    setupac.type == SETUP_TYPE_IMAPG)
+-					gtk_notebook_set_current_page
+-						(GTK_NOTEBOOK(setupac.notebook),
+-						 SETUP_PAGE_FINISH);
+-				else
+-#endif
+ 					gtk_notebook_set_current_page
+ 						(GTK_NOTEBOOK(setupac.notebook), page + 1);
+ 			} else
+@@ -508,10 +479,6 @@
+ 		if (prev_page == SETUP_PAGE_START) {
+ 			setupac.type = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(setupac.pop3_radio)) ? SETUP_TYPE_POP3
+ 				: gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(setupac.imap_radio)) ? SETUP_TYPE_IMAP
+-#if USE_SSL
+-				: gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(setupac.pop3g_radio)) ? SETUP_TYPE_POP3G
+-				: gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(setupac.imapg_radio)) ? SETUP_TYPE_IMAPG
+-#endif
+ 				: SETUP_TYPE_POP3;
+ 		}
+ 	} else if (response_id == GTK_RESPONSE_REJECT) {
+@@ -539,28 +506,6 @@
+ 			gtk_widget_set_sensitive(setupac.serv_entry, TRUE);
+ 			gtk_widget_set_sensitive(setupac.smtp_entry, TRUE);
+ 			break;
+-#if USE_SSL
+-		case SETUP_TYPE_POP3G:
+-			if (prev_page == SETUP_PAGE_START)
+-				gtk_entry_set_text(GTK_ENTRY(setupac.addr_entry), "(username)@gmail.com");
+-			gtk_widget_set_sensitive(setupac.id_entry, FALSE);
+-			gtk_label_set_text(GTK_LABEL(setupac.serv_label_name1), _("POP3 server:"));
+-			gtk_entry_set_text(GTK_ENTRY(setupac.serv_entry), GMAIL_POP3_SERVER);
+-			gtk_widget_set_sensitive(setupac.serv_entry, FALSE);
+-			gtk_entry_set_text(GTK_ENTRY(setupac.smtp_entry), GMAIL_SMTP_SERVER);
+-			gtk_widget_set_sensitive(setupac.smtp_entry, FALSE);
+-			break;
+-		case SETUP_TYPE_IMAPG:
+-			if (prev_page == SETUP_PAGE_START)
+-				gtk_entry_set_text(GTK_ENTRY(setupac.addr_entry), "(username)@gmail.com");
+-			gtk_widget_set_sensitive(setupac.id_entry, FALSE);
+-			gtk_label_set_text(GTK_LABEL(setupac.serv_label_name1), _("IMAP4 server:"));
+-			gtk_entry_set_text(GTK_ENTRY(setupac.serv_entry), GMAIL_IMAP_SERVER);
+-			gtk_widget_set_sensitive(setupac.serv_entry, FALSE);
+-			gtk_entry_set_text(GTK_ENTRY(setupac.smtp_entry), GMAIL_SMTP_SERVER);
+-			gtk_widget_set_sensitive(setupac.smtp_entry, FALSE);
+-			break;
+-#endif /* USE_SSL */
+ 		}
+ 	} else if (page == SETUP_PAGE_FINISH) {
+ 		prev_enable = FALSE;
+@@ -595,24 +540,6 @@
+ 			setupac.smtp_auth = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(setupac.smtpauth_chkbtn));
+ 			gtk_label_set_text(GTK_LABEL(setupac.serv_label_name2), _("IMAP4 server:"));
+ 			break;
+-#if USE_SSL
+-		case SETUP_TYPE_POP3G:
+-			setupac.serv_ssl = TRUE;
+-			setupac.smtp_ssl = TRUE;
+-			setupac.smtp_auth = TRUE;
+-			setupac.serv_port = POP3S_PORT;
+-			setupac.smtp_port = SMTPS_PORT;
+-			gtk_label_set_text(GTK_LABEL(setupac.serv_label_name2), _("POP3 server:"));
+-			break;
+-		case SETUP_TYPE_IMAPG:
+-			setupac.serv_ssl = TRUE;
+-			setupac.smtp_ssl = TRUE;
+-			setupac.smtp_auth = TRUE;
+-			setupac.serv_port = IMAPS_PORT;
+-			setupac.smtp_port = SMTPS_PORT;
+-			gtk_label_set_text(GTK_LABEL(setupac.serv_label_name2), _("IMAP4 server:"));
+-			break;
+-#endif /* USE_SSL */
+ 		}
+ 
+ 		GET_STR(name, name_entry);
+@@ -756,14 +683,6 @@
+ 	setupac.imap_radio = gtk_radio_button_new_with_label_from_widget
+ 		(GTK_RADIO_BUTTON(setupac.pop3_radio), "IMAP4");
+ 	gtk_box_pack_start(GTK_BOX(vbox), setupac.imap_radio, FALSE, FALSE, 0);
+-#if USE_SSL
+-	setupac.pop3g_radio = gtk_radio_button_new_with_label_from_widget
+-		(GTK_RADIO_BUTTON(setupac.pop3_radio), "POP3 (Gmail)");
+-	gtk_box_pack_start(GTK_BOX(vbox), setupac.pop3g_radio, FALSE, FALSE, 0);
+-	setupac.imapg_radio = gtk_radio_button_new_with_label_from_widget
+-		(GTK_RADIO_BUTTON(setupac.pop3_radio), "IMAP4 (Gmail)");
+-	gtk_box_pack_start(GTK_BOX(vbox), setupac.imapg_radio, FALSE, FALSE, 0);
+-#endif
+ 
+ 	/* Page 2 */
+ 	vbox = gtk_vbox_new(FALSE, 12);
+@@ -991,18 +910,6 @@
+ #endif
+ 		ac->imapport = setupac.serv_port;
+ 		break;
+-#if USE_SSL
+-	case SETUP_TYPE_POP3G:
+-		ac->protocol = A_POP3;
+-		ac->ssl_pop = SSL_TUNNEL;
+-		ac->popport = setupac.serv_port;
+-		break;
+-	case SETUP_TYPE_IMAPG:
+-		ac->protocol = A_IMAP4;
+-		ac->ssl_imap = SSL_TUNNEL;
+-		ac->imapport = setupac.serv_port;
+-		break;
+-#endif /* USE_SSL */
+ 	}
+ 
+ 	g_free(ac->sig_text);
diff --git a/nonprism/sylpheed-nonprism/sylpheed.install b/nonprism/sylpheed-nonprism/sylpheed.install
new file mode 100644
index 000000000..e111ef946
--- /dev/null
+++ b/nonprism/sylpheed-nonprism/sylpheed.install
@@ -0,0 +1,11 @@
+post_install() {
+  update-desktop-database -q
+}
+
+post_upgrade() {
+  post_install
+}
+
+post_remove() {
+  post_install
+}
diff --git a/pcr/czmq/PKGBUILD b/pcr/czmq/PKGBUILD
new file mode 100644
index 000000000..2cb94125c
--- /dev/null
+++ b/pcr/czmq/PKGBUILD
@@ -0,0 +1,27 @@
+# Contributor: Brian Knox <taotetek at gmail.com>
+# Maintainer: Brian Knox <taotetek at gmail.com>
+pkgname=czmq
+pkgver=2.0.2
+pkgrel=1
+pkgdesc="High level C API for ZeroMQ"
+arch=(i686 x86_64)
+url="http://czmq.zeromq.org/"
+license=('LGPL')
+depends=('zeromq')
+makedepends=('asciidoc' 'xmlto')
+options=(!libtool)
+source=(http://download.zeromq.org/${pkgname}-${pkgver}.tar.gz)
+
+sha1sums=('9a78ea2bf2100863eefdd0512c77486ebd1e2587')
+sha256sums=('75115c2a89facf7f706bc24d0cd09ad0cc4f173a6b6b242743a7ed4ffa7a791b')
+
+build() {
+  cd "$srcdir/${pkgname}-${pkgver}"
+  ./configure --prefix=/usr
+  make
+}
+
+package() {
+  cd "$srcdir/${pkgname}-${pkgver}"
+  make DESTDIR="$pkgdir/" install
+}
diff --git a/pcr/debootstrap-libre/PKGBUILD b/pcr/debootstrap-libre/PKGBUILD
index b4ea8c09f..47ea86d07 100644
--- a/pcr/debootstrap-libre/PKGBUILD
+++ b/pcr/debootstrap-libre/PKGBUILD
@@ -1,4 +1,4 @@
-# Maintainer: André Silva <emulatorman@lavabit.com>
+# Maintainer: André Silva <emulatorman@parabola.nu>
 
 _pkgname=debootstrap
 pkgname=debootstrap-libre
diff --git a/pcr/eigen3/PKGBUILD b/pcr/eigen3/PKGBUILD
index a1e186325..240b55f8a 100644
--- a/pcr/eigen3/PKGBUILD
+++ b/pcr/eigen3/PKGBUILD
@@ -4,7 +4,7 @@
 # Maintainer: Parabola GNU / Linux-libre Aurélien Desbrières <aurelien@cwb.IO>
 
 pkgname=eigen3
-pkgver=3.1.2
+pkgver=3.2.0
 pkgrel=1
 pkgdesc="Eigen is a lightweight C++ template library for vector and matrix math, a.k.a. linear algebra."
 arch=('any')
@@ -12,6 +12,7 @@ url='http://eigen.tuxfamily.org'
 license=('MPL2')
 makedepends=('cmake' 'pkgconfig')
 source=("${pkgname}-${pkgver}.tar.bz2::http://bitbucket.org/eigen/eigen/get/${pkgver}.tar.bz2")
+sha512sums=ab30077c845b09aa3f652e4695f1e256c7c7ff1c0f850e38cf9867ab9659ec6008fa646c2796796ca718b996764e7e3d2811a2c6a24abacbe50a2513fc670ca5
 
 build() {
     mkdir -p "$srcdir"/build
diff --git a/pcr/filemq/PKGBUILD b/pcr/filemq/PKGBUILD
new file mode 100644
index 000000000..57f5eb69d
--- /dev/null
+++ b/pcr/filemq/PKGBUILD
@@ -0,0 +1,34 @@
+pkgname=filemq
+pkgver=v1.0a.r124.gd2d6274
+pkgrel=1
+pkgdesc="Chunked, flow-controlled, restartable, cancellable, async, multicast file transfer ØMQ protocol"
+url="https://github.com/zeromq/filemq"
+license=('GPL3' 'LGPL3')
+depends=('zeromq' 'czmq')
+makedepends=('git')
+arch=('i686' 'x86_64')
+
+source=("git+https://github.com/zeromq/filemq#branch=master")
+sha256sums=('SKIP')
+
+pkgver() {
+    cd "${srcdir}/${pkgname}"
+    git describe --always| sed -E 's/([^-]*-g)/r\1/;s/-/./g'
+}
+
+prepare() {
+    cd "${srcdir}/${pkgname}"
+
+    ./autogen.sh
+}
+
+build() {
+    cd "${srcdir}/${pkgname}"
+    ./configure --prefix=/usr
+    make
+}
+
+package() {
+    cd "${srcdir}/${pkgname}"
+    make prefix=${pkgdir}/usr install
+}
diff --git a/pcr/fsniper/PKGBUILD b/pcr/fsniper/PKGBUILD
new file mode 100644
index 000000000..bf7e3a6c3
--- /dev/null
+++ b/pcr/fsniper/PKGBUILD
@@ -0,0 +1,32 @@
+# Initial Contributor: andrewy
+# Actual Contributor: Luca Cesari <luca.cesari@bewq.org>
+
+arch=(i686 x86_64)
+pkgname=fsniper
+pkgver=1.3.1
+pkgrel=2
+pkgdesc="Daemon to run scripts based on changes in files monitored by inotify"
+url="http://projects.l3ib.org/fsniper/"
+license="GPL3"
+depends=('pcre' 'file')
+source=(http://projects.l3ib.org/fsniper/files/$pkgname-$pkgver.tar.gz)
+md5sums=('62f30bb4b00f9499499d83a30281f10f')
+
+build() {
+  cd ${srcdir}/$pkgname-$pkgver
+
+  ./configure --prefix=/usr
+  make
+}
+
+package() {
+  cd ${srcdir}/$pkgname-$pkgver
+
+  make DESTDIR=${pkgdir} install
+
+  install -m644 -D ${srcdir}/$pkgname-$pkgver/README \
+                   ${pkgdir}/usr/share/${pkgname}/README
+  install -m644 -D ${srcdir}/$pkgname-$pkgver/example.conf \
+                   ${pkgdir}/usr/share/${pkgname}/example.conf
+
+}
diff --git a/pcr/gcc-lts/PKGBUILD b/pcr/gcc-lts/PKGBUILD
index b1280fad9..b4ad7137d 100644
--- a/pcr/gcc-lts/PKGBUILD
+++ b/pcr/gcc-lts/PKGBUILD
@@ -1,6 +1,6 @@
 # $Id: PKGBUILD 186915 2013-05-31 23:25:14Z allan $
 # Maintainer: Allan McRae <allan@archlinux.org>
-# Maintainer (Parabola): Márcio Silva <coadde@lavabit.com>
+# Maintainer (Parabola): Márcio Silva <coadde@parabola.nu>
 
 # toolchain build order: linux-api-headers->glibc->binutils->gcc->binutils->glibc
 # NOTE: libtool requires rebuilt with each new gcc version
@@ -8,7 +8,7 @@
 #pkgname=('gcc-lts' 'gcc-lts-libs' 'gcc-lts-fortran' 'gcc-lts-objc' 'gcc-lts-ada' 'gcc-lts-go')
 pkgname=('gcc-lts' 'gcc-lts-libs' 'gcc-lts-fortran' 'gcc-lts-objc' 'gcc-lts-go')
 pkgver=4.7.3
-pkgrel=3
+pkgrel=4
 pkgdesc="The GNU Compiler Collection"
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL' 'LGPL' 'FDL' 'custom')
diff --git a/pcr/gimp-art/gimp-splash-artwork.license b/pcr/gimp-art/gimp-splash-artwork.license
index 0f060c013..22b83f32c 100644
--- a/pcr/gimp-art/gimp-splash-artwork.license
+++ b/pcr/gimp-art/gimp-splash-artwork.license
@@ -1,7 +1,7 @@
 GIMP LIBRE SPLASH LICENSE
 
 Logo and Effects is created by Zé Lara <ze.miguel.lara@gmail.com> and Márcio Silva <coadde@lavabit.com>
-Idea by André Silva <emulatorman@lavabit.com>
+Idea by André Silva <emulatorman@parabola.nu>
 
 The GIMP LIBRE splash screen is licensed under the Creative Commons Attribution-ShareAlike 3.0 Unported License. 
 To view a copy of this license, visit http://creativecommons.org/licenses/by-sa/3.0/ or send aletter to Creative Commons, 444 Castro Street,
diff --git a/pcr/gnuhealth/PKGBUILD b/pcr/gnuhealth/PKGBUILD
index 76fdf442a..2293b6375 100644
--- a/pcr/gnuhealth/PKGBUILD
+++ b/pcr/gnuhealth/PKGBUILD
@@ -1,4 +1,4 @@
-# Maintainer: André Silva <emulatorman@lavabit.com>
+# Maintainer: André Silva <emulatorman@parabola.nu>
 # Contributor: SpepS <dreamspepser at yahoo dot it>
 
 pkgname=gnuhealth
diff --git a/pcr/hunspell-pt-br/PKGBUILD b/pcr/hunspell-pt-br/PKGBUILD
index 0641711df..a15ddda78 100644
--- a/pcr/hunspell-pt-br/PKGBUILD
+++ b/pcr/hunspell-pt-br/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Daniel Felipe Reis Apolinario <dapolinario@gmail.com>
 # Contributor: Bernardo Barros <bernardobarros@NOSPAM.gmail.com>
 # Contributor: Robson R S Peixoto <robsonpeixoto@gmail.com>
-# Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
+# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
 
 pkgname=hunspell-pt-br
 pkgver=3.0
diff --git a/pcr/jitsi/PKGBUILD b/pcr/jitsi/PKGBUILD
index 87913af64..e0fe27d2e 100644
--- a/pcr/jitsi/PKGBUILD
+++ b/pcr/jitsi/PKGBUILD
@@ -1,6 +1,6 @@
 # Maintainer: Xavier Devlamynck <magicrhesus@ouranos.be>
 # Contributors: Keshav P R, atommix aka Aleks Lifey, Xavion, Ananda Samaddar, Dan Serban, Xyne
-# Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
+# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
 # Contributor (Parabola): Márcio Silva <coadde@lavabit.com>
 
 pkgname=jitsi
diff --git a/pcr/libdrm-nvfx/COPYING b/pcr/libdrm-nvfx/COPYING
new file mode 100644
index 000000000..6e74c337c
--- /dev/null
+++ b/pcr/libdrm-nvfx/COPYING
@@ -0,0 +1,48 @@
+ Copyright 2005 Adam Jackson.
+
+ Permission is hereby granted, free of charge, to any person obtaining
+ a copy of this software and associated documentation files (the
+ "Software"), to deal in the Software without restriction, including
+ without limitation on the rights to use, copy, modify, merge,
+ publish, distribute, sub license, and/or sell copies of the Software,
+ and to permit persons to whom the Software is furnished to do so,
+ subject to the following conditions:
+
+ The above copyright notice and this permission notice (including the
+ next paragraph) shall be included in all copies or substantial
+ portions of the Software.
+
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ NON-INFRINGEMENT.  IN NO EVENT SHALL ADAM JACKSON BE LIABLE FOR ANY
+ CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+ TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+------------------------------------------------------------------------
+
+ Copyright 1999 Precision Insight, Inc., Cedar Park, Texas.
+ Copyright 2000 VA Linux Systems, Inc., Sunnyvale, California.
+ All Rights Reserved.
+
+ Permission is hereby granted, free of charge, to any person obtaining
+ a copy of this software and associated documentation files (the
+ "Software"), to deal in the Software without restriction, including
+ without limitation the rights to use, copy, modify, merge, publish,
+ distribute, sublicense, and/or sell copies of the Software, and to
+ permit persons to whom the Software is furnished to do so, subject to
+ the following conditions:
+
+ The above copyright notice and this permission notice (including the
+ next paragraph) shall be included in all copies or substantial
+ portions of the Software.
+
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ NONINFRINGEMENT.  IN NO EVENT SHALL PRECISION INSIGHT AND/OR ITS
+ SUPPLIERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ DEALINGS IN THE SOFTWARE.
diff --git a/pcr/libdrm-nvfx/PKGBUILD b/pcr/libdrm-nvfx/PKGBUILD
new file mode 100644
index 000000000..c8a08bea4
--- /dev/null
+++ b/pcr/libdrm-nvfx/PKGBUILD
@@ -0,0 +1,54 @@
+# $Id: PKGBUILD 198149 2013-10-30 13:05:35Z allan $
+# Maintainer: Jan de Groot <jgc@archlinux.org>
+# Maintainer (Parabola): Márcio Silva <coadde@parabola.nu>
+
+_pkgname=libdrm
+pkgname=libdrm-nvfx
+pkgver=2.4.33
+pkgrel=4
+pkgdesc="Userspace interface to kernel DRM services for Nouveau NVFX [NV30 and NV40] (GeForce FX - 7000 series card) video card family"
+arch=(i686 x86_64 mips64el)
+license=('custom')
+depends=('glibc' 'libpciaccess')
+makedepends=('valgrind' 'clang')
+provides=('libdrm')
+conflicts=('libdrm')
+checkdepends=('cairo')
+options=('!libtool')
+url="http://dri.freedesktop.org/"
+source=(http://dri.freedesktop.org/$_pkgname/$_pkgname-$pkgver.tar.bz2
+        COPYING)
+sha256sums=('2d7b9d94ada0e3a6ede6243509883df2ded01c2983e24322759a366283898fea'
+            '9631d4f694952e3e6ae5a05534c2e93e994e47d3413677a3a00e45c8cef6db93')
+
+build() {
+  cd $_pkgname-$pkgver
+
+  # pthread is useless in Linux
+  sed -i "/pthread-stubs/d" configure.ac
+  autoreconf --force --install
+  
+  # gcc 4.8 introduces graphic corruption and X crashes with nouveau cards (nv44)
+  # http://gcc.gnu.org/ml/gcc-help/2013-07/msg00103.html
+  # we use clang compiler meanwhile
+  export CC=clang
+
+  ./configure --prefix=/usr --enable-udev \
+    --enable-nouveau-experimental-api \
+    --enable-libkms --disable-intel --disable-radeon
+
+  make
+}
+
+check() {
+  cd $_pkgname-$pkgver
+  make -k check
+}
+
+package() {
+  cd $_pkgname-$pkgver
+  make DESTDIR="$pkgdir" install
+
+  install -m755 -d "$pkgdir/usr/share/licenses/$pkgname"
+  install -m644 ../COPYING "$pkgdir/usr/share/licenses/$pkgname/"
+}
diff --git a/pcr/libquvi-scripts-current/PKGBUILD b/pcr/libquvi-scripts-current/PKGBUILD
new file mode 100644
index 000000000..851470439
--- /dev/null
+++ b/pcr/libquvi-scripts-current/PKGBUILD
@@ -0,0 +1,28 @@
+# $Id: PKGBUILD 196118 2013-10-07 11:53:00Z jgc $
+# Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de>
+
+pkgname=libquvi-scripts-current
+_pkgname=libquvi-scripts
+provides=(libquvi-scripts)
+pkgver=0.9.20131104
+pkgrel=1
+pkgdesc='Library for parsing video download links.'
+arch=('any')
+url='http://quvi.sourceforge.net/'
+license=('AGPL3')
+options=('!libtool')
+depends=('lua51-socket' 'lua51-bitop' 'lua51-expat')
+source=("http://downloads.sourceforge.net/sourceforge/quvi/${_pkgname}-${pkgver}.tar.xz"{,.sig})
+
+build() {
+  cd "${_pkgname}-${pkgver}"
+  ./configure --prefix=/usr --with-nsfw --with-geoblocked
+  make
+}
+
+package() {
+  cd "${_pkgname}-${pkgver}"
+  make DESTDIR="${pkgdir}" install
+}
+md5sums=('0ddb9e392b46cee0e7a4af260bc1a1a3'
+         'SKIP')
diff --git a/pcr/libtool-lts/PKGBUILD b/pcr/libtool-lts/PKGBUILD
new file mode 100644
index 000000000..66bcc547c
--- /dev/null
+++ b/pcr/libtool-lts/PKGBUILD
@@ -0,0 +1,44 @@
+# $Id: PKGBUILD 196866 2013-10-20 14:29:14Z allan $
+# Maintainer: Allan McRae <allan@archlinux.org>
+# Contributor: judd <jvinet@zeroflux.org>
+# Maintainer (Parabola): Márcio Silva <coadde@parabola.nu>
+
+# NOTE: requires rebuilt with each new gcc version
+
+_pkgname=libtool
+pkgname=libtool-lts
+pkgver=2.4.2
+_gccver=4.7.3
+pkgrel=1
+pkgdesc="A generic library support script,"
+arch=('i686' 'x86_64' 'mips64el')
+url="http://www.gnu.org/software/libtool"
+license=('GPL')
+depends=('sh' "libltdl=$pkgver" 'tar' "gcc-lts=${_gccver}")
+makedepends=("gcc-lts=${_gccver}")
+groups=('lts-devel')
+provides=("$_pkgname=$pkgver")
+conflicts=("$_pkgname")
+install=libtool.install
+source=(ftp://ftp.gnu.org/pub/gnu/libtool/${_pkgname}-${pkgver}.tar.xz{,.sig})
+md5sums=('2ec8997e0c07249eb4cbd072417d70fe'
+         '1e6ba57420c82c663c85e745d11c7eed')
+
+build() {
+  cd ${srcdir}/${_pkgname}-${pkgver}
+  ./configure --prefix=/usr
+  make
+}
+
+check() {
+  cd ${srcdir}/${_pkgname}-${pkgver}
+  make check
+}
+
+package() {
+  cd ${srcdir}/${_pkgname}-${pkgver}
+  
+  make DESTDIR=${pkgdir} install-binSCRIPTS install-man install-info \
+                         install-data-local
+  rm -r ${pkgdir}/usr/share/libtool/libltdl/
+}
diff --git a/pcr/libtool-lts/libtool.install b/pcr/libtool-lts/libtool.install
new file mode 100644
index 000000000..73cf56422
--- /dev/null
+++ b/pcr/libtool-lts/libtool.install
@@ -0,0 +1,20 @@
+infodir=usr/share/info
+filelist=(libtool.info  libtool.info-1  libtool.info-2)
+
+post_install() {
+  [ -x usr/bin/install-info ] || return 0
+  for file in ${filelist[@]}; do
+    install-info $infodir/$file.gz $infodir/dir 2> /dev/null
+  done
+}
+
+post_upgrade() {
+  post_install $1
+}
+
+pre_remove() {
+  [ -x usr/bin/install-info ] || return 0
+  for file in ${filelist[@]}; do
+    install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null
+  done
+}
diff --git a/pcr/lilo/PKGBUILD b/pcr/lilo/PKGBUILD
index 10d334b05..bd2446fd4 100644
--- a/pcr/lilo/PKGBUILD
+++ b/pcr/lilo/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Connor Behan <connor.behan@gmail.com>
 # Contributor: Eric Belanger <eric@archlinux.org>
 # Contributor: judd <jvinet@zeroflux.org>
-# Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
+# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
 
 pkgname=lilo
 pkgver=24.0
diff --git a/pcr/maliit-framework/PKGBUILD b/pcr/maliit-framework/PKGBUILD
index 545c34a0c..995a12582 100644
--- a/pcr/maliit-framework/PKGBUILD
+++ b/pcr/maliit-framework/PKGBUILD
@@ -1,7 +1,7 @@
 # Contributor: Jon Nordby <jononor@gmail.com>
 # Maintainer: Jon Nordby <jononor@gmail.com>
 # Maintainer (Parabola): Javier Barcena <javierbuilder@gmail.com>
-# Contributor (Parabola): André Silva <emulatorman@lavabit.com>
+# Contributor (Parabola): André Silva <emulatorman@parabola.nu>
 
 pkgname=maliit-framework
 pkgver=0.99.0
diff --git a/pcr/maruku/PKGBUILD b/pcr/maruku/PKGBUILD
deleted file mode 100644
index a647e5a12..000000000
--- a/pcr/maruku/PKGBUILD
+++ /dev/null
@@ -1,24 +0,0 @@
-# Contributor: Adam Lloyd <lloyda2 (at) rpi (dot) edu>
-# Maintainter : Parabola GNU / Linux-libre Aurelien Desbrieres <aurelien@cwb.io>
-
-pkgname=maruku
-pkgver=0.6.0
-pkgrel=1
-pkgdesc="A Markdown-superset interpreter"
-arch=(any)
-url="http://maruku.rubyforge.org/"
-license=('GPL2')
-depends=(ruby ruby-syntax)
-makedepends=(rubygems)
-source=(http://gems.rubyforge.org/gems/maruku-$pkgver.gem)
-noextract=(maruku-$pkgver.gem)
-md5sums=('6e2575e43b675eb4e15bbcee0fd1fd29')
-
-build() {
-  cd $srcdir
-  local _gemdir="$(ruby -rubygems -e'puts Gem.default_dir')"
-  gem install --ignore-dependencies -i "$pkgdir$_gemdir" maruku-$pkgver.gem
-}
-
-# vim:set ts=2 sw=2 et:
-md5sums=('6e2575e43b675eb4e15bbcee0fd1fd29')
diff --git a/pcr/mathjax/PKGBUILD b/pcr/mathjax/PKGBUILD
index 47f581fa1..779aa5a74 100644
--- a/pcr/mathjax/PKGBUILD
+++ b/pcr/mathjax/PKGBUILD
@@ -3,19 +3,17 @@
 #taken from https://aur.archlinux.org/packages/mathjax/
 
 pkgname=mathjax
-pkgver=2.1
-pkgrel=1
+pkgver=2.2
+pkgrel=2
 pkgdesc='An open source JavaScript display engine for mathematics that works in all modern browsers'
 url='http://www.mathjax.org/'
 arch=('any')
 license=('apache')
 options=('!strip')
-source=('https://github.com/mathjax/MathJax/archive/v2.1.tar.gz')
+source=('https://github.com/mathjax/MathJax/archive/v2.2.tar.gz')
 
 build() {
     mkdir -p $pkgdir/usr/share
     mv $srcdir/MathJax-* $pkgdir/usr/share/mathjax
 }
-
-
-md5sums=('8e7ad1b8f3a69be8ec83f21d3e2a509c')
+md5sums=('9e3ace5d926be939befb9bc79138a6f8')
diff --git a/pcr/mesa-nvfx/LICENSE b/pcr/mesa-nvfx/LICENSE
new file mode 100644
index 000000000..ae33d2709
--- /dev/null
+++ b/pcr/mesa-nvfx/LICENSE
@@ -0,0 +1,82 @@
+Disclaimer
+
+Mesa is a 3-D graphics library with an API which is very similar to
+that of OpenGL*
+To the extent that Mesa utilizes the OpenGL command syntax or state
+machine, it is being used with authorization from Silicon Graphics,
+Inc.(SGI). However, the author does not possess an OpenGL license
+from SGI, and makes no claim that Mesa is in any way a compatible
+replacement for OpenGL or associated with SGI. Those who want a
+licensed implementation of OpenGL should contact a licensed
+vendor.
+
+Please do not refer to the library as MesaGL (for legal
+reasons). It's just Mesa or The Mesa 3-D graphics
+library
+
+* OpenGL is a trademark of Silicon Graphics Incorporated.
+
+License / Copyright Information
+
+The Mesa distribution consists of several components.  Different copyrights
+and licenses apply to different components.  For example, GLUT is copyrighted
+by Mark Kilgard, some demo programs are copyrighted by SGI, some of the Mesa
+device drivers are copyrighted by their authors.  See below for a list of
+Mesa's main components and the license for each.
+
+The core Mesa library is licensed according to the terms of the MIT license.
+This allows integration with the XFree86, Xorg and DRI projects.
+
+The default Mesa license is as follows:
+
+Copyright (C) 1999-2007  Brian Paul   All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining a
+copy of this software and associated documentation files (the "Software"),
+to deal in the Software without restriction, including without limitation
+the rights to use, copy, modify, merge, publish, distribute, sublicense,
+and/or sell copies of the Software, and to permit persons to whom the
+Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included
+in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+Attention, Contributors
+
+When contributing to the Mesa project you must agree to the licensing terms
+of the component to which you're contributing.
+The following section lists the primary components of the Mesa distribution
+and their respective licenses.
+
+
+Mesa Component Licenses
+
+Component         Location               Primary Author      License
+----------------------------------------------------------------------------
+Main Mesa code    src/mesa/              Brian Paul          Mesa (MIT)
+
+Device drivers    src/mesa/drivers/*     See drivers         See drivers
+
+Ext headers       include/GL/glext.h     SGI                 SGI Free B
+                  include/GL/glxext.h
+
+GLUT              src/glut/              Mark Kilgard        Mark's copyright
+
+Mesa GLU library  src/glu/mesa/          Brian Paul          GNU-LGPL
+
+SGI GLU library   src/glu/sgi/           SGI                 SGI Free B
+
+demo programs     progs/demos/           various             see source files
+
+X demos           progs/xdemos/          Brian Paul          see source files
+
+SGI demos         progs/samples/         SGI                 SGI copyright
+
+RedBook demos     progs/redbook/         SGI                 SGI copyright
diff --git a/pcr/mesa-nvfx/PKGBUILD b/pcr/mesa-nvfx/PKGBUILD
new file mode 100644
index 000000000..4caacabf8
--- /dev/null
+++ b/pcr/mesa-nvfx/PKGBUILD
@@ -0,0 +1,129 @@
+# $Id: PKGBUILD 198319 2013-10-30 14:08:41Z allan $
+# Maintainer: Jan de Groot <jgc@archlinux.org>
+# Maintainer: Andreas Radke <andyrtr@archlinux.org>
+# Maintainer (Parabola): Márcio Silva <coadde@parabola.nu>
+
+pkgbase=mesa-nvfx
+pkgname=('nouveau-nvfx-dri' 'svga-nvfx-dri' 'mesa-nvfx' 'mesa-nvfx-libgl')
+pkgver=8.0.5
+pkgrel=3
+arch=('i686' 'x86_64' 'mips64el')
+makedepends=('python2' 'libxml2' 'libx11' 'glproto' 'libdrm-nvfx' 'dri2proto' 'libxxf86vm' 'libxdamage'
+             'libvdpau' 'elfutils' 'systemd' 'imake')
+url="http://mesa3d.sourceforge.net"
+license=('custom')
+source=(ftp://ftp.freedesktop.org/pub/mesa/older-versions/${pkgver::1}.x/${pkgver}/MesaLib-${pkgver}.tar.bz2
+        LICENSE)
+md5sums=('01305591073a76b65267f69f27d635a3'
+         '5c65a0fe315dd347e09b1f2826a1df5a')
+
+build() {
+  cd ${srcdir}/?esa-*
+
+  autoreconf -vfi # our automake is far too new for their build system :)
+
+  ./configure --prefix=/usr \
+    --sysconfdir=/etc \
+    --with-dri-driverdir=/usr/lib/xorg/modules/dri \
+    --with-gallium-drivers=nouveau,svga,swrast \
+    --with-dri-drivers=swrast \
+    --with-egl-platforms=x11,drm \
+    --with-llvm-shared-libs \
+    --disable-gallium-llvm \
+    --enable-egl \
+    --enable-gallium-egl \
+    --enable-shared-glapi \
+    --enable-gbm \
+    --enable-glx-tls \
+    --enable-dri \
+    --enable-glx \
+    --enable-osmesa \
+    --enable-gles1 \
+    --enable-gles2 \
+    --enable-texture-float \
+    --enable-xa \
+    --enable-vdpau \
+    --disable-glu
+    # --help
+
+  make
+
+  # fake installation
+  mkdir $srcdir/fakeinstall
+  make DESTDIR=${srcdir}/fakeinstall install
+}
+
+package_nouveau-nvfx-dri() {
+  pkgdesc="Mesa drivers for Nouveau NVFX [NV30 and NV40] (GeForce FX - 7000 series card) video card family (without wayland support)"
+  optdepends=('libtxc_dxtn: S3 Texture Compressed support')
+  depends=("mesa-nvfx-libgl=${pkgver}")
+  provides=('nouveau-dri')
+  conflicts=('nouveau-dri')
+
+  install -m755 -d ${pkgdir}/usr/lib/vdpau/
+  mv -v ${srcdir}/fakeinstall/usr/lib/vdpau/libvdpau_nouveau.* ${pkgdir}/usr/lib/vdpau/
+
+  install -m755 -d ${pkgdir}/usr/lib/xorg/modules/dri
+  mv -v ${srcdir}/fakeinstall/usr/lib/xorg/modules/dri/nouveau_dri.so ${pkgdir}/usr/lib/xorg/modules/dri/
+  
+  install -m755 -d ${pkgdir}/usr/lib/gallium-pipe
+  mv -v ${srcdir}/fakeinstall/usr/lib/gbm/pipe_nouveau* ${pkgdir}/usr/lib/gallium-pipe/
+  
+  # vdpau drivers are buggy with nouveau NVFX, so remove them (FS#36754)
+  rm -rf ${pkgdir}/usr/lib/vdpau/
+
+  install -m755 -d "${pkgdir}/usr/share/licenses/nouveau-nvfx-dri"
+  install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/nouveau-nvfx-dri/"
+}
+
+package_svga-nvfx-dri() {
+  pkgdesc="Gallium3D VMware guest GL driver for Nouveau NVFX [NV30 and NV40] (GeForce FX - 7000 series card family (without wayland support)"
+  depends=('libdrm-nvfx' 'expat')
+  provides=('svga-dri')
+  conflicts=('svga-dri')
+
+  install -m755 -d ${pkgdir}/usr/lib/xorg/modules/dri
+  mv -v ${srcdir}/fakeinstall/usr/lib/xorg/modules/dri/vmwgfx_dri.so ${pkgdir}/usr/lib/xorg/modules/dri/
+
+  install -m755 -d ${pkgdir}/usr/lib/gallium-pipe
+  mv -v ${srcdir}/fakeinstall/usr/lib/gbm/pipe_vmwgfx* ${pkgdir}/usr/lib/gallium-pipe/
+  
+  install -m755 -d "${pkgdir}/usr/share/licenses/svga-nvfx-dri"
+  install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/svga-nvfx-dri/"
+}
+
+package_mesa-nvfx() {
+  pkgdesc="an free implementation of the OpenGL specification for Nouveau NVFX [NV30 and NV40] (GeForce FX - 7000 series card) video card family (without wayland and support)"
+  depends=('libdrm-nvfx' 'libvdpau' 'libxxf86vm' 'libxdamage' 'systemd' 'elfutils')
+  optdepends=('opengl-man-pages: for the OpenGL API man pages')
+  provides=('mesa' 'libegl' 'libgbm' 'libgles')
+  conflicts=('mesa' 'libegl' 'libgbm' 'libgles')
+
+  mv -v ${srcdir}/fakeinstall/* ${pkgdir}
+  # rename libgl.so
+  mv ${pkgdir}/usr/lib/libGL.so.1.2 	${pkgdir}/usr/lib/mesa-libGL.so.1.2.0
+  rm ${pkgdir}/usr/lib/libGL.so{,.1}
+
+  # removing glu headers files
+  rm -v "${pkgdir}/usr/include/GL/glu"{,_mangle}".h"
+
+  install -m755 -d "${pkgdir}/usr/share/licenses/mesa-nvfx"
+  install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/mesa-nvfx/"
+}
+
+package_mesa-nvfx-libgl() {
+  pkgdesc="Mesa 3-D graphics library for Nouveau NVFX [NV30 and NV40] (GeForce FX - 7000 series card) video card family (without wayland support)"
+  depends=("mesa-nvfx=${pkgver}")
+  provides=('mesa-libgl' 'libgl')
+  conflicts=('mesa-libgl' 'libgl')
+
+  install -m755 -d "${pkgdir}/usr/lib"
+
+  ln -s mesa-libGL.so.1.2.0      ${pkgdir}/usr/lib/libGL.so
+  ln -s mesa-libGL.so.1.2.0      ${pkgdir}/usr/lib/libGL.so.1
+  ln -s mesa-libGL.so.1.2.0      ${pkgdir}/usr/lib/libGL.so.1.2
+  ln -s mesa-libGL.so.1.2.0      ${pkgdir}/usr/lib/libGL.so.1.2.0
+
+  install -m755 -d "${pkgdir}/usr/share/licenses/mesa-nvfx-libgl"
+  install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/mesa-nvfx-libgl/"
+}
diff --git a/pcr/minetest-git/PKGBUILD b/pcr/minetest-git/PKGBUILD
index b4a5eb7ce..e322285cf 100644
--- a/pcr/minetest-git/PKGBUILD
+++ b/pcr/minetest-git/PKGBUILD
@@ -1,6 +1,6 @@
 # Maintainer: Konsta Kokkinen <kray@tsundere.fi>
 # Maintainer (Parabola): Jorge Araya Navarro <jorgean@lavabit.com>
-# Contributor (Parabola): André Silva <emulatorman@lavabit.com>
+# Contributor (Parabola): André Silva <emulatorman@parabola.nu>
 pkgname=minetest-git
 pkgver=20130501
 pkgrel=1
diff --git a/pcr/mitsuba/PKGBUILD b/pcr/mitsuba/PKGBUILD
index 0961ef11d..d8e12a3b9 100644
--- a/pcr/mitsuba/PKGBUILD
+++ b/pcr/mitsuba/PKGBUILD
@@ -2,17 +2,17 @@
 
 _pkgname=mitsuba
 _pkgver=0.4.4
-_pkgrel=4
+_pkgrel=5
 _bldname=blender
-_bldver=2.68
-_bldep=9
+_bldver=2.69
+_bldep=10
 _addname=$_pkgname-$_bldname
 _adddat=20130320
-_addrev=40
-_addrel=3
+_addrev=47
+_addrel=1
 _pyver=3.3
 
-# Wed Mar 20 01:30:37 2013 +0100 rev:40 ($srcdir/$_addname/$_pkgname/__init__.py:bl_info>version)
+# Thu May 09 22:07:37 2013 +0200 - rev:47:8689e0896cf6 ($srcdir/$_addname/$_pkgname/__init__.py:bl_info>version)
 _addver=0.2.1
 
 pkgname=(
@@ -50,21 +50,25 @@ makedepends=(
   python
 )
 source=(
-  $_pkgname-$pkgver.tar.bz2::${url}hg/$_pkgname/archive/v$pkgver.tar.bz2
-  $_addname-$_addver.tar.bz2::${url}hg/$_addname/archive/$_addrev.tar.bz2
+  $_pkgname-$pkgver.tar.bz2::${url}repos/$_pkgname/archive/v$pkgver.tar.bz2
+  $_addname-$_addver-$_addrev.tar.bz2::${url}repos/exporters/$_addname/archive/$_addrev.tar.bz2
 )
 sha512sums=(
-  66dcab376a44eeb2fbe808a32ead5b554d777fb2f6a73c43883086b7829e0c697aaeccbb6fbbed9fcb221684a64ccce8be81a78ebcd228316ea12b8f6f3e7f6c
-  c829978a28c7780605662c604450c3d00b8ac958310e26aa7ad02dfb50f1875420e0e85fe0c868e030946c894cb939d18a4589c9e06a169f86eba5948eb2147e
+  01967fb84884fbab0ada3775c8f8c54b5523a97ebc9dedd559da3cb54543ecc919d3251c09718358405c19133218048fdb1c64f83d0637cf7b98acccb7564a1c
+  514cbb1300229599c536183ec300c3074aca349e0ddaa36ae7ae868a2c6b466116d9373a8d9ea89dcd1d09685e9a97bbd5c11121860da1a1bf45b921bcd21ca7
 )
 
 prepare() {
+  mv -v $srcdir/$_pkgname-???????????? $srcdir/$_pkgname-v$pkgver
+  mv -v $srcdir/$_addname-???????????? $srcdir/$_addname-$_addrev
+
   cd $srcdir/$_pkgname-v$pkgver
 
   msg 'renaming wrong OS name'
   _OS=$(uname -o)
   [[ $_OS == GNU ]] && sed -i 's|Linux|GNU|I' src/libcore/plugin.cpp
-  [[ $_OS == GNU/Linux ]] && sed -i 's|Linux,|GNU/Linux-libre,|' src/libcore/plugin.cpp
+  [[ $_OS == GNU/Linux ]] && sed -i 's|Linux,|GNU/Linux,|' src/libcore/plugin.cpp
+  [[ $_OS == GNU/kFreeBSD ]] && sed -i 's|Linux,|GNU/kFreeBSD,|' src/libcore/plugin.cpp
   sed -i 's|Linux/|Linux,|
           s|Linux|GNU/Linux|
          ' include/$_pkgname/core/{atomic,fstream,random,thread}.h
diff --git a/pcr/pandoc/PKGBUILD b/pcr/pandoc/PKGBUILD
index 0d2f2d8ea..49fcabcfe 100644
--- a/pcr/pandoc/PKGBUILD
+++ b/pcr/pandoc/PKGBUILD
@@ -5,36 +5,29 @@
 
 pkgname=pandoc-static
 _pkgname=pandoc
-pkgver=1.12
+pkgver=1.12.1
 pkgrel=1
 pkgdesc='Conversion between markup formats (no Haskell libs)'
 url='http://johnmacfarlane.net/pandoc/'
 license=('GPL')
 arch=('i686' 'x86_64')
+# Needed for pandoc-citeproc
+depends=('icu>=52' 'icu<=53')
 makedepends=('ghc' 'sh' 'cabal-install' 'alex' 'happy')
 options=(strip !makeflags !distcc !emptydirs)
-#source=(https://repo.parabolagnulinux.org/other/${_pkgname}-${pkgver}-$pkgrel-any.src.tar.xz{,.sig}
 source=(https://repo.parabolagnulinux.org/other/${_pkgname}-${pkgver}-1-any.src.tar.xz{,.sig}
         SRCBUILD)
-#        citeproc-hs-pre-0.3.7.patch)
 replaces=('pandoc')
 provides=('pandoc')
 optdepends=('texlive-most: for pdf creation')
-md5sums=('3d5f23060cad2ff29ba2df5651e92f8a'
-         'SKIP'
-         'c2e9f9b880468455b6e6a7f9ba7308e8')
 
 # PKGBUILD functions
 build() {
-    mkdir -p ${srcdir}/{build,${_pkgname}-${pkgver}}
-    cd ${srcdir}/${_pkgname}-${pkgver}
+   mkdir -p ${srcdir}/{build,${_pkgname}-${pkgver}}
+   cd ${srcdir}/${_pkgname}-${pkgver}
 
-# Patches from the next citeproc-hs release
-# These are needed because 0.3.6 with embed_data_files is broken
-# darcs diff --from-tag=0.3.6
-#   pushd ${srcdir}/${_pkgname}-${pkgver}/citeproc-hs-0.3.6
-#   patch -Np1 -i ${srcdir}/citeproc-hs-pre-0.3.7.patch
-#   popd
+# pandoc-citeproc needs hsb2hs
+   export PATH=${srcdir}/build/usr/bin:$PATH
 
    while read _hkpkg; do
 # Skip already built
@@ -47,23 +40,29 @@ build() {
        case $_hkpkg in
         $_pkgname-$pkgver)
          HOME=${srcdir}/${_pkgname}-${pkgver} \
-         cabal configure --flags='-library' \
-                         --prefix=/usr \
+         cabal configure --prefix=/usr \
                          --libdir=${srcdir}/build/usr/lib -v
 
          HOME=${srcdir}/${_pkgname}-${pkgver} \
          cabal build
+
+         HOME=${srcdir}/${_pkgname}-${pkgver} \
+         cabal register --inplace
          ;;
 
-        citeproc-hs-*)
+        pandoc-citeproc*)
+         HOME=${srcdir}/${_pkgname}-${pkgver} \
+         cabal configure --flags='small_base embed_data_files bibutils hexpat unicode_collation' \
+                       --libdir=${srcdir}/build/usr/lib \
+                       --prefix=/usr -v
+
          HOME=${srcdir}/${_pkgname}-${pkgver} \
-         cabal install --flags='embed_data_files' \
-                       --prefix=${srcdir}/build/usr -v
+         cabal build
          ;;
 
         *)
          HOME=${srcdir}/${_pkgname}-${pkgver} \
-         cabal install --prefix=${srcdir}/build/usr
+         cabal install --prefix=${srcdir}/build/usr --flags="embed_data_files"
          ;;
        esac
 
@@ -77,11 +76,16 @@ package() {
 
   runghc Setup.hs copy --destdir=${pkgdir}/
 
+  cd ${srcdir}/${_pkgname}-${pkgver}/pandoc-citeproc*
+  runghc Setup.hs copy --destdir=${pkgdir}/
+
 # For some reason the library is installed anyway
 # Remove all files and !emptydirs takes care of the rest
   msg2 "Removing lib files..."
   find ${pkgdir} -iname lib -print0 | xargs -0 rm -rvf
 
+  cp -av ${srcdir}/build/usr/bin/* ${pkgdir}/usr/bin/
+
 # EC is unfree and makes Parabola TeXLive cry
 # besides, it's unneeded
   sed "/fontenc/d" -i ${pkgdir}/usr/share/${_pkgname}-${pkgver}/data/templates/default.latex
@@ -90,6 +94,9 @@ package() {
   find ${pkgdir}/usr/share -type d -exec chmod 755 {} \;
 
   msg2 "Installing licenses"
-  install -d ${pkgdir}/usr/share
-  cp -rv ${srcdir}/build/usr/share/doc ${pkgdir}/usr/share/
+  install -d ${pkgdir}/usr/share/licenses
+  cp -rv ${srcdir}/build/usr/share/doc/* ${pkgdir}/usr/share/licenses/
 }
+sha256sums=('4cbeb1b112985961ff78b9baaa4cca3b24e5996c243c790fa00bbe44052cd418'
+            'SKIP'
+            '25fae3ded388733915dbaca9970ac5f5ef53883410564305bd225a950e5951db')
diff --git a/pcr/pandoc/SRCBUILD b/pcr/pandoc/SRCBUILD
index f822bb1a0..242356c89 100644
--- a/pcr/pandoc/SRCBUILD
+++ b/pcr/pandoc/SRCBUILD
@@ -2,7 +2,7 @@
 # Based on haskell-pandoc
 
 pkgname=pandoc
-pkgver=1.12
+pkgver=1.12.1
 pkgrel=1
 pkgdesc='Conversion between markup formats (no Haskell libs)'
 url='http://johnmacfarlane.net/pandoc/'
@@ -21,12 +21,14 @@ build() {
     cabal --verbose=3 update
 
     HOME=${srcdir}/${pkgname}-${pkgver} \
-    cabal --verbose=3 fetch file-embed ${pkgname}-${pkgver}
+    cabal --verbose=3 fetch hs-bibutils network hexpat text text-icu hsb2hs ${pkgname}-${pkgver} pandoc-citeproc
 
     msg2 "Getting the dependency build order"
 # Ignore the cabal messages
     HOME=${srcdir}/${pkgname}-${pkgver} \
-    cabal install --dry-run file-embed ${pkgname}-${pkgver} | grep "\-[0-9]\+" >>BUILDORDER
+    cabal install --flags="embed_data_files bibutils hexpat unicode_collation" --dry-run hsb2hs ${pkgname}-${pkgver} pandoc-citeproc |
+      grep "\-[0-9]\+" |
+      tee BUILDORDER
 }
 
 package() {
diff --git a/pcr/plowshare/PKGBUILD b/pcr/plowshare/PKGBUILD
index 3076b779e..608e13ccf 100644
--- a/pcr/plowshare/PKGBUILD
+++ b/pcr/plowshare/PKGBUILD
@@ -2,7 +2,7 @@
 # Contributor: breakdown <breakdown(at)archlinux(dot)us>
 
 pkgname=plowshare
-pkgver=snapshot_git20130901.1c5013f
+pkgver=snapshot_git20131009.5e55a9b
 pkgrel=1
 pkgdesc="Command-line downloader and uploader for Rapidshare, Mediafire and other file sharing websites."
 arch=('any')
@@ -15,7 +15,6 @@ optdepends=('bash-completion: enable bash auto completion'
             'aview: ascii display for no X server')
 conflicts=("$pkgname-git")
 source=("http://$pkgname.googlecode.com/files/${pkgname}4-${pkgver/_/-}.tar.gz")
-md5sums=('c5fe40d79dea2cf02ba534c9a0ea9680')
 
 package() {
   cd "$srcdir/${pkgname}4-${pkgver/_/-}"
@@ -32,3 +31,4 @@ package() {
 }
 
 # vim:set ts=2 sw=2 et:
+md5sums=('cfecd42bf22712f4c410d88c9aa9cf0c')
diff --git a/pcr/python2-pycha/PKGBUILD b/pcr/python2-pycha/PKGBUILD
index 4c9cf4ea4..cc6662f70 100644
--- a/pcr/python2-pycha/PKGBUILD
+++ b/pcr/python2-pycha/PKGBUILD
@@ -1,5 +1,5 @@
 # Maintainer: Jakub Klinkovský <kuba.klinkovsky@gmail.com>
-# Contributor (Parabola): André Silva <emulatorman@lavabit.com>
+# Contributor (Parabola): André Silva <emulatorman@parabola.nu>
 pkgname=python2-pycha
 pkgver=279
 pkgrel=1
diff --git a/pcr/python2-relatorio/PKGBUILD b/pcr/python2-relatorio/PKGBUILD
index e70699886..888cda81d 100644
--- a/pcr/python2-relatorio/PKGBUILD
+++ b/pcr/python2-relatorio/PKGBUILD
@@ -1,6 +1,6 @@
 # Contributor: Florian Walch <florian.walch@gmx.at>
 # Maintainer: Thomas Bahn <Thomas-Bahn@gmx.net>
-# Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
+# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
 
 pkgname=python2-relatorio
 pkgver=0.6.0
diff --git a/pcr/python2-renpy/PKGBUILD b/pcr/python2-renpy/PKGBUILD
index a7ff17837..ee91bafb8 100644
--- a/pcr/python2-renpy/PKGBUILD
+++ b/pcr/python2-renpy/PKGBUILD
@@ -1,4 +1,4 @@
-# Maintainer: André Silva <emulatorman@lavabit.com>
+# Maintainer: André Silva <emulatorman@parabola.nu>
 # Maintainer: Márcio Silva <coadde@lavabit.com>
 
 _pkgname=renpy
diff --git a/pcr/ruby-maruku/PKGBUILD b/pcr/ruby-maruku/PKGBUILD
new file mode 100644
index 000000000..786b03e98
--- /dev/null
+++ b/pcr/ruby-maruku/PKGBUILD
@@ -0,0 +1,27 @@
+# Maintainter: Aurelien Desbrieres <aurelien@cwb.io>
+# Contributer: Luke Shumaker <lukeshu@sbcglobal.net>
+# Maintainer (AUR): Adam Lloyd <lloyda2@rpi.edu>
+
+_gemname=maruku
+pkgname=ruby-$_gemname
+pkgver=0.6.1
+pkgdesc="A Markdown-superset interpreter"
+url="http://maruku.rubyforge.org/"
+
+license=('GPL') # GPL2+
+
+pkgrel=1
+arch=(any)
+depends=(ruby ruby-syntax)
+makedepends=(rubygems)
+source=(http://gems.rubyforge.org/gems/$_gemname-$pkgver.gem)
+noextract=($_gemname-$pkgver.gem)
+
+package() {
+  cd "$srcdir"
+  local _gemdir="$(ruby -rubygems -e'puts Gem.default_dir')"
+  gem install --no-user-install --ignore-dependencies -i "$pkgdir$_gemdir" -n "$pkgdir/usr/bin" \
+    "$_gemname-$pkgver.gem"
+}
+
+md5sums=('b919c2b706ca83502a8bec0be5c16c6d')
diff --git a/pcr/ruby-syntax/PKGBUILD b/pcr/ruby-syntax/PKGBUILD
index 6845206bb..36d38a725 100644
--- a/pcr/ruby-syntax/PKGBUILD
+++ b/pcr/ruby-syntax/PKGBUILD
@@ -1,23 +1,32 @@
-# Contributor: Adam Lloyd <lloyda2 (at) rpi (dot) edu>
-# Maintainer : Parabola GNU / Linux-libre Aurelien Desbrieres <aurelien@cwb.io>
-pkgname=ruby-syntax
+# Maintainter: Aurelien Desbrieres <aurelien@cwb.io>
+# Contributer: Luke Shumaker <lukeshu@sbcglobal.net>
+# Maintainer (AUR): Adam Lloyd <lloyda2@rpi.edu>
+
+_gemname=syntax
+pkgname=ruby-$_gemname
 pkgver=1.0.0
-pkgrel=1
-pkgdesc="Syntax - lexical analysis for syntax highlighting"
-arch=(any)
+pkgdesc="A Ruby library for performing simple syntax highlighting"
 url="http://syntax.rubyforge.org/"
-license=('custom:BSD')
+license=('custom:BSD3')
+
+pkgrel=2
+arch=(any)
 depends=(ruby)
 makedepends=(rubygems)
-source=(http://gems.rubyforge.org/gems/syntax-$pkgver.gem)
-noextract=(syntax-$pkgver.gem)
-md5sums=('d9d2eabc03bc937adfa00e35f228f9a8')
+source=("https://rubyforge.org/frs/download.php/4952/$_gemname-$pkgver.tar.bz2" $_gemname.gemspec)
+md5sums=('bcb53b7d0847190c40a993c3fe1f1611'
+         '6e9a615fd9ba73335b16e5cc8762667d')
 
 build() {
-  cd $srcdir
-  local _gemdir="$(ruby -rubygems -e'puts Gem.default_dir')"
-  gem install --ignore-dependencies -i "$pkgdir$_gemdir" syntax-$pkgver.gem
+  cd "$srcdir/$_gemname-$pkgver"
+  gem build ../$_gemname.gemspec
 }
 
-# vim:set ts=2 sw=2 et:
-md5sums=('d9d2eabc03bc937adfa00e35f228f9a8')
+package() {
+  cd "$srcdir/$_gemname-$pkgver"
+  local _gemdir="$(ruby -rubygems -e'puts Gem.default_dir')"
+  gem install --no-user-install --ignore-dependencies -i "$pkgdir$_gemdir" -n "$pkgdir/usr/bin" \
+    "$_gemname-$pkgver.gem"
+  install -Dm644 "$pkgdir$_gemdir"/gems/$_gemname-$pkgver/LICENSE \
+                 "$pkgdir"/usr/share/licenses/$pkgname/LICENSE
+}
diff --git a/pcr/sipwitch/PKGBUILD b/pcr/sipwitch/PKGBUILD
index eba2bb854..fbaf88141 100644
--- a/pcr/sipwitch/PKGBUILD
+++ b/pcr/sipwitch/PKGBUILD
@@ -1,6 +1,6 @@
 # Maintainer: Dan Serban
 # Contributors: David Zaragoza, Andrea Scarpino
-# Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
+# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
 
 pkgname=sipwitch
 pkgver=1.2.4
diff --git a/pcr/ted/PKGBUILD b/pcr/ted/PKGBUILD
new file mode 100644
index 000000000..aa085dc62
--- /dev/null
+++ b/pcr/ted/PKGBUILD
@@ -0,0 +1,60 @@
+# Contributor: willemw <willemw12@gmail.com>
+# Contributor: shirokuro <tod dot jackson at gmail dot com>
+# Contributor: sergej
+# Maintainer : Parabola Aurélien DESBRIÈRES <aurelien@xload.IO>
+
+pkgname=ted
+pkgver=2.23
+pkgrel=2
+pkgdesc="A lightweight rtf text processor"
+arch=('i686' 'x86_64')
+url="http://www.nllgg.nl/Ted/"
+depends=('zlib' 'pcre' 'libxpm' 'libjpeg' 'libtiff' 'libpng' 'gtk2' 'libpaper' 'desktop-file-utils')
+license=('GPL')
+install=$pkgname.install
+source=(http://ftp.nluug.nl/pub/editors/$pkgname/$pkgname-$pkgver.src.tar.gz
+        http://ftp.nluug.nl/pub/editors/ted/ted_nl_NL.tar.gz
+        http://ftp.nluug.nl/pub/editors/ted/ted_en_GB.tar.gz
+        http://ftp.nluug.nl/pub/editors/ted/ted_de_DE.tar.gz
+        http://ftp.nluug.nl/pub/editors/ted/ted_es_ES.tar.gz
+        http://ftp.nluug.nl/pub/editors/ted/ted_es_AR.tar.gz
+        http://ftp.nluug.nl/pub/editors/ted/ted_pt_PT.tar.gz
+        http://ftp.nluug.nl/pub/editors/ted/ted_pt_BR.tar.gz
+        http://ftp.nluug.nl/pub/editors/ted/ted_fr_FR.tar.gz
+        http://ftp.nluug.nl/pub/editors/ted/ted_it_IT.tar.gz
+        http://ftp.nluug.nl/pub/editors/ted/ted_cs_CZ.tar.gz
+        http://ftp.nluug.nl/pub/editors/ted/ted_da_DK.tar.gz
+        http://ftp.nluug.nl/pub/editors/ted/ted_sv_SE.tar.gz
+        http://ftp.nluug.nl/pub/editors/ted/ted_nb_NO.tar.gz
+        http://ftp.nluug.nl/pub/editors/ted/ted_pl_PL.tar.gz
+        http://ftp.nluug.nl/pub/editors/ted/ted_sk_SK.tar.gz
+        http://ftp.nluug.nl/pub/editors/ted/ted_hu_HU.tar.gz
+        http://ftp.nluug.nl/pub/editors/ted/ted_mg_MG.tar.gz
+        http://ftp.nluug.nl/pub/editors/ted/ted_bg_BG.tar.gz
+        http://ftp.nluug.nl/pub/editors/ted/ted_ru_RU.tar.gz
+        http://ftp.nluug.nl/pub/editors/ted/ted_hr_HR.tar.gz
+        http://ftp.nluug.nl/pub/editors/ted/ted_fi_FI.tar.gz
+        http://ftp.nluug.nl/pub/editors/ted/TedDocument-de_DE.rtf
+        http://ftp.nluug.nl/pub/editors/ted/TedDocument-fr_FR.rtf
+        http://ftp.nluug.nl/pub/editors/ted/TedDocument-mg_MG.rtf)
+
+
+build() {
+  cd Ted-$pkgver
+  make
+  make package
+}
+
+package() {
+  install -dm755 "$pkgdir/usr/share/Ted"
+  install -m644 TedDocument-*_*.rtf "$pkgdir/usr/share/Ted"
+
+  cd Ted-$pkgver/tedPackage
+  DESTDIR="$pkgdir" make install
+
+  cd "$pkgdir"
+  for i in "$srcdir/"ted_*_*.tar.gz; do
+    tar xzf "$i"
+  done
+}
+
diff --git a/pcr/ted/ted.install b/pcr/ted/ted.install
new file mode 100644
index 000000000..f98ba7338
--- /dev/null
+++ b/pcr/ted/ted.install
@@ -0,0 +1,11 @@
+post_install() {
+    update-desktop-database -q
+}
+
+post_upgrade() {
+    post_install $1
+}
+
+post_remove() {
+    post_install $1
+}
diff --git a/pcr/trytond-account-invoice/PKGBUILD b/pcr/trytond-account-invoice/PKGBUILD
index 880c1dff9..0813dd78d 100644
--- a/pcr/trytond-account-invoice/PKGBUILD
+++ b/pcr/trytond-account-invoice/PKGBUILD
@@ -1,5 +1,5 @@
 # Maintainer: Robin Baumgartner <robin@baumgartners.ch>
-# Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
+# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
 pkgname=trytond-account-invoice
 _pkgname=trytond_account_invoice
 pkgver=2.8.3
diff --git a/pcr/trytond-account-product/PKGBUILD b/pcr/trytond-account-product/PKGBUILD
index 14c5a1ea8..2d196b1fd 100644
--- a/pcr/trytond-account-product/PKGBUILD
+++ b/pcr/trytond-account-product/PKGBUILD
@@ -1,5 +1,5 @@
 # Maintainer: Robin Baumgartner <robin@baumgartners.ch>
-# Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
+# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
 pkgname=trytond-account-product
 _pkgname=trytond_account_product
 pkgver=2.8.0
diff --git a/pcr/trytond-account/PKGBUILD b/pcr/trytond-account/PKGBUILD
index 9bb9022e5..31f3c3c14 100644
--- a/pcr/trytond-account/PKGBUILD
+++ b/pcr/trytond-account/PKGBUILD
@@ -1,5 +1,5 @@
 # Maintainer: Robin Baumgartner <robin@baumgartners.ch>
-# Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
+# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
 pkgname=trytond-account
 _pkgname=trytond_account
 pkgver=2.8.1
diff --git a/pcr/trytond-calendar/PKGBUILD b/pcr/trytond-calendar/PKGBUILD
index aa9341c94..bae7cdb5f 100644
--- a/pcr/trytond-calendar/PKGBUILD
+++ b/pcr/trytond-calendar/PKGBUILD
@@ -1,5 +1,5 @@
 # Maintainer: Robin Baumgartner <robin@baumgartners.ch>
-# Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
+# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
 pkgname=trytond-calendar
 _pkgname=trytond_calendar
 pkgver=2.8.0
diff --git a/pcr/trytond-company/PKGBUILD b/pcr/trytond-company/PKGBUILD
index 548c46f38..7455afcc2 100644
--- a/pcr/trytond-company/PKGBUILD
+++ b/pcr/trytond-company/PKGBUILD
@@ -1,5 +1,5 @@
 # Maintainer: Robin Baumgartner <robin@baumgartners.ch>
-# Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
+# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
 pkgname=trytond-company
 _pkgname=trytond_company
 pkgver=2.8.0
diff --git a/pcr/trytond-country/PKGBUILD b/pcr/trytond-country/PKGBUILD
index fa0070eee..802064c3f 100644
--- a/pcr/trytond-country/PKGBUILD
+++ b/pcr/trytond-country/PKGBUILD
@@ -1,5 +1,5 @@
 # Maintainer: Robin Baumgartner <robin@baumgartners.ch>
-# Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
+# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
 pkgname=trytond-country
 _pkgname=trytond_country
 pkgver=2.8.0
diff --git a/pcr/trytond-currency/PKGBUILD b/pcr/trytond-currency/PKGBUILD
index 02dd63565..3f1e364ad 100644
--- a/pcr/trytond-currency/PKGBUILD
+++ b/pcr/trytond-currency/PKGBUILD
@@ -1,5 +1,5 @@
 # Maintainer: Robin Baumgartner <robin@baumgartners.ch>
-# Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
+# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
 pkgname=trytond-currency
 _pkgname=trytond_currency
 pkgver=2.8.0
diff --git a/pcr/trytond-party/PKGBUILD b/pcr/trytond-party/PKGBUILD
index 0854e8193..c21e2b44f 100644
--- a/pcr/trytond-party/PKGBUILD
+++ b/pcr/trytond-party/PKGBUILD
@@ -1,5 +1,5 @@
 # Maintainer: Robin Baumgartner <robin@baumgartners.ch>
-# Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
+# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
 pkgname=trytond-party
 _pkgname=trytond_party
 pkgver=2.8.0
diff --git a/pcr/trytond-product/PKGBUILD b/pcr/trytond-product/PKGBUILD
index 6271f4ef5..210a6b023 100644
--- a/pcr/trytond-product/PKGBUILD
+++ b/pcr/trytond-product/PKGBUILD
@@ -1,5 +1,5 @@
 # Maintainer: Robin Baumgartner <robin@baumgartners.ch>
-# Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
+# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
 pkgname=trytond-product
 _pkgname=trytond_product
 pkgver=2.8.0
diff --git a/pcr/trytond-stock-lot/PKGBUILD b/pcr/trytond-stock-lot/PKGBUILD
index 4d88cd382..08e022e21 100644
--- a/pcr/trytond-stock-lot/PKGBUILD
+++ b/pcr/trytond-stock-lot/PKGBUILD
@@ -1,5 +1,5 @@
 # Maintainer: Robin Baumgartner <robin@baumgartners.ch>
-# Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
+# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
 pkgname=trytond-stock-lot
 _pkgname=trytond_stock_lot
 pkgver=2.8.0
diff --git a/pcr/trytond-stock/PKGBUILD b/pcr/trytond-stock/PKGBUILD
index 9906ed675..d84eda26c 100644
--- a/pcr/trytond-stock/PKGBUILD
+++ b/pcr/trytond-stock/PKGBUILD
@@ -1,5 +1,5 @@
 # Maintainer: Robin Baumgartner <robin@baumgartners.ch>
-# Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
+# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
 pkgname=trytond-stock
 _pkgname=trytond_stock
 pkgver=2.8.1
diff --git a/pcr/trytond/PKGBUILD b/pcr/trytond/PKGBUILD
index d041fabbe..286cff50d 100644
--- a/pcr/trytond/PKGBUILD
+++ b/pcr/trytond/PKGBUILD
@@ -1,6 +1,6 @@
 # Contributor: Florian Walch <florian.walch@gmx.at>
 # Maintainer: Robin Baumgartner <robin@baumgartners.ch>
-# Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
+# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
 pkgname=trytond
 pkgver=2.8.3
 _pkgdir=2.8
diff --git a/pcr/ttf-asana-math/PKGBUILD b/pcr/ttf-asana-math/PKGBUILD
index b8bd85dcc..8b0169d83 100644
--- a/pcr/ttf-asana-math/PKGBUILD
+++ b/pcr/ttf-asana-math/PKGBUILD
@@ -1,10 +1,10 @@
-# Maintainer (Arch): GordonGR <gordongr@freemail.gr>
+# Maintainer: GordonGR <gordongr@freemail.gr>
 # Maintainer (Parabola): Alon Ivtsan <alonivtsan@lavabit.com>
 # taken from https://aur.archlinux.org/packages/ttf-asana-math/
 
 pkgname=ttf-asana-math
-pkgver=000.949
-pkgrel=1
+pkgver=000.951
+pkgrel=2
 license=('Custom: OFL')
 depends=('fontconfig' 'xorg-font-utils')
 pkgdesc="A font to typeset maths in Xe(La)TeX and Lua(La)TeX by Apostolos Syropoulos"
@@ -13,12 +13,9 @@ url="http://www.ctan.org/pkg/asana-math"
 source=("ftp://ftp.rrzn.uni-hannover.de/pub/mirror/tex-archive/fonts/Asana-Math/Asana-Math.otf" 
 "ftp://ftp.rrzn.uni-hannover.de/pub/mirror/tex-archive/fonts/Asana-Math/Asana-Math.ttf" 
 "http://scripts.sil.org/cms/scripts/render_download.php?&format=file&media_id=OFL_plaintext&filename=OFL.txt")
-md5sums=('d9f9faa296a12a14354d9e83c90f167b'
-         'd7a05892aeed8bbe4b410bf845ce9882'
-         '6ed93967ff0dc6dd9c8d31c17f817a06')
 install=$pkgname.install
 
-build()
+package()
 {
   mkdir -p $pkgdir/usr/share/fonts/TTF
   mkdir -p $pkgdir/usr/share/fonts/OTF
@@ -28,3 +25,6 @@ build()
   mv 'render_download.php?&format=file&media_id=OFL_plaintext&filename=OFL.txt' LICENSE
   cp LICENSE $pkgdir/usr/share/licenses/custom/ttf-asana-math/
 }
+md5sums=('d9f9faa296a12a14354d9e83c90f167b'
+         'd7a05892aeed8bbe4b410bf845ce9882'
+         '6ed93967ff0dc6dd9c8d31c17f817a06')
diff --git a/pcr/wikipediafs/PKGBUILD b/pcr/wikipediafs/PKGBUILD
new file mode 100644
index 000000000..d70dd2f6f
--- /dev/null
+++ b/pcr/wikipediafs/PKGBUILD
@@ -0,0 +1,19 @@
+# Maintainer: Antoine Lubineau <antoine@lubignon.info>
+
+pkgname=wikipediafs
+pkgver=0.4
+pkgrel=2
+pkgdesc="Mount Wikipedia/Mediawiki sites locally via FUSE"
+arch=('any')
+url="http://wikipediafs.sourceforge.net/"
+license=('GPL')
+depends=('fuse' 'python2-fuse')
+source=("http://downloads.sourceforge.net/wikipediafs/$pkgname-$pkgver.tar.gz")
+sha256sums=('8c9de78dd92354877a8d604f3128238f10cd6c06d594ddc23c06552cc7c731f1')
+
+package() {
+  cd "$srcdir/$pkgname-$pkgver"
+  python2 setup.py install --root="$pkgdir/" --optimize=1
+}
+
+# vim:set ts=2 sw=2 et:
diff --git a/pcr/xchat-otr/PKGBUILD b/pcr/xchat-otr/PKGBUILD
new file mode 100644
index 000000000..7bc6e8c41
--- /dev/null
+++ b/pcr/xchat-otr/PKGBUILD
@@ -0,0 +1,31 @@
+# Contributor: Tom <tomgparchaur@gmail.com>
+# Based on a quantax contribution for irssi-otr
+
+pkgname=xchat-otr
+pkgver=0.3
+pkgrel=2
+pkgdesc="Off-the-Record Messaging (OTR) plugin for the XChat IRC client"
+arch=('i686' 'x86_64')
+url="http://irssi-otr.tuxfamily.org/"
+license=('GPL')
+depends=('xchat' 'libotr3')
+makedepends=('cmake' 'pkgconfig' 'python')
+source=("ftp://download.tuxfamily.org/irssiotr/${pkgname}-${pkgver}.tar.gz"
+	'http://xchat.org/docs/xchat-plugin.h')
+
+build() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+  mkdir -p ${srcdir}/${pkgname}-${pkgver}/xchat
+  install -m 644 ${srcdir}/xchat-plugin.h ${srcdir}/${pkgname}-${pkgver}/xchat/ || return 1
+  find ${srcdir}/${pkgname}-${pkgver} -type f -print0 | xargs -0 sed -i 's@libotr/@libotr3/@g'
+  cmake -DXCHAT_INCLUDE_DIR=${srcdir}/${pkgname}-${pkgver} -DCMAKE_INSTALL_PREFIX=/usr . -DLIBOTR_LIBRARY=/usr/lib/libotr3.so
+  make || return 1
+  make DESTDIR=${pkgdir} install || return 1
+  mv ${pkgdir}/usr/share/doc/irssi-otr ${pkgdir}/usr/share/doc/xchat-otr || return 1
+  install -m 644 ${srcdir}/${pkgname}-${pkgver}/README.xchat ${pkgdir}/usr/share/doc/xchat-otr || return 1
+  rm ${pkgdir}/usr/share/doc/xchat-otr/LICENSE || return 1
+}
+
+md5sums=('49706959af491c721a8a5a62bd224670'
+         '5ee7da5abedc78a30b90e737370d8f0b')
+
diff --git a/pcr/yafaray/PKGBUILD b/pcr/yafaray/PKGBUILD
index 458181279..1db06b6a9 100644
--- a/pcr/yafaray/PKGBUILD
+++ b/pcr/yafaray/PKGBUILD
@@ -2,21 +2,21 @@
 
 _pkgname=yafaray
 _pkgver=1.5
-_pkgrel=3
-_pkgdate=20130510
+_pkgrel=1
+_pkgdate=20130921
 _bldname=blender
-_bldver=2.68
-_bldep=9
+_bldver=2.69
+_bldep=10
 _gitname=Core
 _addname=${_bldname^}-Exporter
 _addrel=1
-_adddate=20130623
+_adddate=20130918
 _pyver=3.3
 
-# Fri May 10 00:57:12 2013 -0700 - Merge pull request #67 from DarkTide/master // Depth fix for hist on background
-_srcver=44323def5b3866ff601fd401ef2160b80ced8141                                  
-# Sun Jun 23 15:10:57 2013 +0200 - Refine AA changes for SPPM integrator
-_addver=9bcb22e8b8bd9281999ad36c5b22604f671484bb
+# Sat Sep 21 00:41:17 2013 -0700 - Merge pull request #70 from YafaRay/bidirectional_cleanup
+_srcver=caef0fc92078871a5dcd2b9f547d954eca2941f1
+# Fri Oct 18 19:07:53 2013 +0200 - Fix AO issue (wizofboz): -Fixed error of indentation in 'yaf_integrator.py' causer of the error in the use of Ambient Occlusion.
+_addver=1874704e44c57bcea478d652563639e79b00a766
 
 pkgname=(
   $_pkgname
@@ -55,8 +55,8 @@ source=(
   $_addname-$_addver.tar.gz::https://github.com/YafaRay/$_addname/archive/$_addver.tar.gz
 )
 sha512sums=(
-  5045a3de89e0a2d029e8b6ce962eeadeb5587369217d11d42ca79706a65e6ac7b07584f68307f76c90dbaf190af9626e3351e391107a4e763fc9e41d48cfd7a6
-  59322686d0623481b38c531e2a8350cafcf8942eb08df2dfcc8f59657715aa716ca34d473f862291e8a375fccdf717d93898caa3e344cfa1a3e5e760c903d32c
+  0470e26e2c7956f2d2dc18888cffaf7c2916df42c8208d6e0f4e1d5c438660dd6ae99a1e5f06a118175a8b2a97c89e482b1b069ced2abf3916bbfc60fac54e75
+  3c2207dbca7a70ba82ea6d835785401a24c7813d65380bf8c46a527fff6e65a0a7c101b60b5e8b88163ab07d3d42ec9f9aacbcf090f73062d3643c1c314c97d8
 )
 
 prepare() {
diff --git a/pcr/youtube-dl-current/PKGBUILD b/pcr/youtube-dl-current/PKGBUILD
index 22cd86750..f6aeb166c 100644
--- a/pcr/youtube-dl-current/PKGBUILD
+++ b/pcr/youtube-dl-current/PKGBUILD
@@ -5,7 +5,7 @@
 pkgname=youtube-dl-current
 _pkgname=youtube-dl
 provides=(youtube-dl)
-pkgver=2013.10.09
+pkgver=2013.11.03
 pkgrel=1
 pkgdesc="A small command-line program to download videos from YouTube.com and a few more sites"
 arch=('any')
@@ -27,5 +27,5 @@ package() {
     "${pkgdir}/usr/share/bash-completion/completions/youtube-dl"
   install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/${_pkgname}/LICENSE"
 }
-md5sums=('ddbefc30e4efefe29a2fe89ed6f4bccc'
+md5sums=('62e49076cb5e67233b3a8a8df9c8c0e8'
          'SKIP')
diff --git a/pcr/zenity-gtk2/PKGBUILD b/pcr/zenity-gtk2/PKGBUILD
new file mode 100644
index 000000000..f66bd21ec
--- /dev/null
+++ b/pcr/zenity-gtk2/PKGBUILD
@@ -0,0 +1,44 @@
+# $Id: PKGBUILD 183472 2013-04-21 22:12:29Z heftig $
+# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net>
+# Maintainer (Arch): Jan de Groot <jgc@archlinux.org>
+
+pkgname=zenity-gtk2
+pkgver=3.10.0.git20131018
+_gitver='commit=23a7232661bbc2058a483c52394a200f1803a6b0'
+pkgrel=1
+pkgdesc="Display graphical dialog boxes from shell scripts (GTK 2 port)"
+arch=(i686 x86_64)
+license=('LGPL')
+depends=('gtk2' 'libnotify')
+makedepends=('intltool' 'gtk-doc' 'itstool' 'docbook-xsl')
+url="https://lukeshu.com/git/zenity-gtk2.git/"
+source=("libre://${pkgname}-${pkgver}.tar.gz")
+
+provides=(zenity=$pkgver)
+conflicts=(zenity)
+
+mkdepends=(git gnome-common yelp-tools)
+mksource=(".$pkgname-$pkgver::git://lukeshu.com/zenity-gtk2.git#${_gitver}")
+mkmd5sums=('SKIP')
+mksource() {
+  cd "$srcdir/.$pkgname-$pkgver"
+  ./autogen.sh
+  make -C help PACKAGE="$pkgname" VERSION="$pkgver"
+  make dist PACKAGE="$pkgname" VERSION="$pkgver"
+  cd "$srcdir"
+  bsdtar xf ".$pkgname-$pkgver/$pkgname-$pkgver.tar.bz2"
+}
+
+build() {
+  cd $pkgname-$pkgver
+  ./configure --prefix=/usr --sysconfdir=/etc \
+      --localstatedir=/var --with-gtk=2.0
+  make
+}
+
+package() {
+  cd $pkgname-$pkgver
+  make DESTDIR="${pkgdir}" install
+}
+
+sha256sums=('651af86234dc098eba28eb9e88d74afc25662ed95c459dfa50882fd39c2a479b')
diff --git a/pcr/zoneminder/PKGBUILD b/pcr/zoneminder/PKGBUILD
index ede03dd77..29cf5ae8c 100644
--- a/pcr/zoneminder/PKGBUILD
+++ b/pcr/zoneminder/PKGBUILD
@@ -3,7 +3,7 @@
 # Contributor: Jason Gardner             <buhrietoe@gmail.com>
 # Contributor: Ross melin                <rdmelin@gmail.com>
 # Maintainer (Parabola): Márcio Silva    <coadde@lavabit.com>
-# Contributor (Parabola): André Silva    <emulatorman@lavabit.com>
+# Contributor (Parabola): André Silva    <emulatorman@parabola.nu>
 
 # based of debian squeeze package
 
diff --git a/social/sipwitch/PKGBUILD b/social/sipwitch/PKGBUILD
index 6ab789ccc..769757df4 100644
--- a/social/sipwitch/PKGBUILD
+++ b/social/sipwitch/PKGBUILD
@@ -1,6 +1,6 @@
 # Maintainer: Dan Serban
 # Contributors: David Zaragoza, Andrea Scarpino
-# Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
+# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
 
 pkgname=sipwitch
 pkgver=1.2.4
diff --git a/~coadde/cross-binutils/PKGBUILD b/~coadde/cross-binutils/PKGBUILD
index e1a8985f3..9c22f62af 100644
--- a/~coadde/cross-binutils/PKGBUILD
+++ b/~coadde/cross-binutils/PKGBUILD
@@ -1,5 +1,5 @@
 # Maintainer: Márcio Silva <coadde@lavabit.com>
-# Contributor: André Silva <emulatorman@lavabit.com>
+# Contributor: André Silva <emulatorman@parabola.nu>
 
 # toolchain build order: linux-api-headers->glibc->binutils->gcc->binutils->glibc
 
diff --git a/~emulatorman/hunspell-gl/PKGBUILD b/~emulatorman/hunspell-gl/PKGBUILD
index 8c791a2fe..e3de55b8d 100644
--- a/~emulatorman/hunspell-gl/PKGBUILD
+++ b/~emulatorman/hunspell-gl/PKGBUILD
@@ -1,5 +1,5 @@
 # Maintainer: Adrián Chaves Fernández (Gallaecio) <adriyetichaves@gmail.com>, 2009-2010.
-# Contributor (Parabola): André Silva <emulatorman@lavabit.com>
+# Contributor (Parabola): André Silva <emulatorman@parabola.nu>
 
 pkgname=hunspell-gl
 pkgver=2.9b
diff --git a/~emulatorman/iceape-l10n/PKGBUILD b/~emulatorman/iceape-l10n/PKGBUILD
index be0a6dd07..227467123 100644
--- a/~emulatorman/iceape-l10n/PKGBUILD
+++ b/~emulatorman/iceape-l10n/PKGBUILD
@@ -2,7 +2,7 @@
 # Contributor: fauno <fauno@kiwwwi.com.ar>
 # Contributor: Figue <ffigue@gmail.com>
 # Maintainer: Márcio Silva <coadde@lavabit.com>
-# Maintainer: André Silva <emulatorman@lavabit.com>
+# Maintainer: André Silva <emulatorman@parabola.nu>
 # Based on icecat-i18n package, which is in turn based on firefox-i18n
 
 # When updating to a newer upstream release:
diff --git a/~emulatorman/iceape-libre/PKGBUILD b/~emulatorman/iceape-libre/PKGBUILD
index c46631628..db650ddff 100644
--- a/~emulatorman/iceape-libre/PKGBUILD
+++ b/~emulatorman/iceape-libre/PKGBUILD
@@ -1,5 +1,5 @@
 # Maintainer : Márcio Silva <coadde@lavabit.com>
-# Maintainer : André Silva <emulatorman@lavabit.com>
+# Maintainer : André Silva <emulatorman@parabola.nu>
 
 # We're getting this from Debian Sid
 _debname=iceape
diff --git a/~emulatorman/icecat-l10n/PKGBUILD b/~emulatorman/icecat-l10n/PKGBUILD
index 197e3e236..bb3d47c32 100644
--- a/~emulatorman/icecat-l10n/PKGBUILD
+++ b/~emulatorman/icecat-l10n/PKGBUILD
@@ -2,7 +2,7 @@
 # Contributor: fauno <fauno@kiwwwi.com.ar>
 # Contributor: Figue <ffigue@gmail.com>
 # Maintainer: Márcio Silva <coadde@lavabit.com>
-# Maintainer: André Silva <emulatorman@lavabit.com>
+# Maintainer: André Silva <emulatorman@parabola.nu>
 # Based on firefox-i18n package
 
 # When updating to a newer upstream release:
diff --git a/~emulatorman/icecat/PKGBUILD b/~emulatorman/icecat/PKGBUILD
index c26b3c1b7..6e5bddfe6 100644
--- a/~emulatorman/icecat/PKGBUILD
+++ b/~emulatorman/icecat/PKGBUILD
@@ -3,7 +3,7 @@
 # Contributor: Figue <ffigue at gmail>
 # Contributor (Parabola): fauno <fauno@kiwwwi.com.ar>
 # Contributor (Parabola): vando <facundo@esdebian.org>
-# Contributor (Parabola): André Silva <emulatorman@lavabit.com>
+# Contributor (Parabola): André Silva <emulatorman@parabola.nu>
 # Maintainer (Parabola): Márcio Silva <coadde@lavabit.com>
 # Contributor (Arch): Jakub Schmidtke <sjakub@gmail.com>
 # Thank you very much to the older contributors:
diff --git a/~emulatorman/icedove-l10n/PKGBUILD b/~emulatorman/icedove-l10n/PKGBUILD
index 208e176ba..9ed01c353 100644
--- a/~emulatorman/icedove-l10n/PKGBUILD
+++ b/~emulatorman/icedove-l10n/PKGBUILD
@@ -1,5 +1,5 @@
 # Maintainer: Márcio Silva <coadde@lavabit.com>
-# Maintainer: André Silva <emulatorman@lavabit.com>
+# Maintainer: André Silva <emulatorman@parabola.nu>
 
 pkgbase=icedove-l10n
 pkgver=17.0.2.1
diff --git a/~emulatorman/icedove-libre/PKGBUILD b/~emulatorman/icedove-libre/PKGBUILD
index 5ea3ff98f..43cf38f18 100644
--- a/~emulatorman/icedove-libre/PKGBUILD
+++ b/~emulatorman/icedove-libre/PKGBUILD
@@ -1,5 +1,5 @@
 # Maintainer : Márcio Silva <coadde@lavabit.com>
-# Maintainer : André Silva <emulatorman@lavabit.com>
+# Maintainer : André Silva <emulatorman@parabola.nu>
 
 # We're getting this from Debian Experimental
 _debname=icedove
diff --git a/~emulatorman/iceweasel-l10n/PKGBUILD b/~emulatorman/iceweasel-l10n/PKGBUILD
index 8e0172208..988892cbc 100644
--- a/~emulatorman/iceweasel-l10n/PKGBUILD
+++ b/~emulatorman/iceweasel-l10n/PKGBUILD
@@ -2,7 +2,7 @@
 # Contributor: fauno <fauno@kiwwwi.com.ar>
 # Contributor: Figue <ffigue@gmail.com>
 # Maintainer: Márcio Silva <coadde@lavabit.com>
-# Maintainer: André Silva <emulatorman@lavabit.com>
+# Maintainer: André Silva <emulatorman@parabola.nu>
 # Based on icecat-i18n package, which is in turn based on firefox-i18n
 
 # When updating to a newer upstream release:
diff --git a/~emulatorman/iceweasel-libre/PKGBUILD b/~emulatorman/iceweasel-libre/PKGBUILD
index 4f7d77337..b3cf15f28 100644
--- a/~emulatorman/iceweasel-libre/PKGBUILD
+++ b/~emulatorman/iceweasel-libre/PKGBUILD
@@ -3,7 +3,7 @@
 # Contributor: Figue <ffigue at gmail>
 # Contributor (Parabola): fauno <fauno@kiwwwi.com.ar>
 # Contributor (Parabola): vando <facundo@esdebian.org>
-# Contributor (Parabola): André Silva <emulatorman@lavabit.com>
+# Contributor (Parabola): André Silva <emulatorman@parabola.nu>
 # Contributor (Parabola): Márcio Silva <coadde@lavabit.com>
 # Contributor (Arch): Jakub Schmidtke <sjakub@gmail.com>
 # Thank you very much to the older contributors:
diff --git a/~emulatorman/raider/PKGBUILD b/~emulatorman/raider/PKGBUILD
index c5629e9fc..360c3248e 100644
--- a/~emulatorman/raider/PKGBUILD
+++ b/~emulatorman/raider/PKGBUILD
@@ -1,6 +1,6 @@
 # Maintainer: M.Carreira <arch@carreira.com.pt>
 # Contributor: M.Carreira <arch@carreira.com.pt>
-# Contributor (Parabola): André Silva <emulatorman@lavabit.com>
+# Contributor (Parabola): André Silva <emulatorman@parabola.nu>
 pkgname=raider
 pkgver=0.10.0
 pkgrel=1
diff --git a/~emulatorman/xchat-xsys-noaudacious/PKGBUILD b/~emulatorman/xchat-xsys-noaudacious/PKGBUILD
index 7ed44c2e3..42b5e9a46 100644
--- a/~emulatorman/xchat-xsys-noaudacious/PKGBUILD
+++ b/~emulatorman/xchat-xsys-noaudacious/PKGBUILD
@@ -1,5 +1,5 @@
 # Contributor: Gökmen Görgen <gkmngrgn_gmail.com>
-# Contributor (Parabola): André Silva <emulatorman@lavabit.com>
+# Contributor (Parabola): André Silva <emulatorman@parabola.nu>
 pkgname=xchat-xsys-noaudacious
 pkgver=2.2.0
 pkgrel=3
diff --git a/~emulatorman/xonotic-data/PKGBUILD b/~emulatorman/xonotic-data/PKGBUILD
index 13f4d5c12..9ed60c78b 100644
--- a/~emulatorman/xonotic-data/PKGBUILD
+++ b/~emulatorman/xonotic-data/PKGBUILD
@@ -1,7 +1,7 @@
 # $Id: PKGBUILD 35989 2010-12-25 03:22:46Z svenstaro $
 # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
 # Contributor: Alexander Suhoverhov <cy at ngs dot ru>
-# Contributor (Parabola): André Silva <emulatorman@lavabit.com>
+# Contributor (Parabola): André Silva <emulatorman@parabola.nu>
 
 pkgname=xonotic-data
 pkgver=0.5.0
diff --git a/~emulatorman/xonotic/PKGBUILD b/~emulatorman/xonotic/PKGBUILD
index a51606cd5..22b0fa4ac 100644
--- a/~emulatorman/xonotic/PKGBUILD
+++ b/~emulatorman/xonotic/PKGBUILD
@@ -1,6 +1,6 @@
 # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
 # Contributor: Alexander Suhoverhov <cy at ngs dot ru>
-# Contributor (Parabola): André Silva <emulatorman@lavabit.com>
+# Contributor (Parabola): André Silva <emulatorman@parabola.nu>
 
 pkgname=xonotic
 pkgver=0.5.0